man-pages: upgraded package to upstream
Upgraded sys-apps/man-pages to version 4.16 on amd64, arm, x86
BUG=chromium:893025
TEST=emerge in chroot, verified that man pages were updated.
Change-Id: I3c31027dc9189bc6033c4ff6d0a60505a8f722af
Reviewed-on: https://chromium-review.googlesource.com/1289112
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/metadata/md5-cache/sys-apps/man-pages-4.08 b/metadata/md5-cache/sys-apps/man-pages-4.16
similarity index 65%
rename from metadata/md5-cache/sys-apps/man-pages-4.08
rename to metadata/md5-cache/sys-apps/man-pages-4.16
index f889260..c06e1aa 100644
--- a/metadata/md5-cache/sys-apps/man-pages-4.08
+++ b/metadata/md5-cache/sys-apps/man-pages-4.16
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install
DESCRIPTION=A somewhat comprehensive collection of Linux man pages
-EAPI=5
+EAPI=6
HOMEPAGE=https://www.kernel.org/doc/man-pages/
-IUSE=nls l10n_da l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_ro l10n_ru l10n_zh-CN
+IUSE=nls l10n_da l10n_de l10n_fr l10n_it l10n_ja l10n_nl l10n_pl l10n_ru l10n_zh-CN
KEYWORDS=*
LICENSE=man-pages GPL-2+ BSD
-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_ro? ( app-i18n/man-pages-ro ) l10n_ru? ( app-i18n/man-pages-ru ) l10n_zh-CN? ( app-i18n/man-pages-zh_CN ) ) sys-apps/man-pages-posix
-RDEPEND=virtual/man !<sys-apps/attr-2.4.47-r2 !<dev-libs/libaio-0.3.109-r2
+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
+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
RESTRICT=binchecks
SLOT=0
-SRC_URI=mirror://kernel/linux/docs/man-pages/Archive/man-pages-4.08.tar.xz mirror://kernel/linux/docs/man-pages/man-pages-4.08.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
-_md5_=b6aa660414650d200e626f5a8cca7aff
+SRC_URI=mirror://kernel/linux/docs/man-pages/Archive/man-pages-4.16.tar.xz mirror://kernel/linux/docs/man-pages/man-pages-4.16.tar.xz mirror://gentoo/man-pages-gentoo-2.tar.bz2 https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-2.tar.bz2
+_md5_=ff6e9603159e50d6d346753304fbe4b4
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 462979f..fa451b6 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,2 +1,2 @@
-DIST man-pages-4.08.tar.xz 1489560 SHA256 2c6e7db4d76014dc21b1068df372f325e863318c32056369eca2f169519c62b4 SHA512 e00fcf1573f1d6b1e3ec3f59e888ce1a24f6a77c89dcb29225e3d828345c34de5628fa0aeb5d58d2c5fd86ec77544d909054e2b1b0c807e98d82813bce7b3521 WHIRLPOOL 2eab1a30e3c89b7b79a7ff241ed62fad6debfe70716fe68c4f31fa8dc89c574e73ec64139b9a086d83e08545c4be3b41cb8874854390cf7b7e58de0737cee8e4
+DIST man-pages-4.16.tar.xz 1630064 SHA256 47ffcc0d27d50e497e290b27e8d76dbed4550db14c881f25b771bcaf28354db4 SHA512 df282a0480e2c1cc74e4ba02d6ff02ba95886b6583058c737028ea609b916270ba7dcaf075e0c450fd4b49b335979765abfc7d0a75f5570eec5fa2381c10201c WHIRLPOOL 3da75291c95b6cb38ff2f279d1de8325bb225c33d5fa9c92ef6460278026294f4403f81cc9c2a6f03671f3c2a3f0c74b8b7acf5998972fd139209f6bc91b42e3
DIST man-pages-gentoo-2.tar.bz2 5141 SHA256 b7d9423c2069e587deb7671273d4a1ffed7d31b9f95a689b128a759d636762f0 SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 WHIRLPOOL dcacb319a54ccd2a965786c816684de286581dee6f7b3f8ba4c97cc368e2e50abc92aad403dbdb7b0c15764accb06cd562046bcf14229ad12be242bb2bc7f651
diff --git a/sys-apps/man-pages/man-pages-4.08.ebuild b/sys-apps/man-pages/man-pages-4.16.ebuild
similarity index 84%
rename from sys-apps/man-pages/man-pages-4.08.ebuild
rename to sys-apps/man-pages/man-pages-4.16.ebuild
index dbd26a8..5906aea 100644
--- a/sys-apps/man-pages/man-pages-4.08.ebuild
+++ b/sys-apps/man-pages/man-pages-4.16.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
+EAPI=6
GENTOO_PATCH=2
@@ -16,14 +15,16 @@
LICENSE="man-pages GPL-2+ BSD"
SLOT="0"
KEYWORDS="*"
-IUSE_L10N=" da de fr it ja nl pl ro ru zh-CN"
+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
+# 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/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 )
@@ -32,7 +33,6 @@
l10n_ja? ( app-i18n/man-pages-ja )
l10n_nl? ( app-i18n/man-pages-nl )
l10n_pl? ( app-i18n/man-pages-pl )
- l10n_ro? ( app-i18n/man-pages-ro )
l10n_ru? ( app-i18n/man-pages-ru )
l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
)
@@ -47,7 +47,7 @@
dodoc man-pages-*.Announce README Changes*
# Override with Gentoo specific or additional Gentoo pages
- cd "${WORKDIR}"/man-pages-gentoo
+ cd "${WORKDIR}"/man-pages-gentoo || die
doman */*
dodoc README.Gentoo
}
