gentoo resync : 15.12.2019

4 files changed, 4 insertions, 59 deletions

diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 81bf3b1a2b51..f5223b429fde 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,8 +1,6 @@
-DIST man-pages-5.01.tar.xz 1662512 BLAKE2B e2b77aea38eaed44fcefbfc21a59ae3f972901a055d3491effda286f0ef7cd8d1e32b4a610707c5ba8ad18ac7d5ff81df4927f7c68c99f54753af49b40c07f17 SHA512 0f95198e230fe28da2821c931f0078adf67bc4d92434b4da5e67dcfe3b462fd22b3268b7c0b9385603f0bfa7aa273c97ae152edd2b6f6975b9199b6e73e1f457
-DIST man-pages-5.02.tar.xz 1668616 BLAKE2B 91fb6618e13d25c1ad81ac5f6acc20ac0075b0e33b5ecfc271a4a4abcfffb37e4f22dbd15128a3a54ea2a7ed03c0374b907998da15dde90f4b9fb0da7ebf0947 SHA512 424d382f69611e29bd512ad166db7189633dea92b9d57466480a88cc69e83e6f364e16d4303efea19f2252bc9681c14158d60eef79c4cc4be41185300b67a4fd
 DIST man-pages-5.03.tar.xz 1677908 BLAKE2B 54ba60a0ef772259fe8facf9e8d36155b16a3c990adb7bcc63e57bdd969d1853e6eadbc3d21186c23730c65dd7cefe497819921b9b5c8622bee74f656430723a SHA512 e7e0d1952abe75dd2503fd7bd7fbe34532ef22b70d82f299099e38e08a92604df0f23ed83267b57ca6d9d90e697651c46f6a95c1a077e3f193ba89f6293af7be
+DIST man-pages-5.04.tar.xz 1684044 BLAKE2B 61b73edfe0d1f93f20b17e935f73c8c0ae778219f59f9b4739e1574b4b9aea5d83cd856f77b58cd2fdc4cd19ddc9a61cf2c7dd504461e9ac3b9a1d59574a2c1c SHA512 723c67eaddc2652dc36fa698d08473dbc8e17f4351b2c391064b80d637ec7e5cdc1b20ee4e542d95f441331c7b773899cfdeeeb7a2f599c64d6eac5c586b7cbe
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.01.ebuild 1676 BLAKE2B 4183d24483964dc5643ba650d5fe5ccd5c6b79ae3832d84e05da2a43f937e2a28f7da68e1855fe9215ed29896f5388bc0a04530ddb2377fb92ae01a0195d51b9 SHA512 7a6a68a2da452e52b01e68abfdc816f8f20f91aa4dd3e73a02ffa61553a80af52b931a9ed75c15aec760d95506f0b5ebbb492a6f0d1109722c54f3d6ad91ed2d
-EBUILD man-pages-5.02.ebuild 1689 BLAKE2B d9db2f9657322288831ec4d9d04b013107f9348c2de8feeab5002f2161735e293bed5f2ab0a578b44d08d40ad740e631f444bbf8f6917b8c93aa47808fb7e49a SHA512 3f82f173b0b381f53ff577c9d5772073192482ffcea694ca501779528f3b22eefdd31077027fe2e4eec0cbab0e033ed8348293859eab6abf58cda2426a338c7b
-EBUILD man-pages-5.03.ebuild 1689 BLAKE2B d9db2f9657322288831ec4d9d04b013107f9348c2de8feeab5002f2161735e293bed5f2ab0a578b44d08d40ad740e631f444bbf8f6917b8c93aa47808fb7e49a SHA512 3f82f173b0b381f53ff577c9d5772073192482ffcea694ca501779528f3b22eefdd31077027fe2e4eec0cbab0e033ed8348293859eab6abf58cda2426a338c7b
+EBUILD man-pages-5.03.ebuild 1676 BLAKE2B 1433a18e13e90c9c0e0b95fbf6304ba4697c634ba668afa461fa9c5cdf9c925e72d7220ebc76376b4b0fce71433969c8bfb3db60f1f61c4d7aa9a31ea92e067a SHA512 cba63d2b4fc77c4bae06adbbfadf6b71c3ea6fdae6dfd1dd8e8c881c24e8c8cbc883e1067f65437b9e8f35b29c88ce539a94ba001292a0a8fd95b1afc8b08b02
+EBUILD man-pages-5.04.ebuild 1689 BLAKE2B d9db2f9657322288831ec4d9d04b013107f9348c2de8feeab5002f2161735e293bed5f2ab0a578b44d08d40ad740e631f444bbf8f6917b8c93aa47808fb7e49a SHA512 3f82f173b0b381f53ff577c9d5772073192482ffcea694ca501779528f3b22eefdd31077027fe2e4eec0cbab0e033ed8348293859eab6abf58cda2426a338c7b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-5.01.ebuild b/sys-apps/man-pages/man-pages-5.01.ebuild
deleted file mode 100644
index 8572a75e3a49..000000000000
--- a/sys-apps/man-pages/man-pages-5.01.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" da de fr it ja nl pl ru zh-CN"
-IUSE="nls ${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
-	!<sys-apps/attr-2.4.47-r2
-	!<dev-libs/libaio-0.3.109-r2
-	!<dev-libs/libbsd-0.8.3-r1"
-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 )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-nl )
-	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/man-pages-5.03.ebuild b/sys-apps/man-pages/man-pages-5.03.ebuild
index ea909f0780a0..a9922828cd45 100644
--- a/sys-apps/man-pages/man-pages-5.03.ebuild
+++ b/sys-apps/man-pages/man-pages-5.03.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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" da 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.02.ebuild b/sys-apps/man-pages/man-pages-5.04.ebuild
index ea909f0780a0..ea909f0780a0 100644
--- a/sys-apps/man-pages/man-pages-5.02.ebuild
+++ b/sys-apps/man-pages/man-pages-5.04.ebuild