gentoo resync : 14.04.2018

20 files changed, 74 insertions, 198 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 88e619fd8ac5..2a7381b1ef74 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 8a79bb306873..9aa201b6b3b0 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -6,7 +6,7 @@ DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5
 DIST dbus-1.12.4.tar.gz 2067402 BLAKE2B 621a9223c9d20a76415935d421a506100bbdf4852dc3c2a4f221750f739757a4945d60cb4a1f9032602f2993b868b502e7eb1835c8d2764666902c01daa01ba5 SHA512 ca9f7c76f705aca0f71366627fadf8b5c68992d5bcb6fae1746a8c14e9dc93c4492e80c63b6fd522b8753ec264df046e33482a5ce20be82adf181a6dd69b36a5
 DIST dbus-1.12.6.tar.gz 2068612 BLAKE2B 3dbb05e899e511a636816393ebc28548cc2ecaabaa0c04737189a0812791da195708ee455d7b0439fc81eea113f4bd8fc64b1b9b93e9dac84664b9c51049e75c SHA512 a0599329190e90d5982215138a19031028ed825f54c76c1ae13b54c2e4ddf14c949eacaac05c667db11bca13fb4bbdf8855fc9e15641cece55be1efde00c41ab
 EBUILD dbus-1.10.18.ebuild 7511 BLAKE2B 723c6e71e73b4ed5c3b2a664da5b00fd37efca9103e96e19ca0e0a58482e3e60ddc3325c1ad50b2cf58862ea2f1f1ea9944c3a7093a729f3a712b3e4e42255a3 SHA512 1623a683105edaf9f495b18ca770ff788e528302a50235fe584b9eab2b91cd655a5ed0eb3b3e60ca810382a7637a7bdfa736b8b1129a86e56e4040bb16a4d81b
-EBUILD dbus-1.10.24.ebuild 7390 BLAKE2B 70fb7ff68fb36d370fb47c3d6fa20e569b085ac0a845e60ff73fef7c25bd01602d6a4df884ef704d07516822b694f9792a2a1a77e10f4b03f49c3c24df13f6db SHA512 be83ab3778c77c7ca61d82a03f660e75ef512993f80437a455820cb93113ab46bac0c13ba07463a2ca6d68531d5868c276f9fef9f5ba72f8831056faf35f7d82
+EBUILD dbus-1.10.24.ebuild 7389 BLAKE2B ed81773c314cd00ef8f9518e610d5173ce43cad1efec83346f9c0c50b7f9191b10edd15e0bde50d4abac0eeecd2e73051103dbeaa0ec94d6b0a95c4d3e2ce42e SHA512 1dbf455c99251bbb884a83785e73d9770ca8cbb0d9d32e69ef410018997ce4d086848c0ee325e8fb1c8eef12e8b5145b2b48634d646ce7ef177a70ffea8972fc
 EBUILD dbus-1.12.4.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 EBUILD dbus-1.12.6.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild
index 7a299357cfe7..1c816ecab1d6 100644
--- a/sys-apps/dbus/dbus-1.10.24.ebuild
+++ b/sys-apps/dbus/dbus-1.10.24.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc elogind selinux static-libs systemd test user-session X"
 
 #RESTRICT="test"
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index bb5c72ca5a98..a0666536a04e 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -2,6 +2,6 @@ AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca
 DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde
 EBUILD lsb-release-1.4-r1.ebuild 732 BLAKE2B 86e83fb65af3f76b58fda76f2005738c4ae724a9fce7b13c85664262bba7e817ddb42697000394cec90830a5e280f62ff0b61a00781fcba8937e55e7deb09a75 SHA512 ec24e3ade879837b901ac4beee6bd354d0070965386683c40ce27d3b239ad8a5522f77ffc07f96a91c685c4ccbeeae006257e1420d60d58e6a59ba33cd7550a9
 EBUILD lsb-release-1.4-r2.ebuild 854 BLAKE2B ca559ce9afc79b56a947e6dc4d91e445f26ffcde324ad75d5fad418499a226dc25b7473f541d258dba3bc853e08cedfb4d05613e64650a13d60071b3daeb2193 SHA512 ab5356625e24fc97349be711516cf346d21bb3a414c72ae5d6c95cf18b307df74ff8a1ded89d700ef65307b3c79205644e815d2281725c265e3ff61c4cef4dc8
-EBUILD lsb-release-1.4-r3.ebuild 885 BLAKE2B b9d342c48b7414f76a8bd96deb36d373cb12617973bcc3e80f392691fb82c264c1ebd1b23322071bc80f6cb5052e2332c6caca646132d9e1debad4fc5250de10 SHA512 c35a37af7d21abda5e144d6be1d64c0ddffbfc7fffbf8f3bc2f4c75a54b531758eaaf4fdb47c82ce8f8a7a339fe03000b386237ade019f71efebc498cdce5ec8
+EBUILD lsb-release-1.4-r3.ebuild 920 BLAKE2B a7359b9175593d3c9ad4d59dad100430eb7f4f3bb5878b223897d185c07a980d009a3265d00117f9230493a04f3878921860e8cc2605a5e19024b2cfc3b6ad17 SHA512 d846432c4d125ab6e3efbef4846b020ce169f50a7566068e52cbd82b5e9fc03bac8f2a6cd55ac1cbf33e51e87d3bc60f11d807793ee13880a906c92b4061b2b4
 EBUILD lsb-release-1.4.ebuild 682 BLAKE2B a3ede22a4bbb350d836cf3bf1a88238b252cc64a9baed63b2ca54ad826a62e8172221228c4c93f2cd9778d6fe51855d73636dcbbe2ed013b7e3b49e521ccbc59 SHA512 71356ec02e8d4bf81e89353224ec36b86ba6c082fdff2bee7456851e1feed034217a1b49aa9ebe0b43ad2a651161a5341361ff4eaa47baccc8b1c3e61aff6bbe
 MISC metadata.xml 795 BLAKE2B 3af7256256701726c04244c09e8cb8aa9e560cea0b16502412f3565235cae17ab172daf4cc26cf7356ef021d2989752c733a8d4250d241e32e1c79f2149622b8 SHA512 e0951bbb925a0729e886a608c2b177fa9a68aea5571316d0d89f8cae3fa6f48c97aeb37c1393ae429f02ec40f640fe237836f018ba31c2a3d0b9a81ef2661dcf
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
index 6e80c09204c1..6105ea96577a 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils
+inherit eutils prefix
 
 DESCRIPTION="LSB version query program"
 HOMEPAGE="https://wiki.linuxfoundation.org/lsb/"
@@ -23,16 +23,18 @@ src_prepare() {
 		-e "s:echo -e:printf '%b\\\n':g" \
 		-e 's:--long:-l:g' \
 		lsb_release || die
+
+	hprefixify lsb_release
 }
 
 src_install() {
 	emake \
-		prefix="${D}/usr" \
-		mandir="${D}/usr/share/man" \
+		prefix="${ED}/usr" \
+		mandir="${ED}/usr/share/man" \
 		install
 
 	dodir /etc
-	cat > "${D}/etc/lsb-release" <<- EOF
+	cat > "${ED}/etc/lsb-release" <<- EOF
 		DISTRIB_ID="Gentoo"
 	EOF
 }
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index ca4f10adf775..d79454770b42 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,6 +1,6 @@
 AUX pcmciautils-018_p8-flex-2.6.3-fix.patch 593 BLAKE2B bff765ae6c80daf3d2413528c4d42aefb7af7e3823590d33315c7089a5221d99c82802378cf9b51502b53bd920e0b5b4b68aaa82d50a92e83f5dfe7207c39a49 SHA512 b96f9bc3176f1eeb936a31f8fab5a495ce14218e92fbae2350aa970328b53bd6732ade90721f1ca55d80a94436189773f83a300aa8af7c43ecc5ed62c95f3557
 DIST pcmciautils_018-8.debian.tar.gz 11213 BLAKE2B cf28ecf71ebfd5c4ad7d882cbadab71b787f407adb2d20258cdc1157ca7d542bf398ff09207037d1d6e933d43e477b50b28ca3f0ac0e557fbaefb9f31656843e SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9
 DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d
-EBUILD pcmciautils-018_p8-r1.ebuild 1558 BLAKE2B ef53dc63ed2e98eee2e8fe1458b8ebe690aa99e24ba576121667915250f8b8f269c15a95fe012a58ba2f51470ae95381e58984420777c66c9e4c9cfeff7f67ee SHA512 2e5ea5002f51bd2367d7d88f0dfdc46e47863738e4a38cbde7968dfd2a08fed8482f2ad036b33f099605bc43d124368ffcfb61bcc853db86dfe987a5f4df2a0e
+EBUILD pcmciautils-018_p8-r1.ebuild 1557 BLAKE2B 9168ceeb1a34a56dfc16538480d32d828f851699f25776466f31394d9a9806395523f3899286f1fb64b3013bf403b607fbf1cd744e29b0ad71be7b2c46afe65e SHA512 63e239cb2f0bb9b88bb4fbf19d1eba4158751bfcf9ff99a39b99123e6a855889fcd18d004a904ca437119188a8b85dc125f75f5aaf6c36f629d830759b0b3c67
 EBUILD pcmciautils-018_p8.ebuild 1513 BLAKE2B 04f16b0dc86e74a539aec390a58b5461b72c7993490e102bbeb958b1934668e8f6833150b7cfa86e3728e6722ba17785a2296f5b4318b21f21dde898f94a0318 SHA512 71f6ce9e540765a471c79ae5dd7b0aacf942c5f60bde01c7b99e5697360dd347045282a2daa30b26ef8851caa7be66c255e5594b2709c78d0a45f5c7c13c0fca
 MISC metadata.xml 244 BLAKE2B 98282e1c41cb6f5c3e984cc3d0558218b91a7eaf13774ab9f7e3eec7351fb18831088c0ecf1422ec6bac434b1c46654cf253f41bd3a748f4c724bfed2b35e82f SHA512 5c9aa921d361b670fdacbc49e93fb5e3a8ed161e0866ebc08ec0940c480a6bed654059642675e37596d1ede56f0ca5b55ae31ed96040fcf8d01f9f683ce444f6
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
index 6513c3dfa77e..6c637a19fba3 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sh ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~sh x86"
 IUSE="debug staticsocket"
 
 RDEPEND="virtual/modutils"
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index e1e3ba0d777b..b47809ff698d 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -1,5 +1,5 @@
 AUX restorecond.init 650 BLAKE2B 507c65c11f756d5cf11045ba75d40a39a9fb6a527c9e0406247e8d2d06a41ec977110bdb9c77f4a75d97fc179bf507b0fd58b962c1976eff57a743cf019c684a SHA512 ee0ff9bfe542124eff0217dbf9cc2e00586b4577e0eee2bfa67946f78a97fe009c6e5c337e8ad68e1cd9af2f69ec3ce3acba9157b4d53c2fdeeb01f9e0aa9d0a
 DIST restorecond-2.7.tar.gz 17753 BLAKE2B 793a41dbfd0a33d79e15c62e79f4fbbacc4208a8f2057813d7c3e2d16a3435c12e0c29ca60a3b45cef33ec13b5aacd28c8ad95ddcbf47a812654d3a59fcb6c89 SHA512 c81950e4f748a729c8951b13a4075ab1003530f8ada7a9d3fbe6428f76070df4819a37daaab557b63fc234aa8c8320ec41757fbdb24b76fa2c11747bde0038ad
-EBUILD restorecond-2.7.ebuild 1230 BLAKE2B 3317279f51085b9f89b6d291281a8d1cd8808155d146afddb61df89ce05bc7b8b64b324d48920bbc7a1763b3cae13fe5d1ef33c711c4388dca834a55c9560542 SHA512 bac8e86d00ac5c116aa877938f69427a1fa5ce7758594db6400722d953e5ea3fd000f0c4520364a7390cb0e6cd91ba737487b747aea25a38358fbb9c7e8a38eb
-EBUILD restorecond-9999.ebuild 1232 BLAKE2B 5bbb9e4a0507a53bbeae71adbcf6ed3fdd52dcd5cc263e3998540188beecccdc728e115efe15d124da5d5149cbdda6bb412f1cee83103eb4ee4157fbbe066770 SHA512 0c51444d0c278aee93a8da5f35a122d6d9c0849eb1d78f1b347f91f5399e87e11d8cc40b141e1295d5a0df406921e21f16264fb63fb50fa488463a01b057b74e
+EBUILD restorecond-2.7.ebuild 1250 BLAKE2B 7ae1b18d0eb9906ace64c5e2191c894fe424e69fe4f38f14238b3706c426a8272ea7f35ba5237a3375f7329d2140b78c02161cc855460e70f09d7c3f4850a51a SHA512 c5bbc404f56d756897433561485a6c90d5bdfb70958181cf5b670bb4a3dc9b428f91b8960e0960251d7acdd35f0e9b6141c5f4056f90d934a913b5b5ebfc6af8
+EBUILD restorecond-9999.ebuild 1252 BLAKE2B c8a3dd1772439c6b40cbdea77fbe24391b1a4afb2ea4337294e1a189b19ce0c6af491fd4d82c27e52a13eba50e30bfc2bbbfd4145babc7ebf1efe3f4b01bf911 SHA512 f01a7e9a2553090e11f7a5cfcc3abf363b756c57f7e6d6fa0584f70fb1e7a9e31d60e434f1bdfcef091513e10fd235abb4c7c0d98cc16b1d6735d05ed81fb68d
 MISC metadata.xml 460 BLAKE2B d0de63ca5ac8e0c1c061f418ea9dba5472644626bbc5799499ce70ff0c2d1c7e49b023e3855cc7c767e78f5fb6f62429f5aab59dd272d9a906dbe026895e2e46 SHA512 0e4910de5e3932eb2914ddf4ef3250ae919885428337b1939f6827037a4dc5a75b13c97531c7b81748b1c90e3eb2b10a4671c76ede69749dbd1955bc67b5ca0a
diff --git a/sys-apps/restorecond/restorecond-2.7.ebuild b/sys-apps/restorecond/restorecond-2.7.ebuild
index a63282f7029d..d55b72f66e5f 100644
--- a/sys-apps/restorecond/restorecond-2.7.ebuild
+++ b/sys-apps/restorecond/restorecond-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,6 +28,7 @@ SLOT="0"
 
 DEPEND=">=sys-libs/libsepol-${PV}:=
 	>=sys-libs/libselinux-${PV}:=
+	dev-libs/dbus-glib
 	dev-libs/libpcre:=
 	>=sys-libs/libcap-1.10-r10:="
 
diff --git a/sys-apps/restorecond/restorecond-9999.ebuild b/sys-apps/restorecond/restorecond-9999.ebuild
index 3d679bcf4c7e..f638bbc5aee2 100644
--- a/sys-apps/restorecond/restorecond-9999.ebuild
+++ b/sys-apps/restorecond/restorecond-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -28,6 +28,7 @@ SLOT="0"
 
 DEPEND=">=sys-libs/libsepol-${PV}:=
 	>=sys-libs/libselinux-${PV}:=
+	dev-libs/dbus-glib
 	dev-libs/libpcre:=
 	>=sys-libs/libcap-1.10-r10:="
 
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index ad8f03165658..3c41719e4157 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -2,10 +2,6 @@ AUX default/useradd 96 BLAKE2B 64b694bdff7f901e19ac21695e3b2eebeb5a03683be5a01e3
 AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d35c9908ca400bd57dcb234fb7691aa2a5a7646a379553aa6dee0dd96ee569aa492d7f20774e991a90f8602 SHA512 31611a08d97cd2c129f18d451a555ff6c781f91603c77fc0c66ff406b5fa4a97db19ae4ce104816a6324529d10e131de0d5329646bdab2abc8dc3ee5b82b057f
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
-AUX shadow-4.4-CVE-2017-2616.patch 2159 BLAKE2B e51b0c81392207d8e07dd6d4b8b16410a3e62b011eca15e41c5fb7658a7761ff622147416524eab64f51c97feced712ac92bc860d08ecc565ed13d17770b315a SHA512 72cba0857ac6611532a99769d22568816d21a29f77f76f9d22e6b5b400cb936088087e811e9715cb891c70a11c76321653611a2c49d85acb1b163158863634fe
-AUX shadow-4.4-load_defaults.patch 1027 BLAKE2B 632c18631d1218bed95a043e89a2599f008f8af87c230703c759acaab20768920cdfc21233ebd6a065553a92577a6e5a81f2a0d6d7cdecb9c16cacad4df4f22b SHA512 c821149fdcb71b0c1c7b0de72126a3ec625bd54f2edaff1666ccd30abe3f3d516db329dbe873ae020a6670f93caaf7d235283666113d5b02936043d6dd976d36
-AUX shadow-4.4-prototypes.patch 1232 BLAKE2B 757a6db113b6873994dcacfd6867a14e7d35def2d4ba6749b887f28cf7278117722bda2c8b981e23694dafcc25d6f2d7cd9531aeb3d3eb597c9b822729678dc2 SHA512 970f79efaf77e91baa22049230f2a97e6a045f2f03ef846f4c35dc4f5702941e61db5b6544c24d112faafd6d516fc5054725039f28fe81e17926a5e8ef6f0432
-AUX shadow-4.4-su-snprintf.patch 849 BLAKE2B 62cb1498bd79991373b1bc8241a07dfcd731ebba7a39406958b30bd0287c8acab65a9a22bcee8ba95073e36c7a8d0b1931b988b4b5963041f61db9ef4c5dbdeb SHA512 2aaa1c847ec34002c6e63af66fb36664e0fc5dc0b719ab38959043f990e84191f5e2f85c2dc44e324abcfe67691c9a9b8181da49077031e2eaaf979dde95b2d9
 AUX shadow-4.5-CVE-2018-7169.patch 5778 BLAKE2B 59e06cda2d3b48d77548c22073f9c4ce018c16bdd128089ce6ae6d8eebe1ad9b73438530fb32b628bc5e72201852b7c452264a13707bcbfa826777b778a7b90b SHA512 fef082516e47ee4e3d9627916c47ffb8e1987580586639374d461b7b9d041370abe5b80dbbfacd4fd256a1bc2f9d23e0e71497298dd60ccd96d795811a13cd58
 DIST shadow-4.5.tar.gz 3804933 BLAKE2B c4714b7fe9a1af5a5751d4274e70e7fb31994cc40058b44c401bbbdf83c238fcf48e6e6e663d8a61f614b6291ea524862d9d2425d7d839340a10f8fb7c8eaa85 SHA512 02d6482a1159689e404dd49a68b4e2db85e9ffdcdfbacc8efcbd9043f14a1ec3fc4d749700df915d375df67d589219b6b0f57a6cfd9fb5b197012888a608913b
 EBUILD shadow-4.5-r1.ebuild 5405 BLAKE2B 7518b3700adf543a619413066415f64959a50efbbe669b28622e8d2d4cd749705b256c62e3ba73a88e6f3c0d6c195c87c377e7541e165ccbf4328ec5f4b1b0df SHA512 a50352c9b189d5265e921e977acff5c96dedef2634b046f66b376e6d6e2fdab40b629e453695a3153dd1edb13740e94d6d205daed544b3bba885fd35dbb7251e
diff --git a/sys-apps/shadow/files/shadow-4.4-CVE-2017-2616.patch b/sys-apps/shadow/files/shadow-4.4-CVE-2017-2616.patch
deleted file mode 100644
index b788ec35342f..000000000000
--- a/sys-apps/shadow/files/shadow-4.4-CVE-2017-2616.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 08fd4b69e84364677a10e519ccb25b71710ee686 Mon Sep 17 00:00:00 2001
-From: Tobias Stoeckmann <tobias@stoeckmann.org>
-Date: Thu, 23 Feb 2017 09:47:29 -0600
-Subject: [PATCH] su: properly clear child PID
-
-If su is compiled with PAM support, it is possible for any local user
-to send SIGKILL to other processes with root privileges. There are
-only two conditions. First, the user must be able to perform su with
-a successful login. This does NOT have to be the root user, even using
-su with the same id is enough, e.g. "su $(whoami)". Second, SIGKILL
-can only be sent to processes which were executed after the su process.
-It is not possible to send SIGKILL to processes which were already
-running. I consider this as a security vulnerability, because I was
-able to write a proof of concept which unlocked a screen saver of
-another user this way.
----
- src/su.c | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/src/su.c b/src/su.c
-index f20d230..d86aa86 100644
---- a/src/su.c
-+++ b/src/su.c
-@@ -379,11 +379,13 @@ static void prepare_pam_close_session (void)
- 				/* wake child when resumed */
- 				kill (pid, SIGCONT);
- 				stop = false;
-+			} else {
-+				pid_child = 0;
- 			}
- 		} while (!stop);
- 	}
- 
--	if (0 != caught) {
-+	if (0 != caught && 0 != pid_child) {
- 		(void) fputs ("\n", stderr);
- 		(void) fputs (_("Session terminated, terminating shell..."),
- 		              stderr);
-@@ -393,9 +395,22 @@ static void prepare_pam_close_session (void)
- 		snprintf (wait_msg, sizeof wait_msg, _(" ...waiting for child to terminate.\n"));
- 
- 		(void) signal (SIGALRM, kill_child);
-+		(void) signal (SIGCHLD, catch_signals);
- 		(void) alarm (2);
- 
--		(void) wait (&status);
-+		sigemptyset (&ourset);
-+		if ((sigaddset (&ourset, SIGALRM) != 0)
-+		    || (sigprocmask (SIG_BLOCK, &ourset, NULL) != 0)) {
-+			fprintf (stderr, _("%s: signal masking malfunction\n"), Prog);
-+			kill_child (0);
-+		} else {
-+			while (0 == waitpid (pid_child, &status, WNOHANG)) {
-+				sigsuspend (&ourset);
-+			}
-+			pid_child = 0;
-+			(void) sigprocmask (SIG_UNBLOCK, &ourset, NULL);
-+		}
-+
- 		(void) fputs (_(" ...terminated.\n"), stderr);
- 	}
- 
diff --git a/sys-apps/shadow/files/shadow-4.4-load_defaults.patch b/sys-apps/shadow/files/shadow-4.4-load_defaults.patch
deleted file mode 100644
index 4c0b84f68036..000000000000
--- a/sys-apps/shadow/files/shadow-4.4-load_defaults.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 507f96cdeb54079fb636c7ce21e371f7a16a520e Mon Sep 17 00:00:00 2001
-From: Tomas Mraz <tmraz@fedoraproject.org>
-Date: Thu, 25 Aug 2016 11:20:34 +0200
-Subject: [PATCH] Fix regression in useradd not loading defaults properly.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The get_defaults() has to be called before processing the flags.
-
-Signed-off-by: Tomáš Mráz <tmraz@fedoraproject.org>
----
- src/useradd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/useradd.c b/src/useradd.c
-index fefa234..6c43e7e 100644
---- a/src/useradd.c
-+++ b/src/useradd.c
-@@ -2027,6 +2027,8 @@ int main (int argc, char **argv)
- 	is_shadow_grp = sgr_file_present ();
- #endif
- 
-+	get_defaults ();
-+
- 	process_flags (argc, argv);
- 
- #ifdef ENABLE_SUBIDS
-@@ -2036,8 +2038,6 @@ int main (int argc, char **argv)
- 	    (!user_id || (user_id <= uid_max && user_id >= uid_min));
- #endif				/* ENABLE_SUBIDS */
- 
--	get_defaults ();
--
- #ifdef ACCT_TOOLS_SETUID
- #ifdef USE_PAM
- 	{
diff --git a/sys-apps/shadow/files/shadow-4.4-prototypes.patch b/sys-apps/shadow/files/shadow-4.4-prototypes.patch
deleted file mode 100644
index 5209a2988f7b..000000000000
--- a/sys-apps/shadow/files/shadow-4.4-prototypes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/shadow-maint/shadow/pull/53
-
-From 32c0b283ef5d68b63e4ec05fb22ed0db938fea67 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 5 Dec 2016 17:15:29 -0500
-Subject: [PATCH] include getdef.h for getdef_bool prototype
-
-Otherwise we get build warnings like:
-sgroupio.c:255:6: warning: implicit declaration of function 'getdef_bool' [-Wimplicit-function-declaration]
-shadowio.c:131:6: warning: implicit declaration of function 'getdef_bool' [-Wimplicit-function-declaration]
----
- lib/sgroupio.c | 1 +
- lib/shadowio.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/lib/sgroupio.c b/lib/sgroupio.c
-index f2685779a12b..5423626a01da 100644
---- a/lib/sgroupio.c
-+++ b/lib/sgroupio.c
-@@ -40,6 +40,7 @@
- #include "prototypes.h"
- #include "defines.h"
- #include "commonio.h"
-+#include "getdef.h"
- #include "sgroupio.h"
- 
- /*@null@*/ /*@only@*/struct sgrp *__sgr_dup (const struct sgrp *sgent)
-diff --git a/lib/shadowio.c b/lib/shadowio.c
-index 6e44ab24d69c..5fa3d312bbf9 100644
---- a/lib/shadowio.c
-+++ b/lib/shadowio.c
-@@ -40,6 +40,7 @@
- #include <shadow.h>
- #include <stdio.h>
- #include "commonio.h"
-+#include "getdef.h"
- #include "shadowio.h"
- #ifdef WITH_TCB
- #include <tcb.h>
--- 
-2.11.0.rc2
-
diff --git a/sys-apps/shadow/files/shadow-4.4-su-snprintf.patch b/sys-apps/shadow/files/shadow-4.4-su-snprintf.patch
deleted file mode 100644
index 45667c8e4bf9..000000000000
--- a/sys-apps/shadow/files/shadow-4.4-su-snprintf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-fix from upstream
-
-From 67d2bb6e0a5ac124ce1f026dd5723217b1493194 Mon Sep 17 00:00:00 2001
-From: Serge Hallyn <serge@hallyn.com>
-Date: Sun, 18 Sep 2016 21:31:18 -0500
-Subject: [PATCH] su.c: fix missing length argument to snprintf
-
----
- src/su.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/su.c b/src/su.c
-index 0c50a9456afd..93ffd2fbe2b4 100644
---- a/src/su.c
-+++ b/src/su.c
-@@ -373,8 +373,8 @@ static void prepare_pam_close_session (void)
- 		              stderr);
- 		(void) kill (-pid_child, caught);
- 
--		snprintf (kill_msg, _(" ...killed.\n"));
--		snprintf (wait_msg, _(" ...waiting for child to terminate.\n"));
-+		snprintf (kill_msg, 256, _(" ...killed.\n"));
-+		snprintf (wait_msg, 256, _(" ...waiting for child to terminate.\n"));
- 
- 		(void) signal (SIGALRM, kill_child);
- 		(void) alarm (2);
--- 
-2.11.0.rc2
-
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 583d2b38c4aa..9ae24ec67745 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,12 +1,13 @@
 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_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-r1.ebuild 6692 BLAKE2B 397c5ecd815ed00c1e48a6181ada040acc7dd94a32a75e6e86f66be32d62d663b79fa7e60c024657666b2970cae1b6b01c071a9ed5d05087b720159b09a9c328 SHA512 b109407397db51cbc2e0d4cfb954c7733e9d40d2b4fbcec805bd9595379e8b49f997cbc42776b6d5a31b4204b01cd0000cfb16d462d0c29dc3e636ad1943ed82
+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 6680 BLAKE2B 2ed2f44ba3f5eef5e2d09d41f7d8f63b364f531fb55a7e8e065d687728fca6f8443201a62a7f2f82a95f8faf329e706eb0397abb140c01ec8b46e8fa66a08092 SHA512 8fc29a9e99ec8bbfb983967ea5a6c35c82b97e5c478e555ac719cee41e4dab717049e9d8a3e375db510cbf712ddbfd5cd6d2140c27cb1cb380698fe8251d5dd8
-MISC metadata.xml 947 BLAKE2B aeb1eef359b4be20e0df592245a2d432d92adf29336ecb1519bb4a97deed47c75bd14ca6c132f2e2ffe5c2d2ddcd7638ee38d03c7f8bcf8c8accb36a916663b5 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c
+EBUILD util-linux-9999.ebuild 6767 BLAKE2B 4261596c33cca1149917f85b68ec8f50e95a1d1afe3ebb776cd0f173a3e05c4c98473eb4e7ccef8d6afe94c9cca974cad49d9d09f2dd06f995f3c5c97492b810 SHA512 ae8878647760889f7305b1be43c46acef682959f527460c83cd353da3c61d631b585b9e82b4f5649b00a2311ed21ee63eb9373256f3740bddb0d945f4ea953db
+MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch b/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch
new file mode 100644
index 000000000000..8cca093d7cb4
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch
@@ -0,0 +1,38 @@
+From 3188ea9a9292604e537f06f11adddf474fc9e52d Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 9 Apr 2018 12:11:36 +0200
+Subject: [PATCH] build: Add missing -lintl linkage to lib{smartcols,uuid}
+
+Addresses: https://github.com/karelzak/util-linux/pull/615
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ libsmartcols/src/Makemodule.am | 2 +-
+ libuuid/src/Makemodule.am      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
+index 664aca30b..665b2aa7f 100644
+--- a/libsmartcols/src/Makemodule.am
++++ b/libsmartcols/src/Makemodule.am
+@@ -19,7 +19,7 @@ libsmartcols_la_SOURCES= \
+ 	libsmartcols/src/version.c \
+ 	libsmartcols/src/init.c
+ 
+-libsmartcols_la_LIBADD = libcommon.la
++libsmartcols_la_LIBADD = $(LDADD) libcommon.la
+ 
+ libsmartcols_la_CFLAGS = \
+ 	$(AM_CFLAGS) \
+diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
+index 5122622a5..e58fa261c 100644
+--- a/libuuid/src/Makemodule.am
++++ b/libuuid/src/Makemodule.am
+@@ -31,7 +31,7 @@ libuuid_la_SOURCES = \
+ EXTRA_libuuid_la_DEPENDENCIES = \
+ 	libuuid/src/libuuid.sym
+ 
+-libuuid_la_LIBADD       = $(SOCKET_LIBS)
++libuuid_la_LIBADD       = $(LDADD) $(SOCKET_LIBS)
+ 
+ libuuid_la_CFLAGS = \
+ 	$(AM_CFLAGS) \
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index 9a5be00a83a6..d41121d081b1 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -19,5 +19,6 @@
 </use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
+	<remote-id type="github">karelzak/util-linux</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/sys-apps/util-linux/util-linux-2.32-r1.ebuild b/sys-apps/util-linux/util-linux-2.32-r3.ebuild
index 6d113163470f..4fe88effdfb8 100644
--- a/sys-apps/util-linux/util-linux-2.32-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.32-r3.ebuild
@@ -21,7 +21,7 @@ else
 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"
@@ -32,6 +32,7 @@ IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux
 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= )
@@ -68,6 +69,10 @@ 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" \
@@ -119,7 +124,6 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
 		--with-bashcompletiondir="$(get_bashcompdir)"
-		$(multilib_native_use_enable nls)
 		$(multilib_native_use_enable suid makeinstall-chown)
 		$(multilib_native_use_enable suid makeinstall-setuid)
 		$(multilib_native_use_with python)
@@ -130,6 +134,7 @@ 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 static-libs static)
 		$(use_with selinux)
@@ -189,7 +194,7 @@ multilib_src_install() {
 
 	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
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 76ee8160737a..a41435eb9a9a 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -16,12 +16,12 @@ 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"
@@ -32,6 +32,7 @@ IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux
 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= )
@@ -119,7 +120,6 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
 		--with-bashcompletiondir="$(get_bashcompdir)"
-		$(multilib_native_use_enable nls)
 		$(multilib_native_use_enable suid makeinstall-chown)
 		$(multilib_native_use_enable suid makeinstall-setuid)
 		$(multilib_native_use_with python)
@@ -130,6 +130,7 @@ 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 static-libs static)
 		$(use_with selinux)
@@ -189,7 +190,7 @@ multilib_src_install() {
 
 	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