gentoo resync : 07.04.2018

37 files changed, 600 insertions, 254 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 02016d2d9ec5..0ca74b054568 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 9aa4d92071dc..588dc98a0a5f 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,3 @@
-DIST bleachbit-1.12.tar.bz2 396838 BLAKE2B 1784b5bc6602e5599b29ffbd0ad0f27f05ffe3aaab25756e3e07fff56c72517493b551063975c943a0e16efc2ecb30fdf69878577b8a5b27eccfdfb3bdd59c40 SHA512 b9c13a75b86eebbedaf928394714ac4d7847b8d53d345a4884acee68cd9c46ff1d5f4108479d7695109bad03c0fcdbb6f89e77d8794a60697fd5c6acdb34530c
 DIST bleachbit-2.0.tar.gz 886357 BLAKE2B f63ded34d245df892b2c14683ceaae8b57e786a8ab3111e7f76d484c6d3db404996119ab4114c3ae025848936a784878b3f100cf2ca8737401a6daaaf74a077e SHA512 adf5c2f2382b2eaab0eb2b4a173b392c160af7974f223c74ae51a30423514a15b98f04194b9ccde209b5c067d8481f0f1ee28651896d3002fcfa3927d8db056b
-EBUILD bleachbit-1.12.ebuild 1497 BLAKE2B 2f9511605fc483f3f853c1d7b19e1b7884fb075002843b9dba66b1f21b5849c7ba21e1219d5513b92e0a1477eca63c06d6d9383329af9fb10f172ad1119cdeed SHA512 4083aa52a3ae8091bb2532496ad1aa8c7aa48c68c371e8d681fb85c6e6d3745d76ccdb5181f15c61d8a4b07d3ea6220dde37f66848fe2753597da921841ef4fd
-EBUILD bleachbit-2.0.ebuild 1208 BLAKE2B 1359b21e86449a987681f2058c972f5b392122944346b18c901b82fa8b51c34032fdeddb6cb38390bfc3a38606e0e93373c12ca71fac58f524cdb0767cc3c59c SHA512 7ade695a7630cfb39a7d9d652f617c8236fce594fe9cbc8e96faffb9ba34babaa8ae7175dc901f3f122827a3b8ba7a5a14816831bbb0e69f2f8b64e9d303dd3b
-MISC metadata.xml 571 BLAKE2B dfb5414d647ae661fa1aaab2e5a301ce80a5306f1c658ce2448368fa2dc4b0f3f49d0084de0b5f0bf9e0f00f1abe4c6a441f68d5abe0a610ac13a4392a0343f5 SHA512 59eaf4a789189b5f02fbf945a26cddc46c3ca22ce0aeb5b0311768bf8af21bb80081bc31f859add067a32a6a7840343af43d0680913c0422161efb0784b09a8f
+EBUILD bleachbit-2.0.ebuild 1207 BLAKE2B 101fac851806c9de4e20ef8290ff65d5d446f1400bd2f4025d65398d186683df19783bc72f8eece15962dc6f2ecc97375686304d8c187614653aa865f75f7b02 SHA512 d52074b5842dc0fb44610b7fff374ec25855a4e19bfa58f1b8dc709b0b514bd497ea39e7713c2e3f42db8efbb1975ac8f7c763eda0b78e2f01ffa51d63700882
+MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-1.12.ebuild b/sys-apps/bleachbit/bleachbit-1.12.ebuild
deleted file mode 100644
index 927359b5e594..000000000000
--- a/sys-apps/bleachbit/bleachbit-1.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast be bg bn bs ca cs da de el en_AU en_CA en_GB eo es et eu fa fi fo fr gl he hi hr hu hy ia id it ja ko ku ky lt lv
-ms my nb nds nl nn pl pt_BR pt ro ru se si sk sl sr sv ta te th tr ug uk uz vi zh_CN zh_TW"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 eutils l10n
-
-DESCRIPTION="Clean junk to free disk space and to maintain privacy"
-HOMEPAGE="https://www.bleachbit.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+gtk nls"
-
-RDEPEND="
-	dev-python/notify-python[$PYTHON_USEDEP]
-	gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-DOCS=( README.md )
-
-python_prepare_all() {
-	rem_locale() {
-		rm "po/${1}.po" || die "removing of ${1}.po failed"
-	}
-
-	l10n_find_plocales_changes po "" ".po"
-	l10n_for_each_disabled_locale_do rem_locale
-
-	# choose correct Python implementation, bug #465254
-	sed -i -e 's/python/$(PYTHON)/g' po/Makefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use nls && emake -C po
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use nls && emake -C po DESTDIR="${D}" install
-
-	# https://bugs.gentoo.org/388999
-	insinto /usr/share/${PN}/cleaners
-	doins cleaners/*.xml
-
-	newbin ${PN}.py ${PN}
-	python_replicate_script "${D}/usr/bin/${PN}"
-
-	doicon ${PN}.png
-	domenu ${PN}.desktop
-}
diff --git a/sys-apps/bleachbit/bleachbit-2.0.ebuild b/sys-apps/bleachbit/bleachbit-2.0.ebuild
index a3c40b185337..480ea80045ac 100644
--- a/sys-apps/bleachbit/bleachbit-2.0.ebuild
+++ b/sys-apps/bleachbit/bleachbit-2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gtk"
 
 RDEPEND="gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
diff --git a/sys-apps/bleachbit/metadata.xml b/sys-apps/bleachbit/metadata.xml
index 1ba6f1e4b71b..b025f5f8290e 100644
--- a/sys-apps/bleachbit/metadata.xml
+++ b/sys-apps/bleachbit/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">bleachbit/bleachbit</remote-id>
-		<bugs-to>https://bugs.launchpad.net/bleachbit</bugs-to>
-		<remote-id type="sourceforge">bleachbit</remote-id>
+		<bugs-to>https://github.com/bleachbit/bleachbit/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 29ae108c8738..142f91a1d328 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -2,5 +2,8 @@ AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff
 AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
 AUX etckeeper-1.18.6-gentoo.patch 2812 BLAKE2B 4df25391aad119d6c01cb4e35cf83a1105c7f125079b3bb3418f8b7c6cff52400eeceff8cfe5785eb968b6c4a3e9fd1112fe1fd7b654982141d9a0b7596d0ce1 SHA512 2f399e12c7bbeef539fd846532068c18fd0becdab505cbe56759c6eb7f9c4463eff49526858ffa745d4bc50619685dab81811db257506f9b537bbd7af9986958
 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
+DIST etckeeper-1.18.7.tar.gz 77568 BLAKE2B 168b5b683c25a60c6626a678aed2f650106d4db554acbc239a2cd3c937f4b399ccca4f28fded30175c5787d8bd0907a25d62e6566e7902a2e914cd01513a8c2e SHA512 44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a
+EBUILD etckeeper-1.18.6-r1.ebuild 1768 BLAKE2B 31e5a00dab3080b8e2241848a8d2c510b732d0330fc9b732d72e48789b403e65b52fbeeb0f73c8b1b9b7f5afbdeb9cfa7c30932dcf1ba1159c58a773a9945932 SHA512 ac0fac599f4b7917486c671ac949eab706103d0304e2a157267224a07fd6af449565de66ec13988b383380f8624ed443cc1d7b0872a18abea11a2cad93d79781
 EBUILD etckeeper-1.18.6.ebuild 1711 BLAKE2B 9f338ff11900fb652bb9f942dc993caed137ac5fc7af58e8b8741252f1ecac3f328c771f137533b5dfd7afab30acb186f67ac52c476023ffd0379ece8a202ec1 SHA512 870d331516eda64ee50228751d1d6552359e8b7fc8afe57293d2415d3380653185729e22018b17773b5573f1b151d3c46846fa5e226b6a6a66f9203b775913e7
-MISC metadata.xml 780 BLAKE2B 82a4dde4c7c0f01d2bc47b85c0135d305f70515136415ad3484136e87b10ddd67e5317fd711fc758aee6a6d192e218e9b0259819708742de1842cb80437f46b5 SHA512 7977587ec28b947dca79efd21c0f5ec9244b52cb29d663e33952bfc9c64730eaa6b3a5e6c97387028bf2434da5f7cd4ff92c22f1d6bd5ff13071aa988e991bda
+EBUILD etckeeper-1.18.7.ebuild 1852 BLAKE2B 986fc04533c6d045578aeff774c1d7984a116bff863ca56b58f95f8a7852aa787b7befec61ff40dc957a28d25925a856cfdb87a9917e6a8b88d2c2ad5f3f5225 SHA512 841c2593f2f4d251607cbcf4345232fcf8bec6f940590126d9681f2d680e8b60a9cb87c1e76b17565b87325663f7b0cc4c11349f492ac5b8ee06c6d7602a6deb
+MISC metadata.xml 980 BLAKE2B c3c6a13f0b45eddef29c767f55c739298f6554e94f444723e19d6b93dd9af2bfda7aabcf8c6d0e56fba482b4067a2130c4474373708652eb9d8216119177fd7d SHA512 41d4b97b4073278af7543cd459c1c5bcfc951bdb6a6c2a201cba6cdc0e0fedc640fca5d9e59041951315a961f5eea284eb3c12260148bfbe97c11ee15b11ad9f
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
new file mode 100644
index 000000000000..3f0dd55eb8f8
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 prefix python-r1
+
+DESCRIPTION="A collection of tools to let /etc be stored in a repository"
+HOMEPAGE="https://etckeeper.branchable.com/"
+SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="bazaar cron"
+REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
+
+VCS_DEPEND="dev-vcs/git
+	dev-vcs/mercurial
+	dev-vcs/darcs"
+DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+	app-portage/portage-utils
+	cron? ( virtual/cron )
+	bazaar? ( ${PYTHON_DEPS} )
+	!bazaar? ( || ( ${VCS_DEPEND} ) )"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_compile() {
+	:
+}
+
+src_install(){
+	emake DESTDIR="${ED}" install
+
+	bzr_install() {
+		"${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
+			die "bzr support installation failed!"
+	}
+	use bazaar && python_foreach_impl bzr_install
+
+	if use prefix; then
+		doenvd "${FILESDIR}"/99${PN}
+		eprefixify "${ED%/}"/etc/env.d/99${PN}
+	fi
+
+	newbashcomp bash_completion ${PN}
+	dodoc doc/README.mdwn
+	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
+
+	if use cron ; then
+		exeinto /etc/cron.daily
+		newexe debian/cron.daily etckeeper
+	fi
+}
+
+pkg_postinst(){
+	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
+	elog "	dev-vcs/bzr"
+	elog "This ebuild just ensures at least one is installed!"
+	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
+	elog
+	elog "You may want to adjust your /etc/portage/bashrc"
+	elog "see the example file in /usr/share/doc/${PF}/examples"
+	elog
+	elog "To initialise your etc-dir as a repository run:"
+	elog "${PN} init -d /etc"
+}
diff --git a/sys-apps/etckeeper/etckeeper-1.18.7.ebuild b/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
new file mode 100644
index 000000000000..f18078fe62db
--- /dev/null
+++ b/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 prefix python-r1
+
+DESCRIPTION="A collection of tools to let /etc be stored in a repository"
+HOMEPAGE="https://etckeeper.branchable.com/"
+SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="bazaar cron test"
+REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
+
+VCS_DEPEND="dev-vcs/git
+	dev-vcs/mercurial
+	dev-vcs/darcs"
+DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}
+	app-portage/portage-utils
+	cron? ( virtual/cron )
+	bazaar? ( ${PYTHON_DEPS} )
+	!bazaar? ( || ( ${VCS_DEPEND} ) )"
+DEPEND="${DEPEND}
+	test? ( dev-util/bats )"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.18.6-gentoo.patch )
+
+src_compile() {
+	:
+}
+
+src_install(){
+	emake DESTDIR="${ED}" install
+
+	bzr_install() {
+		"${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
+			die "bzr support installation failed!"
+	}
+	use bazaar && python_foreach_impl bzr_install
+
+	if use prefix; then
+		doenvd "${FILESDIR}"/99${PN}
+		eprefixify "${ED%/}"/etc/env.d/99${PN}
+	fi
+
+	newbashcomp bash_completion ${PN}
+	dodoc doc/README.mdwn
+	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
+
+	if use cron ; then
+		exeinto /etc/cron.daily
+		newexe debian/cron.daily etckeeper
+	fi
+}
+
+pkg_postinst(){
+	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
+	elog "	dev-vcs/bzr"
+	elog "This ebuild just ensures at least one is installed!"
+	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
+	elog
+	elog "You may want to adjust your /etc/portage/bashrc"
+	elog "see the example file in /usr/share/doc/${PF}/examples"
+	elog
+	elog "To initialise your etc-dir as a repository run:"
+	elog "${PN} init -d /etc"
+}
diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml
index 877ed977addb..380a1241b6ce 100644
--- a/sys-apps/etckeeper/metadata.xml
+++ b/sys-apps/etckeeper/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>m.j.everitt@iee.org</email>
+		<name>Michael Everitt</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based repository
 		</flag>
diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest
index 1b7a5eaa8491..067c54b65cdc 100644
--- a/sys-apps/fbset/Manifest
+++ b/sys-apps/fbset/Manifest
@@ -1,4 +1,5 @@
+AUX fbset-2.1-add-linux-types-h.patch 275 BLAKE2B 177b56c3989bf360609d3f4541537b279e6a57e3f83420c2f55edb472a5b685602dc73b852626232784afb044a79e0532cee0107ee2a4204b42cf68fbb820b2a SHA512 fb13052aed519da65e1197d81b1c583cae0c6528c362966caa3c65b324a115345745550e2589a92e0c8bab49215dd99252c14704dff71a2950332281ae83749c
 AUX fbset-2.1-build.patch 458 BLAKE2B 93340436783aed64145832fd491223a085a4497adfcfe44a7d3ed100171e0f4dfc608beda73e2659fe93dc9a965d0df47eaf0018a4e91087cabcd5482fbffdaa SHA512 97d8df2776c634ccdcf49433bb45e8e7d944e5d7cc34fe0f55085f76f0f5dfc216323a0f4e58d256767e83987dd73e96be3393bd727d791edd12f0b63ebed819
 DIST fbset-2.1.tar.gz 27721 BLAKE2B 3d078a41d178ed5347d3e8907fa4ff55c1971ccfcca3ac07ec251f7f2949b7133b4589628e349eb29c344e9a5969844b8bb3c423b329f99943a5a5f93e152d65 SHA512 7e0380760f77b0db7dcc128f6375a3ed8da4b8521d1926faba27812c5cb20e6f1a62f3a539591a81a6b7e7986940db4cd83e03d6de487e0ab7f0760ed1d21b28
-EBUILD fbset-2.1.ebuild 786 BLAKE2B d782847e33dd168b04166e401f566b897ea7fe1a9ad5019dcd585ffff492c7a9deac87fe7648123b9b55072aadc4148d59fa3704cf8d7a0379b5dd8e01765d85 SHA512 f0b00c7bd7b09834fec17b0dfbb3e4195980f62289d8a66d9e69afc3df2663611feb819e3b062eaf168d3f83d9e11ec6e876829f08f81b63828fd0adba6bdb21
+EBUILD fbset-2.1.ebuild 831 BLAKE2B 2ee17aa299c8376ae0d84432bcba1886ba0336f1a5e7c25df06bcb7499b11940769d3b612b17f948ef07243ea2a6e1e5d78bd58a3da4a33ae8aca98ba804e4cc SHA512 775c291e68bbc213f5f834d6d330b36e665eba635e326a1aad78ea060624943aa9dbd835a6745aaa2e2185ff909d6bc97eac66938bc0af0201500f8efb09994a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index cd50cd3945d2..1c334fdbfb9f 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit toolchain-funcs flag-o-matic eutils
 
 DESCRIPTION="A utility to set the framebuffer videomode"
@@ -16,10 +18,10 @@ DEPEND="sys-devel/bison
 	sys-devel/flex"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-add-linux-types-h.patch"
+	default
 }
 
 src_compile() {
diff --git a/sys-apps/fbset/files/fbset-2.1-add-linux-types-h.patch b/sys-apps/fbset/files/fbset-2.1-add-linux-types-h.patch
new file mode 100644
index 000000000000..589d61b0ee8b
--- /dev/null
+++ b/sys-apps/fbset/files/fbset-2.1-add-linux-types-h.patch
@@ -0,0 +1,11 @@
+--- a/fbset.h	2018-04-05 18:17:18.292975594 +0000
++++ b/fbset.h	2018-04-05 18:22:20.448747231 +0000
+@@ -17,6 +17,8 @@
+ 
+ #ifdef __GLIBC__
+ #include <asm/types.h>
++#else
++#include <linux/types.h>
+ #endif
+ 
+ #define VERSION         "Linux Frame Buffer Device Configuration " \
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 218e2e8ff90c..517f1b4b4689 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -5,5 +5,5 @@ AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415a
 DIST haveged-1.9.1.tar.gz 474845 BLAKE2B bec7ecaac93f7b6ab746dcb228172272bf7575e33d6ea1e2d1cc8a8fa63187db5e41565a5b49d922c6f4c222d71452e41d0b2dd00984eda179a8026fb76432ce SHA512 267d62cfeb886ea00fa412de1a91a34821460d0f4ad789dcfb3547018300e1cbf480917571b19652f2d449369293031d9534f9533bbf6a59560f4f10608c9cd2
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 EBUILD haveged-1.9.1.ebuild 1002 BLAKE2B c63e879cf82aa18711e357aa62f49ad3f76fdd3b219dd1ef5241585deabf93106428731461d721aab95046ef82e83e67ccfe7e9e919177d927787e47eec25bc2 SHA512 f156ac90f991ccd4b090657055e323123915398a9e8877dc4363b297b192709d3240d68cab397a7d8de96465f08e5b833370ea19e0b5673cc3b9638e30f0af59
-EBUILD haveged-1.9.2-r1.ebuild 962 BLAKE2B 5e9df271a30602c3b109209bee32942aacfac2bfcd0c393334e9193f6e196a067d5b3a0f098b2c2d1b5f52ff9554e5e79abdc2395dae6aea150f61ba4c1cb86c SHA512 6779b13cc7fb9e0a79d0a7fa180c800d0adf544eb27c81e44a6e48e7496b306bcadb5680c61233ed76eb1f273a58f35889d12f147041bab7b81b75875951bcd3
+EBUILD haveged-1.9.2-r1.ebuild 961 BLAKE2B e8c31b46e38b1dec8c4f504998026451154ab9275ab22bceaac36e4493481d7637ab20a63ae5f85956030f827d6f54acebe7cf8e6551c1b5ee7cd85ffb550d75 SHA512 e75771e470aa9d1c19336e2657d79ba3244656e4f620a82187d3726e430035f18de45aef09c7242ffdff80ded0f9d277348eb91693f70dc6cf8a7293d7cc2735
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.2-r1.ebuild b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
index e43732a8d98e..36adaf84b922 100644
--- a/sys-apps/haveged/haveged-1.9.2-r1.ebuild
+++ b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 IUSE="selinux static-libs"
 
 DEPEND=""
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 3990037954e6..b46c1882788c 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -3,9 +3,11 @@ DIST inxi-2.3.43.tar.gz 457941 BLAKE2B cbcdb3061643ba3516c93dc13e5e0e25d0740e4aa
 DIST inxi-2.3.47.tar.gz 462826 BLAKE2B c825b80b5b05fabfad22cbcee685d5c5caa7835493555f1e930dfc11aac35fbe7529fa4738d41dfaae4c6130211d42f576d77ba9f764864bfe89b70a4c0d602a SHA512 be2e0f1880e1b7604acd1f7b8f6595536e12fbe0998f85a195e0892bf1b9942c08f791779f99526a337d097259ea8d3cd0b04da465f8deb1b30bbba9fea4dc4e
 DIST inxi-2.3.50.tar.gz 467912 BLAKE2B e4d42fbcf073c5815451848d55ad24b782a0851d7701ca87f88ec97467a7968577d6ebe3818cd2b5a59017fecc11baa686d23ffaf0f18ab086bdba0393a07fba SHA512 5f32abb56f8466b5c166616680bc7b6ab5d38b76720ecf3d7d065c5ae08de0bdcf14c31b9ab207adaa7c46f4f292c9971022f27aabe5aa14bb3e828a01bff97c
 DIST inxi-2.3.55.tar.gz 471764 BLAKE2B 0615ab13b4d3164ea180b3c34ec6e2d4cacad9712d1c7d3161821398498ee31515db8a84019ac64f7e5c8bfda12473341869432dada4649d4d0e65f411eb0903 SHA512 4b5ca427bfe77bbce95f2889e118cc051c7219328f26c1281d8c4fff5b6de1a34c9813367a79d1a92f5808cbd13c669e463d6a5b965def7c3d4ed29c2aa91148
+DIST inxi-2.3.56.tar.gz 227754 BLAKE2B e3edc0cbe2bc98304b950f420f39f25d52717f7ebda83e7106b35e6b04c8fcef118108f95ebce53140ef50a017d3be1c02dd58653940c23b5e3049c3731c3b5b SHA512 db14a63f59cecf490cc456a4b9d7d7d42ee8c1041785c4635611634e3fbe653d2bcd39eeec3becb42e85d100bcb2d2fadba806566eeb8a6182cd0485e97ac1cd
 EBUILD inxi-2.3.37.ebuild 682 BLAKE2B 04680e7cfe7484c592f47222753684436ee0e15bc8cdcdba1886e11cf25fa39c9b38d6faad71558856554793c29e83a78edb9ea7b6291801d3d59b4a7c8e41dd SHA512 8eb8387e4530484bd717b0449ecba493b0551328789afa5b742b9eec6c67d96fa1a5600385e32bf7521f2e4e9f279bcdafbcfb03e2efa3aae7659e287f9d6044
 EBUILD inxi-2.3.43.ebuild 801 BLAKE2B 5d96bf7434461c805136f71af2f8cbe29455aea670309ef8502a2fda215d2a682532d1bddbcdc720abea7b11e32abb1b6352476dc388dedc0f9ce951dcf4d993 SHA512 d7b716fabac1c5ca6e00fb3baa49c5563a7eade4dd06bd15f87016d41c93caf19903e342bc96284a16d48cf5fb0301e39f65818a9bfaf4b90024ccc8a9720cf3
 EBUILD inxi-2.3.47.ebuild 801 BLAKE2B c4ad47cdced83771be89576fbe0f67f0696335db10111390987c8f690d75027e2bec0ad560b0dea0c88ea0cc4ec142c5ea24aff658597337c4c50cfca4d522aa SHA512 610b8fad3e0c45416edf0b0e313461b7beefcfd8321624209995fec0af9c29c68b0816853931dc665cc7db33d18fe7fec01830bd8d79ad1bd04b074564a5342a
 EBUILD inxi-2.3.50.ebuild 801 BLAKE2B 76fb610a56e89e59f823f63459c8b25f1b1de1e94d20f348b005d3c2100157cb1ee3f952c81facc762950fc9af14dac3cf1da09a944bcd0180cdb3a6a2b5c1cf SHA512 00fb80778b5510756ac782f17c81e57efb6f8aeb35cf30c8cd460b69993a7664795a22ea83954a8fc4775455d10e240878c0896c861f67315198f8ad67b2e616
 EBUILD inxi-2.3.55.ebuild 801 BLAKE2B abb1c53cb6a091142fdc7357a88e1808399c144a131cf1a593fe07961893d7a9d5ccb80583c9cd9624c4c6f50d013e0933b13a3a8c445871b0f4e56dd0b9f62c SHA512 408a987ff2be27b1f0e59a7269cd9b05c4ea60703c9ad385ef75760cf9406ce9f8f11acf8b0d626193b725ce2a3521f877f0723d92d4ca59175f517240b537a3
+EBUILD inxi-2.3.56.ebuild 876 BLAKE2B 4c113e271ebf57aec54d9530aef8e8f3d1e76166e725af284c494cba3add1c98fe1b078ea442d3e9e9251b5111741a8d9d3d9c1938d60827da4bd4c8c2f9708c SHA512 4b5204f1a54084b4f8c88887241462b5d931dac2094925e24b43fd335e5dc65fc9eb95480c5c61c5b411f287ed1c7c41aa9dd491f159cd1e2db447e425fc0f3e
 MISC metadata.xml 444 BLAKE2B 0b67e0f6a42d8b68edcb1fc907729e80cee8ccb0a77fbf768cb40f62e1d665852bf17897466f76b578e2c4225dd5180ccecce899588be420064c5af4b89e99c8 SHA512 f44e29945d98ff44784623624a9c891942c0b69b6272322bd4665a5d49684cc16ee9b01b7a6f60872286a0a96aa437f7b9605aa6820435016e84d92fc96d6fd0
diff --git a/sys-apps/inxi/inxi-2.3.56.ebuild b/sys-apps/inxi/inxi-2.3.56.ebuild
new file mode 100644
index 000000000000..f07ed4edeaf8
--- /dev/null
+++ b/sys-apps/inxi/inxi-2.3.56.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_COMMIT="803a4595658f28decd236c6f8660841abc336cea"
+# ^^ because upstream refuses to tag commits with version numbers
+# 2.3.56 is the last version with no tagged release. 
+# It is also the last bash-based release.
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://github.com/smxi/inxi"
+SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth hddtemp opengl"
+
+DEPEND=""
+RDEPEND="sys-apps/pciutils
+	sys-apps/usbutils
+	bluetooth? ( net-wireless/bluez )
+	hddtemp? ( app-admin/hddtemp )
+	opengl? ( x11-apps/mesa-progs )
+	"
+
+S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 6bb91435b180..014bfc65501b 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,9 +1,9 @@
 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
-DIST man-db-2.8.1.tar.xz 1621664 BLAKE2B 94496c1ca912e7cea2c98be8443d5b13dd685c5af86e9996b625fae44384f4cacf24a4196d77a080da10baa385b5e63d8b090c2bfcc492f2a41757d7a3840468 SHA512 82e75df32eb8575f47c3f36b5f2bbc827776747abfa39af589802e6566636c0771df0ee3197cb2bec3318c3055ff4e9d04c7da13b3bc6ea8a1ea1b1340554ef0
 DIST man-db-2.8.2.tar.xz 1622504 BLAKE2B fc551838488323914319cde2b4d0d724be63741a1e0ed816a67a26da89dfa84a7faf99a9aba20e0e254129aa0f26505b76f4ba6be6786281c4d105e96829e9ee SHA512 ffd6c3ba605da419c819dcad10edf713242074a035ce405f4c97dbbd2a7e9b253f82efae1022d08d9f04591014e752ff38a3f8727e5a5cf60d33a9167cc2d8fc
+DIST man-db-2.8.3.tar.xz 1624280 BLAKE2B 6158608a5a6ecd361391a17642a4bbc9275a8a3105a39d6f6c3971aceb275cfb16670c51dfa8f1d7fc0136fc1b5e96e39c88e8c1d91e9a47d7a1351d16623a93 SHA512 35d5dda7a2bda94978d10770d24d4c78b3c62c71a68cfeb400df61b0df289ed17aa8aa223d4ae3ffa094d76df8d9172b878230fd7b0397ce7728b9c8ac0b1745
 EBUILD man-db-2.7.6.1-r2.ebuild 3173 BLAKE2B 7fc7db98ce8e00ddd57564cfd72129b3b42e1505e3d0cf0ebe875b8793febd33024245e61f4db184955cdd4d60ed7862af9639874859e317a17996483627240b SHA512 0a51e238d3b399eb8fffbb01f229c614aad6c84691ca9b309c982a2e832a332f01d963f6d3e1da850dc667d6248acd04f564418838692bce98af70cc9d6aabf9
-EBUILD man-db-2.8.1.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
 EBUILD man-db-2.8.2.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
+EBUILD man-db-2.8.3.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
 EBUILD man-db-9999.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.8.1.ebuild b/sys-apps/man-db/man-db-2.8.3.ebuild
index 627b8941479e..627b8941479e 100644
--- a/sys-apps/man-db/man-db-2.8.1.ebuild
+++ b/sys-apps/man-db/man-db-2.8.3.ebuild
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 69d97bbdd122..daeff9d2cc9f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -12,7 +12,7 @@ EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2
 EBUILD portage-2.3.13.ebuild 8197 BLAKE2B 0d4dc660b6169ea2c69c35ff9d44ce8ae3d25d18f15f529bca80140e20fae2905598cc2668c5b9fdc9bac042144bdbf7c8ccffb0e2680cff28ceef13123ac228 SHA512 1dea3d8545bdb72b4b0acbaf7377404be97630335ec1d22430e2a872c550a45abde63b03cc2105cac70627e0c5b5481448bcedfa0b7702e11ed79f29c2f4b3a2
 EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
 EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
-EBUILD portage-2.3.24-r1.ebuild 9270 BLAKE2B 56129755048817a6651fae7f243cbc89a17959c59371fb337542840ec3ca4543c1e5ad35143b0564f01ecc818b7a63748749426be91c002c8406d9f2eb78cc36 SHA512 efab90e8139a141d6d5466a2d9d67181d7dfe923bc0be3bc735b3107369b8a20485ad0ed3faef1c4ff105e5dadd0dd55533bcc251cf833222102fc46ed74b1d6
+EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea
 EBUILD portage-2.3.26.ebuild 9279 BLAKE2B 3d8fd9527d24aed70be755af64e7b782eafda0172bf7e12a31be3660d435d687d0e834077a76128350a8275679d7084ca4e18c9c1593d2f8da53274ceb6b4b28 SHA512 0a9b7d938952ce2f3c8856310d211f7eb6e0bfc996b11a26954c1efa9604409a627d8aa83cc4800480a77685c004af2c1d0c49113c0b6bedc1bad9c46be093ea
 EBUILD portage-2.3.27.ebuild 9279 BLAKE2B 3d8fd9527d24aed70be755af64e7b782eafda0172bf7e12a31be3660d435d687d0e834077a76128350a8275679d7084ca4e18c9c1593d2f8da53274ceb6b4b28 SHA512 0a9b7d938952ce2f3c8856310d211f7eb6e0bfc996b11a26954c1efa9604409a627d8aa83cc4800480a77685c004af2c1d0c49113c0b6bedc1bad9c46be093ea
 EBUILD portage-2.3.28.ebuild 9282 BLAKE2B 4496d4c5b4ac38ddb8084c0f8d9d6c833066dedb7817d212d739b379b0f40d0d41cd3755617ccf9b72423ba68bce1e39bc31b0c8c84829875863723bd0ba7f3a SHA512 316b5a517cfd3856910598f01dae9d7f17a7b68723996c02eb05ea6f3b36ecab9ac05f1602c9f9c72775151d483f677f58a4223c6ede4f2d0eaa8587f3cc178d
diff --git a/sys-apps/portage/portage-2.3.24-r1.ebuild b/sys-apps/portage/portage-2.3.24-r1.ebuild
index 979ffb137192..a1bbe006ba62 100644
--- a/sys-apps/portage/portage-2.3.24-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.24-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr"
 
diff --git a/sys-apps/pv/Manifest b/sys-apps/pv/Manifest
index 476e7580cbe2..5c26848e81b5 100644
--- a/sys-apps/pv/Manifest
+++ b/sys-apps/pv/Manifest
@@ -1,5 +1,5 @@
 DIST pv-1.6.0.tar.bz2 107723 BLAKE2B 95118fc6406f73e800e99468457ba00f0b8f0345eef58f7ff7f4e10b90419cb36b37af094dbe5bd84b7832dfcc96e536dfb845a061f99a0b118192e90821fdc1 SHA512 bd405901812ca50b910adbcf1d2c540dc0b8612f03687866734a79cfa5b5b8100024c18a1d1413c6613e1f2085989cbb77907da89bec7eda37cdeaa7597129d5
 DIST pv-1.6.6.tar.bz2 109220 BLAKE2B 1cfb60e49f6301f0d990467a58013522bbc1e28e2936a1a2141918af05149b59b6cc494f290d99ee7072247b8f0e230b799cd5dae6f8aa59d116691319e952cb SHA512 cc841b4bd00e4e8fcaed97da094ebac4a11af1c3f843ce5f73d0c3ab20aca29498c6b1a224c653d40127304d8269d96f413df66b980809e9278ff9544c834a26
 EBUILD pv-1.6.0-r1.ebuild 1367 BLAKE2B 68332f62167add5091841d2d8c8c9ae9379296eea40471674880ec53034bc4a6da69d935042ebb57960a0996bc3a586a955fd7b69837e488842011ad3b8dd04a SHA512 2e13378c2cb765413a6fc87e6b4f6ded4afee8a27b5468b71cc17a688231acf656b9f1234d3b4fa84d3218430aeda4ee53120e80808ced958088109dcf05377b
-EBUILD pv-1.6.6.ebuild 1387 BLAKE2B c5ac5ecf279ea270868427da6ceecaf3423b1436d634f2731a514f7920ed926a17d5a07a974dc34ec5b857e13cfd04fa60d3863263bf56e14199b37a3e85f902 SHA512 615d2b1caccb65b522a620a640f4f2f4830e401076036d06eb9f9e08efaec7085baebb5426c546f03ab31b8f5ca7bb0ae2c5e0eee7bd070c5ad2d403a10fc816
+EBUILD pv-1.6.6.ebuild 1398 BLAKE2B c077a3b62bcff24b084e23059aba0edc526711b29fa64d853446b3b1730cbe83b1e8b3d05d02e8be930bdc9b976f6b9c634503a3b1fa6f0ffcf2f667653195cc SHA512 a96ce67602502c1113db6aa87cdaa1a40ce95c5acea04a765ffcb860efc14ccf37cd3e2abe33c511e38031d918c288902dadaa246cc3a5366fc13642dae42491
 MISC metadata.xml 334 BLAKE2B f38b13fd2aa1e836db200a4f9867a5cbc50caa54372977003b4dfd52f92dc2a165d121de1bcd86e7b489911c31c64bff30af3364930ac708dc8f26f7dab6fa14 SHA512 ae252c205325a4937f8ab6c60c8be5a032ff8f11087b7a1fe737ed9c4fa6325b34dbcab9bc16467096de93baa330cec51909f72686cc4152d653fd1456333fb3
diff --git a/sys-apps/pv/pv-1.6.6.ebuild b/sys-apps/pv/pv-1.6.6.ebuild
index a411e2bb0770..7cf983647200 100644
--- a/sys-apps/pv/pv-1.6.6.ebuild
+++ b/sys-apps/pv/pv-1.6.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.ivarch.com/programs/sources/${P}.tar.bz2"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x86-solaris"
 IUSE="debug nls"
 
 PV_LINGUAS=( de fr pl pt )
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index ad81a0000d54..276e8192bb9d 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -2,5 +2,5 @@ AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
 EBUILD sandbox-2.12.ebuild 1918 BLAKE2B 6be8c0e96b32efc06027ccbb1ac287644e368fad5a025556da1ec1587c56a2825fd387cabb76c72759a647fae422c1d4717afe33dc2d95ed4538f733013189c3 SHA512 a079fec80316d2ecaacf7784287d7d6033b52dcd3be83b20582e76a309ece525fea83e4a6d5170ef2ae3d417b421674a63c09c3e0803931cd325b4e2fa2778d1
-EBUILD sandbox-2.13.ebuild 1923 BLAKE2B 4b552567f21a11c8e6e2487cea857576fb8c3bdb854065bda219e53fffd2ceee6c83298496cbd1d60f78001071454c2e0d5b73de1dff9278cf51ae483086e0a1 SHA512 1076542951779705bf9a9471ac8ecdcfc219e2a80485de7ae0714da4b7a9596ecfed32922fbc4b9c519aef77e3f61814b5b3244461d088d79eb3859868af71e6
+EBUILD sandbox-2.13.ebuild 1921 BLAKE2B 453e086893f5dd49ad5c12ea62e1f704b27c145e65e06e372b4396154955fe26dcb418d9bc96203e983dc7d0974662429966374c1da83d00be30069ee5548b08 SHA512 29334c088f2b3167158a215d1f30e5f1474ff9b32b853782e04f182a240b9d98db32d3c80a27101860ec1bc1e4208164615fd3b10f18ef95f680bd934add507f
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild
index 2d2445ba3416..1e98ec137b58 100644
--- a/sys-apps/sandbox/sandbox-2.13.ebuild
+++ b/sys-apps/sandbox/sandbox-2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index 181361ea3e37..111dffde39cc 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -7,5 +7,5 @@ AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2ad
 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
 DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
 EBUILD setserial-2.17-r4.ebuild 1075 BLAKE2B 2472d28473658c27440e6535b294d5365be0549c34297bd61722289925ab8ea91d8c5208d7ffd251fdff024a50a2b76c865bd69109108a4c14443b62b5463425 SHA512 358e3802389eab9aa24edd99ca22cfa7c1e16dcd7ffeb8251d56c70a1b36993eb31c067edd9d669b5b8ce74c5786e53e5de6da76592a32c721a181d825123b14
-EBUILD setserial-2.17-r5.ebuild 952 BLAKE2B 9c7e25be14ed48bd3d042ace168a77b8e4bfe23af77824251d5a98c88a4d8f1e040ec1dce3a7c2c3057f3d41434a834d3b539b1f54323f5d1ddb6ebaa588e75a SHA512 b8cc99e72717f21ce08a955faa8007484c5d274e63b3c1975dcea20cb68b25175babcbc8dfc1fb85188721c0777512074257acb8f48e47b9a2c80d427f854776
+EBUILD setserial-2.17-r5.ebuild 951 BLAKE2B a6529756d8baa8977bbc666bb7a4ac94573018143fc07bd8f6a43b5baac655ec1fea996f4f91c464f94f3046419553d2622358cc1b33516e7289bede74e84f69 SHA512 a8abd5ae98440967244a3ab9e19325f5d733feb56e0b75ddbfb2df4cb8bda1a559eb33bca8dd59c62597a7cbf48ae153a0dcd8561a29a4e61d951c5bdae753e0
 MISC metadata.xml 329 BLAKE2B bb11d2dbf0f468577593ce76b97e058f369f9ccc8f7442df8673ff0505b67b981c671b647872e05cbc858696759e0c3e01e56db9eafe2ce91099cedc4240eaa1 SHA512 7eb699d04a9f2d0c39997818037f6ba309499afd0b1635d3b2c28389331f19753928d78e69e4cad0b98de11335c350f092153357360bbc8b00d941400d1e2981
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
index a5f8ca032da4..972b31c332b2 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/sparc-utils/Manifest b/sys-apps/sparc-utils/Manifest
index f06ce1e3447b..3f45bd60f347 100644
--- a/sys-apps/sparc-utils/Manifest
+++ b/sys-apps/sparc-utils/Manifest
@@ -1,8 +1,6 @@
 AUX audioctl.init 455 BLAKE2B 5e449ba3910ded2550dbbd367a2a4f63e3964a65b48d228078a30205a731c0270bd96d7bf4105d833b67fcbd2f0ae98de414f5b77f495172dac741498d94183d SHA512 6ae87679c9e51876551babfaa35126a7ae94c15edc21c630154130652a1f9f754c489c5406c9c3166157a45495d05668bb06bce79ab34053a0b74c34b19c16a5
 AUX sparc-utils-1.9-no-implicit.patch 584 BLAKE2B 153440b685bfd044c24f3da85598895724873b536628ec205c24028baf908e84008c0e629381a6f703f42baa7d6bef3534e77bb03af6dd3b23d9a9017a43ebda SHA512 302c29f1a33ea6b92184bd272fc974b1886168e7aa3d0f0cdcc117024475cf6b27eed9336f8b7edd84b40862144f58c3337fcc47cf3c1a744e5f4a71f8ee4f7f
-DIST sparc-utils_1.9-3.diff.gz 10337 BLAKE2B 03ee7ca15c4e736955fa08c66bbd1db2ec39764b4334fbec3838f5bcea3945d22c7a3148c00ab43a67324827af473739d014d7a6a895dbbd58c43ba13cbb1efe SHA512 c6eba75261ffee55cc49e3da71ad3a2f12e04574158975c69db0bbd94d7c22ca4dec50f3140cf0bf9f35bb547865deca3cfd3e28e76c70b9173926bc0b8f34ee
 DIST sparc-utils_1.9-4.diff.gz 9083 BLAKE2B e4b16c26fe67be73d0fd3ad8e1e80b19356d5961abac344f28650e4d355cac9c557999591947391c41be88d819ebb703ae1ff177b4fbe0d9bea7a411a791821f SHA512 ef79dc480471117da3a778450b3a122eaf64fdee69d35ff30b301f2360ff5d76c6343ce37c25cc188891c1619809daa0595d01c6e85781ddd7ddf1713c8378b7
 DIST sparc-utils_1.9.orig.tar.gz 110080 BLAKE2B 52f47c130fb8e24b0340589c846292fb2e4e9b211a10cddf52a7a63edd70673e2b7d05c2415e558c5f2d1235f33f4ae65b777d3f8b2cf2c50a601d1f0a7a941a SHA512 bde05f1a98211aaf502be6dfd757ddfb21c136cedbb46ca84a4539706c71901815c9d8bedfebc3800c7340634b32276197c75f92f9cc829e4f50c37d203e9358
-EBUILD sparc-utils-1.9-r4.ebuild 2304 BLAKE2B 16c4932eff08538320f9e624f942a779fcf6c9011922b0deb52b9abf5595f1274a9cec075756cf29ba81c8b0b5b572d13ccf07e46b6ba8865bc50c8090eea7e9 SHA512 8d72473fb064d0a2c2fc5e4334d23f2af904fa9d7ff4c406193d9dd2f45c4728ed696bc842c6a558958623a5bf89109b37ce25ad7d071d16036ce17807390166
 EBUILD sparc-utils-1.9-r5.ebuild 1546 BLAKE2B 5123d5ebf807f9d52f452615f73067592af46a903584a1abd505baa085f29d010e2773c64fdc85c0a5b884742b78b1ccc2d867accf379536092db0d62a60d805 SHA512 90c68e797ce41ec6816b3c0c5e578b7ade6b8799424a3310bee599f6bd4cfab423a0ba70cce51c6eb95b72c0749f2627aff862cdc7cdf6f09d64ad670f8d3cbd
 MISC metadata.xml 416 BLAKE2B 3d0e052bc957750b869856cabb6e94d86dc1655e63da29ac3753c16d8437e7a9a97c89e225f03b6267bb32bdbe6215c25717f088684e493b5785a6d334854dd1 SHA512 c057eea9ea65b87cb366e802dd8962901024335a85b3ec53caa6c342c9e1a23e656dcadc2a70692e5e7ab55a0ac82637ef052699844f50061461a645613b688d
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild
deleted file mode 100644
index f19f07a176b4..000000000000
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Various sparc utilities from Debian GNU/Linux"
-HOMEPAGE="http://packages.debian.org/sparc-utils"
-SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/s/${PN}/${PN}_${PV}-3.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* sparc"
-IUSE=""
-
-DEPEND="virtual/os-headers"
-RDEPEND="|| ( >=sys-apps/util-linux-2.13-r1 sys-apps/setarch )"
-
-S=${WORKDIR}/${P}.orig
-
-# NOTE: If a system has >=sys-kernel/linux-headers-2.6.0, don't build audioctl
-#       as the SPARC sound drivers have been replaced by their ALSA equivalents
-
-pkg_setup() {
-	has_version '>=sys-kernel/linux-headers-2.6.0' && \
-		einfo "Linux 2.6 kernel headers detected, not building audioctl"
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${WORKDIR}/${PN}_${PV}-3.diff"
-	sed -i -e 's:#include <linux/elf.h>:#include <elf.h>:' \
-	  ${S}/elftoaout*/elftoaout.c
-}
-
-src_compile() {
-	emake -C elftoaout-2.3 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
-	emake -C src piggyback piggyback64 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
-	emake -C prtconf-1.3 CC="$(tc-getCC)" all || die
-	has_version '>=sys-kernel/linux-headers-2.6.0'  || \
-		emake -C audioctl-1.3 CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	# since the debian/piggyback64.1 manpage is a pointer to the
-	# debian/piggyback.1 manpage, copy debian/piggyback.1 to
-	# debian/piggyback64.1
-
-	cp ${S}/debian/piggyback.1 ${S}/debian/piggyback64.1
-
-	dobin elftoaout-2.3/elftoaout || die
-	dobin src/piggyback || die
-	dobin src/piggyback64 || die
-	dosbin prtconf-1.3/prtconf || die
-	dosbin prtconf-1.3/eeprom || die
-
-	if ! has_version '>=sys-kernel/linux-headers-2.6.0'; then
-		dobin audioctl-1.3/audioctl || die
-		newinitd "${FILESDIR}"/audioctl.init audioctl || die
-		newconfd debian/audioctl.def audioctl || die
-		doman audioctl-1.3/audioctl.1
-	fi
-
-	doman elftoaout-2.3/elftoaout.1
-	doman prtconf-1.3/prtconf.8
-	doman prtconf-1.3/eeprom.8
-	doman debian/piggyback.1
-	doman debian/piggyback64.1
-}
-
-pkg_postinst() {
-	ewarn "In order to have /usr/sbin/eeprom, make sure you build /dev/openprom"
-	ewarn "device support (CONFIG_SUN_OPENPROMIO) into the kernel, or as a"
-	ewarn "module (and that the module is loaded)."
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index d4778aa44920..7cb4aa17824e 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -3,6 +3,7 @@ AUX 238-0002-core-do-not-free-heap-allocated-strings-8391.patch 1664 BLAKE2B 6a3
 AUX 238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch 1688 BLAKE2B 19faeab810419669a6743ebc6a3051b2f5060f6de793a3f7c9c21fce26d395dcad95f6b8aee58fe133d11e2b02e8847d1df4cde30a5dc237f615a8656f823f30 SHA512 075f7d6f20f33f5e0b07ae993853e969e0d54d0a0683302ab1ab7c4047185397f39aaa894cbe4104e75ae65f8944fb5af47e9f8adb1e66c28b152c6d6e863eff
 AUX 238-initctl.patch 1497 BLAKE2B 7f916414a8bb92e5d8a2b47fc9adf90da73c9fb27bd32eb2a89c5d0b56215bac1ac8c7e9e011268b2f3126fa272c0a118f5e2916f6eca48f60e359a056cf6d92 SHA512 1963c653321fd69a66f75dc441e36d47d7eb15c193066845e43a6f62d436d9a7fefd98c6418cdb08fca823720fa62887c93e67de427e599ee19b1f72301cfe62
 AUX 238-libmount-include.patch 2164 BLAKE2B d9d86e8affb6a6d5cc8cb42b4f1744936b0773318d466a7f76b43a382ffc6aca7d863cbfef7ea8a114615db35d1a6f57b22a2fd451a82b71cfac3383bb019870 SHA512 4f1d82195623a213b6439aec6a2ff17b027f4ed079e6917957635503125a0917d4069c8055b5b9d1be235c47d62235f4c7baa0cfb9184d48f06bac356b69706a
+AUX 238-nspawn-wait.patch 3415 BLAKE2B db43b0128709bba3bd50199645e2e819d0b86eb6839f3bff34b21ce989f5e9301d541265fdb0dbaa76cae00df492581a624e9ca694d4d6d1f2d1cabf5a02612c SHA512 8f1c940da604d72948aa14e735f31ce6b349d274f18836233f15bdec7605e7a52a9ac1016cbd98fdd57d547e31ff882f3244029fba58ac4a408aad41f378a0a0
 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-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
@@ -14,6 +15,6 @@ DIST systemd-238-patches-0.tar.gz 30019 BLAKE2B 0f393865cd6bcd815c1a6e932c0e5a25
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
 EBUILD systemd-236-r5.ebuild 13049 BLAKE2B e06a3d3d52778f00c7ad935ea674e76c19185adff4fcabfb08ad4ab77866256358d17a0c359d8d69d083f5c0a0adfb457d9abcd52bef71c9019c5cd005f51edc SHA512 d17627d55e3006fbcd2c6c91a51482c599788a3d96ba10bd5d4fc369fbb6ab7dbb2daf0f432402f422df21fb8bb1fa9416366853dde90710c51f23505be732c6
 EBUILD systemd-238-r2.ebuild 13272 BLAKE2B 1f24a5fb90f29640fd52b1c37d67180c733a5fea1a66ae855daaee797b9458bbf42db3fe915b10e0fd90ebfcbfe9cb415fec7d6d4c83cc529e284725b3463cc7 SHA512 537f5053ce876c4b57677768e249be492e1f8b238d96230ddca780ca1ca3785aeda5b61a805703f3efffa7c8e08196fb3022334d2efbb407178440cfae96b451
-EBUILD systemd-238-r3.ebuild 13136 BLAKE2B 6b020f91bd932475f372a372fbc1a20975117dd62ee170252b5056b518a2cfa19a7f8182716c64a63c807de82abaaea2bb8a7aba887fd08f207296eaf497f17c SHA512 866e86d1fb97c0f97a7738374633ba8300e287860554d08702f578a7f516505672f638fdd929757425350a2579670d103ab0ec64f2c3246abde25d1c2e6c468b
+EBUILD systemd-238-r4.ebuild 13174 BLAKE2B 712d300426c0463939f6684a0458aad3abbbbc473fbf830c1ecc2b8d75163cb25b1b97a712c39d4b4fa635863f0fb646a4993e164d8cd9f02abe56a55f6bef90 SHA512 a5894928bc22d1a420d56345dac8f8baaff11b3c308245f90585f6596ef6cc93ba64139c8ab94d6613ca7923bedf85a8bf44638302236fe46b45b14bc40645dc
 EBUILD systemd-9999.ebuild 13186 BLAKE2B 8de75e0c231da02f48ac6a886abc6014ede50b1761ad65e6fcdd3ade2f2cb38bef73bfd4b49f1e35f9b651057b18be886e39ce7d9c09ddbcaea52b7456ff84a4 SHA512 7d2d65b6c37479ebf5997540a35b39125fbb2a050021090c588acd1a38a3b1b09822c59887883b2cdffd518c5a3d4f980193fad23ac5baa6beb736317ea2fbda
 MISC metadata.xml 2036 BLAKE2B c2f3d74c0cdcf1a5d850c31d43085ab441523e025369c9ad07d9e518d01c7c585c2019c4365892dd6b395c1b4eebc3c7f31c8948c13cab78acf6a2f9528f614c SHA512 72d9f1db3a9cf681a7971d9ded4d73b8b56bf7c467e453f7599293bf3761c66daa7e80716b5c70adcd18a181521f6710267b92df78e8e9a3430a340f8d33fd47
diff --git a/sys-apps/systemd/files/238-nspawn-wait.patch b/sys-apps/systemd/files/238-nspawn-wait.patch
new file mode 100644
index 000000000000..a740e8933453
--- /dev/null
+++ b/sys-apps/systemd/files/238-nspawn-wait.patch
@@ -0,0 +1,83 @@
+From 7511655807e90aa33ea7b71991401a79ec36bb41 Mon Sep 17 00:00:00 2001
+From: Philip Sequeira <phsequei@gmail.com>
+Date: Thu, 5 Apr 2018 14:04:27 +0000
+Subject: [PATCH] nspawn: wait for network namespace creation before interface
+ setup (#8633)
+
+Otherwise, network interfaces can be "moved" into the container's
+namespace while it's still the same as the host namespace, in which case
+e.g. host0 for a veth ends up on the host side instead of inside the
+container.
+
+Regression introduced in 0441378080489e4ab6704cd0a2d78cb1ceaca899.
+
+Fixes #8599.
+---
+ src/nspawn/nspawn.c | 19 +++++++++++++++----
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
+index 810f1247ea2..a5bc50c1f4c 100644
+--- a/src/nspawn/nspawn.c
++++ b/src/nspawn/nspawn.c
+@@ -2329,6 +2329,9 @@ static int inner_child(
+                 r = unshare(CLONE_NEWNET);
+                 if (r < 0)
+                         return log_error_errno(errno, "Failed to unshare network namespace: %m");
++
++                /* Tell the parent that it can setup network interfaces. */
++                (void) barrier_place(barrier); /* #3 */
+         }
+ 
+         r = mount_sysfs(NULL, arg_mount_settings);
+@@ -2337,7 +2340,7 @@ static int inner_child(
+ 
+         /* Wait until we are cgroup-ified, so that we
+          * can mount the right cgroup path writable */
+-        if (!barrier_place_and_sync(barrier)) { /* #3 */
++        if (!barrier_place_and_sync(barrier)) { /* #4 */
+                 log_error("Parent died too early");
+                 return -ESRCH;
+         }
+@@ -2448,7 +2451,7 @@ static int inner_child(
+         /* Let the parent know that we are ready and
+          * wait until the parent is ready with the
+          * setup, too... */
+-        if (!barrier_place_and_sync(barrier)) { /* #4 */
++        if (!barrier_place_and_sync(barrier)) { /* #5 */
+                 log_error("Parent died too early");
+                 return -ESRCH;
+         }
+@@ -3533,6 +3536,14 @@ static int run(int master,
+ 
+         if (arg_private_network) {
+ 
++                if (!arg_network_namespace_path) {
++                        /* Wait until the child has unshared its network namespace. */
++                        if (!barrier_place_and_sync(&barrier)) { /* #3 */
++                                log_error("Child died too early");
++                                return -ESRCH;
++                        }
++                }
++
+                 r = move_network_interfaces(*pid, arg_network_interfaces);
+                 if (r < 0)
+                         return r;
+@@ -3656,7 +3667,7 @@ static int run(int master,
+          * its setup (including cgroup-ification), and that
+          * the child can now hand over control to the code to
+          * run inside the container. */
+-        (void) barrier_place(&barrier); /* #3 */
++        (void) barrier_place(&barrier); /* #4 */
+ 
+         /* Block SIGCHLD here, before notifying child.
+          * process_pty() will handle it with the other signals. */
+@@ -3684,7 +3695,7 @@ static int run(int master,
+                 return r;
+ 
+         /* Let the child know that we are ready and wait that the child is completely ready now. */
+-        if (!barrier_place_and_sync(&barrier)) { /* #4 */
++        if (!barrier_place_and_sync(&barrier)) { /* #5 */
+                 log_error("Child died too early.");
+                 return -ESRCH;
+         }
diff --git a/sys-apps/systemd/systemd-238-r3.ebuild b/sys-apps/systemd/systemd-238-r4.ebuild
index b68ed0bf92ab..0aca5fbb3029 100644
--- a/sys-apps/systemd/systemd-238-r3.ebuild
+++ b/sys-apps/systemd/systemd-238-r4.ebuild
@@ -155,6 +155,7 @@ src_prepare() {
 	PATCHES+=(
 		"${FILESDIR}/238-libmount-include.patch"
 		"${FILESDIR}/238-initctl.patch"
+		"${FILESDIR}/238-nspawn-wait.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/timer_entropyd/Manifest b/sys-apps/timer_entropyd/Manifest
index b03addea0006..04d51e7ec34c 100644
--- a/sys-apps/timer_entropyd/Manifest
+++ b/sys-apps/timer_entropyd/Manifest
@@ -1,7 +1,5 @@
 AUX timer_entropyd-0.1-syslog.patch 833 BLAKE2B f7b3aec1bd30185e8f5e8c5efded4c30a39fa7208ee6396a69b1e93053f3c5efc1904c4006b6e1989976b213edad29974e037650552b5c219ec119c7ae746946 SHA512 93eefcd75c2c61515d8304f13d196022d76a8244c9b74764247d330e518a2c06fd93e6c9859cde7d6be2ae7e50c05f9e45d5a0c68bf2aa057821b52f588187c7
 AUX timer_entropyd.initd.1 236 BLAKE2B 281b56e70175419ffe5bec4609ce75a48982103353ca88f866e5bd11b0a59cd771fd0ccc9d80466d105de93d467afa0c7ea37c0b9cab90a3d5e89888af73b451 SHA512 78f0ef265ec514a781e9c53d4938a56fd83196c4e923882aaa368c40545f59196cd74aa63be08d500db083603ab871434365583b23932e284fffcf7a4f897f1d
-DIST timer_entropyd-0.2.tgz 8323 BLAKE2B 82c33f9a0ba1a27c86550f13b2729dcfcdf2cedd12c4562866cca9e7d9b1bc8cfbb24c6776ff5ed6a9deb6d592ad6cb310ae3f1cc1f25a146f85a62d0a918e55 SHA512 789f19c2652781593b9ce91c584eab4ef9210bb47f1afb6186311416a67c84235ed1a163ffdc017b6d50ff706bf7ff6a84013b4b31fe6c09eabe95a484805898
 DIST timer_entropyd-0.3.tgz 8329 BLAKE2B 96af82883eeb5a136e1f059afb067b6df46e5940fe0da5b4c161047c0e4e40a9885454e3faa926b864c2db64cb6b481d5dfed7d8ba4f28d5c8691959e41d26d2 SHA512 bdfedb594ee32daf7fb961a703842ca3479de158fc19bd75664b183e44bcf2ef3e74645cc6097f340834933db6f9133710df7d433ac062b2375494de5c052dcc
-EBUILD timer_entropyd-0.2.ebuild 975 BLAKE2B 69bda567f330d4bf46aa4ce123920d08b79dd5069ec03f8c6977c8a3548eb396e0b9758076cc2bb1b0a456ffb1f7711d9be307a5084b840f75c62700994b1925 SHA512 b529143760436b945583a8eddd0f4b0b26f772670b5e44f37262c2f13408c4c3997a59adb09f6db083c4a59001e0d1ca21e47a6cbdf5cf261ac821d9f3e7ba28
-EBUILD timer_entropyd-0.3.ebuild 976 BLAKE2B 78f86cfefc8a4b4e782abd03c8c7790bcb83a24189435e0df56cd046df2a1248f8eb932f617cef7c611cd045663c010541ad770818b695d45403a9a12f62d8ac SHA512 b616f766bfacbfc11521bf8a76c560a1b26adc3aed770435ad15344afb24bf82390b0d1c509d3e6d0c1060617acf0b2b7cb64734bd734a0de3bc057ec5b55f63
+EBUILD timer_entropyd-0.3.ebuild 975 BLAKE2B a9cfa6e4fef55f39ca1ffc67857f1fc0acf8ff41c001881a86fa347e91306f5ef533a9352fc4de08a4b494c926c77d9f4b52012a648b5f82894c66b3994920c4 SHA512 483a2d78bfbcfee64f43668af9c1072c90cc8d072b5fdb404dd3429aaff7425c0a4d249aa8412ff394184b24b4ce9a8188b28a30c8938f965d08b9b6e68bcd7d
 MISC metadata.xml 274 BLAKE2B d51bf5510ddf8970e76b90692ad94c469cb31da3aa6b9c76b3de4a6d3643290443ad601307f63b809b7d386c7293ada0be699570b4035f80f74bfbcce58f45b4 SHA512 22599f724e804e72e8db6fcab11ee7495bb5cd3c3a6e25a6424c33bc0ba343859cb88664ecfccb9805c3f35128342aba446f1145edfee5b0a39a92f20a48ad81
diff --git a/sys-apps/timer_entropyd/timer_entropyd-0.2.ebuild b/sys-apps/timer_entropyd/timer_entropyd-0.2.ebuild
deleted file mode 100644
index 2b3bcbaaca69..000000000000
--- a/sys-apps/timer_entropyd/timer_entropyd-0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A timer-based entropy generator"
-HOMEPAGE="http://www.vanheusden.com/te/"
-SRC_URI="http://www.vanheusden.com/te/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips x86"
-IUSE="debug selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-entropyd )"
-
-src_prepare() {
-	sed -i -e 's:-O2::' Makefile || die
-	epatch "${FILESDIR}"/${PN}-0.1-syslog.patch
-}
-
-src_compile() {
-	use debug && append-cppflags -D_DEBUG
-
-	tc-export CC
-	emake DEBUG= || die
-}
-
-src_install() {
-	exeinto /usr/libexec
-	doexe ${PN}
-	dodoc Changes readme.txt
-	newinitd "${FILESDIR}/timer_entropyd.initd.1" ${PN} || die
-}
-
-pkg_postinst() {
-	elog "To start ${PN} at boot do rc-update add ${PN} default"
-	elog "To start ${PN} now do /etc/init.d/${PN} start"
-	elog "To check the amount of entropy, cat /proc/sys/kernel/random/entropy_avail"
-}
diff --git a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
index 0c55fac4e636..9a5835c0363b 100644
--- a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
+++ b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/te/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~x86"
+KEYWORDS="amd64 ~mips x86"
 IUSE="debug selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-entropyd )"
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 19b4815b39e6..583d2b38c4aa 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,6 +6,7 @@ DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37d
 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.ebuild 6469 BLAKE2B 6c84dfecb250b52372b56ba381efaa419f4a896476a3da5642cba7b5d1b10c1acc298aaccc12e35ab2d0345437c91ee49b65240e8abbf8bad0c3cb2d0785c733 SHA512 7dae1d9371295d2f2a415927afe945b7a9ba1e893e33a7fd63b560ff4d619ed706280e644572a1828bab6df76084e7b31d868cea26d06acf6aa2ca9f7e995cfa
-EBUILD util-linux-9999.ebuild 6436 BLAKE2B e239ea519099ac597dcd2d05135afd4adb310d57ac035367b86ffc269472bc79b858235b5120cadc5f49cfb7018e068206b8cc19a445b471a3cc42cb38a9928c SHA512 af57f409ddc524fe2b5dd965246ed6fde2b132ada32b2187214f45f24fb18dd91b4301847928c60965bac56da98fb9a37c61422559d4e923548531f8bf326a4e
+EBUILD util-linux-9999.ebuild 6680 BLAKE2B 2ed2f44ba3f5eef5e2d09d41f7d8f63b364f531fb55a7e8e065d687728fca6f8443201a62a7f2f82a95f8faf329e706eb0397abb140c01ec8b46e8fa66a08092 SHA512 8fc29a9e99ec8bbfb983967ea5a6c35c82b97e5c478e555ac719cee41e4dab717049e9d8a3e375db510cbf712ddbfd5cd6d2140c27cb1cb380698fe8251d5dd8
 MISC metadata.xml 947 BLAKE2B aeb1eef359b4be20e0df592245a2d432d92adf29336ecb1519bb4a97deed47c75bd14ca6c132f2e2ffe5c2d2ddcd7638ee38d03c7f8bcf8c8accb36a916663b5 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c
diff --git a/sys-apps/util-linux/util-linux-2.32-r1.ebuild b/sys-apps/util-linux/util-linux-2.32-r1.ebuild
new file mode 100644
index 000000000000..6d113163470f
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.32-r1.ebuild
@@ -0,0 +1,225 @@
+# 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-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/"
+
+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 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?] )
+	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"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+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 ! 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
+	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=(
+		--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)
+		$(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 static-libs static)
+		$(use_with selinux)
+		$(usex ncurses '' '--without-tinfo')
+	)
+	# 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
+		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() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU; 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 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
+}
+
+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-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 6fcbc94b0787..76ee8160737a 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -25,7 +25,7 @@ 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"
+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}.
@@ -73,6 +73,13 @@ src_prepare() {
 		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
 		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
 
+	if ! use userland_GNU; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
 	if [[ ${PV} == 9999 ]] ; then
 		po/update-potfiles
 		eautoreconf
@@ -110,31 +117,11 @@ 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,39 +131,63 @@ multilib_src_configure() {
 		$(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
+	# 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
 
@@ -190,6 +201,12 @@ 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