gentoo resync : 07.01.2022

3 files changed, 18 insertions, 28 deletions

diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index d06b4c38f702..cc13ce0d5c50 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -3,6 +3,6 @@ AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81
 AUX libiconv-1.16-fix-link-install.patch 968 BLAKE2B 29d67eb01de00f68b1245a8fe521caf3da262ac0d78da615aeec1e67e08220e6366e1cf708775217e94e282a7b6c236edc322016c3ebdb37486f5e789e4655a1 SHA512 fe5b5376f491df5ef2d01496232e56742b86d52ef043dad21993cb4f463b404c0b8bfaf46ef7fb0d3d8f19504af9875b5096c6a4392ec0666416e0389b1d1923
 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
 DIST libiconv-1.16.tar.gz 5166734 BLAKE2B 8e7f4d64d757db6c3ffa973c9cebcf20b34f9859a547dbba8cebe3a4865bda86f33c5be197951877c46eff5a7fc00b1b11474fb3baa036f08ac2faf97eca138c SHA512 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139fe935caf51a465d17fd8ae229ec4b926f3f7025264f37243432075e5583925bb77b7
-EBUILD libiconv-1.15.ebuild 1883 BLAKE2B 6465ea829fb9c274e600dec8d0b8f382f20a09acd096e25a78ac1935ffe0e1660fdda712605939e88d3b36edb059f9169af00e2fbff77ed8fd2bf5ca4d88b092 SHA512 185a8b821546553392393034c8b926792db378668b88b9756bda5716c949edd49f6eac2315e408ce7e0cc9e6be875ccbcc7a82d235824db035aeec8dbf82a745
-EBUILD libiconv-1.16.ebuild 1731 BLAKE2B 0982de773367eb76cb0a3af53abeac7ec008900070311eec938e8854a4e374a483cc9c4fcdbd86eca68ef8d34254a3f23d7e24721efa7a1f5295b3e30a097e8f SHA512 7ae0e738562c546e6b02a595b43114c0efe685165e92969360d30746fc8fa62d87b50bacf90191de4eae14226d01021e2778de369d9eff93ec64bf60136b3747
+EBUILD libiconv-1.15.ebuild 1661 BLAKE2B 71536b7702adf5254b7018586b1013bdffa69f012ed63debf67d6928436b78e1cb40d423cac2d364632e87e3a24e6910bbc20a99bb29a1e733ccd417e3505df9 SHA512 b6073de175b3f5ebde9fe78b92017190344f8f9c98f76a33b9624be25fa1742ee57d43e5c1a163d5168d8ff27b445966db1deb5456dad201040d6a0b451535e5
+EBUILD libiconv-1.16.ebuild 1509 BLAKE2B 2ed27646d9ade07f36d40d8cc169f79f24916891355168a4872e09a8294811a9136eeca7b2b61357fb7589e6f6ae86f89b0315f7ff0f41196d2f82e0d08ffa7e SHA512 c8aeb2cba82f35c60d4364feda8cfe88da5ffd2d49a183dcc5de5a46a2398d2d8493d3faf1d9274573acbba999abaee121e146fe39593d8973d0fca5a9dfb667
 MISC metadata.xml 466 BLAKE2B 6393ff7a79bc98751c816e1c753f86224a305e5cf242028d29559ce27f4439f76cae30f735298efb69ad2d1059d636d8c753e21c4f12000c8e024afea9f0df5d SHA512 71547717b83a866737aa75d79a488a6c1ac1003bd44fac367df845a2bca95d986b7e90c0d85e807212f66ef7ca23ccc622c239ff1ebea4e8d331bc013ea97d55
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index d6a93da72c86..6180c813ce14 100644
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,8 +15,7 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~spar
 IUSE="prefix static-libs"
 
 DEPEND="!sys-libs/glibc
-	!sys-libs/musl
-	!userland_GNU? ( !sys-apps/man-pages )"
+	!sys-libs/musl"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -53,14 +52,10 @@ multilib_src_install_all() {
 	# can depend on this
 	gen_usr_ldscript -a iconv charset
 
-	# If we have a GNU userland, we probably have sys-apps/man-pages
-	# installed, which means we want to rename our copies #503162.
-	# The use of USELAND=GNU is kind of a hack though ...
-	if use userland_GNU ; then
-		cd "${ED}"/usr/share/man || die
-		local f
-		for f in man*/*.[0-9] ; do
-			mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
-		done
-	fi
+	# we need to rename our copies #503162
+	cd "${ED}"/usr/share/man || die
+	local f
+	for f in man*/*.[0-9] ; do
+		mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
+	done
 }
diff --git a/dev-libs/libiconv/libiconv-1.16.ebuild b/dev-libs/libiconv/libiconv-1.16.ebuild
index 6962ed176257..346661c34d79 100644
--- a/dev-libs/libiconv/libiconv-1.16.ebuild
+++ b/dev-libs/libiconv/libiconv-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="prefix static-libs"
 
 DEPEND="!sys-libs/glibc
-	!sys-libs/musl
-	!userland_GNU? ( !sys-apps/man-pages )"
+	!sys-libs/musl"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
@@ -44,14 +43,10 @@ multilib_src_configure() {
 multilib_src_install_all() {
 	use static-libs || find "${ED}" -name 'lib*.la' -delete
 
-	# If we have a GNU userland, we probably have sys-apps/man-pages
-	# installed, which means we want to rename our copies #503162.
-	# The use of USELAND=GNU is kind of a hack though ...
-	if use userland_GNU ; then
-		cd "${ED}"/usr/share/man || die
-		local f
-		for f in man*/*.[0-9] ; do
-			mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
-		done
-	fi
+	# we need to rename our copies #503162
+	cd "${ED}"/usr/share/man || die
+	local f
+	for f in man*/*.[0-9] ; do
+		mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
+	done
 }