Merge pull request #294 from flatcar-linux/dongsu/shadow-4.11.1

sys-apps/man-pages: update to 5.12-r2
flatcar-archive · Feb 25, 2022 · 8297073 · 8297073
2 parents 96e674e + c91aff0
commit 8297073
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 50 deletions.
diff --git a/changelog/updates/2022-02-18-man-pages-5.12.md b/changelog/updates/2022-02-18-man-pages-5.12.md
@@ -0,0 +1 @@
+- man-pages [5.12-r2](https://man7.org/linux/man-pages/changelog.html#release_5.12)
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
@@ -1,8 +1,3 @@
-DIST man-pages-4.09.tar.xz 1521560 SHA256 a574a08e4a62a24dc639cb4ee3e7aa68e7cd8ef2c14a5d54b90d09ac137e809c SHA512 695f90b9f4721d041de0441e240afce88e49f4ea5ffea855262da3cdd0f3f2b6401f2728786da3afa2245aef84d41c0c449415e7e78e408b69c9214ddb4c74ad WHIRLPOOL 6b937d95cbefddf94658a54ec8cc820f7a970830ecc0857cc36577946586084a13fadc7cbcf48c5eddc31b6cc9b2f3b08509b33b1b96e023f0e07927d8c9ec97
-DIST man-pages-4.10.tar.xz 1556948 SHA256 7395dfc391d545385a998d23df9accb60f2020451c53940eaf8a07b6ea8a63fa SHA512 6c5b8e1339a02054a5346ca3ff665c414ef178e69fe0d064d4ad7dc372ba364df2753bf605a682cc366c12661c42b9fd17567c72a0f24173f9b086d79cf354d4 WHIRLPOOL d15515e5525797bb40b9d640ad130e82998d2a07e8464231ad422f5b2e38228c60616223cdb8bbb208edef6eed509374efe10db8ec414ca7157168836a1bbc0a
-DIST man-pages-gentoo-2.tar.bz2 5141 SHA256 b7d9423c2069e587deb7671273d4a1ffed7d31b9f95a689b128a759d636762f0 SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 WHIRLPOOL dcacb319a54ccd2a965786c816684de286581dee6f7b3f8ba4c97cc368e2e50abc92aad403dbdb7b0c15764accb06cd562046bcf14229ad12be242bb2bc7f651
-EBUILD man-pages-4.09.ebuild 1621 SHA256 6c1f28eda315330bd2455661988a8732fcf2fbe33ed18a022ebe01cbda22f14d SHA512 6f6ea6f112514a64ffb90ad4be93e5106ac88558037619b3c6532833fd988ebae8029680e4aa2dfd6e4ec3c901369d4f09674cb98e6c3d703883697ed5163646 WHIRLPOOL b10a28bf435675d0bb4d10f3da00275a8b92c13191e2401465ebb3ad998c8750c76bfcb8d9b0d386768f21ea1cbf95b46e24684731c2f9f5a694682484ef6e3f
-EBUILD man-pages-4.10.ebuild 1672 SHA256 d9b499135a7dd2c0f00a2cde96659eefc1a375230b795c629213ed918289b89f SHA512 b4740db0a08368d4437de045e0c731c53977818083846cf09b47eb398a67cbe17790c74376ac526eb68ffa46198637d64647ba0ffe5b6d805d7c3eba47482cf8 WHIRLPOOL c0e1731cece147781f4e4502fc1a9db3ed5c82bb2580f7d160380ac5589af3cd33e8bdc8611ff4e8c964c29a3eb30da647614417320ce0d689fa1eeb6e71adfb
-MISC ChangeLog 7711 SHA256 87b40ee151bba3dfd65259e3faabb9910619066898c46f57ea9b447648236f04 SHA512 c79cc4f6d22bacdef20f6248f9e6be0e96a4fbbe3daf3b17065bd79c4ff93d44c58fdac92b7a50f4ebc33860c9bfc2323a67ed73a50660c7fa674634ce76b2d1 WHIRLPOOL 959157dfc863415fed27f8e8e11c9bb3b5c01d8a559284a0af4ef154a4f2457cd35b75dc8aa9e826b794b4f9a6ebd9ffac8ad5ee69185e547fb0f2145da0f357
-MISC ChangeLog-2015 32780 SHA256 d47f4d1f1d9a784b8181fef378eb0604dbfd39ada83eb90e7972061c66e2d759 SHA512 ef79e581aeadee729f57c1642421ce02d5d3b7d0e85a164d0a092e74fb9be3576bf0ca98ff899ea5e52866fb88f4f469806de8e677567557b5607c5a21593496 WHIRLPOOL 0bf669d8ddf8b182aaceaccc4ea604d5c32fb9449f3e60b7bad0a0727d6f9bee457ddc8c1accac8ed6ed8ee6dfd6d8a03cb5e8427f76a76471e2570f54b7c7c5
-MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
+DIST man-pages-5.12.tar.xz 1778220 BLAKE2B 347c5ef63cb80134018f322f810545354ccc7afdb8acb62f83e3b06ef15d7fbe6c0c68db37f52ce9727682a856a7810a5e64f1dcbe1cc11b22f83fb0273f7add SHA512 455794ed6e3bf20649f78b464300d5c1adad5000668a82a1194c1af8bdcbd064e4d930696cbe534481368d6526c7cda69927e958b9a868d95891202476fb4608
+DIST man-pages-5.13.tar.xz 1788980 BLAKE2B 7cca88b7f201d177b087893f60e6a87fd3ed8c78a183bd6ebcd0c28961f5f5d24aa2ba9d3a1d9cec4e0fc9cc0b26489c91e991a2d4420c28e1f61b850b882752 SHA512 a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499
+DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
diff --git a/sys-apps/man-pages/man-pages-4.09.ebuild → sys-apps/man-pages/man-pages-5.12-r2.ebuild b/sys-apps/man-pages/man-pages-4.09.ebuild → sys-apps/man-pages/man-pages-5.12-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 GENTOO_PATCH=2
 
@@ -14,28 +14,38 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE_L10N=" da de fr it ja nl pl ro ru zh-CN"
-IUSE="nls ${IUSE_L10N// / l10n_}"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 amd64-linux ~x86-linux"
+IUSE_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
+IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
 
-# Block packages that used to install colliding man pages #341953 #548900
-RDEPEND="virtual/man
-	!<sys-apps/attr-2.4.47-r2
-	!<dev-libs/libaio-0.3.109-r2"
-PDEPEND="nls? (
-	l10n_da? ( app-i18n/man-pages-da )
-	l10n_de? ( app-i18n/man-pages-de )
-	l10n_fr? ( app-i18n/man-pages-fr )
-	l10n_it? ( app-i18n/man-pages-it )
+# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
+RDEPEND="
+	virtual/man
+	!<sys-apps/keyutils-1.5.9-r4
+	!<dev-libs/libbsd-0.8.3-r1
+"
+PDEPEND="
+	l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] )
+	l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] )
+	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] )
+	l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] )
 	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-nl )
-	l10n_pl? ( app-i18n/man-pages-pl )
-	l10n_ro? ( app-i18n/man-pages-ro )
+	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] )
+	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] )
+	l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] )
+	l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] )
 	l10n_ru? ( app-i18n/man-pages-ru )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	)
-	sys-apps/man-pages-posix"
+	sys-apps/man-pages-posix
+"
+
+src_prepare() {
+	default
+
+	# passwd.5 installed by sys-apps/shadow #776787
+	rm man5/passwd.5 || die
+}
 
 src_configure() { :; }
 
@@ -46,7 +56,7 @@ src_install() {
 	dodoc man-pages-*.Announce README Changes*
 
 	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo
+	cd "${WORKDIR}"/man-pages-gentoo || die
 	doman */*
 	dodoc README.Gentoo
 }
diff --git a/sys-apps/man-pages/man-pages-4.10.ebuild → sys-apps/man-pages/man-pages-5.13.ebuild b/sys-apps/man-pages/man-pages-4.10.ebuild → sys-apps/man-pages/man-pages-5.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 GENTOO_PATCH=2
 
@@ -14,29 +14,38 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE_L10N=" da de fr it ja nl pl ro ru zh-CN"
-IUSE="nls ${IUSE_L10N// / l10n_}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
+IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
 
-# Block packages that used to install colliding man pages #341953 #548900 #612640
-RDEPEND="virtual/man
-	!<sys-apps/keyutils-1.5.9-r3
-	!<sys-apps/attr-2.4.47-r2
-	!<dev-libs/libaio-0.3.109-r2"
-PDEPEND="nls? (
-	l10n_da? ( app-i18n/man-pages-da )
-	l10n_de? ( app-i18n/man-pages-de )
-	l10n_fr? ( app-i18n/man-pages-fr )
-	l10n_it? ( app-i18n/man-pages-it )
+# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
+RDEPEND="
+	virtual/man
+	!<sys-apps/keyutils-1.5.9-r4
+	!<dev-libs/libbsd-0.8.3-r1
+"
+PDEPEND="
+	l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] )
+	l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] )
+	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] )
+	l10n_it? ( app-i18n/man-pages-l10n[l10n_it(-)] )
 	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-nl )
-	l10n_pl? ( app-i18n/man-pages-pl )
-	l10n_ro? ( app-i18n/man-pages-ro )
+	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl(-)] )
+	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl(-)] )
+	l10n_pt-BR? ( app-i18n/man-pages-l10n[l10n_pt-BR(-)] )
+	l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] )
 	l10n_ru? ( app-i18n/man-pages-ru )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	)
-	sys-apps/man-pages-posix"
+	sys-apps/man-pages-posix
+"
+
+src_prepare() {
+	default
+
+	# passwd.5 installed by sys-apps/shadow #776787
+	rm man5/passwd.5 || die
+}
 
 src_configure() { :; }
 
@@ -47,7 +56,7 @@ src_install() {
 	dodoc man-pages-*.Announce README Changes*
 
 	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo
+	cd "${WORKDIR}"/man-pages-gentoo || die
 	doman */*
 	dodoc README.Gentoo
 }
diff --git a/sys-apps/man-pages/metadata.xml b/sys-apps/man-pages/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>[email protected]</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<stabilize-allarches/>
 </pkgmetadata>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- man-pages [5.12-r2](https://man7.org/linux/man-pages/changelog.html#release_5.12)