gentoo resync : 25.04.2020

5 files changed, 60 insertions, 5 deletions

diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index d0169a7b75d1..1e8e3708ebf8 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,8 @@
 DIST man-pages-5.04.tar.xz 1684044 BLAKE2B 61b73edfe0d1f93f20b17e935f73c8c0ae778219f59f9b4739e1574b4b9aea5d83cd856f77b58cd2fdc4cd19ddc9a61cf2c7dd504461e9ac3b9a1d59574a2c1c SHA512 723c67eaddc2652dc36fa698d08473dbc8e17f4351b2c391064b80d637ec7e5cdc1b20ee4e542d95f441331c7b773899cfdeeeb7a2f599c64d6eac5c586b7cbe
 DIST man-pages-5.05.tar.xz 1687960 BLAKE2B 68d1391e9517837f55e1516f5c8f869d43ea4e7a01faef62ea27c740ecb73726d66a582b1f5b6bb8674173146035eed8d811d4923351d99bf9363a0ee6297e4a SHA512 4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395
+DIST man-pages-5.06.tar.xz 1703140 BLAKE2B ff123efe4534321d0646e1ce275ec9e9543f4c35d0e2ee89354181f7ac5def3ca8fc403847b19222179b37604064ad2f5453d611bc25df5460bdf0bfb86f0b5a SHA512 2d321ae88be662712293e9b054e5cec3d817836fc154924cbd6a0b759992463a586ec01dc3292fcee6d8146c60e63ef505b223fd955ce71fcbd8760cc60512ed
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.04.ebuild 1636 BLAKE2B f9558c322a7c6c5f422e6600930afdeb153c467c1cb5e9ebc085d364d54a041cb7b0e34d1c576626d6b93337e8e5f09a3e0d44d45e927e6c7ec4eec8c67f4c99 SHA512 dc3ad987d990b0cee10afa1cd83a01ffe1940e0daebbd39c0930abac86cc94fdffb63d120a7d77ba0773f22af4a0312c59ab278ef6cf0f7e7f1a312856c796bb
-EBUILD man-pages-5.05-r2.ebuild 1736 BLAKE2B 6c620ccd3d161cabf1fa942ac0a03d1c602e8fb3f1a8b716bcfc969f5d5de1f909ecab8abc7fb03ecb8485734e03e842c5ff5650fd6541a90555aad7723bdef8 SHA512 bbdbe939f70c5c5129b467698f59933eabdc2c6c2764f46e1ebe287fa0a514b2d6bad4df79e88df1d2f8d874795e1cef7c190aa17413d9fd90ce0f450aee07b2
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD man-pages-5.04.ebuild 1637 BLAKE2B aa289c279045d4e50f5e6bbd9b0c94d49ca2b3fe2e70b38f6f2b53169fda4b1f3c96e4d585c0ecbce87770a91614ab7981bacd1de844b74abf3dcbdb1c091282 SHA512 c18d2bda790107c5497e6b16b2bbadac150f17746b6d89e7238312d3c2e983101dfc31ee441c437c71d37f8499f097b6b57a3c62ea5f1e99a68737c5c5c0a72e
+EBUILD man-pages-5.05-r2.ebuild 1727 BLAKE2B 12e153927e15fdfbdad8b443d4e99469e98d214730083a741e200280c76c19124e10846542793d46529882fc8504f18e818cc317026e8a798299933d823938e7 SHA512 2401e62218595541ea8a6e19b8a814d9f045366dac64d79c094bb8af6ca07d80abe3b27962fc3b386c45af888b94b7adaf070c852fc82c1fad70998b56828fbc
+EBUILD man-pages-5.06.ebuild 1740 BLAKE2B c9ad16d149f63fb02dce7be3059afd2d138bc5ca8c3012287816fb27e52ae1e56b74036d79590d104feb64323597d8d9d3d5c71e4b9ced28528740d281477177 SHA512 e272b2bfc376207206b8eb36c91ae14c867cecfd6cd929e1cebf9a1155018b0528f3c35e003e7a9e8e0966e049db4c5f251d8d120883cdb5f6b010a9e5fd8dbf
+MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.04.ebuild b/sys-apps/man-pages/man-pages-5.04.ebuild
index a7f6e7bf9335..42af68e52b59 100644
--- a/sys-apps/man-pages/man-pages-5.04.ebuild
+++ b/sys-apps/man-pages/man-pages-5.04.ebuild
@@ -14,7 +14,7 @@ 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.05-r2.ebuild b/sys-apps/man-pages/man-pages-5.05-r2.ebuild
index 497d908fc39b..a514eeede3c8 100644
--- a/sys-apps/man-pages/man-pages-5.05-r2.ebuild
+++ b/sys-apps/man-pages/man-pages-5.05-r2.ebuild
@@ -14,7 +14,7 @@ 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.06.ebuild b/sys-apps/man-pages/man-pages-5.06.ebuild
new file mode 100644
index 000000000000..1b3edb48e843
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-5.06.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_PATCH=2
+
+DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
+HOMEPAGE="https://www.kernel.org/doc/man-pages/"
+SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
+	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
+	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
+	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
+
+LICENSE="man-pages GPL-2+ BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE_L10N=" de fr it ja nl pl ru zh-CN"
+IUSE="${IUSE_L10N// / l10n_}"
+RESTRICT="binchecks"
+
+# 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] app-i18n/man-pages-de ) )
+	l10n_fr? ( || ( app-i18n/man-pages-l10n[l10n_fr] app-i18n/man-pages-fr ) )
+	l10n_it? ( app-i18n/man-pages-it )
+	l10n_ja? ( app-i18n/man-pages-ja )
+	l10n_nl? ( || ( app-i18n/man-pages-l10n[l10n_nl] app-i18n/man-pages-nl ) )
+	l10n_pl? ( || ( app-i18n/man-pages-l10n[l10n_pl] app-i18n/man-pages-pl ) )
+	l10n_ru? ( app-i18n/man-pages-ru )
+	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
+	sys-apps/man-pages-posix
+"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
+	dodoc man-pages-*.Announce README Changes*
+
+	# Override with Gentoo specific or additional Gentoo pages
+	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
index 56c124413057..e51634279815 100644
--- a/sys-apps/man-pages/metadata.xml
+++ b/sys-apps/man-pages/metadata.xml
@@ -5,4 +5,5 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<stabilize-allarches/>
 </pkgmetadata>