gentoo resync : 07.01.2022

4 files changed, 27 insertions, 96 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 198ce27bacbd..c82ee8f13330 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,7 +4,7 @@ AUX su-l.pamd 140 BLAKE2B 34f00c8814d454c8caa6bd5f0dd0bb89b24c12dbc0e39e852dc459
 AUX util-linux-2.37.1-agetty_ctrl-c_erase.patch 1900 BLAKE2B 570c03cc5059198efdec4bfe367c560bcc863de61e8b0e1055535d4731525613ee20eaee5efeac6f96b399df1a60865c29e554df6684e3525f71dac821c8205c SHA512 e970c7b3c6e50bffc2e57f90f3284ba55906d71d286e8d23f06fd9905f66273796712cbd8cf3fa1a12bbb2dc404c72b790caba11ec63c8ff84ed9e4e041f64ca
 AUX util-linux-2.37.2-ioctl_ns-test-hang.patch 1308 BLAKE2B 87f9d63b91342c7560987438dad5e6ed43046233ae3400f91ff09767825b20ae2ff3886d8a7a3d7790dda11cffbf351c4047ac5397d1dbb98a548303d1caa8af SHA512 f0f0616a8729e302ef30b72437e34d7ac308e32206c0fdea2d3117da6a01d18b809016e2f46affed3b8fcaf156c64cd895a7460895aadcf39352fe724a3bfd78
 DIST util-linux-2.37.2.tar.xz 5621624 BLAKE2B 40ab80485781dfc58e6d0e98dae115b96f11ee0cc370524e1e13d3c4a4dfed3a5a4a248311f8ca645f6f84bbaf4785412ca8282b840af4e37a01312764885abe SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d
-EBUILD util-linux-2.37.2-r1.ebuild 9412 BLAKE2B f94d8887209e0a2e547c1846483bffc3f6f371fb03904317b6a7e50bffded3d8eda64d6119af2c72dba64bb75844deb717b9daad96a023033bf3c2711f880b43 SHA512 d7a74218f362e0ff1807899001006824801f7da22b580cf43c8e621b03240d8bd33a3a78c6718ac1604897744c9552315d1b24330c3e94553294de6564fd5f1f
-EBUILD util-linux-2.37.2-r3.ebuild 9573 BLAKE2B 2738dff580cab8a5b5a508a66e7adf32fa5505ff4d9b68fef57b91f61dcf9c3d6d54818d21e90104722d66f3cbe98200c72dbd25f17d72819fee9b9ca74c22fc SHA512 c7c4ecb87d10041b2121037fe8f4c7b25158cce15820778a421b5f61ac24fde73117617545b32971cdea391fe784b4e4e1dba79d29cf8b572dc665597f754247
-EBUILD util-linux-9999.ebuild 9426 BLAKE2B 9b316a2a5504239f7efbaabbe02091c306ed692bc2c50c78a7ce0c60281595e03bc710c97ba8079ef407c771859038f7311d6435da5c35ef4c0d3f275f63d862 SHA512 f4a9ccd964c4108410fda35a37c8219c1a034892460fe19e99fcd1d28507bf63b1f55591e79cf1e556d1ba3b2e5246e81d8aed02af314a3c845d22905d524f48
+EBUILD util-linux-2.37.2-r1.ebuild 8770 BLAKE2B a5662ed7720f636f06896b98662d94267ca0b6719614ddabbeb27600bc29232577c96b1af13a2574a16216a0f401635554753c42f815174e933522c7cd4aa0bb SHA512 d4834e6e9c585e150a6ace0c29063cbc895e61346d554da8c1e5606c2338ef7c4ff343d338913fbccb38886b9c1b83c9a3917a764ff368a10d3dd4f74077a343
+EBUILD util-linux-2.37.2-r3.ebuild 8931 BLAKE2B c763a44e29ac98ea3a93a534cf758907a864fcbc611e5c9b83dec875e6432a57515ad0509236f26e1adec70230baeba1e5618cb03ef0b5c9ac8a1f5c6065aac5 SHA512 52e9dbb2068e7632166a8aa727f254876be51a2078679d67038cf2a9a02b81175aeb0e7c08cf4a31ff2f5981c241655ecc915565b3b9866cedd319bc0082b5f4
+EBUILD util-linux-9999.ebuild 8784 BLAKE2B 1cb0e949416b98a3abfd296360e54cb55c5984e0789b9ea661c841ba2a85383ee64620b2b626e19ec56a0134580d6fa78ed256ce47401cb16f682ce4a152eb68 SHA512 09c2c35e8b15afe82f98fd14495cbbc3b743e95a6196f2c4d01294709b090a0fb2901d936874ffc2a692ae63e74788bb3d40a5b6eb9069dca61f038fbd20d9f1
 MISC metadata.xml 1448 BLAKE2B 5fb494f00e91500e600340c00734b34c953a9bec939bdbcf8c9946412290bfce34219057f8a7eeadca56ffc050ac4b043039efbeb9d1db2396bfd35917ccca10 SHA512 729b1e16d89447baaa37085bd8aa7a887984ac2c64810d4f81127aaac873f7d28f0299e10a1cb8ca151ff59553cbe8b734390ca26f6998044f0a889a452b907b
diff --git a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
index 46c6b0ce7ed2..619414e131e1 100644
--- a/sys-apps/util-linux/util-linux-2.37.2-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.2-r1.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
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs su +suid systemd test tty-helpers udev unicode"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -97,13 +97,6 @@ src_prepare() {
 		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
 		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
 
-	if ! use userland_GNU ; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
@@ -132,14 +125,10 @@ python_configure() {
 		--disable-bash-completion
 		--without-systemdsystemunitdir
 		--with-python
+		--enable-libblkid
+		--enable-libmount
+		--enable-pylibmount
 	)
-	if use userland_GNU ; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
 	mkdir "${BUILD_DIR}" || die
 	pushd "${BUILD_DIR}" >/dev/null || die
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -188,8 +177,7 @@ multilib_src_configure() {
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
 	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
 			--disable-login
@@ -236,13 +224,8 @@ multilib_src_configure() {
 			--enable-libblkid
 			--enable-libsmartcols
 			--enable-libfdisk
+			--enable-libmount
 		)
-		if use userland_GNU ; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
 	fi
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
@@ -293,7 +276,7 @@ multilib_src_install() {
 	# This needs to be called AFTER python_install call (#689190)
 	emake DESTDIR="${D}" install
 
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		# need the libs in /
 		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
 	fi
@@ -305,12 +288,6 @@ multilib_src_install_all() {
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
 
-	if ! use userland_GNU ; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED}"/usr/share/man/man3/uuid* || die
-	fi
-
 	if use pam ; then
 		newpamd "${FILESDIR}/runuser.pamd" runuser
 		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
diff --git a/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild b/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild
index 9532360938eb..29ca2387ed7a 100644
--- a/sys-apps/util-linux/util-linux-2.37.2-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.2-r3.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
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -97,13 +97,6 @@ src_prepare() {
 		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
 		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
 
-	if ! use userland_GNU ; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
@@ -132,14 +125,10 @@ python_configure() {
 		--disable-bash-completion
 		--without-systemdsystemunitdir
 		--with-python
+		--enable-libblkid
+		--enable-libmount
+		--enable-pylibmount
 	)
-	if use userland_GNU ; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
 	mkdir "${BUILD_DIR}" || die
 	pushd "${BUILD_DIR}" >/dev/null || die
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -188,8 +177,7 @@ multilib_src_configure() {
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
 	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
 			--disable-login
@@ -236,13 +224,8 @@ multilib_src_configure() {
 			--enable-libblkid
 			--enable-libsmartcols
 			--enable-libfdisk
+			--enable-libmount
 		)
-		if use userland_GNU ; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
 	fi
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
@@ -293,7 +276,7 @@ multilib_src_install() {
 	# This needs to be called AFTER python_install call (#689190)
 	emake DESTDIR="${D}" install
 
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		# need the libs in /
 		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
 	fi
@@ -305,12 +288,6 @@ multilib_src_install_all() {
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
 
-	if ! use userland_GNU ; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED}"/usr/share/man/man3/uuid* || die
-	fi
-
 	if use pam ; then
 		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
 		newpamd "${FILESDIR}/runuser.pamd" runuser
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 8ba7230d848f..3fdf6c85b949 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.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
@@ -25,7 +25,7 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -92,13 +92,6 @@ src_prepare() {
 		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
 		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
 
-	if ! use userland_GNU ; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
@@ -127,14 +120,10 @@ python_configure() {
 		--disable-bash-completion
 		--without-systemdsystemunitdir
 		--with-python
+		--enable-libblkid
+		--enable-libmount
+		--enable-pylibmount
 	)
-	if use userland_GNU ; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
 	mkdir "${BUILD_DIR}" || die
 	pushd "${BUILD_DIR}" >/dev/null || die
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
@@ -183,8 +172,7 @@ multilib_src_configure() {
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
 	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		myeconfargs+=(
 			--disable-chfn-chsh
 			--disable-login
@@ -231,13 +219,8 @@ multilib_src_configure() {
 			--enable-libblkid
 			--enable-libsmartcols
 			--enable-libfdisk
+			--enable-libmount
 		)
-		if use userland_GNU ; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
 	fi
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 
@@ -288,7 +271,7 @@ multilib_src_install() {
 	# This needs to be called AFTER python_install call (#689190)
 	emake DESTDIR="${D}" install
 
-	if multilib_is_native_abi && use userland_GNU ; then
+	if multilib_is_native_abi ; then
 		# need the libs in /
 		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
 	fi
@@ -300,12 +283,6 @@ multilib_src_install_all() {
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
 
-	if ! use userland_GNU ; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED}"/usr/share/man/man3/uuid* || die
-	fi
-
 	if use pam ; then
 		# See https://github.com/util-linux/util-linux/blob/master/Documentation/PAM-configuration.txt
 		newpamd "${FILESDIR}/runuser.pamd" runuser