gentoo resync : 14.07.2018

7 files changed, 208 insertions, 268 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 9ae24ec67745..3defb28b4978 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,13 +1,12 @@
 AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
 AUX util-linux-2.32-add-missing-lintl.patch 1279 BLAKE2B d76fac864c34f38f51fdf422042f3199ddd8eecf7b2eab1b222c6be65605df365477be7e605bd45937ca3be716008227e7157d3da130fc0bf32eeffbefdbd9c1 SHA512 e705a5ec1a686d46226d9fa1e9369cc266c69c314a2a2f2f456cf92235d87b974c1dac72c928892657ea12f71bdaea83afaf95ed2eefd89b36007b371e047eb1
+AUX util-linux-2.32-python3-tests.patch 4512 BLAKE2B ae8f93748f4ef71e0bb7952272b7d3e7c4a3e63adecfe341e60fc65cf784a2df021cc7b567b0283902f22e1653a54644f508c4ae16d8056c21c3b279649af04a SHA512 9c065bc91e22f38eb8ad8156db8e66671749d2544cb8452da787f0d9e07f34107e9db49beb0d80962020e0b5c134fd8b090d7484d1dbf87eac933e65c81989dc
 AUX util-linux-2.32_rc2-umount_completion.patch 1157 BLAKE2B a20c9965747048e236cabbc5902afde093732794d8898c8aac619e9841332566b7fc07a0f7d5841e49bac08f3502986f37eaca8d66f258f22ed9afe5434a00cb SHA512 6f5311ea43495bb0b0da180e77044124c8fbeb3a3791182871afd562a7bfa4799184faf7a43f34845ddf11611412df342826679169f55831f43c2f256fb6c799
 DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
-DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37deed57eb48a028ddfb578ecc057c1c928b2082d13014f0dfdaf5a8274ee3a13993fdbc19b7e05e5a992505ac90de79a SHA512 d45c1e62e39f5d5c7a642071e7ccce44fe4ecaafec54d8c9a4e9d526280a6e25723bfa0eb068401e291579c0d067661775bbe085190d13ff16493f47360b7760
 DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
-EBUILD util-linux-2.30.2-r1.ebuild 6505 BLAKE2B c1d22b2567a811b2b4727eca13ed9974eb115f0e1bad9a0cc096b96afdcedeef013480aa7d5832b93c94b1a885be0edfceb3eb80d693b6f09d10a37d0e9113a8 SHA512 d27ea0f42a066dfdc1c5c5bfa5af3fb50e5f7b04b27a692cd810316143c942f3befd18e1d83880e5cf56b3505d0c265b751c570ef947f568fb417bb92e0c6c60
-EBUILD util-linux-2.31.1-r1.ebuild 6542 BLAKE2B 7fe9468885f684c1300f731a3c9bfbd3b55b6fe68e7d9eaeb90145e74ae70ca4fa06208f6d2a2d3a3dc86beddbdee972bc34099e077c24f98920a236fb07a352 SHA512 c71aa0e58861fb36f186ee6d9e65ad889b6a0339ae6c1544c9def001331739dff4e7950dd7c70565531e28acbb81862392f1c369081b18489a13cc026b2d4a90
-EBUILD util-linux-2.32-r3.ebuild 6958 BLAKE2B b2bfa2c490c21eb7808eaf426e0b8d55d9fa2e97db69ff7c0e5335df5e8c8002d5e48f4d4e363801479d1aebec2f9ad21f7bce84247c8cf18907145fccda57f8 SHA512 123f7c97559ed0c57b83ec5fcee9150ad0d6a0e489acdb873ca1f033de13d3a818db3487629da0c32f615e5ee3ee24bbc9bb283f3702b27b260ead63bf739819
-EBUILD util-linux-2.32.ebuild 6469 BLAKE2B 6c84dfecb250b52372b56ba381efaa419f4a896476a3da5642cba7b5d1b10c1acc298aaccc12e35ab2d0345437c91ee49b65240e8abbf8bad0c3cb2d0785c733 SHA512 7dae1d9371295d2f2a415927afe945b7a9ba1e893e33a7fd63b560ff4d619ed706280e644572a1828bab6df76084e7b31d868cea26d06acf6aa2ca9f7e995cfa
-EBUILD util-linux-9999.ebuild 6767 BLAKE2B 4261596c33cca1149917f85b68ec8f50e95a1d1afe3ebb776cd0f173a3e05c4c98473eb4e7ccef8d6afe94c9cca974cad49d9d09f2dd06f995f3c5c97492b810 SHA512 ae8878647760889f7305b1be43c46acef682959f527460c83cd353da3c61d631b585b9e82b4f5649b00a2311ed21ee63eb9373256f3740bddb0d945f4ea953db
+EBUILD util-linux-2.30.2-r1.ebuild 6489 BLAKE2B 45ce658cfffcf33f2c50090be7d19a645a9694f9cf2307f7fbdb3bc7b5823ad310e73291ef64c96995dca5da0bede72d74218857ecb9da044c87c5f9a281c6b2 SHA512 3b34b7a023e092177537ed518be1b3f603751d58166e68bb2425c2438e592ec57ef5b91da5f36c010ec472ef519be4e7b26e07db3942cd5adfe8bd18dc13e955
+EBUILD util-linux-2.32-r4.ebuild 7288 BLAKE2B 6ac6e765f793217d4b7f5fbee8eebf13e9eca2bb26fc9e340c148b30db3b990e7148bbefabae8186df4b957a9b9a6a2978788c36bcdd4900d57f235872e51669 SHA512 d3c7e30f23403494fc4271c42601ba823ee7c5fd5b2fe51619f662b0fc3e610dea66e813d8181377c526646a99abed736d3f7f759fec3b1e61f8497ee2e7519d
+EBUILD util-linux-2.32-r5.ebuild 7373 BLAKE2B eb956b454e12433bdcb142e26ceb7caf37867009caf97ab21a173499741f3c431d228606e38f4286cfd1c7a1e312c976456db364a524ad797869ca937a33048b SHA512 f9b23adedf11cc21757cfb1b4684027b18a5fc362eb5ab3f1954984f537bae29f3f90f789046525758ba08d45f1e5ef0715c278c98648346f37eaea782c73716
+EBUILD util-linux-9999.ebuild 7118 BLAKE2B b121e4cbf52de36406205013823d04cb7a0f9aca156a067199f1cddc9799846d887cbfa94ec34ab1f1a841790924209136ee3e8b73e53acabeed89f3ea8fd935 SHA512 47ebbee7e21abb56fc3523104512d697191b934781a7c003ce0855625032d350b5df14a9896b86ab788d57753a2b3866a0d501df0b5791d998f52c39beeffae6
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch b/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
new file mode 100644
index 000000000000..7b8867ba0347
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
@@ -0,0 +1,105 @@
+From 8a12ab57755afc36546834f175ef0b9e9376ba59 Mon Sep 17 00:00:00 2001
+From: Frank Schaefer <kelledin@gmail.com>
+Date: Tue, 10 Jul 2018 20:21:02 -0500
+Subject: [PATCH] * break up large strings for PySys_WriteStdout()
+
+---
+ libmount/python/fs.c | 56 ++++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 43 insertions(+), 13 deletions(-)
+
+diff --git a/libmount/python/fs.c b/libmount/python/fs.c
+index d6490d248..634a914ef 100644
+--- a/libmount/python/fs.c
++++ b/libmount/python/fs.c
+@@ -63,32 +63,62 @@ static PyObject *Fs_get_devno(FsObject *self)
+ 	return PyObjectResultInt(mnt_fs_get_devno(self->fs));
+ }
+ 
++static void _dump_debug_string(const char *lead, const char *s, char quote)
++{
++	/* PySys_WriteStdout() will automatically truncate any '%s' token
++	 * longer than a certain length (documented as 1000 bytes, but we
++	 * give ourselves some margin here just in case).  The only way I
++	 * know to get around this is to print such strings in bite-sized
++	 * chunks.
++	 */
++	static const unsigned int _PY_MAX_LEN = 900;
++	static const char *_PY_MAX_LEN_FMT = "%.900s";
++	unsigned int len;
++
++	if (lead != NULL)
++		PySys_WriteStdout("%s", lead);
++
++	if (quote != 0)
++		PySys_WriteStdout("%c", quote);
++
++	for (len = strlen(s); len > _PY_MAX_LEN; len -= _PY_MAX_LEN, s += _PY_MAX_LEN) 
++		PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
++
++	if (len > 0)
++		PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
++
++	if (quote != 0)
++		PySys_WriteStdout("%c\n", quote);
++	else
++		PySys_WriteStdout("\n");
++}
++
+ #define Fs_print_debug_HELP "print_debug()\n\n"
+ static PyObject *Fs_print_debug(FsObject *self)
+ {
+ 	PySys_WriteStdout("------ fs: %p\n", self->fs);
+-	PySys_WriteStdout("source: %s\n", mnt_fs_get_source(self->fs));
+-	PySys_WriteStdout("target: %s\n", mnt_fs_get_target(self->fs));
+-	PySys_WriteStdout("fstype: %s\n", mnt_fs_get_fstype(self->fs));
++	_dump_debug_string("source: ", mnt_fs_get_source(self->fs), 0);
++	_dump_debug_string("target: ", mnt_fs_get_target(self->fs), 0);
++	_dump_debug_string("fstype: ", mnt_fs_get_fstype(self->fs), 0);
+ 
+ 	if (mnt_fs_get_options(self->fs))
+-		PySys_WriteStdout("optstr: %s\n", mnt_fs_get_options(self->fs));
++		_dump_debug_string("optstr: ", mnt_fs_get_options(self->fs), 0);
+ 	if (mnt_fs_get_vfs_options(self->fs))
+-		PySys_WriteStdout("VFS-optstr: %s\n", mnt_fs_get_vfs_options(self->fs));
++		_dump_debug_string("VFS-optstr: ", mnt_fs_get_vfs_options(self->fs), 0);
+ 	if (mnt_fs_get_fs_options(self->fs))
+-		PySys_WriteStdout("FS-opstr: %s\n", mnt_fs_get_fs_options(self->fs));
++		_dump_debug_string("FS-opstr: ", mnt_fs_get_fs_options(self->fs), 0);
+ 	if (mnt_fs_get_user_options(self->fs))
+-		PySys_WriteStdout("user-optstr: %s\n", mnt_fs_get_user_options(self->fs));
++		_dump_debug_string("user-optstr: ", mnt_fs_get_user_options(self->fs), 0);
+ 	if (mnt_fs_get_optional_fields(self->fs))
+-		PySys_WriteStdout("optional-fields: '%s'\n", mnt_fs_get_optional_fields(self->fs));
++		_dump_debug_string("optional-fields: ", mnt_fs_get_optional_fields(self->fs), '\'');
+ 	if (mnt_fs_get_attributes(self->fs))
+-		PySys_WriteStdout("attributes: %s\n", mnt_fs_get_attributes(self->fs));
++		_dump_debug_string("attributes: ", mnt_fs_get_attributes(self->fs), 0);
+ 
+ 	if (mnt_fs_get_root(self->fs))
+-		PySys_WriteStdout("root:   %s\n", mnt_fs_get_root(self->fs));
++		_dump_debug_string("root:   ", mnt_fs_get_root(self->fs), 0);
+ 
+ 	if (mnt_fs_get_swaptype(self->fs))
+-		PySys_WriteStdout("swaptype: %s\n", mnt_fs_get_swaptype(self->fs));
++		_dump_debug_string("swaptype: ", mnt_fs_get_swaptype(self->fs), 0);
+ 	if (mnt_fs_get_size(self->fs))
+ 		PySys_WriteStdout("size: %jd\n", mnt_fs_get_size(self->fs));
+ 	if (mnt_fs_get_usedsize(self->fs))
+@@ -97,7 +127,7 @@ static PyObject *Fs_print_debug(FsObject *self)
+ 		PySys_WriteStdout("priority: %d\n", mnt_fs_get_priority(self->fs));
+ 
+ 	if (mnt_fs_get_bindsrc(self->fs))
+-		PySys_WriteStdout("bindsrc: %s\n", mnt_fs_get_bindsrc(self->fs));
++		_dump_debug_string("bindsrc: ", mnt_fs_get_bindsrc(self->fs), 0);
+ 	if (mnt_fs_get_freq(self->fs))
+ 		PySys_WriteStdout("freq:   %d\n", mnt_fs_get_freq(self->fs));
+ 	if (mnt_fs_get_passno(self->fs))
+@@ -112,7 +142,7 @@ static PyObject *Fs_print_debug(FsObject *self)
+ 	if (mnt_fs_get_tid(self->fs))
+ 		PySys_WriteStdout("tid:    %d\n", mnt_fs_get_tid(self->fs));
+ 	if (mnt_fs_get_comment(self->fs))
+-		PySys_WriteStdout("comment: '%s'\n", mnt_fs_get_comment(self->fs));
++		_dump_debug_string("comment: ", mnt_fs_get_comment(self->fs), '\'');
+ 	return UL_IncRef(self);
+ }
+ /*
diff --git a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
index 3077f85b78e7..adba6b4d54f7 100644
--- a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	pam python-single-r1 multilib-minimal multiprocessing systemd
diff --git a/sys-apps/util-linux/util-linux-2.31.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.31.1-r1.ebuild
deleted file mode 100644
index ce356da9a592..000000000000
--- a/sys-apps/util-linux/util-linux-2.31.1-r1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-single-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +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}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-RDEPEND+="
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	!net-wireless/rfkill
-	!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.7-r1
-	!<sys-apps/s390-tools-1.36.1-r1"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.32_rc2-umount_completion.patch" #649812
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Prevent uuidd test failure due to socket path limit. #593304
-	sed -i \
-		-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 [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-
-	# Undo bad ncurses handling by upstream. #601530
-	sed -i -E \
-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
-		configure || die
-
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
-	local myeconfargs=(
-		--disable-chfn-chsh
-		--disable-login
-		--disable-nologin
-		--disable-su
-		--docdir='${datarootdir}'/doc/${PF}
-		--enable-agetty
-		--enable-bash-completion
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-		--enable-line
-		--enable-partx
-		--enable-raw
-		--enable-rename
-		--enable-rfkill
-		--enable-schedutils
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
-		$(multilib_native_use_enable caps setpriv)
-		$(multilib_native_use_enable cramfs)
-		$(multilib_native_use_enable fdformat)
-		$(multilib_native_use_enable nls)
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_enable tty-helpers mesg)
-		$(multilib_native_use_enable tty-helpers wall)
-		$(multilib_native_use_enable tty-helpers write)
-		$(multilib_native_use_with python)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable unicode widechar)
-		$(use_enable kill)
-		$(use_enable static-libs static)
-		$(use_with selinux)
-		$(usex ncurses '' '--without-tinfo')
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if use pam; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.32.ebuild b/sys-apps/util-linux/util-linux-2.32-r4.ebuild
index a6b7310e742c..907bea63807a 100644
--- a/sys-apps/util-linux/util-linux-2.32.ebuild
+++ b/sys-apps/util-linux/util-linux-2.32-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	pam python-single-r1 multilib-minimal multiprocessing systemd
@@ -16,22 +16,23 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
 DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
 
 LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
 RDEPEND="caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
@@ -55,8 +56,7 @@ RDEPEND+="
 	!<sys-apps/sysvinit-2.88-r7
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.7-r1
-	!<sys-apps/s390-tools-1.36.1-r1"
+	!<app-shells/bash-completion-2.7-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -69,11 +69,22 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	eapply "${FILESDIR}"/${P}-add-missing-lintl.patch
+	touch -r "${S}"/configure "${S}"/libsmartcols/src/Makemodule.am || die
+	touch -r "${S}"/configure "${S}"/libuuid/src/Makemodule.am || die
+
 	# Prevent uuidd test failure due to socket path limit. #593304
 	sed -i \
 		-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
@@ -111,31 +122,10 @@ multilib_src_configure() {
 	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
 
 	local myeconfargs=(
-		--disable-chfn-chsh
-		--disable-login
-		--disable-nologin
-		--disable-su
-		--docdir='${datarootdir}'/doc/${PF}
-		--enable-agetty
-		--enable-bash-completion
 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-		--enable-line
-		--enable-partx
-		--enable-raw
-		--enable-rename
-		--enable-rfkill
-		--enable-schedutils
 		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
-		$(multilib_native_use_enable caps setpriv)
-		$(multilib_native_use_enable cramfs)
-		$(multilib_native_use_enable fdformat)
-		$(multilib_native_use_enable nls)
 		$(multilib_native_use_enable suid makeinstall-chown)
 		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_enable tty-helpers mesg)
-		$(multilib_native_use_enable tty-helpers wall)
-		$(multilib_native_use_enable tty-helpers write)
 		$(multilib_native_use_with python)
 		$(multilib_native_use_with readline)
 		$(multilib_native_use_with slang)
@@ -144,42 +134,67 @@ multilib_src_configure() {
 		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
 		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
 		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
 		$(use_enable unicode widechar)
-		$(use_enable kill)
 		$(use_enable static-libs static)
 		$(use_with selinux)
 		$(usex ncurses '' '--without-tinfo')
 	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-nologin
+			--disable-su
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_enable kill)
+		)
 	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
 	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_test() {
-	multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
 }
 
 multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
-	fi
+	emake DESTDIR="${D}" install
 
-	if multilib_is_native_abi; then
+	if multilib_is_native_abi && use userland_GNU; then
 		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
 
 		use python && python_optimize
 	fi
@@ -191,10 +206,24 @@ 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
 	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
 }
 
 pkg_postinst() {
diff --git a/sys-apps/util-linux/util-linux-2.32-r3.ebuild b/sys-apps/util-linux/util-linux-2.32-r5.ebuild
index 4fe88effdfb8..1bce9daa5a9f 100644
--- a/sys-apps/util-linux/util-linux-2.32-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.32-r5.ebuild
@@ -62,6 +62,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/util-linux-2.32-python3-tests.patch"
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -216,6 +220,14 @@ multilib_src_install_all() {
 		newpamd "${FILESDIR}/runuser.pamd" runuser
 		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
 	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
 }
 
 pkg_postinst() {
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index a41435eb9a9a..0ddfbaa27d27 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -212,6 +212,14 @@ multilib_src_install_all() {
 		newpamd "${FILESDIR}/runuser.pamd" runuser
 		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
 	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
 }
 
 pkg_postinst() {