gentoo auto-resync : 21:09:2022 - 11:25:44

5 files changed, 68 insertions, 26 deletions

diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 28a8c12a88a1..83606eaf5a3e 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -2,8 +2,8 @@ DIST man-pages-5.12.tar.xz 1778220 BLAKE2B 347c5ef63cb80134018f322f810545354ccc7
 DIST man-pages-5.13.tar.xz 1788980 BLAKE2B 7cca88b7f201d177b087893f60e6a87fd3ed8c78a183bd6ebcd0c28961f5f5d24aa2ba9d3a1d9cec4e0fc9cc0b26489c91e991a2d4420c28e1f61b850b882752 SHA512 a68c0bd5f078aff2f13f962060863e5d30734c1c562e8e9e3d5eda5a329b18ad3e9b4ebb883d31cacfc0a476f91fccb8dd4257598acd75d09dd21351893d3499
 DIST man-pages-6.0-rc1.tar.gz 2636606 BLAKE2B adeaa325669631125fe55fd140abe25309b287c03a377aa665e39b4279241fc1e711199493498e97c03c8af9c5a3370a47991f88d7c602e7fc54e5f6ef61ff55 SHA512 61be0a14e5ffb9c89bdbdb3a83967c65a6fae15a6f46f5c2e7304205646bf8ab6d10f954a4ea003f3d75bc2775fcb0a88b5cd6ad15e6beed3dd56a25f395342e
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.12-r2.ebuild 1886 BLAKE2B dd190c72f4101b257f1088a37c9a247def4c8ca74ee7353f992b2380e2c6824a051af381dd5e1254226c504f50cfbff6282a34d0c88dfa22b90116e564540307 SHA512 6f7e5adf9848363e190aefbc2482c436fb4f56b3383068fff98e00b0ac94ce2ba5b17332fca0b97735c1b5cc3fc9d380bf3c8335eca8e7ca2f23f9aab6ca39d5
-EBUILD man-pages-5.13-r1.ebuild 1894 BLAKE2B e7315d6c5641d1a43a53f1b963c93af0dd936eaad122d98710b79f38860720d5ddc6330cb81587b51369eba866d696777e0d7316be9e71a45713bc9370296f15 SHA512 c713eb685190e68dc7c87285c8d2dd261764135018c3ac69c5a3c315f32a479206ca75c93b6c1b4b072b4fe467b771b92ecefd08b3e645807a206fa06eebb5da
-EBUILD man-pages-6.0_rc1.ebuild 2281 BLAKE2B 940709e35f99156280821d6b6219e30768484df5bbc37892f00aea9e4fa9ec6acad6bbfb3c79847c23c8f62f825358b3b853fdbe7e562a203cf1b2d1f7abebd8 SHA512 21104b620639bc5d9e675b918e2f5b9bda3a20a2157ea71e5c6e23a3d2e231dcdd643d9f8886d48352636f3dbd854de5b351e75d4d9b31db7aa2efc8a144f2eb
-EBUILD man-pages-9999.ebuild 2281 BLAKE2B 940709e35f99156280821d6b6219e30768484df5bbc37892f00aea9e4fa9ec6acad6bbfb3c79847c23c8f62f825358b3b853fdbe7e562a203cf1b2d1f7abebd8 SHA512 21104b620639bc5d9e675b918e2f5b9bda3a20a2157ea71e5c6e23a3d2e231dcdd643d9f8886d48352636f3dbd854de5b351e75d4d9b31db7aa2efc8a144f2eb
+EBUILD man-pages-5.12-r3.ebuild 2227 BLAKE2B 3b3bd8ef026cdd916dd380a88a79e0bf79752309440629bfaed6791c18e09e86c7703b042f241e86c69d4bbd92b9cd37f9b450c05628555f2eb4d79a85026cb0 SHA512 7c054aeb1a8dee95e8f94ddc7226e83fb21fb8d8080111b0f20173c911fa37c6d63976af8db7cfaadfb6223ca205cc29fe33ec3c84aa7a78a71bf0b1a2034ed9
+EBUILD man-pages-5.13-r2.ebuild 2235 BLAKE2B 69ccf3e43c912486f4a10dd6a96a084eb51e2373d6eaf5fb2d1bdb1168d6b7c6a2157f97ebd3a30c9b3e562b1d047156f6ad92b1cf7aa593c84b3a2bcccc14f6 SHA512 9b48404aed7680bfecda777399c24c9e93d4415ec4585832e9a6eb2f621a9ed471e3773be86d798e96b45784b03b42df28528af7cea228f024fb1ca4586df26b
+EBUILD man-pages-6.0_rc1.ebuild 2466 BLAKE2B b819b93ec8b70bb987d1df92463e810f97b04193f2c099047d00871a1c9743b74eea248c343b1735e74ed8a38838ad487d1d6a6f1bf63e6a4c8b6464591ac88c SHA512 9bfed946eda52a59422e6eb94546bd5148beb59e5ea8c024fe5a444b4b419049bc1d467bdad9ad40dc363633f81d7edb25b68586ac9bb4479ba67ccc71d48e80
+EBUILD man-pages-9999.ebuild 2466 BLAKE2B b819b93ec8b70bb987d1df92463e810f97b04193f2c099047d00871a1c9743b74eea248c343b1735e74ed8a38838ad487d1d6a6f1bf63e6a4c8b6464591ac88c SHA512 9bfed946eda52a59422e6eb94546bd5148beb59e5ea8c024fe5a444b4b419049bc1d467bdad9ad40dc363633f81d7edb25b68586ac9bb4479ba67ccc71d48e80
 MISC metadata.xml 277 BLAKE2B 866b0f11a1927de0a75083001a598aa5ff99fc21b3e2b61811bda22915df73776a2d0ffe350497964c95c47a050723d2573d7248589c5cce28ba83c2660736b9 SHA512 0f502e6d4e3e23c0c88e2d5f4ba641974d934a175a643ba2ad96cdd954a2ab26972794b6ca9a1b370536c6eade6798bcb9c89be0193d170320e1b0f302a2747f
diff --git a/sys-apps/man-pages/man-pages-5.12-r2.ebuild b/sys-apps/man-pages/man-pages-5.12-r3.ebuild
index 4c561dc4e4ad..fc0a324bdb91 100644
--- a/sys-apps/man-pages/man-pages-5.12-r2.ebuild
+++ b/sys-apps/man-pages/man-pages-5.12-r3.ebuild
@@ -59,3 +59,15 @@ src_install() {
 	doman */*
 	dodoc README.Gentoo
 }
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -lt 5.12-r3 ; then
+			# Avoid ACCEPT_LICENSE issues for users by default
+			# bug #871636
+			ewarn "This version of ${PN} no longer depends on sys-apps/man-pages-posix!"
+			ewarn "Please install sys-apps/man-pages-posix yourself if needed."
+			break
+		fi
+	done
+}
diff --git a/sys-apps/man-pages/man-pages-5.13-r1.ebuild b/sys-apps/man-pages/man-pages-5.13-r2.ebuild
index 2d41baecac59..e42088c5e35d 100644
--- a/sys-apps/man-pages/man-pages-5.13-r1.ebuild
+++ b/sys-apps/man-pages/man-pages-5.13-r2.ebuild
@@ -59,3 +59,15 @@ src_install() {
 	doman */*
 	dodoc README.Gentoo
 }
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -lt 5.13-r2 ; then
+			# Avoid ACCEPT_LICENSE issues for users by default
+			# bug #871636
+			ewarn "This version of ${PN} no longer depends on sys-apps/man-pages-posix!"
+			ewarn "Please install sys-apps/man-pages-posix yourself if needed."
+			break
+		fi
+	done
+}
diff --git a/sys-apps/man-pages/man-pages-6.0_rc1.ebuild b/sys-apps/man-pages/man-pages-6.0_rc1.ebuild
index b76d3df8daa8..ca09d48f31f6 100644
--- a/sys-apps/man-pages/man-pages-6.0_rc1.ebuild
+++ b/sys-apps/man-pages/man-pages-6.0_rc1.ebuild
@@ -31,8 +31,9 @@ SRC_URI+="
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-IUSE_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
-IUSE="${IUSE_L10N// / l10n_}"
+# Keep the following in sync with app-i18n/man-pages-l10n
+MY_L10N=( cs da de el es fi fr hu id it mk nb nl pl pt-BR ro sr sv uk vi )
+IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}"
 RESTRICT="binchecks"
 
 # Block packages that used to install colliding man pages:
@@ -43,23 +44,19 @@ RDEPEND="
 	!<dev-libs/libbsd-0.8.3-r1
 "
 PDEPEND="
-	l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] )
-	l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] )
-	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] )
-	l10n_it? ( app-i18n/man-pages-l10n[l10n_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[l10n_pt-BR(-)] )
-	l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] )
 	l10n_ru? ( app-i18n/man-pages-ru )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 "
+for lang in "${MY_L10N[@]}"; do
+	PDEPEND+=" l10n_${lang}? ( app-i18n/man-pages-l10n[l10n_${lang}(-)] )"
+done
+unset lang
 
 src_unpack() {
 	default
 
-	git-r3_src_unpack
+	[[ ${PV} == 9999 ]] && git-r3_src_unpack
 }
 
 src_prepare() {
@@ -80,3 +77,15 @@ src_install() {
 	doman */*
 	dodoc README.Gentoo
 }
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -lt 5.13-r2 ; then
+			# Avoid ACCEPT_LICENSE issues for users by default
+			# bug #871636
+			ewarn "This version of ${PN} no longer depends on sys-apps/man-pages-posix!"
+			ewarn "Please install sys-apps/man-pages-posix yourself if needed."
+			break
+		fi
+	done
+}
diff --git a/sys-apps/man-pages/man-pages-9999.ebuild b/sys-apps/man-pages/man-pages-9999.ebuild
index b76d3df8daa8..ca09d48f31f6 100644
--- a/sys-apps/man-pages/man-pages-9999.ebuild
+++ b/sys-apps/man-pages/man-pages-9999.ebuild
@@ -31,8 +31,9 @@ SRC_URI+="
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-IUSE_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
-IUSE="${IUSE_L10N// / l10n_}"
+# Keep the following in sync with app-i18n/man-pages-l10n
+MY_L10N=( cs da de el es fi fr hu id it mk nb nl pl pt-BR ro sr sv uk vi )
+IUSE="l10n_ja l10n_ru l10n_zh-CN ${MY_L10N[@]/#/l10n_}"
 RESTRICT="binchecks"
 
 # Block packages that used to install colliding man pages:
@@ -43,23 +44,19 @@ RDEPEND="
 	!<dev-libs/libbsd-0.8.3-r1
 "
 PDEPEND="
-	l10n_de? ( app-i18n/man-pages-l10n[l10n_de(-)] )
-	l10n_es? ( app-i18n/man-pages-l10n[l10n_es(-)] )
-	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr(-)] )
-	l10n_it? ( app-i18n/man-pages-l10n[l10n_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[l10n_pt-BR(-)] )
-	l10n_ro? ( app-i18n/man-pages-l10n[l10n_ro(-)] )
 	l10n_ru? ( app-i18n/man-pages-ru )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
 "
+for lang in "${MY_L10N[@]}"; do
+	PDEPEND+=" l10n_${lang}? ( app-i18n/man-pages-l10n[l10n_${lang}(-)] )"
+done
+unset lang
 
 src_unpack() {
 	default
 
-	git-r3_src_unpack
+	[[ ${PV} == 9999 ]] && git-r3_src_unpack
 }
 
 src_prepare() {
@@ -80,3 +77,15 @@ src_install() {
 	doman */*
 	dodoc README.Gentoo
 }
+
+pkg_postinst() {
+	for ver in ${REPLACING_VERSIONS} ; do
+		if ver_test ${ver} -lt 5.13-r2 ; then
+			# Avoid ACCEPT_LICENSE issues for users by default
+			# bug #871636
+			ewarn "This version of ${PN} no longer depends on sys-apps/man-pages-posix!"
+			ewarn "Please install sys-apps/man-pages-posix yourself if needed."
+			break
+		fi
+	done
+}