gentoo resync : 15.02.2018

15 files changed, 258 insertions, 125 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index e78a62df03d6..dd00f66970d2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 4231a96481ae..e4bac3253ad8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,5 @@
-DIST fwupd-1.0.3.tar.gz 1534438 BLAKE2B b578bc4f8a53bd596f13a2bc45e5229b30a9aacb837fe3ef3b267eaaf5e8e277c21b9c2b915495d5b58a36b386b9b223ff219cfe2082ca6d18fae2cbd37b1ff9 SHA512 4a39c6d2da5ca83f9bf2a6aba9a63cd716622f6bfda4760c7abdc73932d86dc41305cc8780b3292b208c285fddda6edd926d58d2c90847e34130e6f145b5c6b7
 DIST fwupd-1.0.4.tar.gz 1555679 BLAKE2B 75282437169cbb5a0da8d4c296ddd4fe62e32f4bd4d4b6d386b57708869a1dfc591a991c4c17dba5dac80f84e7238181b0beed654da453f72cc8e92f9513d3df SHA512 20f24253c4ee5c90d6d262ebe5c515bea78c6cc3720e78bdcff04c1b02500a79de583886ce0ae6c48d24b9c3d9638c4c5896d57d2efc0b77346317ba53924d2a
-EBUILD fwupd-1.0.3.ebuild 2468 BLAKE2B ae4b1a59eb7e81f6faf75b7df3b1a7bb446df4207dee13f286a86b0783029e9da3b9f34453305b77eacaa96358c24546cd4eb0086505d82192e7a0fd30011da5 SHA512 3fccd7b9c663b765bd07c2eef41a10e4d4a4f8085901f5c3e510e00810a8eb3e52d45c0bf2b63b72abcf1005b883676f2a82f818aede3cf136df8cb1406db612
+DIST fwupd-1.0.5.tar.gz 1564037 BLAKE2B 1b97cf35e2531fc11b901f061dc30ac0c6b745f32f0b2f756e428509121ac3269d8d51c273566290cba2b840c890ce1274a268d46c35bd6486a932454c2d2cfa SHA512 dbbd0ae574c493de5d89f58e0050e44fd3cd1353807131d7e821ae02cffd4da594855df0ed35e9ceb72bdfc9c4b670e022d184c24897bf2ed370ce545c578621
 EBUILD fwupd-1.0.4.ebuild 2447 BLAKE2B 41d784772438221fd54e43a66ca563742bd2dbb3d5771394a0e3b283e52149532d86f43c8810da7e659a0201209e2c3579053553b155365bdb3424268988cc54 SHA512 4a4441e3da906e7fde5face91abc2f792ccf9a8ee8070a9a4fe5baea108ab40841955b160f7923cc4456b8ef88039108ffbd685301d4a7a9095d66f12e818c61
+EBUILD fwupd-1.0.5.ebuild 2447 BLAKE2B 41d784772438221fd54e43a66ca563742bd2dbb3d5771394a0e3b283e52149532d86f43c8810da7e659a0201209e2c3579053553b155365bdb3424268988cc54 SHA512 4a4441e3da906e7fde5face91abc2f792ccf9a8ee8070a9a4fe5baea108ab40841955b160f7923cc4456b8ef88039108ffbd685301d4a7a9095d66f12e818c61
 MISC metadata.xml 738 BLAKE2B 53421e28e9d5b0d92a29b909ea234c22d38992979bc1f3d34781f9956a1250ba68e6f6c88f951ad1b029cc020d02ab80e7ab50bc5115084f53069e93985e37ba SHA512 d598e706e5d818a91f91589cf4e16f484e3bb574e1b778b681f1d927bc6014600841169f46765a325c5e27ee8360151e8c2ae2701f9ef1e826807ec924698124
diff --git a/sys-apps/fwupd/fwupd-1.0.3.ebuild b/sys-apps/fwupd/fwupd-1.0.5.ebuild
index de768b752cdd..c5747fe2cd8f 100644
--- a/sys-apps/fwupd/fwupd-1.0.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.5.ebuild
@@ -17,10 +17,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="colorhug dell doc gpg +man systemd test uefi uefi_labels"
 REQUIRED_USE="
-	uefi_labels? ( ${PYTHON_REQUIRED_USE} )
+	${PYTHON_REQUIRED_USE}
 "
 
 RDEPEND="
+	${PYTHON_DEPS}
 	app-crypt/gpgme
 	dev-db/sqlite
 	>=dev-libs/appstream-glib-0.6.13[introspection]
@@ -28,6 +29,9 @@ RDEPEND="
 	dev-libs/libgpg-error
 	dev-libs/libgudev
 	>=dev-libs/libgusb-0.2.9[introspection]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 	>=net-libs/libsoup-2.51.92:2.4
 	>=sys-auth/polkit-0.103
 	virtual/libelf:0=
@@ -44,10 +48,6 @@ RDEPEND="
 	!systemd? ( >=sys-auth/consolekit-1.0.0 )
 	uefi? ( >=sys-apps/fwupdate-5 )
 	uefi_labels? (
-		${PYTHON_DEPS}
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
 		x11-libs/pango
 		x11-libs/cairo
 		media-libs/freetype
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 906558da672c..89f492b06d3b 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -2,8 +2,10 @@ DIST nvme-cli-1.1.tar.gz 207679 BLAKE2B 16f442f1896ff6d91301f97948a02a944711f753
 DIST nvme-cli-1.2.tar.gz 228964 BLAKE2B 27fba038bc9deb931d7a3f864f98dbfeb7af41267ca0e6b4127188403977295e08e8ab88f431d1a12f748c0d523f00ae2302ab2e81f2a32a61e9c40cdb350ac1 SHA512 42e31f9c7e5a4e3d5c500844e7a1f599bf52b3d4ea8312b518232ea94940487aa6f191b6711266b6595c8b3bca61f2f269168ca61201fe12e6d47c3a53629b00
 DIST nvme-cli-1.3.tar.gz 236788 BLAKE2B ad8035692b03f7ab988397ddddbbb6ff6b7e8f669628b0bb31401847fa5d0d4e83d5886e1214fed6b7e54bb2677ed84c9856167eecb31b9599c359d283d77d68 SHA512 0794e72124e73af619a71dd01879d178ad48d30155326e854fb5447e0bb5b879049a7a0a2e3b5301a0de1207034fbbdca07ecf647ff7d4085d56dc793271b576
 DIST nvme-cli-1.4.tar.gz 260269 BLAKE2B 00c3878c9bbf3c1f934df3a3bf8a4188b53045dbda0cdfc437c6998f22269f1d5954dcf3fe2176fd66086904331861a8c9fae50b33e9b2f654fb08dff08f4320 SHA512 8d7e2f0717562bfe2306306830983644e4b118bd6705a0386fcae02f6d171faa76a6d594f01fc8ee57dcbf1a41ea0a84cd4527f7a729fddc3431975cf6914955
+DIST nvme-cli-1.5.tar.gz 282891 BLAKE2B 31eb9f4acda978977b7de222e1d973aac4ea18a34eaa0ffea73f2603cc2b8936aecd23248c764d05af161943db06533faf881711f2f22ad539b7e7607d5f8652 SHA512 0fc3dafeba8f67c8f3a3f25aac3b454d9e3ebfb1c20d67f96009a4490f269f0fe3642de781cd161896300f91a1cc37bd8a4e61c77f35422ab134c747702ffaca
 EBUILD nvme-cli-1.1.ebuild 579 BLAKE2B 06020bc5380471ae36104ca1d0f603a1cb2c9e73bf086d11a64dac9b344c54746af0680dccbfe68cea2683c45e747ff8f9e76af84774618f0d79efdb295634a5 SHA512 cfc6f7bd2f6dbc070c604c4e72ca406e29e2e2d240b14559836054039ae71f5f0eda82e808558115e97e4ac19d29d178c9fa584045ecf60458f1dcb743a62358
 EBUILD nvme-cli-1.2.ebuild 595 BLAKE2B 63bbaa12561818fae5ec1bdc49e1589b8b403c21f64c8bb8525cb9bad9425d66eac7d7a5112cb569a30f25e2171a1f0b044d524eb868932c1651dc70f4667c81 SHA512 5cdc918133b831a3c5c8cb78af07107770e60c2aef399834b3c6c17ba0628986d902d90b22149ab8bc23be341653788e708d1a6dd4f8543001ee569262beacbe
 EBUILD nvme-cli-1.3.ebuild 568 BLAKE2B ecf0ba7fadc2aaaf14da03c66ced763dce19e20eacacb9f68617528740a58d2d6862fdd4efe057fd5a9d0ef04b3d14cc1cdec35de7242958aa3e5e4e60f41179 SHA512 db12e2ecfcccab7cadaa134695e5235c98baffe34d76b889e12119a73b49c630fa5a82d6894caacb17dbaadaac4f4536031ef3b4dfeedc01a067999e897c999f
 EBUILD nvme-cli-1.4.ebuild 566 BLAKE2B cb2dd807e6c5328816a527a5ebae478cb323506fde758fd2f47c23e620a195373163b030ef6f57bd4863e90c5099efff0ac76a8486d12e2ae8e01ce70efb7403 SHA512 1bd5660ea24b05ad923106b860c11b1934f78da54c87c9ae5dd2cdfaa4f7a44bb0af9c5170da3a231ea915e6697c5f8e47e67c01d02403885007f726bc64fec3
+EBUILD nvme-cli-1.5.ebuild 566 BLAKE2B e723786af2108253b54742b752ea755b84964e2155e68a3500c90a8900a2cf80de952c3a212c3e0809009518b274158aace3afa9c7f2bf16d2e2b31321581c2f SHA512 3fb2c2818a77fe647dc8216004bc817ebcdefff99e18abffc62883d98d0448972975651eae704b945324bd809aaa6215d9803145955a971a15ae19357ca647ee
 MISC metadata.xml 310 BLAKE2B 08c09b5876534bafc616d925be9898f2679ce3727a430ebcebd265b1a330118f3f14aab98189112e718bd7d6762878d2445b514d85bcf792b92144ba8ce36bd5 SHA512 f32474bd2f6daa3306a5bcea0ad742c51142823dd6a14a6bd18c8201016c0182d2e87762c66b95882a42d5ff9083813ff995b0774d615745c2a6666c444bf616
diff --git a/sys-apps/nvme-cli/nvme-cli-1.5.ebuild b/sys-apps/nvme-cli/nvme-cli-1.5.ebuild
new file mode 100644
index 000000000000..66b123fe5141
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-1.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="udev"
+
+RDEPEND="sys-libs/libcap:=
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
+	MAKEOPTS+=" LIBUDEV=$(usex udev 0 1)"
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 2b3a679021a9..0ce05c17dd24 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,12 +1,9 @@
-AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 BLAKE2B 019ad0113d58d2833b582ac269ecbf4e51c6b46d3a3ba84357cf135ddbf34829e7e98c9c376b4b9bf717be5fefed8cea517f2cc4e9aefee08807185f1057dfbb SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376
-AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 BLAKE2B ec6e9cb15160b91c54bf714229785c081044727e5d9e6f5ecfffa0df4ce84e4e71227f177aced29d24f3a26c7b118aba3ed1073fa2353cd7a44c509658f20dce SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78
 AUX 237-0001-networkctl-display-type.patch 9575 BLAKE2B 17b42e55d7f9eb2452d2826bb62a8b2ee4f6655d686c21a0f6471629aef06f171427baa79a24eff910ff8c3dc0a7612fa48fc6df1f4de2c586852e1eb4498c85 SHA512 8378a1c153e92d3fad084c57badfa9bf13faab5e9e6319ab3be387b1c609cce5fcc481776365da2cfabde7c9f7c9f4fe24e280b53c76d5813eceeec800d173f0
 AUX CVE-2017-15908.patch 1371 BLAKE2B ccb735919864347108366e33466d2daa5599825e8efcef29ad2139c20070443a6c2c6cb008ba018ea64a37f7046e366f42d45698d6c82aee19d38ca9f2b489d9 SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3
 AUX gentoo-noclean-tmp.patch 804 BLAKE2B ffa2edb5e88dbc61d7c7c9b40e8329bc0f86a7b4298181bec61ffdd7b231181bf764e1ed2dcfa3d5cdadae02ae961e53b796a8b68e0be66ad312f5c0e7521330 SHA512 fc3297cb0ceacdab58cdbd5b6c70c6005312aaa790768f87eb637b8cb26be01ba7c2f5f608893689f0132ac35f19561bc0bc77e34d167f01bdfaea3644b56e71
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
-AUX gentoo-uucp-group-r0.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912
 AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9
 AUX nsswitch.conf 698 BLAKE2B ad209377afa4bea6383dba80b045c3905e6e0c0cd091c6710f753fa7b0bc911ee2c48d6975a0646d688fc534add23d0be3fac7c1da6f3654a5a27a609c2ec434 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a
 DIST systemd-233-man.tar.gz 31386 BLAKE2B e4947e658db3efeec6b5a6adf340d2cc8e8aff2a14db4932720f90c3dc898b1e78595db983948373a2e28191fb3b0aad234f80feb91ee8ae4b607a44038a9cae SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40
diff --git a/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch b/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch
deleted file mode 100644
index bd2b3364369a..000000000000
--- a/sys-apps/systemd/files/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c013a410d0ec5f419ce8d53df19946795849591b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 8 Oct 2017 09:47:05 -0400
-Subject: [PATCH] test: skip hwdb and sysv-generator if the features are
- disabled
-
----
- test/meson.build | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/test/meson.build b/test/meson.build
-index 995a97177..c2df7ec22 100644
---- a/test/meson.build
-+++ b/test/meson.build
-@@ -163,9 +163,11 @@ endif
- 
- ############################################################
- 
--sysv_generator_test_py = find_program('sysv-generator-test.py')
--test('sysv-generator-test',
--     sysv_generator_test_py)
-+if conf.get('HAVE_SYSV_COMPAT') == 1
-+        sysv_generator_test_py = find_program('sysv-generator-test.py')
-+        test('sysv-generator-test',
-+             sysv_generator_test_py)
-+endif
- 
- ############################################################
- 
-@@ -181,6 +183,8 @@ udev_test_pl = find_program('udev-test.pl')
- test('udev-test',
-      udev_test_pl)
- 
--hwdb_test_sh = find_program('hwdb-test.sh')
--test('hwdb-test',
--     hwdb_test_sh)
-+if conf.get('ENABLE_HWDB') == 1
-+        hwdb_test_sh = find_program('hwdb-test.sh')
-+        test('hwdb-test',
-+             hwdb_test_sh)
-+endif
--- 
-2.14.2
-
diff --git a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
deleted file mode 100644
index 9c11106f6058..000000000000
--- a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6acbbdd4da2d072112042abbce8c0a9523beed4e Mon Sep 17 00:00:00 2001
-From: Susant Sahani <145210+ssahani@users.noreply.github.com>
-Date: Wed, 18 Oct 2017 11:55:57 +0530
-Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in kernel
- (#7030)
-
-If FIB Rules are not supported by the kernel then networkd fails to
-start as it retuns error=-EOPNOTSUPP.
-In this case just ignore and let start networkd.
-
-```
-sendto(5, {{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}, 28, 0, {sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, 16) = 28
-recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base=NULL, iov_len=0}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=MSG_TRUNC}, MSG_PEEK|MSG_TRUNC) = 48
-recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base={{len=48, type=NLMSG_ERROR, flags=0, seq=8, pid=8856}, {error=-EOPNOTSUPP, msg={{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}}}, iov_len=7416}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=0}, MSG_TRUNC) = 48
-```
-
-```
-Oct 08 10:22:24 naomi systemd[1]: Starting Network Service...
-Oct 08 10:22:24 naomi systemd-networkd[983]: Could not enumerate rules: Operation not supported
-Oct 08 10:22:24 naomi systemd[1]: systemd-networkd.service: Main process exited, code=exited, status=1/FAILURE
-```
-
-Fixes #7027
----
- src/network/networkd-manager.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
-index 71445d5dd..200d0f622 100644
---- a/src/network/networkd-manager.c
-+++ b/src/network/networkd-manager.c
-@@ -1454,8 +1454,14 @@ int manager_rtnl_enumerate_rules(Manager *m) {
-                 return r;
- 
-         r = sd_netlink_call(m->rtnl, req, 0, &reply);
--        if (r < 0)
-+        if (r < 0) {
-+                if (r == -EOPNOTSUPP) {
-+                        log_debug("FIB Rules are not supported by the kernel. Ignoring.");
-+                        return 0;
-+                }
-+
-                 return r;
-+        }
- 
-         for (rule = reply; rule; rule = sd_netlink_message_next(rule)) {
-                 int k;
--- 
-2.15.0.rc1
-
diff --git a/sys-apps/systemd/files/gentoo-uucp-group-r0.patch b/sys-apps/systemd/files/gentoo-uucp-group-r0.patch
deleted file mode 100644
index 89cf552c8295..000000000000
--- a/sys-apps/systemd/files/gentoo-uucp-group-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/rules/50-udev-default.rules.in
-+++ b/rules/50-udev-default.rules.in
-@@ -22,7 +22,7 @@
- SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
- SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
--KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
-+KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp"
- 
- SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
- 
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 6fcbb652ac14..e57c2539a758 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -17,5 +17,5 @@ DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2f
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
 EBUILD ucspi-tcp-0.88-r17.ebuild 2467 BLAKE2B 6c7e824f9b04f39482eeb87f0bc8dc8b3a92eae7366647b3c06912ca945041fbd963eee67cef8dd9d5aa4fb9d50dde7659e2b0f2dce59ad2040ea259e9d0ef3e SHA512 5691a29591259022e80a6cfbaba6d4755846223b14bce64c7df0e0e7ef08c57877f612b6e2b19da7d90a0c4dc8b3d8d5c8885a1b21eac19bd48bf527739e10d3
-EBUILD ucspi-tcp-0.88-r18.ebuild 2119 BLAKE2B 4b976deb4d3a37061d16d24094192271a1595177cb6f6bb501c6be30ad505ec9fa0230c42783cd1afb132dacf7dc567dd85d65e04618241eb93050e3ca95274d SHA512 956a8c8bca90885dc968974e7538a91b156effc3923a3ecf166073533e437dffb2de7bfcf475f1a2002398078aa894d8be61e81e648d84f32a73577b591a38c3
+EBUILD ucspi-tcp-0.88-r18.ebuild 2115 BLAKE2B 4c7555834596e83e67cf3770804fea99fac3ada917e27845b5a20cf37089adf3013a74c4b7fef3121612b4809b5bd6840b591383163b90ceebb3b3130df6e761 SHA512 80df49862fb804dc5d050a9e3a87d7dbd908434e40e9f735001f56cee6721c5139e04b7e4a6da58101add93f507aa7a71cede854cabf4e77d3b297efdbce3ac8
 MISC metadata.xml 677 BLAKE2B 099199a467eb6f06daeece058d090c48825fecb5474425c4cec45ab90a981608a5948a7c4d11074966e7b72d80bc7d826ec8ebe2a93cb54ae90d91121deb5244 SHA512 cf774ef0c4584905cbac057f7239138025e6a92e55a6ae006a91aa438d9dcf0bd0cb9939b4bc6eb7ac1cc2ae67c7804312b5011da3d91fbe1d95f9205ea456ac
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index 85884df56cf1..1f6e89fce9fa 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index ac1de5060745..048cb7a2b628 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -1,7 +1,7 @@
 DIST usbredir-0.7.1.tar.bz2 329895 BLAKE2B 7017b1441c2265c9e58532bcc8718844e6f64c7272ad599a8cf5f6e21f694524e05da2d8672c4892faa7b744be46bdfff521dbcb4944715d45b24d5925972ac4 SHA512 f8d26d59d5a530aa413fabe2402fbbd9662760453c2b4e83d34f2e5287c188114ea870f15ae1bc910297649986315be965f0d23d0a2b7b0cec2f207fc65d7598
 DIST usbredir-0.7.1_p20170503-patches.tar.xz 8120 BLAKE2B 21c7a853b3d5329fcca45169e22135bce615c9422f314f680f1087014d64179bf26f07bdb377bcff48155f28a37dec82b0bee8bce4d868e41614b128fe61b95a SHA512 b281d7a1ee191746e5fbe655b21c0cd9b2cf9cd69d5f28d91ab41de2d62a7f3c5c2a42f3f9c40c73d61a57d89423d996f4a779ebdff8f9d088030c2a4c2a24a7
-DIST usbredir-0.7.tar.bz2 317216 BLAKE2B b1b770ed5e88161e8ccb57367d0f2e2ecd9755b43977085b0227f0f3d7713b508b303f2cb803dfbe6b1c8cad9f51e6fef8ae138d83fcdf48f84109e510e34e6c SHA512 f615fc52f195c7159d16b551f6ecd9426f2aad64222f24b964fbd66fbf59498d80d4d5cf851cc1be9ddd27a9d962afa05970e1379f1ef02e8ac304235e82ad4a
+DIST usbredir-0.7.1_p20180211-patches.tar.xz 12508 BLAKE2B 57479444752070147583a0cc2f6651a32c8a618756638ae04928dda7082214d501fb5122a0f5d02aca994be0a386a8e493628faa240f61987dbd02d2fcfa679a SHA512 993c7ad5faf66f249546e1a631a10cd842439486de029ed2fff049b70967cb0a6ad45fb773a1c97fd6811e246f4cc4c7482522393dcc74b26ba2646a83ac70c8
 EBUILD usbredir-0.7.1_p20170503.ebuild 996 BLAKE2B 2763f27eee0d53ba70ce3681f747c03a76ac201e2e469d781c8af634f3a046fed05d6f4f768960c551683449b7198abc153d54aac95808d37537530ba32b38dc SHA512 6eedca169265c5cf0ff262a1b805a8832e95c05d9af297608984709125cc5d972ca504c42118ed907b91edf342fa8c83b6f08fbf9dcb2d1d600801d3a1e128dc
-EBUILD usbredir-0.7.ebuild 840 BLAKE2B 06e9550c39b6370c172ba89630381841868e5282e5ec937c67353f03a59c4edcb2b98844853474ba642370a2c09743bf1211bd6eee23ea5e410ab0e4e0028838 SHA512 f4de5f68250391c49407597459a9b0fb6bf7976ef9275beebba72a390069a380fdf320cb4d1a832bbb066ccb55c6ba35b61bd4c9ba28c159ba6569a13c90c571
+EBUILD usbredir-0.7.1_p20180211.ebuild 1010 BLAKE2B 65a5caa3305485112723f29d3480e25dd67e77ad50bd069a00b8d46b5e5143263ecc2690a5b7b58a0ce81e80040aada4bc5918b52a9b141800edd43dde632319 SHA512 937feaed1957166fe3f6a25f01ae702d0625f42857b28302eb0ab86e7c550b0829169e389d330508875c544d15b65275adc2fa2b7081c792c6d3dbdfe515825e
 EBUILD usbredir-9999.ebuild 847 BLAKE2B b6a67f1e6c2eddae470b8b176315c67de20a8ca0936832a0bef022b3fc22716797964a125dfd8ad10ea6fb6a4ebbcd14f888d20648d4f79e4c2a39967ca73542 SHA512 18c1926ad3c95992bf65530a7e1b852cf177cee063e4f93373c166e70fe088f0dda0d94df99c7071c7e2f6c508ae153c234e4c958a96804815b3da7da57a2865
 MISC metadata.xml 361 BLAKE2B 58ee743a25bff089895528495050dbde3fb7acafac2653762d5eca42fb085e644df689eba522d31d2168e703b04e5748b8907d9df88950cd38de523360dc1883 SHA512 3cf32d1610947c8e1fe9acdcce071a5b5d7ac6711c7d81f0c87f31e7e2d07b13a012312f1380e30c54c95f7371963cde9c76052914b6582507ce964621673cd6
diff --git a/sys-apps/usbredir/usbredir-0.7.ebuild b/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild
index 9225004b14b2..511853883be1 100644
--- a/sys-apps/usbredir/usbredir-0.7.ebuild
+++ b/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild
@@ -1,22 +1,31 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils flag-o-matic
 
+MY_PV=${PV/_p*/}
+
 DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)"
 HOMEPAGE="https://www.spice-space.org/page/UsbRedir"
-SRC_URI="https://www.spice-space.org/download/usbredir/${P}.tar.bz2"
+SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-patches.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
 
-RDEPEND=">=dev-libs/libusb-1.0.19"
+RDEPEND="virtual/libusb:1"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${S}_p20180211-patches"
+)
+
 DOCS="ChangeLog README* TODO *.txt"
 
 src_configure() {
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 130e3ac92ebc..e883da4d28f2 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,8 +6,10 @@ AUX util-linux-2.31-too_generic_symbols_pt3.patch 1118 BLAKE2B e2f098346f7359945
 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.31.tar.xz 4503892 BLAKE2B 8a9e2fc674cacbfabfc76cc0ab671f3fdb35d49de9f4ae8660b49df9e196878c2459d8fc57f6c9b6d2ad73cc56d970656ffcbc22deed97bb7a0cc28490a1fbb0 SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5
+DIST util-linux-2.32-rc1.tar.xz 4540628 BLAKE2B 2ece393a3ba334cd1e39e38b47330ea588b67034be2fcdd88ff38ac06c8c20099d177119e4e186d207df02d2aefed03470ec2f3538497df3b2cb6fef9c63dbb7 SHA512 46ccffb1b10b9b386ac04d1d627ae291a2e710f723546d527c6ffdf30e276694f8c19d4cbb563a0a5f1e5a30f1b4be7a5009f7de5a26b11d761138861c711fc1
 EBUILD util-linux-2.30.2.ebuild 6088 BLAKE2B 90967f2b8c4cf9e5125226fe2bd34a4bf0786e4380316c13ead390daa81165bf39b106a344c0f1de27db1623f65bb0ca17ff285090358d57d68415c66de1c0c2 SHA512 92e96b92c6e6e05b2d828f0f7f41ef99963a9b6fe82dfea85945c7986a67fdb7ba3f8291e5abcd1124fd3973ef415d09f337fdf1828eaf7bba87fb2a2de574aa
 EBUILD util-linux-2.31-r1.ebuild 6200 BLAKE2B ac7a9047da0ba8ca5c3b0d74ffad0279959579573ae921db0e2484ad605b61357cd544762464fddec4a13c30ca71d836ad6c45114b524ef576e15595e6e56464 SHA512 6ac9ff512e5090bce89279e9c91ced5a6d5b654e67827b80041b3998b5ef3641e91cb855fe9a43640b1327c511128c3557a0c5d027add52bdd89720baa04aec0
 EBUILD util-linux-2.31.1.ebuild 6123 BLAKE2B baabda73487d0759010a991a1b5cd062bd154ae2e2fc38783656d78a8042180adeba3bddc764e53ff51c7364c16c4e9ce94ccb25f5d8ae348d6f86a2b7a21b31 SHA512 08357d6965531f0377756ba41bdeb5cf1b9e53d30983f438898329905c21e6d8bde2beab600074690565dccc8e282d8457094489e374eba27d42639e44e84de7
+EBUILD util-linux-2.32_rc1.ebuild 6123 BLAKE2B baabda73487d0759010a991a1b5cd062bd154ae2e2fc38783656d78a8042180adeba3bddc764e53ff51c7364c16c4e9ce94ccb25f5d8ae348d6f86a2b7a21b31 SHA512 08357d6965531f0377756ba41bdeb5cf1b9e53d30983f438898329905c21e6d8bde2beab600074690565dccc8e282d8457094489e374eba27d42639e44e84de7
 EBUILD util-linux-9999.ebuild 6090 BLAKE2B 912da0452d851eef8b8d9dfdf014117a4d62e3e4ef3bd6cc27c5fe7251cf8b08fae6aa9fe8ba4caa1de00f2c226c7550dfcf02f9943d63e8b643ac6fe5dda3c1 SHA512 21f6cfe59cce0a8bb08e462011296fe5f2a21ba1a62fb57de74659dde40f432f9b81bacdd7a6bc8422609bbed73b601204d80147f82bf270c643f1928efc37c6
 MISC metadata.xml 947 BLAKE2B aeb1eef359b4be20e0df592245a2d432d92adf29336ecb1519bb4a97deed47c75bd14ca6c132f2e2ffe5c2d2ddcd7638ee38d03c7f8bcf8c8accb36a916663b5 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c
diff --git a/sys-apps/util-linux/util-linux-2.32_rc1.ebuild b/sys-apps/util-linux/util-linux-2.32_rc1.ebuild
new file mode 100644
index 000000000000..ee5b6efcc218
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.32_rc1.ebuild
@@ -0,0 +1,202 @@
+# 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 systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="git://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}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	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
+}
+
+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
+}