gentoo resync : 15.09.2018

4 files changed, 2 insertions, 112 deletions

diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 6d13edde0017..42218f9319cf 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,8 +1,4 @@
-DIST man-pages-4.14.tar.xz 1611348 BLAKE2B d06d6d5bf67f5a17ca685bb1a6742a4d300791c1ed715372fa9bacf3006cd73c4b43434ff7c0a21e3a15082ca1bee91c8559751225eed2946da23c6f4d66e71d SHA512 d7163aacc6c3da914182d685d459d24ad60182e2cc528d72b08b565a9e2901ec319c8b44aef9b7e20838e146e159834482c62ba1b65823d5a06794283ebef41f
-DIST man-pages-4.15.tar.xz 1622184 BLAKE2B fac4895411bead3f2ce7ce642206f80ec7422b11b0cbe96abdbb855e24acb1f271c07c7f3d2b07105c46062b0f07c54c9ee06281ba3dd81224e0304174a6842c SHA512 cde896add266e672347841a9116e5d182084044c4543a847945825f98962192f0e8278a4f562fc47a580eb2ddc3d669ffc75a21922219b4d3c36cbe8a792e205
 DIST man-pages-4.16.tar.xz 1630064 BLAKE2B 7c436ebc01d5248378f40fa8f8004bd2e0760a8409b419d4d7aadf8f0075bfa9b89801172b328856ed0f0a70b75523a489957a9aacba66e893698bea1ac98efc SHA512 df282a0480e2c1cc74e4ba02d6ff02ba95886b6583058c737028ea609b916270ba7dcaf075e0c450fd4b49b335979765abfc7d0a75f5570eec5fa2381c10201c
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-4.14.ebuild 1645 BLAKE2B 1313b896ab46a82d8c7db39313163388bb91a2fc23faf11ab758beea2b968ccd0225cb0d8f3c1040b68d8e82b6803e47e84eaebebfce61d5d251a7b6e6e495ab SHA512 a7d6ae123a2e7e3769a206e62587a5d2aeb87ce2da6b3fd217f4658fd97e0f29816f5b2fa4a7b3cd754a4150b293c155d006cf19337a906b08b9104bcebd0325
-EBUILD man-pages-4.15.ebuild 1645 BLAKE2B 1313b896ab46a82d8c7db39313163388bb91a2fc23faf11ab758beea2b968ccd0225cb0d8f3c1040b68d8e82b6803e47e84eaebebfce61d5d251a7b6e6e495ab SHA512 a7d6ae123a2e7e3769a206e62587a5d2aeb87ce2da6b3fd217f4658fd97e0f29816f5b2fa4a7b3cd754a4150b293c155d006cf19337a906b08b9104bcebd0325
-EBUILD man-pages-4.16.ebuild 1663 BLAKE2B 56422d9d813f110c23d84d133c65b4628e381c7d91d2e8c4cb3c35527c271a517e77a3ddd115b2dea4cd99ccd53b2c5b23ca6df48afa845d75521fd6fa9d0b91 SHA512 673726a6eed0f05f37e44550e35684d3305fb778778e4fa8c3b69a8a387eff4d05b1c2bd8e285500af7377dbf7c0696b99a3a3445657dad569a4e16a81f29075
+EBUILD man-pages-4.16.ebuild 1650 BLAKE2B 0662c50e59b56ed93eb22c4b2be0e3d21a413db695354c1a286d27cb87f7fe29808d3d10bc97b08618092f39db2f02bea1da31ded19f9991635e17077a38f010 SHA512 b98c8fc1e0c233586db21e276cac0b3a717b50b7223e401fcd5d799c63bec719cbc3bbab3e47090fbc7fb97241cae098b3b4305b2107bcc0a88c84cca8da624e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-4.14.ebuild b/sys-apps/man-pages/man-pages-4.14.ebuild
deleted file mode 100644
index d1ebe8fa6a89..000000000000
--- a/sys-apps/man-pages/man-pages-4.14.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
-	mirror://kernel/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 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
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-4.15.ebuild b/sys-apps/man-pages/man-pages-4.15.ebuild
deleted file mode 100644
index d1ebe8fa6a89..000000000000
--- a/sys-apps/man-pages/man-pages-4.15.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
-	mirror://kernel/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 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
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-4.16.ebuild b/sys-apps/man-pages/man-pages-4.16.ebuild
index 946ba0ae743a..8711bf486e8c 100644
--- a/sys-apps/man-pages/man-pages-4.16.ebuild
+++ b/sys-apps/man-pages/man-pages-4.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/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 ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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"