gentoo resync : 24.07.2021

3 files changed, 28 insertions, 10 deletions

diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index b1bdc66c188e..878ebe19403d 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,6 @@
 DIST man-pages-5.11.tar.xz 1758092 BLAKE2B 45f1f8751f197f616913fd0084ead3ff7e3b3d11d0c3c70ecd43acbc621927cbb3582ffc7df5101887ec5c733e35a9c5321af9ddaf477e06da391c5af9eb6bc5 SHA512 2f57308fb331e0207ed4764d7753711caf74c0b74eef789612bc1869126be529450c7a2a7011fd6413eebea4ff0fee9a1ba0c94959652a3c747c780e83741450
 DIST man-pages-5.12.tar.xz 1778220 BLAKE2B 347c5ef63cb80134018f322f810545354ccc7afdb8acb62f83e3b06ef15d7fbe6c0c68db37f52ce9727682a856a7810a5e64f1dcbe1cc11b22f83fb0273f7add SHA512 455794ed6e3bf20649f78b464300d5c1adad5000668a82a1194c1af8bdcbd064e4d930696cbe534481368d6526c7cda69927e958b9a868d95891202476fb4608
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.11.ebuild 1741 BLAKE2B 10e2c786b94ec1da5380c4d6a63e23214272c01b12c72d996784151d46bf0f3f1a04859de02f9fd70983d8ccfe143f7d78e535db4a15756bffd403ac2565f3e9 SHA512 3d14586afcf8695398168b6c7fe8ff2893fae4065c71a2e6c9c2116edbd19f384f3956e003bec0552aa9612c4b020986e1ef051c8cf17523ed24ea1da8359962
-EBUILD man-pages-5.12.ebuild 1749 BLAKE2B 776fbd4cbdc20511530945337a364c1a9fd4e46e8a1ba03508a4b62945d40c125073785528aa6147dfc6c88fddcc24b0d853782e22ba2916211e42d3118b1518 SHA512 c254fa30e04ea868df16470c694905d105907856a08b377c6db794f2f4a538e25864307ce935069c1d19a94af98de3ec0301bcea43d7a34425bf11dc532bd333
+EBUILD man-pages-5.11-r1.ebuild 1844 BLAKE2B 01ffab22fdb472dff042e9f6d99c4133de5c94903f9d64510dabccb4aa5756c5dc8f3e2ee098c8129312448a11d2a755d86ae5b6e2f4ce5c2f937fbf8c657c66 SHA512 558d9cff941082d9488e861a2832e9ef5943ed3dccdd20afb32e3fe0888bb6a203586ec6d1033ef78b974d670e114766c7a855894ab479ebe369de26fa1a1697
+EBUILD man-pages-5.12-r2.ebuild 1955 BLAKE2B a15709358bf511be71b57c9fc5a246d05bb6f461cdfdc06574138d6fdbeb8097fc6a9fa0b31d129077f8439ef2aeee1d6a2a0257ed66269b26910161672641a4 SHA512 bf6ef86098064bbea9611adaa748ce4684b4b57fc25484e7ecdd9e614cd24a2b54f1d52be57fd4a8f0c578b689e1de92a473f21a215d7a96f456ac2b6ed30be0
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.11.ebuild b/sys-apps/man-pages/man-pages-5.11-r1.ebuild
index 557612b11447..003bfac75bbb 100644
--- a/sys-apps/man-pages/man-pages-5.11.ebuild
+++ b/sys-apps/man-pages/man-pages-5.11-r1.ebuild
@@ -39,6 +39,13 @@ PDEPEND="
 	sys-apps/man-pages-posix
 "
 
+src_prepare() {
+	default
+
+	# passwd.5 installed by sys-apps/shadow #776787
+	rm man5/passwd.5 || die
+}
+
 src_configure() { :; }
 
 src_compile() { :; }
diff --git a/sys-apps/man-pages/man-pages-5.12.ebuild b/sys-apps/man-pages/man-pages-5.12-r2.ebuild
index 2a296f092cdc..fa7c93e7d50e 100644
--- a/sys-apps/man-pages/man-pages-5.12.ebuild
+++ b/sys-apps/man-pages/man-pages-5.12-r2.ebuild
@@ -15,7 +15,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"
-IUSE_L10N=" de fr it ja nl pl pt-BR ro ru zh-CN"
+IUSE_L10N=" de es fr it ja nl pl pt-BR ro ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
 
@@ -26,19 +26,30 @@ RDEPEND="
 	!<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_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(-)]
+		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_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 )
 	sys-apps/man-pages-posix
 "
 
+src_prepare() {
+	default
+
+	# passwd.5 installed by sys-apps/shadow #776787
+	rm man5/passwd.5 || die
+}
+
 src_configure() { :; }
 
 src_compile() { :; }