gentoo resync : 22.05.2021

4 files changed, 2 insertions, 112 deletions

diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 177c167d5845..9de54a84d0e6 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,8 +1,4 @@
-DIST man-pages-5.09.tar.xz 1740816 BLAKE2B 5434453dc75058a2aef5d1ca04854abe3d2e3a7ddd5167fbbc36cefc0e103bb75339279fd5638698b12e7fbe2314dafd0498b2104e01b4314e909f89db65d50e SHA512 fa5684c316326afd2056876c174e4f2c8baa18d76bfc2f63009903f09f93b4c204fb0773e0991b5247e50596b2da7e232c5087121a0c938a072af8c77848686f
-DIST man-pages-5.10.tar.xz 1747688 BLAKE2B 39da2ec75b0096db7b5af483e6096259b2439bf9ce3b651af82350b612c234375e3e34d70ff84f401c23189c0aa921f29cf77c0979e40efd3fda0f06378a7c2b SHA512 a23f90136b0bf471f5ae3917ae0e558fec0671cace8ccdd8e244f41f11fefa4ac0df84cf972cc20a1792d7b930db5e2c451881c0937edabf7d5e1ec46c4760ed
 DIST man-pages-5.11.tar.xz 1758092 BLAKE2B 45f1f8751f197f616913fd0084ead3ff7e3b3d11d0c3c70ecd43acbc621927cbb3582ffc7df5101887ec5c733e35a9c5321af9ddaf477e06da391c5af9eb6bc5 SHA512 2f57308fb331e0207ed4764d7753711caf74c0b74eef789612bc1869126be529450c7a2a7011fd6413eebea4ff0fee9a1ba0c94959652a3c747c780e83741450
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.09.ebuild 1616 BLAKE2B 98433096a314fccabec42c902adb32f25f01d7a2379c7d8fec0ef02ee4d2492ec70927e2554ad2770bdfd5171508dba1539948f8513555bb88f46886c0885c04 SHA512 9ba40e4f932c4d29977591439eb4ecbd15cd8fd8968270b17ef647eda7b14ac93925c9cef196cd6a16d7f810680b60321fa9b63cc1561f0ce778a8f2e4abf923
-EBUILD man-pages-5.10.ebuild 1749 BLAKE2B 776fbd4cbdc20511530945337a364c1a9fd4e46e8a1ba03508a4b62945d40c125073785528aa6147dfc6c88fddcc24b0d853782e22ba2916211e42d3118b1518 SHA512 c254fa30e04ea868df16470c694905d105907856a08b377c6db794f2f4a538e25864307ce935069c1d19a94af98de3ec0301bcea43d7a34425bf11dc532bd333
-EBUILD man-pages-5.11.ebuild 1749 BLAKE2B 776fbd4cbdc20511530945337a364c1a9fd4e46e8a1ba03508a4b62945d40c125073785528aa6147dfc6c88fddcc24b0d853782e22ba2916211e42d3118b1518 SHA512 c254fa30e04ea868df16470c694905d105907856a08b377c6db794f2f4a538e25864307ce935069c1d19a94af98de3ec0301bcea43d7a34425bf11dc532bd333
+EBUILD man-pages-5.11.ebuild 1741 BLAKE2B 10e2c786b94ec1da5380c4d6a63e23214272c01b12c72d996784151d46bf0f3f1a04859de02f9fd70983d8ccfe143f7d78e535db4a15756bffd403ac2565f3e9 SHA512 3d14586afcf8695398168b6c7fe8ff2893fae4065c71a2e6c9c2116edbd19f384f3956e003bec0552aa9612c4b020986e1ef051c8cf17523ed24ea1da8359962
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.09.ebuild b/sys-apps/man-pages/man-pages-5.09.ebuild
deleted file mode 100644
index 58d24ea28c5d..000000000000
--- a/sys-apps/man-pages/man-pages-5.09.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 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] )
-	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
-	l10n_pl? ( app-i18n/man-pages-l10n[l10n_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.10.ebuild b/sys-apps/man-pages/man-pages-5.10.ebuild
deleted file mode 100644
index 2a296f092cdc..000000000000
--- a/sys-apps/man-pages/man-pages-5.10.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 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 pt-BR ro 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] )
-	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	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-4.2.0[l10n_pt-BR] )
-	l10n_ro? ( >=app-i18n/man-pages-l10n-4.2.0[l10n_ro] )
-	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.11.ebuild b/sys-apps/man-pages/man-pages-5.11.ebuild
index 2a296f092cdc..557612b11447 100644
--- a/sys-apps/man-pages/man-pages-5.11.ebuild
+++ b/sys-apps/man-pages/man-pages-5.11.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 pt-BR ro ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"