gentoo resync : 25.11.2020

3 files changed, 56 insertions, 2 deletions

diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index a8ade92a7e71..96429d8f6439 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,8 @@
 DIST man-pages-5.07.tar.xz 1716544 BLAKE2B f9320aea51c81720f3b77275dbd3ce4b0a2405c3bf0fc43569d42b2ccc848850adf281bd7c213eb9f821c12d627ac61fc43ca169c154df700b774cbd807d3aa9 SHA512 701837b6a8dd3bf9e0fa3d0234384bcc8af4ba8b6a4fdce01a441a146c5101bb14b96cfd68b48613c2ddd2237d01c63fb24a8478c4fff5482265f6605bcbe2f5
 DIST man-pages-5.08.tar.xz 1721672 BLAKE2B 7a912d4581ab734f7f3859d2b6553f470f4a38dfccc3ce42263d3733e1bfe5aabd478ad7137dff03f93ee031fba53f439b0c4cf5a369c442ce9302d0b7a6688b SHA512 fbd54c96c3ef1272f856a27d2258fefd3934d9f6ef60c243a824377769c4784b65aba54d680bb382371b0ce35fd4d065b17980cb535118e7986844f19afd7932
+DIST man-pages-5.09.tar.xz 1740816 BLAKE2B 5434453dc75058a2aef5d1ca04854abe3d2e3a7ddd5167fbbc36cefc0e103bb75339279fd5638698b12e7fbe2314dafd0498b2104e01b4314e909f89db65d50e SHA512 fa5684c316326afd2056876c174e4f2c8baa18d76bfc2f63009903f09f93b4c204fb0773e0991b5247e50596b2da7e232c5087121a0c938a072af8c77848686f
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-5.07.ebuild 1615 BLAKE2B aef12c4bd4190869ac6ea8ea15728370fcbd536efd75b1e6e746585909d401cbf62fb14644d34a0c456645d750e59600fbd5c5ecae734b1297466ea701e6ba98 SHA512 e18aa04a42cb95b926c076605d1d594faa999a46fa6f680f65364e91a31f061fd9ff058707adaef7f91c5098d27ea2e4006e87714cf35007b200ac04fb622634
-EBUILD man-pages-5.08.ebuild 1624 BLAKE2B 3ce3c687f162b8926bf9969e167a5e21571b0648e02505c334f0d63c1dcace21ee85f85e4dd6fc74e50e17e36bc80ade2c8f7275b31b45b5e21c97ecb1a43820 SHA512 7de0828430ec97feff671e2343bbabe86e4d4caa08dae068018e742c72def53e20e7b3b9244c27cdec6b62a38ee4113d399fe543b1de5eb313f4ad4dd0e54155
+EBUILD man-pages-5.08.ebuild 1615 BLAKE2B aef12c4bd4190869ac6ea8ea15728370fcbd536efd75b1e6e746585909d401cbf62fb14644d34a0c456645d750e59600fbd5c5ecae734b1297466ea701e6ba98 SHA512 e18aa04a42cb95b926c076605d1d594faa999a46fa6f680f65364e91a31f061fd9ff058707adaef7f91c5098d27ea2e4006e87714cf35007b200ac04fb622634
+EBUILD man-pages-5.09.ebuild 1624 BLAKE2B 3ce3c687f162b8926bf9969e167a5e21571b0648e02505c334f0d63c1dcace21ee85f85e4dd6fc74e50e17e36bc80ade2c8f7275b31b45b5e21c97ecb1a43820 SHA512 7de0828430ec97feff671e2343bbabe86e4d4caa08dae068018e742c72def53e20e7b3b9244c27cdec6b62a38ee4113d399fe543b1de5eb313f4ad4dd0e54155
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.08.ebuild b/sys-apps/man-pages/man-pages-5.08.ebuild
index c17bf4553435..5095446eeaad 100644
--- a/sys-apps/man-pages/man-pages-5.08.ebuild
+++ b/sys-apps/man-pages/man-pages-5.08.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.09.ebuild b/sys-apps/man-pages/man-pages-5.09.ebuild
new file mode 100644
index 000000000000..c17bf4553435
--- /dev/null
+++ b/sys-apps/man-pages/man-pages-5.09.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] )
+	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
+}