gentoo resync : 25.01.2018

121 files changed, 732 insertions, 474 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 68e9ee309533..95b082c6deb5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index dc08cc5de6c1..98d52b06bbf5 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,6 @@
 DIST baselayout-2.3.tar.bz2 32266 BLAKE2B 6535bb451e393accd7c041079188c8c76b318f449adf2e5d1579496a27951de12b8404fb4ded3c143b60fe59ad04017a1a53e4a4ce864559f192fc96f1269a05 SHA512 cf9636c7d5c1fb4abf63dd931dc8ceaa30cf871f5e576a53dcc207abd54b8eec7778a1ef29766e2e8f5c0a098b9b3d07361717ae190027d1e102aceb4a07cacb
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
-EBUILD baselayout-2.3.ebuild 8346 BLAKE2B e69042d75377e5993f7f834cff27fbb30ecc5c1b1f6bceae70b96c6c077918e214d1d25b2b335f9c711ec32bb0edbeed3daceb4a98860342e7ac0e9e66b15304 SHA512 c2efae56623e39a6dcb13a064810c900bb22bdd9b04f31b1837c4a56a48cf2135eaaa3340c72e2ebf4ac5800d8ba2ee03083d2edf0c3181ff465b6a87cc7d4c1
-EBUILD baselayout-2.4.1-r2.ebuild 8586 BLAKE2B df33e986a6d7f0135b7e0861c6a8f689c1eefded615d4d40f18fb1885b725f6b6c3115596c5da399426e54a40facf577fd4d6cdfdfb2ca59f520a79859dd6366 SHA512 c7816cb2f1dfb69608ee0a3ea12fe5bb4c4a94b63f281ebc727b6faae11e796cb2393c696bd04c9a197268c8d3fc73e8caf59c849ba2dc359597ff4a7396ccd9
-EBUILD baselayout-9999.ebuild 9191 BLAKE2B defd00dbef7c524e118b8d863c7eae6f87870d25169ea7919c43c68b5e20892b214d7cc72637dfaebb29b50eab546e38a8cbb745d0eb236a5155c4cdf20f8799 SHA512 0cc07338bdc4eaba42770dca5fb7be1e0c025325f9879d3a0d4081edd3e9f6dd11a7c1ea24d2ab2eb19b28ac2648f14877cf305ef65b6d9bd7aff11fc3d60e0f
+EBUILD baselayout-2.3.ebuild 8334 BLAKE2B e5a11ef84c953d802cf7d9b4a0aaffb62ae24882176067ca64a359ea3092cf6eac3e6666ee68dc74db1a1024ce99127342e09b8ecb287a0c16c807fe3b2665fa SHA512 c070760aedc79dc1fa2642aadd4db41d40e6c10738d2815d479c81a39a0d930cad150bdf01162f880f9cf64e81498d910278a0e028d696f915a13ecefb7babdf
+EBUILD baselayout-2.4.1-r2.ebuild 8574 BLAKE2B 13006a5d466e76cdc845198de3b9535c0ba5a08ae7584c7d2d1cb64cfb2005ed5becd0b3e05903d88f750c706457a235f65d88a811b27eeb57bd6d438c09deb2 SHA512 a64f391e2efb667d3b819fd14ea246eb09e2c4db305a00c7528c34eabf16a2206ab7b216cffdcb048c20038c1ff3238d32be9405e9c31f04b98692e425fd1292
+EBUILD baselayout-9999.ebuild 9179 BLAKE2B 0846b334af76aa2e121e476511f9623995b239aff79c25aab86d40302b85e641c95f0368758c68044b1ec256a68b2dbf0173b722725f0079f403e9e9258bacf9 SHA512 69bd9ce94c2a315f403d9cf539a0f5cd491ae752fe50f678d4e9e2ab61fbb9715c302d368aa1d21922101fb742b85596cb2ab38f9dc3e05d130bafae5dd0042e
 MISC metadata.xml 447 BLAKE2B 8d2a924108bc62d05d6324741f3f5b008ce6a5197b5615c2a798dfda5bfccffc1b489139d41f59668298bb5947c25be4c08d818499008d188544706f53c8af0b SHA512 df8ef8945e71112074f70af3fb2ffc0d83ffd0b25827f802b96924436b6a7f184ffcfef495d543bddc3007e7a1ea5429ca696e2ad6dfb09a0541e504f7d135d1
diff --git a/sys-apps/baselayout/baselayout-2.3.ebuild b/sys-apps/baselayout/baselayout-2.3.ebuild
index c7cac095dbf5..153e53b5ebe2 100644
--- a/sys-apps/baselayout/baselayout-2.3.ebuild
+++ b/sys-apps/baselayout/baselayout-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build kernel_linux"
 
 pkg_setup() {
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index ec9e36e9794c..bb57d59ef093 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="build kernel_linux"
 
 pkg_setup() {
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index a7d95e53ed43..4622672eb5ba 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index e1b1e71c9c41..8664fe1a9569 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -18,8 +18,10 @@ AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379a
 DIST busybox-1.25.1.tar.bz2 2103070 BLAKE2B 304e194d436b0625fa7cf03ab5d64f5a8c4b97180a00db248fcbbf399566cad85135e4f39b1fad9cf09a445f6d41ef58890e212be24807f65ee56df1a913fce6 SHA512 9648877ed11e5a55213cd14fd64f6fc64dbd17013fbfaa4e67f4fd433f59e9231ed78a88e6e8100a4794d833f1d9863bb86f75faae093418866770804bf873cb
 DIST busybox-1.26.2.tar.bz2 2120931 BLAKE2B 41c0bea7b1548df24cf1c5d655f4e767c2fb54f674065b3599d5d179ec2cc78a3806f14ee85535aa3831931fa0b19dbbfc2cae945123295eba1b31e20e70bfb8 SHA512 9926d211d0b4f34b513d934d7b111ebbf933c2dc31206bdd80426a62d47d5b1475b70bec5aaa14a26b94a202ab1465d994062a002750a312dcb8167096eb3719
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
-EBUILD busybox-1.25.1.ebuild 8597 BLAKE2B 14ef86039d47e2d6c2323aec3d25cf7840520b629888fd471af8a3eb5f096b314a4620ea4b819e487d5b77738a0c937dc85572bec5bac0869ed02e9afff9c83a SHA512 40c4af782f391f44a05bdde056c1c3d8935369dbfdad7b464f6883c4a4f82a4dc821427f7109da73a703891c0cb5ed65723c0b2c373fdf54155e7fafcb58553f
-EBUILD busybox-1.26.2-r1.ebuild 8934 BLAKE2B 6483597d33875e5298d285588a269a0ce4d3c88e4d8a3a36089f65a30939e19b749d234731cf35c54061b9bb7673e9f07f01cb661f68e81dc1e5ac490708687e SHA512 d5320f05e15b3b62e720d0fab274575a4ce4c18eca66b811e271c3dd7bafe2bcf9160fcb32d14a36849904f79623b9c1f4817029e813c51f2ef1aecb04375737
-EBUILD busybox-1.27.2.ebuild 8934 BLAKE2B c940f059c0f6bad5a1d90292f67692cb806188168f32d0b97c0925223c95ec5d192c9471824b2eb53648b7d0449ea92b859a4ba222ccdd7b1e844a0d6c5e3201 SHA512 28543dc9a553778bdcf7dbae63cd4a726a326bd679658f634927a12a8008d2fb2f421acbb734fb780163773d55ba7f5afe4d6d63abcd9124d273c0bd2a3bb534
-EBUILD busybox-9999.ebuild 8936 BLAKE2B 19f5a5e58b33ecc7524d91c8fcaa41b348764c6947aa9948ded98025969f88053447af00f3c787338cce25c5fb6d67d7a761b3c6552645e650f367c37b064b0b SHA512 fc1fd4f220690befc1795c42a61491caa20d4e45172f69e37cd20bdc7b0952aa749542423e037a1fb34811179a8fb464afff94d6cc84cc00bee87208a96dcd61
+DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e34565103eaa64b2000b042bd2b9b234df14b5e8b74f7cf8f9071b907e1b9eff556e852bb921088d81548473430d3acf SHA512 346a71d44e6c4e1889ac12ae52320cb0c3d0c45c2b4b49fc4e3c0bb25f427707d8075150d545906f414b9f4e5b6d8f1a3afe8cdc31f6a64e06c62b400d7d129b
+EBUILD busybox-1.25.1.ebuild 8772 BLAKE2B 09a9f7fcf016901ae5d79fcca962ff13dec578bd2815f0196a9458d066b6ff1ecdaaa21a457ad0dc3fce6d8b4a5d8bc3cb66e79824067d7dc973e8163bc99c39 SHA512 0c1bfc1298ec19e03d3c1efcd974332f3f960937c69124d2f9399640f468b4b823b8196dfdc2eb955af8257c3bca538dc92ca6d71b1cf1e5838fa5f12fd87cd0
+EBUILD busybox-1.26.2-r1.ebuild 9109 BLAKE2B 310e0233de69bb18a6789f127dbcc97ef648f420e8119fe97eb99ddfa8efd124d7ec71536a0282ab63975241e5f8618969b38dc98c6736dac44e63027c96bed9 SHA512 c8acdb039cca5528efcb5c2861b4eaed3f7611909be5b368a72f35c86ed4d0bf386b5f88f8b1ee083663aa73da1812854e613d43b303150c9d2013bb151566e4
+EBUILD busybox-1.27.2.ebuild 9109 BLAKE2B 76fa055773bedb7511974c2e695bb23ddc48ec3233e169ef90d4ab789ddbd086fd7ebc9ffab8ed7b255382d1291618d554a56891bd76ec4c8b7a47dd1275812e SHA512 e2ea36c7a4f48c3766363f7f447e4ab5f31b88541db7c64207e0c3fc0d5410ba309d112d9ca6734adf631bd4bbf815049c79713de77a6aa9ad558f53a688fbb1
+EBUILD busybox-1.28.0.ebuild 9303 BLAKE2B 3f794930b716599ab002d5f5bc08021ac316024385fc5386ced878229572d0d2c39afa497308a90943d56a1896656be57fa79e00d0a3a3a9bdd54f747f0ccc8b SHA512 b252fa2fa58a345d89cf63f706072c58a5fdcc4377b0d2a5e3c07de21d00751928649100cf8309fa66c9bf07423d129236d69882173c85beef4c90603a8226a2
+EBUILD busybox-9999.ebuild 9303 BLAKE2B 3f794930b716599ab002d5f5bc08021ac316024385fc5386ced878229572d0d2c39afa497308a90943d56a1896656be57fa79e00d0a3a3a9bdd54f747f0ccc8b SHA512 b252fa2fa58a345d89cf63f706072c58a5fdcc4377b0d2a5e3c07de21d00751928649100cf8309fa66c9bf07423d129236d69882173c85beef4c90603a8226a2
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.25.1.ebuild b/sys-apps/busybox/busybox-1.25.1.ebuild
index 373d932ae1a4..e2608ae82c0d 100644
--- a/sys-apps/busybox/busybox-1.25.1.ebuild
+++ b/sys-apps/busybox/busybox-1.25.1.ebuild
@@ -139,6 +139,12 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/busybox/busybox-1.26.2-r1.ebuild b/sys-apps/busybox/busybox-1.26.2-r1.ebuild
index 19d62510f287..2cf1f1574c30 100644
--- a/sys-apps/busybox/busybox-1.26.2-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.26.2-r1.ebuild
@@ -147,6 +147,12 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/busybox/busybox-1.27.2.ebuild b/sys-apps/busybox/busybox-1.27.2.ebuild
index 80b530dc184a..97b793186c4c 100644
--- a/sys-apps/busybox/busybox-1.27.2.ebuild
+++ b/sys-apps/busybox/busybox-1.27.2.ebuild
@@ -147,6 +147,12 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/busybox/busybox-1.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild
new file mode 100644
index 000000000000..68000bffa174
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.28.0.ebuild
@@ -0,0 +1,323 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI="5"
+inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="https://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P=${P}
+	EGIT_REPO_URI="https://git.busybox.net/busybox"
+	inherit git-r3
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
+REQUIRED_USE="pam? ( !static )"
+RESTRICT="test"
+
+COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+	pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}
+	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
+	>=sys-kernel/linux-headers-2.6.39"
+RDEPEND="${COMMON_DEPEND}
+	mdev? ( !<sys-apps/openrc-0.13 )"
+
+S=${WORKDIR}/${MY_P}
+
+busybox_config_option() {
+	local flag=$1 ; shift
+	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
+		busybox_config_option $(usex ${flag} y n) "$@"
+		return
+	fi
+	local expr
+	while [[ $# -gt 0 ]] ; do
+		case ${flag} in
+		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
+		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
+		esac
+		sed -i -e "${expr}" .config || die
+		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
+		shift
+	done
+}
+
+busybox_config_enabled() {
+	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+	case ${val} in
+	"") return 1 ;;
+	y)  return 0 ;;
+	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+	esac
+}
+
+src_prepare() {
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	# patches go here!
+	epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
+#	epatch "${FILESDIR}"/${P}-*.patch
+	cp "${FILESDIR}"/ginit.c init/ || die
+
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	#sed -i '/bbsh/s:^//::' include/applets.h
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || die
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+}
+
+src_configure() {
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 -s oldconfig >/dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 -s allyesconfig >/dev/null
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 -s oldconfig >/dev/null
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_2_4_MODULES #607548
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n FEATURE_CLEAN_UP
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n USE_PORTABLE_CODE
+	busybox_config_option n WERROR
+	# triming the BSS size may be dangerous
+	busybox_config_option n FEATURE_USE_BSS_TAIL
+
+	# These cause trouble with musl.
+	if use elibc_musl; then
+		busybox_config_option n FEATURE_UTMP
+		busybox_config_option n EXTRA_COMPAT
+		busybox_config_option n FEATURE_VI_REGEX_SEARCH
+	fi
+
+	# If these are not set and we are using a uclibc/busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option y SH_IS_ASH
+	busybox_config_option n HUSH
+	busybox_config_option n SH_IS_HUSH
+
+	busybox_config_option '"/run"' PID_FILE_PATH
+	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
+
+	# disable ipv6 applets
+	if ! use ipv6; then
+		busybox_config_option n FEATURE_IPV6
+		busybox_config_option n TRACEROUTE6
+		busybox_config_option n PING6
+		busybox_config_option n UDHCPC6
+	fi
+
+	busybox_config_option pam PAM
+	busybox_config_option static STATIC
+	busybox_config_option syslog {K,SYS}LOGD LOGGER
+	busybox_config_option systemd FEATURE_SYSTEMD
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG_SANITIZE
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+	busybox_config_option $(usex debug y n) TFTP_DEBUG
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe busybox_unstripped ginit
+		dosym /ginit /bin/bb
+		dosym bb /bin/busybox
+	else
+		newbin busybox_unstripped busybox
+		dosym busybox /bin/bb
+	fi
+	if use mdev ; then
+		dodir /$(get_libdir)/mdev/
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.initd mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# add busybox daemon's, bug #444718
+	if busybox_config_enabled FEATURE_NTPD_SERVER; then
+		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
+		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+	fi
+	if busybox_config_enabled SYSLOGD; then
+		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
+		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+	fi
+	if busybox_config_enabled KLOGD; then
+		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
+		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+	fi
+	if busybox_config_enabled WATCHDOG; then
+		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+	fi
+	if busybox_config_enabled UDHCPC; then
+		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+		exeinto "${path%/*}"
+		newexe examples/udhcp/simple.script "${path##*/}"
+	fi
+	if busybox_config_enabled UDHCPD; then
+		insinto /etc
+		doins examples/udhcp/udhcpd.conf
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	rm _install/bin/busybox
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin
+	ln -s /bin/env _install/usr/bin/env
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	dohtml *.html
+
+	cd ../examples
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+		ewarn "If you are creating a binary only and not merging this is probably ok."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+		die "silly options will destroy your system"
+	fi
+
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+}
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 73ee93bb96b8..68000bffa174 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -123,6 +123,13 @@ src_configure() {
 	# triming the BSS size may be dangerous
 	busybox_config_option n FEATURE_USE_BSS_TAIL
 
+	# These cause trouble with musl.
+	if use elibc_musl; then
+		busybox_config_option n FEATURE_UTMP
+		busybox_config_option n EXTRA_COMPAT
+		busybox_config_option n FEATURE_VI_REGEX_SEARCH
+	fi
+
 	# If these are not set and we are using a uclibc/busybox setup
 	# all calls to system() will fail.
 	busybox_config_option y ASH
@@ -147,6 +154,12 @@ src_configure() {
 	busybox_config_option systemd FEATURE_SYSTEMD
 	busybox_config_option math FEATURE_AWK_LIBM
 
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
 	# all the debug options are compiler related, so punt them
 	busybox_config_option n DEBUG_SANITIZE
 	busybox_config_option n DEBUG
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index c30fdc277c84..28a33e54476b 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -2,7 +2,7 @@ AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3
 DIST debianutils_4.7.tar.xz 156276 BLAKE2B 9d32dc8222b67d4f1f91d58af0811412924f5de43a691463bc24ac51087f986440d6464fee71f7723980b9c21c579cd4aef70213d5033c419f3802be3bd4cd29 SHA512 74110d194de8b6b61d40b133b97629520048a8fdedac349ec2031c793c0246526c1c7904e88098b4c2a121e5efba2d724924139ab1aca15d129a4d210f94a1aa
 DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec09073802c9778594619686c93fc3061cf5248ac8e9e2c1b391eb49dd572f3033b1db206ff43f373b17caf7f3c835111f SHA512 468b8f001c0338f166cbc2fe25079edc5feeaa38dce2f5c7e6724c691d6cb35f4843e987695e33ead557bb11887e78ff8a5e3e1f52a266a0f32fb978fa643897
 DIST debianutils_4.8.4.tar.xz 156344 BLAKE2B 069d15039579d4ce03d2ca4bfd0df199f0044049e7cd6ca899104eec5d917f3db290649bfdd851d8b14519df2750fb975bc6d96e98e14cdb626a610d44da80b0 SHA512 7d7b2d12d4907f6032477b4cd5b5dc94d8093724af8a97859c1d4cf229479e2dfe6d44143b454ed9b1990ca2d4833eaeb059659d8c305623875fdc8420659855
-EBUILD debianutils-4.7.ebuild 955 BLAKE2B 62f8d18a91a707314302473daab1d2e4645261e552036378271500238251cca8b8c9c9156532832637aeab5045ef1b8528c21fca9ceae8d4424a826862145bb9 SHA512 581e2efee6fc722bb26cb3f5072758f119927455e584c41be27562906d405309d121e9e7cde3d5427d6399f7e9519423ad4a7e99650a2214a142963b27f22cca
-EBUILD debianutils-4.8.3.ebuild 963 BLAKE2B b49bbda0dd4607a25393bb77fa722b0a4606db10f61234aea1b93dd7d22f50594e3489e3bc0665de0f0b286009800eed5be3134e3f8eb324df7a152967cdadd1 SHA512 9234f06a2b364d6e7ea3a347dc3708ff04a01c2168fba1d69a2db8eec62dfad88a49829c7e29ac9e64c2fcd52292516c7ac524bf678aabe53dd61a47d1964743
-EBUILD debianutils-4.8.4.ebuild 975 BLAKE2B b0578fe970dc5497fd7989f35e5b0e111ab901a660e996e5ee067a3f6d8fddafdb528d45ecfbed166bf5cba006552265269d18fd9cee6fd20d7af9a38d563947 SHA512 17f0039fc61ffe48e27a993465d208397abed8d50c823af3cab45749c6d841a96e2b1717b970d0ae98853b8b65f4b201d85012d9dceddf7dd21f64fceec1c7a5
+EBUILD debianutils-4.7.ebuild 943 BLAKE2B bfa2506c83becb7dbf47bf311f00ac931107679446551ab4f38938f957377997d5340009bf8947036f2b6c0fd9a8b4ab265cc8ac5b28c0ed5784938ee0ae906c SHA512 f45eada04cddfefbe2961d7c2a7ff5ddf3a742947d9ffa1dd66b37ca33b99dc06d5d811b24fd660e972b0650569483eba78b4d7e4d97fe957f9e0db297227dea
+EBUILD debianutils-4.8.3.ebuild 951 BLAKE2B a69242ed524af63dc881c3cfb61bdc1f525fbd33434f6e5fb5da7c96b11eec31981c9483deb1ec26644851c9993cdcdaff80ced3c5631b8c7bd93365aaae1987 SHA512 4b1ebc42a1da56fe9183ca91fee58909f696414e419d71f06aa21d295ac22afa5ae3523323c3ab0ad1355e22beba6fe03f35b785414a62f4dfc608409ebb62c0
+EBUILD debianutils-4.8.4.ebuild 963 BLAKE2B 32705ce1d6aef1a96bdb597ef36e3ca0465611f53b975dce303842ad3abf51984c719c5f68187cb1cd7d433d0e5be6738bba62a6369d9efa83571130c168ea50 SHA512 df8c91246658fb77f1e126a37479814e28d3c1dd8f8c532197689f5150088ebefe56d4296cd6674215e1eafadcf226e925d08a3c85d8553208faeaf6ea7a1071
 MISC metadata.xml 355 BLAKE2B 9f0e6370bbf41d0180e561b2a747f2d3b9e400ea2f9396c059f0b03ad5293032554135573e5fc02f4d91b68d41bdb6722946662eb1c94ac10b1e0384aaeeeeb3 SHA512 967535ef4f2ce2ae377f05548d1cd15589b6e9ceb0b76c49a3ceec1d464aaff2aea43c98be4d8ffd7a8566f77dbce41a75d4b5dc489bc03b4f7562af656b3f84
diff --git a/sys-apps/debianutils/debianutils-4.7.ebuild b/sys-apps/debianutils/debianutils-4.7.ebuild
index cc93d0fc79ca..d2e7bb775738 100644
--- a/sys-apps/debianutils/debianutils-4.7.ebuild
+++ b/sys-apps/debianutils/debianutils-4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="kernel_linux static"
 
 src_prepare() {
diff --git a/sys-apps/debianutils/debianutils-4.8.3.ebuild b/sys-apps/debianutils/debianutils-4.8.3.ebuild
index ce4ceda7e7b1..da3add83b946 100644
--- a/sys-apps/debianutils/debianutils-4.8.3.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="kernel_linux static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/debianutils/debianutils-4.8.4.ebuild b/sys-apps/debianutils/debianutils-4.8.4.ebuild
index 6932bae8d611..b4860c091b15 100644
--- a/sys-apps/debianutils/debianutils-4.8.4.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+installkernel static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index f9d4723e8b7a..46b7cd51f717 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -2,7 +2,7 @@ AUX diffutils-3.5-fix_macros.patch 928 BLAKE2B caa78e408cfcdf299277d5f8ee24be3d2
 DIST diffutils-3.3.tar.xz 1197832 BLAKE2B 8819e84f6d1d9ae30dccba01934ba506fd9e2033cc7ac8e2dc827868f6b8ce54c76129167d8754215d0637f9e731ca1176ffa83abd80eb95e37a29776e29afa1 SHA512 b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83
 DIST diffutils-3.5.tar.xz 1360996 BLAKE2B a2348911daff19a73a00985e8528888306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6 SHA512 758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
-EBUILD diffutils-3.3.ebuild 1449 BLAKE2B fc9aa80d28217eea857dcf170b438046f0a1b378c585b49407152f6b749805cc03c0c4554cd03acaa32dc31cf2869fd032cc4945643c6cc910c07c03230542c5 SHA512 b25387889515894f8b7249565f4c022b91268995ace9227829cbe67312a13222979eff92a9262816e5dff8043a70ddad635d6d53c06df2139324ab387dada12a
-EBUILD diffutils-3.5.ebuild 1262 BLAKE2B 62981e71f105a71876ed4dad748b9b1b41d91dba86d62a0260704df9b0b0226c6fe0038f0a4f925b98b61d228bf1a53a30881ca346974ff396501a8df7b8b65a SHA512 f7945872ccf1d61d411b1d209a522acc68e4a7c2261705b0be23f822c987b05ec92840693679e633ff5d1aaff198646c3df57aa12c0f0f16b2ea0297c5fef240
-EBUILD diffutils-3.6.ebuild 1178 BLAKE2B 247793c2bb8ad7eee4a8c0aef12266e2e11bc6885fbf7633499f8075314cbeb244571e1a15554810d2a10f56e7f2055c27aa71a2159c2ba42715068388585444 SHA512 27e98ff03aba18e11a681fbdee5ae2b23b311806d647fe5dd07179d90ea8e277de0aa34f7e60d5d4c6077813c15f77f82a8be480bbe62efa53fd1b40af0428ff
+EBUILD diffutils-3.3.ebuild 1437 BLAKE2B c2fc69bfbfa2dfd0953b9f1cb80a4a7a4980740dbc5cbba631e3311e4ee548fcbee51c3c191709b890a90e8f46409689c217762a64cbdef672383bcca23c4aff SHA512 d0f286f68b667e5049bd0713336308f43f6fd75353e285d9753a2f1d43a94e218beca55a6df58d834dacc968c672d64e0daa0229c3654da4239da57c99004bcf
+EBUILD diffutils-3.5.ebuild 1250 BLAKE2B ee2af68ab02655eb85ddc6afa4ed7a7ac8c45d618738f53cf41067440333dba8b2197d101253688081f27e81388af445119fdea9b5185b67fe14071250c05983 SHA512 50a51b0a9bf659004ce150eefcb3b969494fffe87e7f48365a3df0e54b5b960efa228a6ab3e3766aabc63ff3ae39c91eba7da00665a0567f2c0252d0c62ef5b1
+EBUILD diffutils-3.6.ebuild 1166 BLAKE2B d4c28e6a0eab8b9c66fa6c07199c4ee6d7b862e0c4fdee27dc2bac56e8bb3a0ba87e7ca91605f12bacd9b3bc2695cb4987523465003009bfb20674dc10ffdd89 SHA512 2ac74317252603d3da51aa5a038ad3da40c77ac94a53bea59e82e93c66a64a7dff87c10beb8ba469e83c016f57cbf8fd23d5b08a87d92939947547916387bd9a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.3.ebuild b/sys-apps/diffutils/diffutils-3.3.ebuild
index 74de856d5c86..ebe4d3023998 100644
--- a/sys-apps/diffutils/diffutils-3.3.ebuild
+++ b/sys-apps/diffutils/diffutils-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild b/sys-apps/diffutils/diffutils-3.5.ebuild
index 4f4cc34faea0..12510de9dd81 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/diffutils/diffutils-3.6.ebuild b/sys-apps/diffutils/diffutils-3.6.ebuild
index 3a2a7b9e2be5..58f25710df80 100644
--- a/sys-apps/diffutils/diffutils-3.6.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index e0f4ae9849af..f2d4163653c1 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,7 +1,7 @@
 DIST ed-1.13.tar.gz 87984 BLAKE2B 296e2448457b10acf0651c76f44d21ea51aa9068f07e13d2d392ff82a825868a44ececc22a4594a1e628581d36847a79978d731ddfac22f1337c503c786b76e9 SHA512 003b4e1015b3c9eb831c805b3bb1072f2e6da02c351770ddae69b438b6e9124b06cb9e30d9a0036dd1fc6a1f7d27fbe84f7e86ac5073ef403bd5958111986f5c
 DIST ed-1.14.1a.tar.gz 91662 BLAKE2B 654eddf7328418507a3a9536da0daacd85c2ef3ea3b1a58b742fad3fc48cfc9a07f8232ecbf5e8e0da42ccf191b1da7e050b0779879e2dbe8b98a329e0f0d45c SHA512 423a30729c16355d80ed84e408034f63fe0d700d12441f82b476af1919c08e7fd4be18736c30cdecbdec5d851f9a08999242aecfe687beed17b779a7485963c9
 DIST ed-1.14.2.tar.gz 91773 BLAKE2B c09ae263e08e07ff1b3411bfea2bf39d7c56364c2c66359ea1447176b42dd0df85464eae7326b983dd64f1d344e25214ef9427be52f5fcc9c57473ca1dd02a44 SHA512 e7638a07d6bdcedc2e00686a6677075fd7b8becebfd7650e60794bcb0d317a8611c7acd90420c952cc6c4beaede250eabff304d27585e190985b1f83e5930057
-EBUILD ed-1.13.ebuild 923 BLAKE2B 781214a4ec07a5d207639c511f11ffb272382cd7b8105df77704e9b1c93385e89d9de39ee1a9123ad38bbf36a15025687267378efa7977964cb5230929367c7a SHA512 34afe2dee8259d42c4376ff17bace4eebee8236945e2518a786b2e25a8fdbe28aa28d38131e1f50d5f0e8f6c3c795a311529bce226fe09826f24e68f07a406fe
-EBUILD ed-1.14.1a.ebuild 933 BLAKE2B e8e81f5c5aa4fff276e5cd192f378772b5a920d8d6661bb0910d32f3f8470bf81633fdcfa017e1e65c30947e677da69cbf63a1d17bc6c6a826cea210893874f6 SHA512 27ecf81d89cc653e676f46cdea352a5438ddb09def853c6dbfc137af8c7b55211f79369c643a7dd8c85210ffbdc7e7e9104462028435b987adfc2b3850126d9b
-EBUILD ed-1.14.2.ebuild 945 BLAKE2B 6a9727ddf391d4d1d7f53654886ddd6aae5d61c2972a1998a65cf9beee7d9672275f69e770206f4ec82f540242c7773901e81a47e07541df6e8689bad3587b9f SHA512 6c4965c6657e419e0dd05ffc0106234567e27875f810ce06d6f97dc0568624e1f7993cf9ba73a741a7180a5a6572e38198cff04b4dd3f8f792bacd684c075446
+EBUILD ed-1.13.ebuild 911 BLAKE2B 9072480e149b2911d14861077f3c1d213cb32d8497d09f836be32b659d3774ee8f812ef757b1a2dec6139c75ab14f087494369432977e12b784a053f5a204a15 SHA512 6093f37ab651e0c6e12b74771a8e62e40096f5e2f84ea051a9875c56f66df495f71b07e01ccaac5bd8f24776a72fc917d87988949507fd6dc7371d46cecb32ef
+EBUILD ed-1.14.1a.ebuild 921 BLAKE2B 249e5469c4cd8ffe6d8b10aa3efd46b4159e6632124d720bba0437ea0866e6f799342eb0a2a9ee538b4037581df0783fd054ff9e3b2aa661a7b9db9239e3ef51 SHA512 e9aa3bff70c0af368e3139168ffd8c4098b61b3f1a601d2bc387e013fedcee4747277072bcc70890244f569e0054ea54a4addfc3919f79fe001e8d1cc19642ea
+EBUILD ed-1.14.2.ebuild 933 BLAKE2B 19f9fcc693ad3b1e29d2dff7a1fa270d41e3418cc2ee9aee2be3b63f17b67e49baa3568d8b1726b982e99756a905cdb4eff979abe73b2730cc4dd6d720fdc9fc SHA512 257ac23dbe5557474be40169d01ac71d5b244d5e1177fd33c742392873683884e2b0814807d11883f6d45b18b1f15af4452f99acd900faeaba9b3bc89e4e79ea
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.13.ebuild b/sys-apps/ed/ed-1.13.ebuild
index 950215c0ff3f..2004db464329 100644
--- a/sys-apps/ed/ed-1.13.ebuild
+++ b/sys-apps/ed/ed-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/ed/ed-1.14.1a.ebuild b/sys-apps/ed/ed-1.14.1a.ebuild
index 685492cee99e..3513310e6364 100644
--- a/sys-apps/ed/ed-1.14.1a.ebuild
+++ b/sys-apps/ed/ed-1.14.1a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/ed/ed-1.14.2.ebuild b/sys-apps/ed/ed-1.14.2.ebuild
index 798cffa0764b..e4ecd98a48aa 100644
--- a/sys-apps/ed/ed-1.14.2.ebuild
+++ b/sys-apps/ed/ed-1.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://fossies.org/linux/privat/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index efeccfbbba02..4d2dd943d8a0 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,4 +1,4 @@
 DIST file-5.32.tar.gz 797025 BLAKE2B d00196a2331b7325acc1b3f52d011faa3864db526f1962e4fcb769a92a715a1ee9874750cdde8f7c5c48541ecedea36c0fbd788a5ee9eb175cfcfc984acec430 SHA512 315343229fa196335389544ee8010e9e80995ef4721938492dedcfb0465dfc45e1feb96f26dfe53cab484fb5d9bac54d2d72917fbfd28a1d998c6ad8c8f9792f
-EBUILD file-5.32.ebuild 2911 BLAKE2B af8288ff23bd5ad66fe7cb935d25f114b5f10221e76c910156bc28f027203dac22b30a97b87e0d467cf54a759bd5c4b888f27bf437487cc9bdedf2e06ca5bee5 SHA512 668586ad4b842d209c19266a6063493af7482b0542bc401af5c439c28f009c4c904a5edf258bb739984410e1eb345a4e0c430a7e8ec1b7a5e17d6e8d1f0819bb
-EBUILD file-9999.ebuild 2924 BLAKE2B 2342093bf71db8bad4b29aae0a3a1479c823881aed1ff635856f78da5f0a1d2405d0aca67c713d8c6f1b434d5f2b251a2a4e5af1be930e25f2ec700840bc262c SHA512 e656d0ecac3d195a3e61cb0168f4f7c9f2b74c351a583c6ed568ad73bdfe35885593a7f9c4258e9ef51af82a4489a3afb34f9baa39dc00e032b0485d7dad4b0c
+EBUILD file-5.32.ebuild 2899 BLAKE2B 5ec2b6b9e369d603736a4384006fb4c07a8abf23859a9d89e76bb7a0257e852bf290a96e990ce4869ebdc3f36d5033d56a7801470cd847e09cd84aecd9bc3d67 SHA512 7a01b1f616a52d8079fdd33060263922bf1279fe20c64036b365531a1e27513af28a96acafe1dc7919ff602475ff79abfa0b860645c631ae45239bb610905a63
+EBUILD file-9999.ebuild 2912 BLAKE2B b63c099f3e2036f91a8d9866a453aa688b20fc9b303d1a9fe0f83ed3ee110eeb5120eaa657302e955f7dbfa81d6f3b92a669d6dffa948caa7885ad2d50e431bb SHA512 2609753025bfb22cb4a371d4799df8afa6e4c7393145cff6cc2751cd41039aee6b542ad269be823997ac994da2a5de92a5beba094d8a89b8d3e847ea45ff6e57
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.32.ebuild b/sys-apps/file/file-5.32.ebuild
index 43c64a51de95..c431956b3788 100644
--- a/sys-apps/file/file-5.32.ebuild
+++ b/sys-apps/file/file-5.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 4f3a87f8bf98..3c9e2e50e4a6 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 6384dbddbb1d..4561627aaf4b 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -6,6 +6,6 @@ DIST findutils-4.4.2.tar.gz 2149838 BLAKE2B be061487c8b50bbb8aa1e085dc46f9b71dcc
 DIST findutils-4.5.18.tar.gz 3870196 BLAKE2B 766c072aed143313460facf8179ff3645f441e8f1253a5e7b59d67e20207a060c074f17f0a839e60027810fed739839ffe066ff40e2e07fb23c6f20d326ec8d8 SHA512 2ae70cef9aee81d4402298db11890efa0ec38dba561dfc11afc9c91af7c1c6a7cca221f669c45b00e65eba53a8b08f5124ed4e862d9e26bcf69c48a927e6b398
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
 EBUILD findutils-4.4.2-r2.ebuild 1334 BLAKE2B 79b08e96148ec6a073aafcb00fbd1a49dd03861582744d3a9c02867d396a20aa1bdd5318e6b36148f90d5de1a639212c94111479868d819b285f579162836a6b SHA512 83c6b0066bc3ac61b50924fbfeba59bc7161987b402465fec1267ebd3d518331cbcf639fc6b5442a8ae9b3b7eb642d853b38883412328f0609a8a8fa4a058b6b
-EBUILD findutils-4.5.18.ebuild 1577 BLAKE2B 1af0a4be329cef9cb2ddf986628d90b3cd86bc5ab9ea10b39d5b9fa1f9bdb9758093f6e807880610f2fd10ab04a90cab5657ac1cab39ff18ea1d205ff24bce2a SHA512 e149ce4f5dde29c308f2872068014fb3aa42e41d08d5eb0b41bab3c3dcaf223bd2b559371a3e7a5d2ffa748cd9ab52614d4f8136de80e7c08e9a0e84a79fb5d1
-EBUILD findutils-4.6.0-r1.ebuild 1917 BLAKE2B cb6059d106b7c70b6211264b3949537ed170968525e37a6f597cbb6cf9eb24399f0fd4ba4e86b8bbf462b3363f64d17bc22e7752731638ac8e501d03b599b667 SHA512 6c75ac0fbfcec910671d7341adda481ce3f1fc6d862b00039bc9af3ec17e2b6da7568b12812afa0d890db816c8e74e3ce739e9fc7b8ad1ea37ef30a338742595
+EBUILD findutils-4.5.18.ebuild 1565 BLAKE2B 98fc64b152d8df52278d07d5d1650c55bbd3c533ed68259fb99b460728e4c283d365cbe63b082492caf965ad9ef52021ebef68bf7258baa40839a9c095fc1df2 SHA512 1e26cb6d5fc097f32611cd8e5d21919b334938a2064e66d68238cbaafd34ae1cc32b773da807546111d1315d04c87ff71bcf317309c746932c5a39fafd2a13ec
+EBUILD findutils-4.6.0-r1.ebuild 1905 BLAKE2B e8a6f4faf5a488f83f4b41f03baed7024703fe49d9ca61d0b8864d7bc2757f4a2cae015bf558bcb0d8eee8d0f8a4caf44dfc22b4b469c0278794245b076cfd6f SHA512 11a56e7bc5ec30731a7bd2bbfd9979360a41f87a2f62b1d3316e34ceeec25e8c1fe271c3ea9c27b7123d3c57d234fbbb6af93cd390cb73a216125aaada53c9fb
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.5.18.ebuild b/sys-apps/findutils/findutils-4.5.18.ebuild
index 9d821a86d772..ec1a6951c909 100644
--- a/sys-apps/findutils/findutils-4.5.18.ebuild
+++ b/sys-apps/findutils/findutils-4.5.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls selinux static test"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
index 6f7b51dcc2a2..ea8388072a29 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
 
 RDEPEND="selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/fwupdate/Manifest b/sys-apps/fwupdate/Manifest
index 2645d5523886..2cd69c6cc35d 100644
--- a/sys-apps/fwupdate/Manifest
+++ b/sys-apps/fwupdate/Manifest
@@ -1,6 +1,6 @@
 AUX fwupdate-9-objcopy_detection.patch 1616 BLAKE2B 88daad5739b7bc1e7a5fb2d9c96a4e8c3157b42e654de23061ea871cbab85d4d02c18066b213aeb9817a5926794eccfd83e30eed9d1b047c47ab29c7f3c263fc SHA512 d2e790aaf3a3e10d4154507d1243d429e3fefb914a1fdc3677ec8f7450b3059c34c6d8aeb48eba96647165d95b41adebb849dbba398be07031759499de4a3052
-DIST fwupdate-8.tar.gz 41062 BLAKE2B 904cd34cf490fc48d0bd89667b37ec23ab41432e1b6a5155cd3887697e910b5758404c47c85acb8c8acd5d41acc7ef68a08b49f0c8e39c6007b20690a763bbb4 SHA512 3b9b2693d7d792f0a6c7107325612cba35c891259d870152ca9ebcbd397edc307601e414f6f0fefbcb1aff422badac651ce00867c4dba38dac347ff75e1267b7
+DIST fwupdate-10.tar.gz 55899 BLAKE2B 34e74386de5151a977d0e136ac4d022a42d339775c77525fa26a2669ad7b10da2c0882435ac6093cd69d56473b83234c9d808f12565ab029a4f14c006ce6a1d8 SHA512 7c01a41a8c2876a954a1047790b45999c07416eeafffdf5a0802c53a877ca300811bc2282cb9398e46df53f761404a8fe4ef8caa1995f326122dbae2af1018da
 DIST fwupdate-9.tar.gz 41698 BLAKE2B 72026feab48f39e25548dc2475c10f11ea74d88228dffbb99f58f00bcc8052a90522ebb572558bffc538524a0791a78e9f7aa8fefa76f3a05ee6a09ad93e1878 SHA512 bcb7783944aa007450a28f71cb4e3c8b06220b3ad04dd90a9505273224ba192369fb63ac0d72bd1efc06c78a5f6f38f2eea2c4affe915eff5f2b7c04db0847c8
-EBUILD fwupdate-8.ebuild 694 BLAKE2B b9dbe6e4a747ac4a0832b0d9d3c5090c41eb17b7e53190fb6317e735a9ca10b4a0ec6e664fad12d8929977ae708f2aca52c9ddbf2f000de728acce00d6af1d90 SHA512 59cdd6682ce60e98b2dd605e3edf32c7e458641a7ca5b5db14754ae8e3b87cd2e646566061a3fb1a8e68b53487fa8feecff882c6e7ee59970372b0b9c7e679d5
+EBUILD fwupdate-10.ebuild 852 BLAKE2B fde9ce5e48019e4b33907fe2c6c6c5887a02676297fb59282b90dd8ebbc69263d9634c5674218d56a0fa80cca4732950c92b28622eea54c4ddadfa62310c39c9 SHA512 40d3e3498c3797d230d3a38cd1ce9e5c8355942baad10f99d8f8d549d5416639f3375e6317f9762a42a5d477355f0016ae8286cbc7517d8c1c27a7d976e349dc
 EBUILD fwupdate-9.ebuild 901 BLAKE2B 3c6e68d44c4de562e43cfbc808624f0c06ad94a98d67ca4b7a4e78694680eae5be4681add956c0dce9c5a17850edc0809a612f64ff676856c63350fbb1e3006a SHA512 fe51dd20e9b7e8f23d5d76b48c027bb6b13df001b705d780c4a24fbc5b435d040d5c6a8bbac2293092e032d7625bfe9976ec5c1371ae5e80a469eba6560824df
 MISC metadata.xml 346 BLAKE2B c1ac02b4846e985ebd37bf1cd865b1ca889ed8c7b06efc75dc293fe28b443f3eb886e1c31c461776f567288702923c0b9cf4ce644c31fe5064321b194a60c210 SHA512 55ff3da29bf22afc47434b7079e8559e72d34f769ecdfd198f84c051e6ba68e91751c23c36c841b6c0f81ada4fe74854dd7f1fc0e579e96e43ba3b35bc164dcf
diff --git a/sys-apps/fwupdate/fwupdate-8.ebuild b/sys-apps/fwupdate/fwupdate-10.ebuild
index bd9f9fc1fd01..ac5e222c9472 100644
--- a/sys-apps/fwupdate/fwupdate-8.ebuild
+++ b/sys-apps/fwupdate/fwupdate-10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit mount-boot
+inherit mount-boot toolchain-funcs
 
 DESCRIPTION="Tools for using the ESRT and UpdateCapsule() to apply firmware updates"
 HOMEPAGE="https://github.com/rhinstaller/fwupdate"
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/popt
-	sys-libs/efivar
+	>=sys-libs/efivar-32-r1
 	>=sys-libs/libsmbios-2.3.2
 "
 DEPEND="
@@ -26,11 +26,19 @@ DEPEND="
 
 do_make() {
 	emake \
+		CC="$(tc-getCC)" \
 		EFIDIR="gentoo" \
 		GNUEFIDIR="/usr/$(get_libdir)" \
 		"${@}"
 }
 
+src_prepare() {
+	default
+
+	# Remove -Werror
+	sed 's@ -Werror\([[:space:]]\|\n\)@\1@' -i linux/Makefile || die
+}
+
 src_compile() {
 	do_make
 }
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 4e221e4eed32..d0f6533b7a00 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -6,9 +6,9 @@ DIST gawk-4.0.2.tar.xz 1626808 BLAKE2B f66ebc3650c7288d46ed4548f07c83cbd591873a5
 DIST gawk-4.1.3.tar.xz 2311268 BLAKE2B 956872ef3c8bdf27ccf9c3f7f158f161f42bb8607af7f966e843e24cb4e4e89380cd05a3169157cc822ea5ce8d849993b952795ecd0ecf14213f0bdd689d1b16 SHA512 8b9470a1bba397353f10e4e652e8589a637a49e8235fb39ca7681ae662fd27cd140c193d0634179c800f99e19b0e49aef55dfa6612f9695ba80760a36936a1c3
 DIST gawk-4.1.4.tar.xz 2367832 BLAKE2B 67004e2867e4c4f43aac7142a52c83642d8bb3b0a5451293418bc15e575a8ed1d97c0a975e084bf46ffd1c27dc70e48de492cd2e007773622ef14886b9269ee1 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097
 DIST gawk-4.2.0.tar.xz 2948108 BLAKE2B 6e46b70480184edd3a70bcea2b4e4448b4dfbac317be6e1a6d9225bc6c0b42abe49fe9380231cb3fc87efd449d2c5232ac7099b4c4472c3815a52200ef0013a3 SHA512 3076b2f42e43fff0ce63dcaa3fb749ce421473d0abc3e1e2d9dd375207d3e35c98d5bf91c3179f49156e8a4977424c16bb2d3d662846ad487153729dd4cfeb4c
-EBUILD gawk-3.1.8.ebuild 1794 BLAKE2B 0149b2393d2bfadc67e142a4e3e97639d34c15e8eea57f03e394198bc1e6feb45fe58fcf13f22275501b8d72588d0e1c41024fb7ecbd71755ae5b38e731a13a2 SHA512 ca82d7bba5d88aadb4616817d0d55f001446a90da3def7fd49fb817c5b2674cd389f5a92efe82736e562ea0f46c9a214286f96137f324ee2be2149d09f298f61
-EBUILD gawk-4.0.2.ebuild 2088 BLAKE2B 6d7a23d4d2cecda99a5b740bc3efaf3c0da7635059eabf6589e6bddf03fcc997bccbe89ad104c8533534d96419101877a972912e4b51898eca729fa7b783c6f8 SHA512 b15b3c32c04c724e7b0c5c6f8d7cae86e3118c1560ca2fae0f5ded39fc098afa29987e425733e96daedbf1db5757e15fb21059a023c5158498f5b6168809f063
-EBUILD gawk-4.1.3.ebuild 2201 BLAKE2B f0acd7924985862b2a260f8c241fac4fdf16dce5027eb0493b89a6d3ee74085a01bd0cb4a695b6ae1188cb84259c346c7374161d000d05c9816fca3fd3d1c2ee SHA512 fd78556fbd0d2ba92c2816d4a82330a365ca99985b042a3431e075e7a1390954bec0139d7dc63370c564eb90ab3f0a97c6966230a7309d46462d5e934b090d0b
-EBUILD gawk-4.1.4.ebuild 2292 BLAKE2B 79736b9008392c0191f9b927730cf4c0ac989aeef5fc7ff88600f4ceb445e4060e51267f89ceba673d89a03739f2918958b25aacbde0ab983995e64bf88ef554 SHA512 1fe406de8f0b81d08618c884029e18843dd9304cb7d16ecb06bdd1057727d66c6623087153d50ea4ed61d7b68a556a9031268804ffc331195d9197f0fa83372c
-EBUILD gawk-4.2.0.ebuild 2415 BLAKE2B 991f5126b97d4f0e2add75e1657c5422b692485c95daa45ebec8b9544dac2722a3e8a75e339d0d536af8ae64301e469d24760ec059a0b459c57586c86e78a9ea SHA512 02b2dbba4b6a240c8d48a94b6f9037a556bb5182009b8318bd1ec0fe60caa341ffff64d8d33b9baba9ed2b3626dac6c097e1bfdd4fce7bcccb32528c8f276943
+EBUILD gawk-3.1.8.ebuild 1782 BLAKE2B a960ff46bb378cadf1b7125fff29ac6045e403d1052025621fe565145f792a43a79cc4ac540faf217670f69ffc8a0b9b5af4b7a231de624c3c0d6832737c68ac SHA512 747c9f7f32af7469b7359bbaa7e329a84c78aaf0c8c122a0003bb3e32dad47d1470edd30f215504e0305027b40a3e72e8000ee3889e7cbc4c427ebd12bae884c
+EBUILD gawk-4.0.2.ebuild 2076 BLAKE2B 73d9ce392a42ee14556b70be84ed284108212c471d7e31faaaf07305c525ed73d16df7d3bdc12539ca50352c861a4ed7ca291a376e7516c0f4facf1bc1e813c7 SHA512 69f941d2eb134277c70b4e7ea4364a8902d7522903064192c7f306219128fb45f0a2d42ed79c852da918acb0c740e49052d36a5e27d331d239c6e6d811b7cc41
+EBUILD gawk-4.1.3.ebuild 2189 BLAKE2B cbd7a2fdd568544975ebea18313a3ee53578621f976fc60c38914ef17500b47f7e056b7ce7ff5ebd9d4e663b16f54fff67c4fc17acc2f49645da822a727f32c9 SHA512 674a608dd79b81e65f7fe473583403116f76a309afda68e75d2474125d399e6dc8e1396e67db213d0c68c0297f6940b4672c2f88e071506a213dcc58fdcdd9ef
+EBUILD gawk-4.1.4.ebuild 2280 BLAKE2B cc058a61eb920ada018002678b9525568c1cd6f75a1535d08c43bb3c4318fdbb3234caedac5c361d4cc413a765b1f09682f0b277ca6de5a3d1960a8050688119 SHA512 ca16121ba9c64a7dc335b2e8d343d96f6eee73b57347d8cc22d0780605e345ab8563103166feef03963e62c7aaf20741939fca4a419744c340fe6cf2a0ebe537
+EBUILD gawk-4.2.0.ebuild 2403 BLAKE2B 63eb90fbd3ec95a3cc739c8a6f3936cdb9245fb347cb8b08bc40043ee57c328701b7b1191dae0c1b94545a663ee60803f64bcc4f7285fc34228a9b78214cdaa5 SHA512 bf9c48fdd03eacdbd922e0117e8a360ce92a518e17c0e81413697aa2781156fc0c1b0963ca37f4bf2aa32e0a71bfc68b5496dd67c7d1a115758f7f7cc4033d2f
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-3.1.8.ebuild b/sys-apps/gawk/gawk-3.1.8.ebuild
index 9647eae39c9d..8d9f004395f2 100644
--- a/sys-apps/gawk/gawk-3.1.8.ebuild
+++ b/sys-apps/gawk/gawk-3.1.8.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="2"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND="!>=virtual/awk-1"
diff --git a/sys-apps/gawk/gawk-4.0.2.ebuild b/sys-apps/gawk/gawk-4.0.2.ebuild
index 5ca0de1ce0cd..4108ca1c6efb 100644
--- a/sys-apps/gawk/gawk-4.0.2.ebuild
+++ b/sys-apps/gawk/gawk-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls readline"
 
 # older gawk's provided shared lib for baselayout-1
diff --git a/sys-apps/gawk/gawk-4.1.3.ebuild b/sys-apps/gawk/gawk-4.1.3.ebuild
index b3a2af376238..6c403d62d926 100644
--- a/sys-apps/gawk/gawk-4.1.3.ebuild
+++ b/sys-apps/gawk/gawk-4.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index 966fab13c929..1d9408a23ca1 100644
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ b/sys-apps/gawk/gawk-4.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/gawk/gawk-4.2.0.ebuild b/sys-apps/gawk/gawk-4.2.0.ebuild
index 231bcb851dcf..f2529a996aea 100644
--- a/sys-apps/gawk/gawk-4.2.0.ebuild
+++ b/sys-apps/gawk/gawk-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 4392331227e2..ba76200c2af7 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705
-EBUILD gentoo-functions-0.12.ebuild 858 BLAKE2B a69011ae4096f3e49548eb183e11ef2b126f03edd391442403530ec6392ba93d418d2c50757f426fadb79c5cf2cfd1360bdf96467911ed48405aaa6b44c9a80b SHA512 1d4bf591d0d8661cbf87747b197d2a9185a78be1b67bebad8dac672ae00157b34839482f0595483a6bf0b1a4b91cf3d3667ba6d75e7b9e8fec956ca88379c2d2
-EBUILD gentoo-functions-9999.ebuild 859 BLAKE2B 6db273f1f2ccfeb05676785d8bae40d13338c266a74bf522dfb6c66753d345ed20f6dbd69a7d45e9f90e55eee97fa4f46d5b3f4a1ac70c2e1fe9f29a28454ba8 SHA512 8ed5e1564aad2a5c26f8f771cf027f3dc2ae471b08a50ab945cc9703c7dd96fb5a947f9a8e9d5f33a8afcd98876507279187165d0dca8bcf29a5fe56bac25633
+EBUILD gentoo-functions-0.12.ebuild 846 BLAKE2B 6f8138c350334a38c8e9ecc3421d2fe6af90fe4a687fb6e3ee9bc42d699376f92dcb1a8bfd80527946e970aae87902e80610c262f5f5d72f6f3dd2fdad29b2f9 SHA512 632abc3875fb537fcef9702685a07a2f9a55e540b3fb506f7168f2427e77c69d8fdc553090dc9060f8b63f32a46d7f05a39db922e773164e7d541b93f7351166
+EBUILD gentoo-functions-9999.ebuild 847 BLAKE2B bb3c020a1e5837b5897c1d6b10a7ea5486b44568189613d7fe2225811c09a088e9ac96e24fd4e907d6ff4b8b59c12156e95a6af73dd3b12b2cc3faa19cc44dc9 SHA512 c9a2cd71ba3a533867741a5b6dafa920f5e329b1bf475289e7412b0237552ab3fb10df7474005e25c2e7b7bf999afe19fb8c0083f85d7d76b99268af90f9e979
 MISC metadata.xml 626 BLAKE2B 1ce5e077ad0857f9a7bd975429c8964dde8a340ed31d345439f8e1d8769873e8f36a5ce3fd9d611ae67478dacf2f9b6451e6bd93219532e32dc9a5840e1c03b9 SHA512 c63b4d51b0cd8ae662f66870ca15a26300005fd683a4a16643aa553128b2ded5ee0542a8185ae09b989040f602f2f42f79e02574e44bb1ce63457b5c0d8b4dd2
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
index b790ea181493..4389b6a2075e 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index 94ee57ba1007..71d08995e04c 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 17bb40fff486..e6ab5d388e57 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -2,7 +2,7 @@ AUX grep-2.27-splice.patch 2056 BLAKE2B bcaa98b6c7b009194def6d0b3bba81bfcad6fab6
 DIST grep-2.27.tar.xz 1360388 BLAKE2B ed750fa7a6aea389c8f096acc9ac9cdebc9561c4b0cedfd5415ef033dd90076d5b9a42fa97c97207474b250ac0c4e4ed3c2ff216fe4462ac80baa6e47a2b90eb SHA512 d67f16cc5f931a455d5287badbaf080967da573d290430f440e578a563cff4f4c0c2668f60dbb8bc71eaed289f075957006c10c6827f0da1a49df49efd3f0781
 DIST grep-3.0.tar.xz 1375156 BLAKE2B 19f5441ed3fe5bb16d9d8327e76f0beb7eb837b727f6da99844dc9c74eb4def9eab857059c527e651758fa224a6f4079ec5939806645806f2db341ed0cb727e4 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58
 DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
-EBUILD grep-2.27-r1.ebuild 1402 BLAKE2B b5239ae60457d2e7a6f5938303196a333f419e439b428a141e9c290ad85ff28a7499c93cd1c4da05e85068b1644e33bfdfeea6ab3a4180f4258323dfeede8445 SHA512 4f36b61dcf73306d8d49fdb94168c6312d46f0995dbeec288c95da193276dcfce3dc85c10aa539a8e68abe052395012d0004de1ed643f19fc7641afe7eed6fab
-EBUILD grep-3.0.ebuild 1370 BLAKE2B 9da292e0f453304f1e4c949c4a1630202f9145824d5da171410166455425861e78870eb4592f236d16b344c0d89c73a0451b3771c62f044006257c762c539d26 SHA512 faaaf06fb22d6cde684084c78dbb75281784700f4b71d1748184e1af6439233e3464615f71dbe60a36a6c840281a4f3c416423abb07ac821f639228e7ff170ec
-EBUILD grep-3.1.ebuild 1383 BLAKE2B 302d4a7ca2ff461b809b346fd870d74a3b1c83948ca4cfe4c5beaa24169d33e4c6a5e026fb69a55a3ee3ca2cb821ef9bd07c2abe29611b2b00e07f566f7fb269 SHA512 181beb8c30a3bb7b0375682c6f68c081b5bd8b4eb41247dc860c59f0ebd07fb19e7efa6ec32e4a584af09ab777a4c72e1ecbcf92d38b15167a65c86ee47daec6
+EBUILD grep-2.27-r1.ebuild 1390 BLAKE2B 007ddfe84acb25c755f6ed9ff9b31f0273196f7186679b0f69713713207a3b7cb04ab166dbfeae42cfaa1cfeb0fcbc68486ee991f3e62ca2f718f979eafe692b SHA512 e92f35dce7ac3790c79a155d9c2b6323dfdabe63d6ba35c7b7207ac7fa00cd2f18316241dc9038ddb120db5a7b6472309266e6d5658dcd57cd1ec1428d7642a2
+EBUILD grep-3.0.ebuild 1358 BLAKE2B d3dd5e78bf8763f54b30e1447b61248673d0da1151458c6bcd0bfd4dcd4784e45aac6adb71b2cb26cab95762e0c7ec5d54c0ea85ea01df174bc2e0367ba3499e SHA512 3778bc0473f795069196d67b7b806f368994396454d0255c9d37a68b33e35e1b8415c8760373819aa59c12ab2533faf30fb27dad032da40007781ac05fe8cb09
+EBUILD grep-3.1.ebuild 1371 BLAKE2B df9979b53cad2ba812eaec36fbae856ed48334acfa683d138e14e286262d6f6a7fdc7bc304fcbfd489f3b2409a3f6381b5a3c4ea790cddd94a67d21dbdf3ae65 SHA512 47961de1dc3f2b28eacd3b695253a6b86ae73b8690f9eddc2b6b9792a4f1dc6f21d01cd919b4f1e106268a319d4a28edcfe3813b5fbccba242e3a110cd9079ec
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-2.27-r1.ebuild b/sys-apps/grep/grep-2.27-r1.ebuild
index 30072ddf8869..b2e9b3858350 100644
--- a/sys-apps/grep/grep-2.27-r1.ebuild
+++ b/sys-apps/grep/grep-2.27-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/grep/grep-3.0.ebuild b/sys-apps/grep/grep-3.0.ebuild
index 087dc86877e8..69114f07cfa0 100644
--- a/sys-apps/grep/grep-3.0.ebuild
+++ b/sys-apps/grep/grep-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/grep/grep-3.1.ebuild b/sys-apps/grep/grep-3.1.ebuild
index 165ffbce3706..6424c8ba9474 100644
--- a/sys-apps/grep/grep-3.1.ebuild
+++ b/sys-apps/grep/grep-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index bb7dc9a2d842..7a414ae2d270 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -4,6 +4,6 @@ AUX groff-1.22.3-parallel-mom.patch 378 BLAKE2B 46d38a599ec073bddd24a31562960ed8
 DIST groff-1.22.1-japanese.patch.bz2 52968 BLAKE2B 8064ff973c9507536c4e6edb6146c33c6c3a994598f0bb925bd23307a5ed407af9fe744990735d640ea69def4a6aed69ee87b7abbacca401c0059cf63e6eb147 SHA512 883d15dd2f1420a067d35737c45431f33f05bbe3c7e7edab0e119416117b5d096972d71452eae94bfd3df23aa7d6595fc6e65208bd4fba86815162bdf9af8bef
 DIST groff-1.22.2.tar.gz 4019913 BLAKE2B 904a2a6064cc70cf088224d6f608389eb56842142802636b94fef30f5e20b5c62db03087878d0e04e22c65754e0fd253aa7cfd23c1354057862f70e17db43366 SHA512 ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80
 DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6fb632c731bb6b26f76fee1857e7340d62a2239b360e049351e2e291c420db18a4f6bf8f50221bf249457872693 SHA512 c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
-EBUILD groff-1.22.2.ebuild 2840 BLAKE2B 6c1a9841de517d07f7bdf65f2a206f83f5a15497259a97f85f91bb4ec806cc59b3fe962a31ba54df1279864b467047536b862a0c6cabb3e9e0731601eee46ff6 SHA512 62eaa5c8efbe59d5d9d531910ed27c542c3ac9d40641c7ac22566cf8afecee914d8d24747cf7a72d04d2c333d9193c6bb5130662d6f5047e58cae2154857dd3c
-EBUILD groff-1.22.3.ebuild 2567 BLAKE2B db4c3bea253ec89ce840b923565f2d7a11c4686523dbea4701962ad60381a6495e42cedc706c25f675fde8ecbb35626f5815d89f30c45a0306d316958c2d53e6 SHA512 4e702cb2c82141cd8b953c569ec9d9dd7e9ac9132bd2d0b94e54bd97ba02419ff2c840a3ad3f0e76ec64baec2fd256edb3e619395754579567a85d59df326565
+EBUILD groff-1.22.2.ebuild 2828 BLAKE2B cfdd8875e9b270ce3b38bbf4d707d34757c6d7b529041c85c7758b559936c0e3080062cca3a8d3461a8ade109f2d2cc81b735de5a6711010c5574d304cbda935 SHA512 6a28fdd8b6cdf9aeb5054631916a667aead8e1102cbee07322bb36bd8a1deb393818ba16418fd30819ea3d4ff573351b726f347a71283023995dee5bd50fc05b
+EBUILD groff-1.22.3.ebuild 2555 BLAKE2B 28de6ef1b32b32b0faaf83120353f031186a1b9ffe941cb4fc5a7bd3f44458a699705896dfd6401021fe92f59e74fadbea13fec9af13bde621efb279874bbc22 SHA512 7461162a44ebb7a20b36805534311df707968452ae7f7094ccb616bee20b724a56613ae8a4025b6249c41dc969f8ea5f61c4c55a5543492bf93ef69508ec7aec
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.2.ebuild b/sys-apps/groff/groff-1.22.2.ebuild
index 379d1b58aff2..f8c0b15a7e2c 100644
--- a/sys-apps/groff/groff-1.22.2.ebuild
+++ b/sys-apps/groff/groff-1.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/groff/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples X l10n_ja"
 
 RDEPEND="
diff --git a/sys-apps/groff/groff-1.22.3.ebuild b/sys-apps/groff/groff-1.22.3.ebuild
index 5c88efb3500a..e9d0eeaf804e 100644
--- a/sys-apps/groff/groff-1.22.3.ebuild
+++ b/sys-apps/groff/groff-1.22.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/groff/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples X"
 
 RDEPEND="
diff --git a/sys-apps/hd-idle/Manifest b/sys-apps/hd-idle/Manifest
new file mode 100644
index 000000000000..8a078834f1d2
--- /dev/null
+++ b/sys-apps/hd-idle/Manifest
@@ -0,0 +1,5 @@
+AUX hd-idle-conf 1530 BLAKE2B a67f5d13a3a204c0e49e66c91c1503d1b9cb191d35def96f3e98ba6f3ce9094559eaaaf5cc974c2bb9f3017c9dfe99461fbf7ba8bf4e48935d30a2ea1c451c70 SHA512 d7f2b2324f3a248ddf0d205ed188aa6c886701bf18189c16284bb16143bda8e3707d30226c69b440058dd9eb4d6222ebe10df7e10c6bbb7c9fd442f88df216fe
+AUX hd-idle-init 296 BLAKE2B e4d2b4a7f7ff816198c7e9b1b5289ec3abb1a928d4bfe50175af2d25d4333a661ad7beaa0c6a6a6fc73775a2e61408e7b6ea2721239648d1e4142be09e07c9cd SHA512 aa26ad5f4d0e97197801ca3e791301a88bcf86f094b338f2c9f7b5000de7fbb91efb9cab8e3b142039b17d5dfb47bf07465a85d12a3ed3594a9d0f38e6e518f2
+DIST hd-idle-1.05.tgz 17951 BLAKE2B f99dd25d41f2ac4391025ff652827a8687db19df2dafe0f07eeeea700eaf0d67a255ee67017123510a3b89f3aba2f50de7204923d9ab85e80138f657f5e120d3 SHA512 8636d8bf2bce40f380afdea859aef7d142258071c62f87884a9af55c7c84310d89de712f56dff2bd825f0c7d79b04356df92e3012d8f683d8c41ebb23cd3920b
+EBUILD hd-idle-1.05.ebuild 564 BLAKE2B ce81e6345abc58ae06f99934760805ad5617d0cea1c8a3541432279cabe53100875c84baaf347adf8ee280b0cda1ed47279f0f3a011bd99b83bebbbf6f1ae531 SHA512 9e2f9fe60301428b8c99e16ab6ea8a2c5b68f36e52a1e0d854cfc383b4d52c2a0c9b841d58be7b3cfefa7ca13a58585485e31fce216bb128409555114aa2cd2f
+MISC metadata.xml 531 BLAKE2B ff7be843730e8fb8168e9ce1f738c1966f3d840e374e89e7e83d4600685b70eb1e08509b6d4e46b5f88bdc678bd22dcef524435c73cfa94f8ba2013967d35d90 SHA512 86911ee41d9874d57984d4d7d526a7a21913bccc3a3b3db52d1d2dee7b7d0cfcf11e1e8b7e3d547ee33036966dccf175a75699721e104401843382cf81b3ccd6
diff --git a/sys-apps/hd-idle/files/hd-idle-conf b/sys-apps/hd-idle/files/hd-idle-conf
new file mode 100644
index 000000000000..a0bd68336e2a
--- /dev/null
+++ b/sys-apps/hd-idle/files/hd-idle-conf
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# defaults file for hd-idle
+
+# hd-idle command line options
+# Options are:
+#  -a                      Set (partial) device name of disks for subsequent
+#                          idle-time parameters (-i). This parameter is optional
+#                          in the sense that there's a default entry for all
+#                          disks which are not named otherwise by using this
+#                          parameter.
+#  -i <idle_time>          Idle time in seconds.
+#  -l <logfile>            Name of logfile (written only after a disk has spun
+#                          up). Please note that this option might cause the
+#                          disk which holds the logfile to spin up just because
+#                          another disk had some activity. This option should
+#                          not be used on systems with more than one disk
+#                          except for tuning purposes. On single-disk systems,
+#                          this option should not cause any additional spinups.
+#
+# Options not exactly useful here:
+#  -t <disk>               Spin-down the specfified disk immediately and exit.
+#  -d                      Debug mode. This will prevent hd-idle from
+#                          becoming a daemon and print debugging info to
+#                          stdout/stderr
+#  -h                      Print usage information.
+
+#HD_IDLE_OPTS="-i 180 -l /var/log/hd-idle.log"
+
diff --git a/sys-apps/hd-idle/files/hd-idle-init b/sys-apps/hd-idle/files/hd-idle-init
new file mode 100644
index 000000000000..650d1934a437
--- /dev/null
+++ b/sys-apps/hd-idle/files/hd-idle-init
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Utility for spinning down hard disks after a period of idle time"
+
+command="/usr/sbin/hd-idle"
+command_args="${HD_IDLE_OPTS}"
+
+depend() {
+	after bootmisc
+}
diff --git a/sys-apps/hd-idle/hd-idle-1.05.ebuild b/sys-apps/hd-idle/hd-idle-1.05.ebuild
new file mode 100644
index 000000000000..4da29a661672
--- /dev/null
+++ b/sys-apps/hd-idle/hd-idle-1.05.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info
+
+DESCRIPTION="Utility for spinning down hard disks after a period of idle time"
+HOMEPAGE="http://hd-idle.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+
+CONFIG_CHECK="~PROC_FS"
+
+DOCS=( debian/changelog README )
+
+src_install() {
+	default_src_install
+	newinitd "${FILESDIR}"/hd-idle-init hd-idle
+	newconfd "${FILESDIR}"/hd-idle-conf hd-idle
+}
diff --git a/sys-apps/hd-idle/metadata.xml b/sys-apps/hd-idle/metadata.xml
new file mode 100644
index 000000000000..6a1a90c15b59
--- /dev/null
+++ b/sys-apps/hd-idle/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>o.freyermuth@googlemail.com</email>
+    <name>Oliver Freyermuth</name>
+    <description>Proxy-maintainer, assign bugs</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">hd-idle</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 132f58ab94b0..57755ee35a36 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,7 +2,7 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
 DIST help2man-1.46.6.tar.xz 171044 BLAKE2B 41e5edddac3d7e9683b92aef2c5b1fc57c3a3684e13e17a58707bb2f332b4290841a80bd47913f9466e9d2cb02fcacaa515b4f4bb7053993988d599baff6256d SHA512 55bea01b80baf318e4350ee505bf67da9a7e76b7a5cbd861d0fd6e3afe47b82d1de8f1079d0df2f4ea8ec176d6ca95d5c847d8b1c118cf96ab59b06567c1204c
 DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd
 DIST help2man-1.47.5.tar.xz 186044 BLAKE2B 288eeaab3781293209f4a6aeab570317e5ed9e2e76acf9a1669c767b627e3896936fba775e32f6016b7881b5747a51b5020c0ab4fc77030d1e27c15acab032f1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7
-EBUILD help2man-1.46.6.ebuild 961 BLAKE2B 10f138e3e25fb00117ba05f43970baabdcaa19ff2e581887278f41b5e6745dc4218f050e85281470e5de284e99c056409472bf9d0be3a557cbb58e8a35d4f6e2 SHA512 73e75acc9f8980950a9257e4e08c11f17cd67bf9965d9917e46c43ffe6ccc66aac1c0ae14df72f6b3f9e1fa4c7ca85d96ce260f76a6648f8fdc7907b70185881
-EBUILD help2man-1.47.4.ebuild 1097 BLAKE2B 59999bef241dc62498aadf9bb49dba91bc2171b673047d3a0c9d3576dab108cc2b592d654750f9f755c8fce3b5dee3447e41a502e965ef1fc4a55de8b6e88a6a SHA512 aeb8da2e473032d185a0ad1a8aef98e69650843ba50685528021a48c1f61a753d9aad9edea6a7f4aae1e53dc8588145ce66eed865486c10caba8b87bddf60cba
-EBUILD help2man-1.47.5.ebuild 1077 BLAKE2B 25c72181d5c9c10789f7cbd212d2e5169d1511e6d4c5e0dfefd07566263c57bbea86bd63091c823b07d724e63a64c4828f33973403f840210a33fd76db121de3 SHA512 8dc708b304aae08f8fad597a1e0537e3f709deda7ba7568c1acdfb3d37fe1c338376310160c16cb2a1e02661687f52ebb68fcc0987a418c57121e78376d2bcb0
+EBUILD help2man-1.46.6.ebuild 949 BLAKE2B c1bc74c78bfb78764a17b747e1f16a0d2abb8f78a1e35737f829212f127b0739f97f14dbdfc1dbe465034dd0f603868e35cd02b2fceb15c699946cc93fcbe5b4 SHA512 578767b49b696227dabe944055ceb1afc410382230de113a6a6b898f23a33fab50dc433b670329bd550b61ffd12955e44ea1a8729077d521bac43156f3cc31c9
+EBUILD help2man-1.47.4.ebuild 1085 BLAKE2B abe7a2655e5b9766d0d694251ba95b101c893028f425e55ea1c7ffd4272c81f465d3772d407bd22af62633925df1b6ef5f84d066ea091ed55431d8a27dac19bc SHA512 9f3da9258602e507c9ccc89ea45b5e26a4ec948fc9bffb43ddf084f91fd871364a64c5a3eae48ec603f2f838fae8051b9ba5ed819e69cadd101be1b2cc816da6
+EBUILD help2man-1.47.5.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.46.6.ebuild b/sys-apps/help2man/help2man-1.46.6.ebuild
index 323fc66a7f3a..3dd0890fd359 100644
--- a/sys-apps/help2man/help2man-1.46.6.ebuild
+++ b/sys-apps/help2man/help2man-1.46.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
index 2f979facc7d3..4af6edd8e5eb 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.5.ebuild b/sys-apps/help2man/help2man-1.47.5.ebuild
index 8a0794c2c588..dfceeba86d7d 100644
--- a/sys-apps/help2man/help2man-1.47.5.ebuild
+++ b/sys-apps/help2man/help2man-1.47.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index f433deda41c9..752b3e819bdb 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -2,6 +2,8 @@ AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.7.tar.gz 1694854 BLAKE2B a46940da8b71439d803342bb640353498a9ae2ac5516930bcb76042aba9981c50bbe7cd2bdd4feb18e1074bb180d578fb213c151a3d10593985c8b9601eee905 SHA512 26a0c805f2c49102eee44052814a6f7af67c74082489e70b058bd4350526a65aad1e1352e33b12e1afeae5e9e96fd2eb361fc6a112d38782dee58f95c3e2a13b
+DIST ipmiutil-3.0.8.tar.gz 1695826 BLAKE2B 1a20ecdab438c461519db6c9065aab28c07ac26303c3ace0339b1aceb53da73d05e975fa0b73f543a2d1e6ae908ec291d167b545430b85c9744b7a1252d8850a SHA512 9997dac5bc48231ec5333c86cff669bb6b321940497d9e7397763482960956dcf066f27ad2fdf33f4e42033ae2479d8f1ed37fb096b06f9075ad43709b94950d
 EBUILD ipmiutil-3.0.6.ebuild 1334 BLAKE2B 01ed4959fbefdc4487df779d5659a4b9d05893b536da58f1a828e435cf34a4938e2d05ae69568a728b0a91ab6380f040d6ad27b506ba8901f0d191f4ab7241c3 SHA512 a565e97bf6a0875a50033736a8172527f3a745e0ad45ff3d44eb985576e0d597585261bfbce779d552a6d0589ceadf6c453abcb9864e0ecac2867b9ceeacc18c
 EBUILD ipmiutil-3.0.7.ebuild 1336 BLAKE2B 591dc4e0d765c7234b76c0641d5f4f2ac0563bdbbcf461fcee1a4fe9f9239b308fe9f9b5bb0ac5c0730adc75c79b983c5d729ad02608baf31d28d057077d0aaa SHA512 4893b8f52d6e3f4502394f39ce7d622575d73c247315c8752aa6924972e98086e6332bf58c3c2797cbd71b5e1fdc2920ddfe2304401d9d822006343f2cc053be
+EBUILD ipmiutil-3.0.8.ebuild 1336 BLAKE2B a64dab4dff49eaa2f5e0bdf22476e88ce7ee3e780b72e5692247e53bf64b83718b3ac1d407fef7d9bfd93f169dcad4f6074bc5ecbf98ab3d128813be920b6e42 SHA512 63e1c498e25e2dd153d840c3a78f7d9b3d74f4a9ccaee1efd728dde314b7c866875133b89d67f39a5589c97c3b7652ab71647a15a30b463dc1f3a4e5fe86d31c
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.8.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.8.ebuild
new file mode 100644
index 000000000000..ffa3c3ea3fc2
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-3.0.8.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools systemd
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND=">=dev-libs/openssl-1:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8-flags.patch
+	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
+	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-systemd --enable-sha256
+}
+
+src_compile() {
+	# Ulgy workaround. Upstream is misusing the make system here
+	# and it doesn't even work.
+	# Please check on each bump if this workaround is still required.
+	pushd lib/lanplus &>/dev/null || die
+	emake || die "emake lanplus failed"
+	cp libipmi_lanplus.a .. || die
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
+	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
+
+	# Init scripts are only for Fedora
+	rm -r "${ED%/}"/etc/init.d || die 'remove initscripts failed'
+}
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 8f828aeae086..c1972053ed4e 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,10 +1,7 @@
-AUX kbd-1.15.5-loadkeys-parse.patch 2163 BLAKE2B dede07f128792190b91bdb3f1a6f6654b7cc2ed730a2227a0f9efde4e234a8d3f2a0b736868b7901b602ab3d1f506105f86ce64a7dcf4d14c64677f22dd283a2 SHA512 c338c5f5ee9054f3dfc62646f9e8a47a577fc55dbc4723a04f006afa6c966ac5b056b744c49d4bdfcd80d69e64af20b0f71cc9cfff23db9f017adb32bd6d9d7d
 AUX kbd-2.0.0-tests.patch 841 BLAKE2B 8162bc2521c6b6c470868ccabca87d9b5e2fa9417f8c4682bf9ff1cb67a0f4fefd403a1a9da99685403c8a280f9d0ed39c06768cd8cb436a88c42ec9ee813953 SHA512 b189b02c509f851bb871d75903dcbbef0177b39db923cf7b3bff4b3058868074975dd7c32bdafb54d50d3e4798ae8648a5b4e461078c86d025257e0502405f58
-DIST kbd-1.15.5.tar.gz 1730719 BLAKE2B 3a331237b235a0731abbfd6d2846bb1fd8e90ba6641559598d7c970fb6be12a0d57f293a7e1d79ac93d5bf4279513825e7ebbbad0c5d13afad5de349fa7b5100 SHA512 725853b0ecde6a38976e2bae5672b8de78bfc90d65a0762695964a6dab729c96be4af778fe7f0f195caae04d630b07a3d0d95c9c928d1a5609e223e47723e58c
 DIST kbd-2.0.3.tar.xz 1037036 BLAKE2B bbdc0ecd21e74c2d1074339f6d0e4caa69e0d3ee10a211c4ccd187906d7f513032df495c18e1c2667d1f2960a68db3d5aa995bdaafd3719fc35da5b769af7c11 SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f
 DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f
-EBUILD kbd-1.15.5-r1.ebuild 1040 BLAKE2B b0a2cd71950581a1a7bdcf75b4aa29787ef9b5e22cb5e482c885733be799b02b0d4433fd6a47a50a54efecfc0596d98a9cc30f42e67af9fd831414280f2a2039 SHA512 aea6c477a1527e5f38419c2356bf97e52bbfc9473919b182392d1a0bff96af9d0912b2cd132e4d015889a55e9b3a8613937b1d8e0d847b0d794596309ddc9ceb
-EBUILD kbd-2.0.3.ebuild 1360 BLAKE2B 3d285f5816f752701e123fc4441e9991dceb0d80eb9ee5f84f87f4cdb140306d23f7e7d40abca7df0ce372ec79ad55996e37b0fa6dc0bb67030fc5b8fde00cde SHA512 358c6679bea2e0270159fa07a4578f75c8356d1774e6d9f8def085f94225ac733a3e2e9a9e552485e15d763a0835256a9ea238893dd0280b4435f724cf23edba
-EBUILD kbd-2.0.4.ebuild 1351 BLAKE2B 8eac72198ebbb768d02a6a6e9ae50c6f2f37d1a2938f6f10c0cdea0d053431fabd5864ccc3383bb017aee0b0921e2d90fc4466d03e0ccdea2c3020266c61e05f SHA512 232570febfc48781aca0167cf1ef8294895cf6cf6b497b7a3cebe656685be9a921a4a3693f6f25c52ac714d99a18da2558aef3231de8f1161f3b0cd678359320
-EBUILD kbd-9999.ebuild 1412 BLAKE2B e0ed21760db01f1b81ed5b41225edb1fbc2b7638875fb663b7b4a70edc7a0f8dff5d02aaa289be61d2276035ec56589a4eebd2a3f9bdf2bdcf26a700b8a0020e SHA512 73150ecc4977e06aab03c867d97a9e78cfc749b1261fb099347072a4b07ff6a0fbdfa868c2262ed6d1c8ae2e994c137906aaf70e9a83919ba27025a600594fb7
+EBUILD kbd-2.0.3.ebuild 1362 BLAKE2B 2467e0d4c9d52258b9568b96df23f612bfc894b1861c16fff67d129b0d0345b2b7e6c3c0b9562678905cee44128758d8d6ca007b0f64cf64ce651aa918abeb01 SHA512 1d75087eaf1125646cd7650be96b45b9267751e0f4a278c635f760f30fd7c755f39ec49b7abb2c7fb5821a0357cbdd2ebf830042223f3e2d3da90e9a6fe7da65
+EBUILD kbd-2.0.4.ebuild 1351 BLAKE2B e7c4e92f4ba8c98107dabdf72b2bdc9bb09c3e34aca20e972f1268d75d2b3d48c6959a8b5757343013b8099f43756ef278bbe4135b64b3dc65d312275fcb46df SHA512 cf72dd4ec1e2a68793a4880136abcbde1e5a5e2683bb170c7ecd543b3a3714b5ebe2e069c380d6abf4f18b87e1a3bd1516550a741d445cc529c69e1e150f3e9d
+EBUILD kbd-9999.ebuild 1414 BLAKE2B 3b9e77383bdc18b4801eef6a7758f9eae122b3811dc924c06edad6c3826bf1d2ac68bc8231e7c159565a7fb00e64a026f6479502d9f1c7a791964eb144ecd0f0 SHA512 dbd5f7b4cedc8192b400aeca9f63dbed8d6f65cf075067dfe580ea8b77232e77ba0916e7b08d2cf71a12a78c9a52b697b55de485b1f7c8c8390d067da1a4585e
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch b/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch
deleted file mode 100644
index c78a22780840..000000000000
--- a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/447440
-
-From 7e06e56157e8431d02e1377cdc44230944203d88 Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Tue, 11 Dec 2012 14:24:44 +0400
-Subject: [PATCH] Fix regression in 16117ce6ab
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- src/loadkeys.analyze.l | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l
-index c18dcea..f817c78 100644
---- a/src/loadkeys.analyze.l
-+++ b/src/loadkeys.analyze.l
-@@ -307,8 +307,10 @@ To                      to|To|TO
- 				char *s = xstrndup(yytext+1, strlen(yytext)-2);
- 				/* use static pathname to store *s ? */
- 				open_include(s);
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 			}
- <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol}	{
- 				yyerror(_("expected filename between quotes"));
-@@ -323,7 +325,7 @@ To                      to|To|TO
- 			}
- {Eol}			{
- 				line_nr++;
--				if (state_ptr > 0) {
-+				while (state_ptr > 0) {
- 					yy_pop_state();
- 					state_ptr--;
- 				}
-@@ -428,8 +430,10 @@ To                      to|To|TO
- 			}
- <STR>\"			{
- 				*p = '\0';
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 				return(STRLITERAL);
- 			}
- .			{
---- a/src/loadkeys.analyze.c
-+++ b/src/loadkeys.analyze.c
-@@ -1359,8 +1359,10 @@ YY_RULE_SETUP
- 				char *s = xstrndup(yytext+1, strlen(yytext)-2);
- 				/* use static pathname to store *s ? */
- 				open_include(s);
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 			}
- 	YY_BREAK
- case 3:
-@@ -1393,7 +1395,7 @@ YY_RULE_SETUP
- #line 324 "loadkeys.analyze.l"
- {
- 				line_nr++;
--				if (state_ptr > 0) {
-+				while (state_ptr > 0) {
- 					yy_pop_state();
- 					state_ptr--;
- 				}
-@@ -1670,8 +1670,10 @@ YY_RULE_SETUP
- #line 429 "loadkeys.analyze.l"
- {
- 				*p = '\0';
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 				return(STRLITERAL);
- 			}
- 	YY_BREAK
--- 
-1.8.0.2
diff --git a/sys-apps/kbd/kbd-1.15.5-r1.ebuild b/sys-apps/kbd/kbd-1.15.5-r1.ebuild
deleted file mode 100644
index 7c4451fcab11..000000000000
--- a/sys-apps/kbd/kbd-1.15.5-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://freshmeat.net/projects/kbd/"
-SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls pam"
-
-RDEPEND="pam? ( virtual/pam )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	default
-	cd "${S}"
-
-	# broken file ... upstream git punted it
-	rm po/es.po
-
-	# Rename conflicting keymaps to have unique names, bug #293228
-	cd "${S}"/data/keymaps/i386
-	mv dvorak/no.map dvorak/no-dvorak.map
-	mv fgGIod/trf.map fgGIod/trf-fgGIod.map
-	mv olpc/es.map olpc/es-olpc.map
-	mv olpc/pt.map olpc/pt-olpc.map
-	mv qwerty/cz.map qwerty/cz-qwerty.map
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-loadkeys-parse.patch #447440
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable pam vlock)
-}
-
-src_install() {
-	default
-	dohtml doc/*.html
-}
diff --git a/sys-apps/kbd/kbd-2.0.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild
index 084b72febeda..3d02370de950 100644
--- a/sys-apps/kbd/kbd-2.0.3.ebuild
+++ b/sys-apps/kbd/kbd-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"
 	EGIT_BRANCH="master"
 else
-	SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
 	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild
index d1af17e39a9e..aa313ff81c3d 100644
--- a/sys-apps/kbd/kbd-2.0.4.ebuild
+++ b/sys-apps/kbd/kbd-2.0.4.ebuild
@@ -9,8 +9,8 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"
 	EGIT_BRANCH="master"
 else
-	SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 fi
 
 inherit eutils ${SCM}
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index df8a5adeb6c8..60f4d9718542 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
 	EGIT_BRANCH="master"
 else
-	SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 6d36dbb56471..2072eac569a1 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -14,7 +14,7 @@ DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B 7e7bbe11dc2792be3cab6318c12b6866bf
 DIST kexec-tools-2.0.4.tar.xz 271604 BLAKE2B f3359e91295b1c37bd94d3ea7889e948e0716781375f3387077962313615986947b0ac134023876b88cf92b5f0b5e1d3d5d97099ac799d0ba182b58f1bb4674c SHA512 2514f407d9150d2615dffc91a525fb28f159bef92b9543f9802e2618746b7d4c04137668ad8a8d8f0b75f68ed9057d09629ce736b6a061b5cf817b9d904f549e
 EBUILD kexec-tools-2.0.14.ebuild 1700 BLAKE2B 13e47f83fcb672fb4bbc33234f4e1b249171ce883a3515c3d046243c6981bf211652d37e3d4d952850abda95c130ebeb8b909270221658b148725aa20158aa99 SHA512 3fbfc404e7e83a7a74efa5d1ffdf18239ba0e342a0a8a53d1e18b5cc97dd3258d78448b1c5ba20c22559ad18a4488917f3a9feeb711a98fb5720b65cbf47053a
 EBUILD kexec-tools-2.0.15.ebuild 1709 BLAKE2B 659d4ca60e032a34c793e9a2076192b1e89d43576122940456343f5d5b662476fd3c31aac0fe4013facabfc3d02d0ed9e6dc82085c4cee3bf9be71921a99922f SHA512 2a55d5f45633ef05a2fd7bafe0da9052e7f994f698705eb1e3707ae0a0b916c16354e0ea4fd0a8b575217c773f1b7e79b3eedf5f2d5a475829afb49267621ef7
-EBUILD kexec-tools-2.0.16.ebuild 1709 BLAKE2B 659d4ca60e032a34c793e9a2076192b1e89d43576122940456343f5d5b662476fd3c31aac0fe4013facabfc3d02d0ed9e6dc82085c4cee3bf9be71921a99922f SHA512 2a55d5f45633ef05a2fd7bafe0da9052e7f994f698705eb1e3707ae0a0b916c16354e0ea4fd0a8b575217c773f1b7e79b3eedf5f2d5a475829afb49267621ef7
+EBUILD kexec-tools-2.0.16.ebuild 1763 BLAKE2B e04d8b08d79df40644ecc4f2940dd68de6e3201756d7282328fc362b8770e65961cc4f0fdc928ecd63d966132202043c3e1b1a89b655ae779d5d2e9a258ed4d2 SHA512 59e742b204778dbcdde57368509d0a76456dbad1495e3a977de6dbd59e9156447a8ade274bdc916ef62bdb615f3018b3a7f238ac9b1704b35d301599a4f06274
 EBUILD kexec-tools-2.0.4-r2.ebuild 1639 BLAKE2B ffd12a8db13e9075fb7992fdf1c59c52de7f1c950dd25366513db71f41856a977c55e88df61ea3581aefb61ce4ee10abc61cce4048a3bfd32fd3a8925bac26a8 SHA512 0b1fdd825a235646f6589e1043a7edb190d3aeab6ec4dc153235140995d5ee6b09c226eb159182a3cebfcd9ff9251e241ef12fc0313a6f092a8187e197a3ce82
-EBUILD kexec-tools-9999.ebuild 1752 BLAKE2B 42eb31ec7702b158b34894847b838296e1a73c2ad1170740747fb9f4f0605190a4ed898a63f684f9e89abebe440a5fadcef00797a0f66a958cd73c0e889b3669 SHA512 5ce109028b7a097a4039e8ad516deef61e2dfbf012164396d29f28ab013efc8e18c7bd8d90bc71eb18ddc95203ac4b1d8769a52d497d70db46681f05433ccce0
+EBUILD kexec-tools-9999.ebuild 1806 BLAKE2B c387eddd9fbc233349c2f05ed461b95d7ed96a3fdcce74f490d7aec4563a658106725201e992a49b40bb849f725bec81225edbf70285c88f3777f0b6c48e3dc9 SHA512 4912c208396fcbc1b76f4098e95cf970f6ae9c7b7b5621d5e08f7e2a04bfb60a481c27ea55aba02fa722c82ba127c6f2af201a2a475ed56a41703838f862e14f
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
index f3f01574c051..e691dd6cb127 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
-inherit libtool linux-info systemd
+inherit flag-o-matic libtool linux-info systemd
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
@@ -43,6 +43,7 @@ pkg_setup() {
 src_prepare() {
 	default
 	elibtoolize
+	filter-flags '-mindirect-branch=thunk*'
 }
 
 src_configure() {
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index 784f7a48e98b..89ef61b3896d 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
-inherit libtool linux-info systemd
+inherit flag-o-matic libtool linux-info systemd
 
 DESCRIPTION="Load another kernel from the currently executing Linux kernel"
 HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
@@ -46,6 +46,7 @@ src_prepare() {
 	else
 		elibtoolize
 	fi
+	filter-flags '-mindirect-branch=thunk*'
 }
 
 src_configure() {
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index f3fabf5020ea..b222ab694f85 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -9,5 +9,5 @@ DIST keyutils-1.5.10.tar.bz2 74190 BLAKE2B 8eeab02ef363b785152ac4576f1ce9792711f
 DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
 EBUILD keyutils-1.5.10.ebuild 2804 BLAKE2B f0f4d4b762592597e38e358c721e6625288ed5b443b37b459d4edf3f285f17d3776a1695d6a04cc24435df297de76b151d2d5ae4939472a88276d72a28db6ab6 SHA512 88cd81319c89a05b6f4f446f22833810e894802809610afc3066df35ad0d426349e964e739aaa34bdc4dab9368d5c728cb791af2486f38f0e966be9c49981323
 EBUILD keyutils-1.5.9-r1.ebuild 2293 BLAKE2B 6839a041eaafe1ea4cfd4706970694883ae01e1c8a39bd031a4368378ded11fce323e7c56e23025e1e523a81ee382bfdfa9ee3f5deddc156440c29d95d30d6d4 SHA512 fbcf7923a757dd2247cb0d1c644e865f03c31f09fa3c880264d1e0b5631e7b8f4611c6206286d8fbba616bba9c0f553d9c1c714744d94e454f309f64ed37980e
-EBUILD keyutils-1.5.9-r4.ebuild 2951 BLAKE2B 9900bae33b3e40f55f9a8a82de36398fc0933ed73ee6c2e6b3883469f383e8f5c49f0af6321dab0b6b983d903822748c690d768658b53ae44a47702ee9f63337 SHA512 ed51b0f3ef93d81f135b20d5c54ae867221c8da2a4246706c62af409a97a462bbb5c85f587c8951a654fb3a9134b4b77965b7a9b98a094f40db7e5ea6d1759cb
+EBUILD keyutils-1.5.9-r4.ebuild 2950 BLAKE2B bd0aae5077e5f2932a3f7424faf07a8e2f8e943b171c49f3735bee5f35b8741efee5d84756f85c5d4246e1c6b885d90142fa71a3e7b467021e1d18c827ce60fc SHA512 f678e927bb7d6dc199d94c0d821ba2dfd0cbe9c1ca2f43da2cad7fac8a49d9c783ee7a6d69d6b8d210de45dfffb953113078548b6aa47cfd17b750a823617574
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index 9a2e98de587c..3ca355e6df9d 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static static-libs test"
 
 RDEPEND=""
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 299d50a4136f..ca1ff7823a98 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -4,7 +4,7 @@ AUX lesspipe.sh 7797 BLAKE2B 1f66e2ef843e24de958dab1577f6f69f63b260369b9b625c1fd
 DIST less-487.tar.gz 318488 BLAKE2B 294ce992da39488fe5b50edf80d70179a45a449f5bcf8b93d6735be9f57db708734984f3a58654773155148c96037e2c445dac63abed1bc4ce655a4e472eca08 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a
 DIST less-520.tar.gz 337959 BLAKE2B e3008ec61b9095c7e0f696a662478e1aaeb9108dc26aa6437015e152bd74e8231d459c6369457c07f01b62869431c278585e4499b02285476bb70740003d6423 SHA512 67b51f4734a3b5a7871509110f87bbd6d1fa3068ad2d524adaa07b8917ff18a962b706cf5d55cf9800a39f9e583f21d0249837841d3c999babaaf5aa2bc4ff9d
 DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c556c69837f2018ef95efeea35acadcb9946bdde0272848d1bd8537c847e89591d980ceb2eda5a4c5963c4 SHA512 902e3ed86161c5a9eb3c08567b6b702371b5c88a85ef0b21beada223eaa47e0abf4d4d166a4a7a195caef67509fa683d07d0b6a40b529d703ee26aa8910c360a
-EBUILD less-487.ebuild 1440 BLAKE2B dded5fb96b09a7de894e13c701ecd479ad1b1569094500f3701aa58f58b8f2d46106b8d9c82ac16f9b9e648655f87d788de5a71d7d0f69d357184a656a1bec51 SHA512 b7a1ee3d58a3ad29c3ef7d50f5f37c9fea7bbd0bf15a157f323ced895daf6a1aa31544374428df2ebd4e3385897e6721cf530b0c21de688e3cd0dee9c7e2939c
-EBUILD less-520.ebuild 1404 BLAKE2B 3a09547f4565168340d4a2c33b84a1380af245d6e949fc4a88f7be0c6829c8470ad4d20a59682268adb32592deff948f8f86ec2f05f3e023708d2a8ba62c0f8c SHA512 10b5c220228b1adf41271de6d7ffc3b222ad2b417194b4f47f0d96f682b73dc0644c1a6ca6d8d8ca2e0712c05cf66d0fa19d0aa612e568d04c95cda763288ac5
-EBUILD less-529.ebuild 1392 BLAKE2B e553fd8175982f06c0b4aed598df102eb79f0c8d3317966d87c7e81118acdc5ac24077631c393f2086ca4f197483c515742e09caf84f57a3c858df1a0ca6c1ea SHA512 90b9cafcc6541bd5c47ffc742ddcf2a3bcd84e1e7ed979e0f25c5669c973b91647b5b7f08841f529c32de88469342d7cf15471b69c6108b7868e5c1aa908edb5
+EBUILD less-487.ebuild 1428 BLAKE2B f1f6d3a489e2d96d948717877e0f6c0cd57eb0fbb611cc8210f5718cfc68cd02b616195c626501cee03ea2b264089cbf88b26aa3cde47e9aee95c3bfc5a6c8c1 SHA512 0cf3e17c9deab9b81e3e3d17938d84e4008dbc5875955dc7d3aa5514f36556a5791d580a3b897cb36310dc6520ee383e432c47d38b1c2dcc1a4c0c065d39cfd6
+EBUILD less-520.ebuild 1392 BLAKE2B eb779b740776cbb763f13a1e9212c80f5935b03dcfc80d4ae94ffb5efb6499a191551de03b0265c2d6a7fceb2fb5a66f5222368f6c9baa603a1224d3297705e6 SHA512 8b5fd99e7b47fbdb9bb3e079079a33783d5b1ff915a057e6cf6d2f7b23016d4882fe3395778ba173638a2b07593291a5c6ea1840a7fa2e97bb52b96295a41078
+EBUILD less-529.ebuild 1380 BLAKE2B ff64439bb5f138b1d037b658881f5c68e25f37b1d6a85b453c9ae93f23c0bded7e066dd0585a81ce11ca847f14efa60d688b4fcc00f6e13bcbc0b19606d2098b SHA512 a7c281704a9bce283c1ca247f7b9a710879394fc35aaae5a662d16160fe04e56d100e601abf299923b5d29648b7a8493139be2e574a59e37eb4f188f44038212
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/less-487.ebuild b/sys-apps/less/less-487.ebuild
index 89f64cced928..b1552f3d1c11 100644
--- a/sys-apps/less/less-487.ebuild
+++ b/sys-apps/less/less-487.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-520.ebuild b/sys-apps/less/less-520.ebuild
index 643a59bc2b71..84d4144cc47f 100644
--- a/sys-apps/less/less-520.ebuild
+++ b/sys-apps/less/less-520.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-529.ebuild b/sys-apps/less/less-529.ebuild
index 78d7018ad037..aa3e5024689f 100644
--- a/sys-apps/less/less-529.ebuild
+++ b/sys-apps/less/less-529.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
index ab7903195a91..e0aaaf12c52f 100644
--- a/sys-apps/man/Manifest
+++ b/sys-apps/man/Manifest
@@ -13,6 +13,6 @@ AUX man-1.6g-echo-escape.patch 630 BLAKE2B add028d6c6bd11590b3f69f989aac874e6695
 AUX man-1.6g-fbsd.patch 366 BLAKE2B 882b3b3048e3dcb4f64f38e94d7603ae577038dce6636d6b2cbcb76a96b1c54427ddff737429e9e464fc50d0956cf9a9da86c0689bb6ebd8ae84d5d8f15727a6 SHA512 4019267584b1350b2c9da9aa1851a2e4e96f271265d189ecd677206be20dac67cd212b2887f844f43c10d96076a76613a12e53f3b29a185ec62ed4bff4c5a502
 AUX man-1.6g-xz.patch 1848 BLAKE2B 6a0855eda72386a0f48e715e9ba620b3473b3aa854c42fabd93bc02b7c9cd44fbd07f2608257fe953bdfa9b02e8fa35876d651ba5aab99937fe42325fcfb7b69 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man-1.6g-r1.ebuild 3703 BLAKE2B 0b14333d5030015180ab5f5f7ab4794dbbab01d678370481c01f650111901b86f1165a0a8479a51d4e677e3190723746ce97509543289c451429c0c32cf30dbd SHA512 2e6306b888a1c9be4f80f3b7e407cff67e05aae868fbff29c85793002aa209d5d38946c829b717969583017d5564747d7fbe61881640d06b86d9986fb798ec4d
-EBUILD man-1.6g.ebuild 3627 BLAKE2B 00f0dd960a3fa7e7c1949c22bb604bf2c57cfa2ac74a3cd990b94887175da090d5b66059760d97cfc51a6c78ce8f7371e5b4a59248a112d66dde07d3d37f14dc SHA512 ab6b2d67d6944d07a1291c3518c7ecd9d6c69e9d6ef10c5a18794e5808cb34871044ef9e5180e0c45171478076e90bb2fb0919c55fc0cb647112dbdd7554f9e8
+EBUILD man-1.6g-r1.ebuild 3691 BLAKE2B b1b70ac40645756896dbc07bf0e8b03d3ff890b832dd7c4247f67bc040449eac08e115a6c254d949cb17d19b66bddd7df6828e57f6510a3769d32e356aed9cb8 SHA512 345a60fb954eda80191fc035f8925bba5456adda0e8bed8ab210378bb3ad9011b93386c315a4633b080af21d053ec3c644c55d168797a85c38638b0ec96bd30a
+EBUILD man-1.6g.ebuild 3615 BLAKE2B a5b54b2f72e9051b61143984dbfd2f876b0529b6d7885ce9f1e546e0342a2378e165421d701a7b15644badcff56cb38dd9ad6267f772879b55c2360e062f5fb4 SHA512 bab63322d55c19177916326f8958a60ba1bc0c1310302cab38b4d92fad54b6e8c0d49d66594a572151c2b3c33402998388ffdeab4aaa48912557cd7d675965f3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
index eda4969dce0a..f1ed1ad03406 100644
--- a/sys-apps/man/man-1.6g-r1.ebuild
+++ b/sys-apps/man/man-1.6g-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,7 +11,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+lzma nls selinux"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/man/man-1.6g.ebuild b/sys-apps/man/man-1.6g.ebuild
index c72bff3d0c25..eedcdcab96b3 100644
--- a/sys-apps/man/man-1.6g.ebuild
+++ b/sys-apps/man/man-1.6g.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="2"
@@ -11,7 +11,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+lzma nls selinux"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest
index 032b6ad0aeb9..eccb97788f02 100644
--- a/sys-apps/man2html/Manifest
+++ b/sys-apps/man2html/Manifest
@@ -2,5 +2,5 @@ AUX man-1.6-cross-compile.patch 1743 BLAKE2B c94335e791ee5385f747f473ee6d4293524
 AUX man-1.6f-man2html-compression-2.patch 1725 BLAKE2B 314c3f3eccb90db6419b6069679457f24e3f5dbaa4ec466513f7a553886db1e25572a07ab8e74676df5bcb3d7a991ac58aa876d3abb780d5bdb415c4c8b1bfd3 SHA512 c7dc78f75876882e4f241ededd61ab1dad9292e2aa91d82c09e0e4a81c6a97d6537c8bb4b9154a17cb1db47d8716464b8146ccd487545e3f5c317482ad86e0bb
 AUX man-1.6g-compress.patch 343 BLAKE2B b91a16bd5f0a1a5e7a83cf225659c204b6b3fd8785251171bba6a229eb6e1f721c3ff8b04379d09fa39d44984757342139d053ecde821aa6ebcb9de914765af1 SHA512 eab984c95b75bbf29b65ff38029bbcfa870972fa2cff208da5d4d43c89dd0ceeb32a8faceb43836ced9ff50ee5765d2a5c4f1faf51f5507f0ea97b6ffcfe36c8
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man2html-1.6g.ebuild 1235 BLAKE2B 7abe58ce8e41918c2074d6e2b0841ca3552a01b8f4e1a7c68a19f806b3f598879e86bee8f4b4805928e471e6edeb0920781835c2f754af0fdac6d3edc5d6c252 SHA512 3c8c616e959c8b5b2d3ae801357f3122b7b50f22c4894df0074d418d9063226c9de9add2c0a575fd99ad59a548897cfef1380817ac0bd737ff8fb90d8203c1d6
+EBUILD man2html-1.6g.ebuild 1223 BLAKE2B f0dd20b17f61ecda6cfe472ebb8f76c6a6d6e57c808036df79a713ebfa5e4bbe3fcd106023036978e68933382f332fa53de34db80690c3c2dabb295fc810eda8 SHA512 6c738ae40dfe4d8fc4943c6aee69d21990848cfe3a89d5253a2f8f344c2639e9fd50cebbb5bb8e09c1c6b8a7a393d6f84ab31df4158c2267e5f2434ee1c5de33
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
index 605d4798b82a..6edff8090093 100644
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ b/sys-apps/man2html/man2html-1.6g.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="!sys-apps/man"
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index 3dd9ae83185e..50b2d1ae1d19 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,4 +1,4 @@
 DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
-EBUILD miscfiles-1.5-r3.ebuild 1855 BLAKE2B 7cad46bb8019cc919355f189acd39bb9ea5547ea69252232dd40881fb29fa55cb769b708b9348ba96dacc955dee9bde5e581fbb234ba22fe7245c354a53246d8 SHA512 9420610675ef25e9f05e3a598d79a9cc5fa12d0048af0b6978d202e393530cdb08ea6083ec3596a1cf235c435c2bd75a1fcd5bcaa5553e5bc2c08ea2b5a8ee41
+EBUILD miscfiles-1.5-r3.ebuild 1843 BLAKE2B 63149a345e6fdfc49282682f7313be56326770234df3a9907c0a7e130f3dab4e319e376f39b8b51aecc811313ab40aa9edea1db57532e23b880dbb64175ec560 SHA512 8b76e4977ba3f7d521c64baf53b44318d2ea7e0e5dbb2d5d126892db88c4001ea2799080c441e0b6aedfd5ee7503a1df05921d20113f900c2efeace4761d259f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index 32a2b8071329..60dc54811311 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
 
 LICENSE="GPL-2 unicode"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="minimal"
 
 # Collides with older versions/revisions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index ee8df8260e16..e3caec6fe5e6 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -3,8 +3,8 @@ AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6
 DIST openrc-0.28.tar.gz 224228 BLAKE2B 6f4693003aba77148bb5ed3516c1372e3ca67364a25d866fce418ba6a287a8cc0c33534cbe1edcdab32a869f8f8dc72819fb2dffc46375bca1e053fb3acf415b SHA512 a10c293bf4287bcc4ffb9c996cbc1294f979483ea9fb2efb0dd1becee193f49ff114530c078850e8c11cf2c0a812be2e74801352fdbfe313b90cd9af5b8ccf93
 DIST openrc-0.32.1.tar.gz 223808 BLAKE2B 4aadd36e371de56d5c2b59597ab04c1b004be73e370fa00560b77ab0587ba49fb4a49608aba4ad85ed7279eadf54e023961e25784e3078edeed4891956995f38 SHA512 9cd48978fcd69a6d80b474a06b56550cc8c538d6d7a1cb6f88b90087593eebb8185ee5192ec05be2f87f61de53dbe6ded9058aee7ae8f806bb0d7d7da70f62d8
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
-EBUILD openrc-0.28.ebuild 10123 BLAKE2B 93866eee80dc86f95a4e1f2a506832048720a01608c020108bc20a54936b857b1e5e5c1f88625c01afa482247677977c33c478ef3ef38519693b01e4d09694bc SHA512 f32502ebbd8e1a8e13044cd23d8b0e136eaf26e86001ae5f225640f085069c78921392a492614d3d1b734542bb0f99a9c781706158bdf5cd1ec91634d9f89e72
-EBUILD openrc-0.32.1.ebuild 10162 BLAKE2B 2948ad5e2f905ccd933861ce20c1ccf8dae1a51e3f11086015f250d217c76f70cc87d99ecd8fdfc1f525984f2337841dd0d3eb83fa5ff8c9369fa8f8f476b65c SHA512 8fbf8406cb499dfac756ba1c7eb040e61eeefc61d6d294967864651e10edb862d16fc81f81e4d012c7df248c651305866c3656f39d9c5ccc3d884c5bc3e77eb0
-EBUILD openrc-0.34.11.ebuild 10157 BLAKE2B c40f4e35c5be8609a061e763521eccea6c6a83f1b3e244157a9100387e68c8a9e300930b217aad9d9f9dd4e234485fd8258cd90d272255856840117a6aee8e8e SHA512 36f92e6cffb5effa0304c2117ae436649d9f2a885917a43c5b71d9c46f6327188d32ac70ef82c30d9d869727341c26ae0776b23b1bcb6e0de9515301c3d4f827
-EBUILD openrc-9999.ebuild 10276 BLAKE2B 40b25d0b8dd57aed46814ad381caa3df4a6b56f3f66c5271943eafd83d44f536d8fd654fa91efe00ce20a51c01f40c871cf0c94ceda41b81ddc89bf301dfd88e SHA512 370126a545dec34a34366badcd11ead8588c58f2e8414c85afb80c3544c94610caa7fb258118a7d2b2b4b289d8c67cd3d7119fd2ff4410613a1a1942be984506
+EBUILD openrc-0.28.ebuild 10111 BLAKE2B a089c38ecc6b602a7a9c94fafbab8d5afae7784578fc9be238fa47039bc218edfeb0935c96531a3b7c350ab11a9c43c60b26e818ee8fd85b5d367222d7118c8d SHA512 0327bd3daab7411065e80c3eef8dad7b14b963ddab254fbafa9e4d62953aa3c05fba8eb3b1b46dbe089add1e6fac95ad6722593982f56a7053dc8c10bc41dd94
+EBUILD openrc-0.32.1.ebuild 10150 BLAKE2B 18205fb38a46193f0134b00570ebc2b11cb873eedbe8a3aa638ebdaefddb3742f49e6e21b3dce100795174ed3cafb347566e7878a0cf1443fc20ddd739d1bb82 SHA512 7d4948ff6de5c2b9027e0f00cd43a9b578d3e5c924683ac8af8d4f817132370297cf1b9fd673bd1a5c473682d0030a2cf3e67ed1f5f89b120c9baee3d31bea58
+EBUILD openrc-0.34.11.ebuild 10145 BLAKE2B 44747f052ca54517722e08a8877b36bb12985ef703ccd7608faecc7b9f6727e6f9157aad51f563ccd1b9346945f56cb553e47fc77dd369c5e635a80da5f2a4dc SHA512 6f71094d74e5ea02e87427619a6b55883ef5de3e8d581447c9662a46f0c1b0a6f49cdb00737a7a0ed8ca9d3ce23418f1d0068832ab58a268398781d4aabccd15
+EBUILD openrc-9999.ebuild 10264 BLAKE2B 98b1cb59f635ef3d07d6faaa536964fb5408f613a7418d56425810a9adc579373ab4de9fba31a5239fedc83688aca7dc623d47b1e5ab163ec32152fa52e9fdae SHA512 7198628422361a508f83f3d5af9820296c75636725f39b708ce0f7af53153dc2fee75d781117869f3c5d9d3cba3ab20311d4cd89e0f50b869468cb88ee27e669
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.28.ebuild b/sys-apps/openrc/openrc-0.28.ebuild
index 85f67e95d70a..23e168975f36 100644
--- a/sys-apps/openrc/openrc-0.28.ebuild
+++ b/sys-apps/openrc/openrc-0.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.32.1.ebuild b/sys-apps/openrc/openrc-0.32.1.ebuild
index f54f45f0fd3f..87ce1832378a 100644
--- a/sys-apps/openrc/openrc-0.32.1.ebuild
+++ b/sys-apps/openrc/openrc-0.32.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.34.11.ebuild b/sys-apps/openrc/openrc-0.34.11.ebuild
index 129eefba81e6..83b1d927468a 100644
--- a/sys-apps/openrc/openrc-0.34.11.ebuild
+++ b/sys-apps/openrc/openrc-0.34.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 52c13e050884..dc6f3b58eabc 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 6336cdafe8f8..7e0417a2f62e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,12 +8,12 @@ DIST portage-2.3.20.tar.bz2 956633 BLAKE2B cf166a10522c5fab6b273674be4d7a673b961
 DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
-EBUILD portage-2.3.13.ebuild 8209 BLAKE2B 1004c283bb2b76242c9abc06664d4370867265c55ba9d62a1f477e769dce602018f6777891ea9f5674f0ae0f86ef52bd13ff5c353f48e7b711a418b2514af776 SHA512 9c190f7b21e34fd33e4d63185cefa011fdd9ced949c8310ea84e959db7834df725fa5d89de22fab958e6942589f44dae2e4b17047c060395ec69f0f7e9bf70b1
+EBUILD portage-2.3.13.ebuild 8197 BLAKE2B 0d4dc660b6169ea2c69c35ff9d44ce8ae3d25d18f15f529bca80140e20fae2905598cc2668c5b9fdc9bac042144bdbf7c8ccffb0e2680cff28ceef13123ac228 SHA512 1dea3d8545bdb72b4b0acbaf7377404be97630335ec1d22430e2a872c550a45abde63b03cc2105cac70627e0c5b5481448bcedfa0b7702e11ed79f29c2f4b3a2
 EBUILD portage-2.3.14.ebuild 8512 BLAKE2B e32c3ee1a5828cdbe53aad326c4dc6fbdcd57b7963b196ec4853bcb3cef900711ae50d0776200d8f9b74e7552022435dd7f260266c90e49b7bc0a4319a082673 SHA512 60ec8c92d5a46572945d90b9136f4b2f7e4fdf439beabe2d03563002075fa8cd3edc6fd101694795837de770e0545aa6083e2023f7a1483161f7355e8327215c
 EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
-EBUILD portage-2.3.19-r1.ebuild 8411 BLAKE2B 8fef5e60dda148ec909e41d7baec1d4fb62544cc76afbcdeab9e12a0ece109435b3c7c1c330126fdfab8efc3b15a931bb8a8a8a23edde8744ecef48109e04cdc SHA512 4f391d25e2388a39775def36576da9a69d04d6055a61723bd1ec4df75f507759c7060451697a20aeca0e64f7a0df2a2efc1c360ef7dbe6d405a12b58b1576451
+EBUILD portage-2.3.19-r1.ebuild 8410 BLAKE2B 1a3753ecea5555ac11a60b3ded94a75cdffb931a828927fd5d01cc0d544bccbaa35a5ac559001d02c4a8df7cdd61939bb60785cc7c0e518a30470b3a611c1829 SHA512 c91fd81e456c454614c23609776aa10de0a3e1f1114ef6bc03b15db6715109aab31e357e7ce7bb2b5f4873c1e64585ed060d52533874b745c430e1050e929bab
 EBUILD portage-2.3.20.ebuild 8417 BLAKE2B 9810d0113d505f17d79427d42b5d065b07495f1ec024bd853d7390ebb6226fc355aec038a7ade04fece97d21e68ad61fa063a238cc379173f5dd02cf4af42b38 SHA512 96e5a26737bfc3e10805fffd07ab7509d1888e96534b0df113fc00e18040671bfca8c0b7d12336d73e972f64862093af2f3b8cabcad2571234599450406be263
-EBUILD portage-2.3.6.ebuild 8650 BLAKE2B a455ad0c60356d9e27115f20ca098536fe8ba76ec67c44a6244a5cbf1f2aeb3d5700e332a462decd77a78285bf9d2200a41a8487a0c8465b78625f1a9dcfc2fa SHA512 19083847eb304f04dcf63f3362ae6bc6fdb14cdb0f40673841e5155f9c9dd9578734dc93a8b8721cca3546b42a45b838feafc7632b35e916280d55041e5fe1cb
-EBUILD portage-2.3.8.ebuild 8196 BLAKE2B cd4e96948e07dd8f9c055847a6638e95725b8fe49158ebcde1a22b7aac1d23f269160e62786c58e78d6ab0273a555dabc17ff0f2d4560d3b52f5c892f3e7e631 SHA512 6b829c279d6447c6041723e113d71157127bef8d103b9f89a8e0c24b225c599b579f4f6d60b5f207590c79854d035ddc2b4ccf596f8d8f1d9bb93ed2d4dfc49e
-EBUILD portage-9999.ebuild 7951 BLAKE2B a1b82cea5366a9ca1b6291a997328035a5c1d84591028227f3f96f84905ea73b0074ef3e6f90624272ed23b7783971b6425e9609b7e93d77774ec15f6cfa02e7 SHA512 e158702758f00977e4f8f59371ea8025f019cde06aeb2ceb29a2f90a52582fe6a09169ed71da58cf2946d6bd4c8e867aa204141d02bcec7628d24a54bf14365d
-MISC metadata.xml 1147 BLAKE2B 7a665b1c7a67e5f14020c1604c846840698a973885b6ab3d48c1ccd0782504a4ded3b12c81ccf3b17e539a593ee03a7ea23ec1656d65b0aceeeb59cf67e76408 SHA512 733193cbfc96da31252b5e4109d0b76f797e339c41eda2c1230cc1d5b0e75912177570ed0140218a7a7b85d9b8bc53e8e6931e88810269c499be87af40e6b86c
+EBUILD portage-2.3.6.ebuild 8638 BLAKE2B 0c50b63b0b233cc9d6d13e914659b0057c7f330e05906d4cd7ee19bef5ad2874749a403e48252e321a42e8109213cb7d6861aa7fffe9616447b2587f5d4a4810 SHA512 a80367ffbeaf00d887e0af09e239a8deb7d37818db50a6f3df59aa2c0ed7b8b6fe233f0520aebfdfad583694f1f6b7252d35d00d9bea2943251fd7b216bee602
+EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
+EBUILD portage-9999.ebuild 8252 BLAKE2B 1601f99de425e84989aecc1779a905d48cd4561948a9dffbc071920a7a5a6e56f466fb49b046e0b152efac7073a6aea0b9de0d091fbbad6aeb804074e68fb691 SHA512 5768f872f6024328c926ffa80a755a15cbb93b5cca4c406890964ee289944b53d90e636d6d13712ea4eb71eda0db36a0797814866938432f46f3d06cf32e5040
+MISC metadata.xml 1324 BLAKE2B 3e403e150d3487708ac804f718aee00557810f2ea1c6f3dfa4c37666f3c5ca710b61c00f9fc01404fb88dd96dd675fc81c90021305c3e903dc0ab4f540f206df SHA512 052fc2dd654dbfd81f62646de4c6b6dc38d09637afc2e80e7c98eb20b65acf2e985466700bc8068145f08746cc7ccdb0555c5a549969fb8177b6bd83310669a9
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index c66241962c33..8d4801007bc4 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -20,6 +20,10 @@
         This should only be temporarily disabled for some bootstrapping
         operations.  Cross-compilation is not supported.
     </flag>
+    <flag name="rsync-verify">
+        Enable full-tree cryptographic verification of Gentoo repository
+        rsync checkouts using <pkg>app-portage/gemato</pkg>.
+    </flag>
     <flag name="xattr">Preserve extended attributes (filesystem-stored metadata)
         when installing files. Usually only required for hardened systems.
     </flag>
diff --git a/sys-apps/portage/portage-2.3.13.ebuild b/sys-apps/portage/portage-2.3.13.ebuild
index fc6f962041e2..a3f111a6dd3b 100644
--- a/sys-apps/portage/portage-2.3.13.ebuild
+++ b/sys-apps/portage/portage-2.3.13.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.19-r1.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
index 04830e6a4b2e..9dd63fc62c97 100644
--- a/sys-apps/portage/portage-2.3.19-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.19-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 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.6.ebuild b/sys-apps/portage/portage-2.3.6.ebuild
index e4a7c2f62378..6ed032813336 100644
--- a/sys-apps/portage/portage-2.3.6.ebuild
+++ b/sys-apps/portage/portage-2.3.6.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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.8.ebuild b/sys-apps/portage/portage-2.3.8.ebuild
index b67871e7a197..58eeac56b574 100644
--- a/sys-apps/portage/portage-2.3.8.ebuild
+++ b/sys-apps/portage/portage-2.3.8.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 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 SLOT="0"
 IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 69caf4064227..98724289cf76 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
+IUSE="build doc epydoc +ipc +native-extensions +rsync-verify selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
@@ -33,6 +33,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 # for now, don't pull in xattr deps for other kernels.
 # For whirlpool hash, require python[ssl] (bug #425046).
 # For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
 RDEPEND="
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
@@ -48,6 +50,10 @@ RDEPEND="
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
 	>=app-misc/pax-utils-0.1.17
+	rsync-verify? (
+		>=app-portage/gemato-10
+		app-crypt/gentoo-keys
+	)
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
@@ -104,6 +110,11 @@ python_prepare_all() {
 			|| die "failed to append to make.globals"
 	fi
 
+	if ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
 	if [[ -n ${EPREFIX} ]] ; then
 		einfo "Setting portage.const.EPREFIX ..."
 		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index a238b991c5ef..15d8b31079ab 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -5,7 +5,7 @@ AUX sandbox-2.10-memory-corruption.patch 1515 BLAKE2B 2c0ef4ca1899efd2d525aafb26
 AUX sandbox-2.11-symlinkat-renameat.patch 3418 BLAKE2B 4864dd5794abbf70d70f30949ee39921f9dafea4445f4cd49d88a5bef9b19769ed0c2c37a7a30fd6e241c159b21aad4f6465ef159ec1652cbb0d4a65e6531869 SHA512 cbefae8aa9c289db0bfe7b2429f64aa4c437be0e269eaa657eb3b22a3086db1fca45a624cb181978b4157f0cb9b475b4ece2eb9337285bf8bede709ad4431c52
 DIST sandbox-2.10.tar.xz 417068 BLAKE2B 78bb5b29b520d41c582e7f7cb444ce580f9f8f05ce80795986ff8e1f84f9320e21fda0c5ae092cce8e5a3dc1c0efa48e1ce69c21107e541d2c569e6369ccb5b0 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
-EBUILD sandbox-2.10-r3.ebuild 2168 BLAKE2B fa95588691da010c6239e89a52e55f5d7b006276e269527319ef2628956f35719af65d918ef046fa6feb2a8c7d28531e49c218e0b26c3c41209138e114300fd6 SHA512 13daa106179f4203616524cda931e3c79ecc510c09a0991f8165eedbb2e612569f648881183679941a75ee280757fcb3e6176cb61a0c2f2096573ac7a3110dfc
-EBUILD sandbox-2.10-r4.ebuild 2234 BLAKE2B 7ec0b2ea8c5aa220f6a99bbc7135b5f9ed0d57c119988d37a75a02b8f0797a68c6dd0ad1b90c45a69e7e941b61cbdac0705c53194dfdc61704155e0ae8675b2e SHA512 08ca4e1d4923b663483d097541020725a8f50efc36779519ccf591d4cedc55017d368b474da5b7d010cf15cc3814b5d31937e742b02a327bbb18b225d92cf78d
-EBUILD sandbox-2.12.ebuild 1943 BLAKE2B 3d9e79d200e30c891a3c81c2a779046da49e57f943b500ace6eaf820c536c39643f0c5fbdad3fa9e369f829225ca8aa955470c787f2213f763e1c737e3a09b8f SHA512 238eb5b34c72430fa4854eb70e7ec3ffbc74e387c61ba85c6a05799533951edb0c6b12f6ffa6a877ed887e5e2f5da71d621a204d77ad348a99da83280f677866
+EBUILD sandbox-2.10-r3.ebuild 2156 BLAKE2B fecdef4a769d481e6479c82c341626de5d935f031b33df13eaae51b2041e0793a9854f3726ae90586586dc7d0008230f7ba6ae948c48d145d5c05bd4fd0aa027 SHA512 a08a00c80dcd282c929078c7c3afed16a7c30d710294e1621cf2ca1841f01f95872dd92a0bea1f3d7bb8850c05cffcefb68c58a36c9b1eac1960d1d4b04e3224
+EBUILD sandbox-2.10-r4.ebuild 2222 BLAKE2B 5f0e178bafb0f28dcf320452c64317d9883afee0a68c09190e3293bd857b5ee816e4656b01b5e1dbb7664802d0e13a05540ab4ba61a04c93788dc1d21cee7c95 SHA512 dca8808e22888f5542a1233604a84b0a5e9952bf6e8792b24a716e477b254fc90ac1efc0cff0eccf832f10026cf56341011e227001c70f0d5eaab36c89b5a23c
+EBUILD sandbox-2.12.ebuild 1931 BLAKE2B cd545ca0c7b3b1ca9672e7a0562da03b9eae5dbef36cec7d1eb59d452785ee8f11c03b9a25a9cfe0862a923d5b0f9349c15c6076f9735062cb43505607520b73 SHA512 2a5ec9b1aacfb63d3c4d8f64d067091ab28c7f54ca295a857d14d11d1f4e410c5475cf32d0801cfa1362ce57045da0ef5e1f413a1b56dc541c5efe56d4410d7c
 MISC metadata.xml 266 BLAKE2B f0eff1a6b8face69d2c99fb4c4426deb3800b2b0c4a009ead29e2c5898fa0650e8003c85961ba4c3303053ae9dd6707619d25d03a40e0919ff779c2f1f893316 SHA512 8dcc34d3a08407d6807bc5e30b23c6696dbfc63c19106338780d4e2a61be360e17faeb54af993c962f347ada5d24cb314de866506484b04de4c619d6a88787e3
diff --git a/sys-apps/sandbox/sandbox-2.10-r3.ebuild b/sys-apps/sandbox/sandbox-2.10-r3.ebuild
index 0f7d12d168dd..49e172c3c527 100644
--- a/sys-apps/sandbox/sandbox-2.10-r3.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 #
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.10-r4.ebuild b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
index 4a5c4ddd52c6..29827378c0c2 100644
--- a/sys-apps/sandbox/sandbox-2.10-r4.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.12.ebuild b/sys-apps/sandbox/sandbox-2.12.ebuild
index 78b591933e89..2a7f3ce6beb3 100644
--- a/sys-apps/sandbox/sandbox-2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-2.12.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 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 2c59e6789c48..751130fefb8a 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -5,7 +5,7 @@ AUX sed-4.3-dfa-segv-3.patch 5334 BLAKE2B 44cd0e56f46e0ed458ff6e157f28bf2e0f7c5a
 DIST sed-4.2.2.tar.bz2 1059414 BLAKE2B aebe0bf90e9f9c7907e0baa8a4d1a16e59a5893198382fb9fe08ed66cab670921c0db1e07f668bf3db8dfe9bb4f0e68b9c34fd7228c70df24be043d3e7ea8d92 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573
 DIST sed-4.3.tar.xz 1167168 BLAKE2B 5751943cb64d03afef727deba3bee7027a1611b4729c7b33497c28513b61571d1c323f1d07ab68a252a9e45d0f7c95e303f05443310dcae74bedab28160b079d SHA512 4d76a099cf7115763b79b45be5c96338750baa47e34c36075f714e022614397aa9240099d6d009e69aa4d06b6cfc14dcc0f8313442a1465f448b36fb6874a26d
 DIST sed-4.4.tar.xz 1181664 BLAKE2B 03804c209c2108cca4aa991cd68065fd03a15c726b6daf5212603835b5c046c63e9c2e4c28f76dfe165128f060db5b992c981f314d2fe230f30521545d00a468 SHA512 4e1b0a7403913f1e25047eb2292a0a9b3488b15b4463ce2803e05eaecbc2da19f477a18e6a70c992461c38ced90774415091aa2d8ce85cb74e391610d9eedb70
-EBUILD sed-4.2.2.ebuild 1715 BLAKE2B f67af0d6dd4f4b0044ed543b8159c8a2d72776ec8033dd143fbdda07fdbd861c7677b22edf2dc01c3dd7478a5e1351ea8aec6ac04a1182303daba994b822f3a8 SHA512 512f3f3da20b8f556c9d0c65ff31a8c6876bc22f4075831dd3d147d856232f8e97293119dceec902534bc74478e4aaa83bcc0ef87737ae98879beb18bfdb82ae
-EBUILD sed-4.3-r1.ebuild 1483 BLAKE2B ccdaeeddab2c9bd6c5c5d846f03586ccf856a6baddd0cc62e322bfcb1a39713576fedf174d5c33f1079f71c5860124c014fdbc44668296273682dda5d958ee24 SHA512 df98241b8a8f1b1d2bd2ba906fba4ae23d8fd3d1a4a09a129fde9f07261f306863078d27daee401085500be15536b1d87724c75d8382bae7673d6b3d0f75b7a5
-EBUILD sed-4.4.ebuild 1443 BLAKE2B e2fa57152f458ac40576331fd81f9951ad8be58bd29424018b6ad61c6fa2b53cbc719cefa090bf2de63248395f58bef9b05db8e25ce7b043b994e80adbca3a9c SHA512 cb5a40e371063b96b4c7f514944f8da502a83a526718214bf296a62dc1870def5074a1d91d99679011c2ea1619b85b3049f5ee6c77cf1ab911101b7c839bcfaa
+EBUILD sed-4.2.2.ebuild 1703 BLAKE2B 85de6422cc772bb64b6e4ccb3a8e385e21314f266497a30753dd37f193c95ec57f0522488efb6e956f582e34182ae38d13492b01cb3fe90d504b6af4f9ca25ef SHA512 83ad39ac0a61046ddfb1ceab35284b776bf1bac6656f7a60d3e4eee8070febec7bdbfe23138934d0b6fb688142759825deab25eb6988c90b54d269b553cc274b
+EBUILD sed-4.3-r1.ebuild 1471 BLAKE2B ccfc211be1e8ee18580188db738958243c13af4ed0a42934386628a086199bb48ce1edac9609098545f599b352824fd3bbf1e984fbc02dc928676150f010c16f SHA512 a87cb60ca1b125d0db8b90f5cd4211b5f90316cee63d5543ab92e089a1c6782599d66b9fcea2431523126a1e7b1b1230d14c396fdf2c6de1d2704aacee08ea87
+EBUILD sed-4.4.ebuild 1431 BLAKE2B 81ed2cb028f7f748629b8c9b73a2786ed48bab298e92ad10c1b6b5436ac03d515766ad1223d1cff4c8157714abaca950e9791b498fbb1558dbbe8f2609039dda SHA512 d1cc340b33bb8d5ac0565136d9dabf84d261f5496fb0ebfe27f69a2d37dc8031bedb43e610e744d7bd60de0b672afde5e6fbdb4862d556ed960de832f2f7b94a
 MISC metadata.xml 323 BLAKE2B 746a8514f64aa6bc67931a9a1c61ff47dd0ff984dee09d04afd44557986ef1fe87ebdbd844fb68bdbe8158ec16b6d776b6f9956f2b5611495af5aa3d56c8bff5 SHA512 ec3a11f7aafded3d4b5e12680358f39dbeb166f96af51eae8dafb21b186024ddb9b5b9ba36bde626be01b1938fd6f4bbcb58f0f8bad2208a84d44eaadc95652e
diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild
index 7c91a5f00047..ad3f071a2b1b 100644
--- a/sys-apps/sed/sed-4.2.2.ebuild
+++ b/sys-apps/sed/sed-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/sed/sed-4.3-r1.ebuild b/sys-apps/sed/sed-4.3-r1.ebuild
index fcc30b064a0e..b0be9297fb01 100644
--- a/sys-apps/sed/sed-4.3-r1.ebuild
+++ b/sys-apps/sed/sed-4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/sed/sed-4.4.ebuild b/sys-apps/sed/sed-4.4.ebuild
index fcae761846b0..aa52e2921cdc 100644
--- a/sys-apps/sed/sed-4.4.ebuild
+++ b/sys-apps/sed/sed-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index fd01755e923c..930ed5e9fbe3 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -18,6 +18,6 @@ DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c
 EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 888f373f78f0ba49f91d765b1568c7b6183b2cc2794f66cff37bf1518aa926148ce67411077de68f45419021bd4b99610e4552b1bd7d84dd2a3ce594f109be43 SHA512 ba05ead8530e2276ebde9b5dbd76d129ddb80224cb551114bcd0d55a079597a77b57f1bf58be520b74bbbb419a0c4020cf1039897a6d01c1e839fe3b67cac711
 EBUILD systemd-235-r1.ebuild 13515 BLAKE2B a7c8172b85924b970a5104681c0577c447408d88232eff3dd9a607b86f18952db48ed358c7451834291214432424694e5873719a1e0d2d30888d9747d3313729 SHA512 263a14227163ca7d4a993f150e864a67e7ccc1092f808a14493206f418780453e4e74df3b700cb746060d46da5025d8c0db5841404db09afc13e2e968bdf93b8
 EBUILD systemd-236-r4.ebuild 12986 BLAKE2B 1ea709672003c2864317751b1471e088bdc5cd430a9449fe28b43840d9af53ecbcfa4877bf6a9eb0f96999a5d4ad4c47c7b548d5125196c5df5984a187868210 SHA512 ed6f3ff41b7266f6010e73d67659619836f17f8900e64d0172b335631ae75e2d357af0ceeb5424c691a546e9b4cf5f68ff2a01d766fa73319567a0b628752ac7
-EBUILD systemd-236-r5.ebuild 12986 BLAKE2B fa47e67d13fc1dff405f14d9d55aee478b9cf6efb1ade36481101929f476421703fe75633479a497be7dfe69fa2021df5c73268c5f2adb3c6a17c3fcde708db2 SHA512 9715f12f3a27756a07acafbf8001353c23c6194a5c53d77b52e0a845ccef8d4452e283a79f1e6224dfbd87bf233d96e1e1ad780551c091895b83a4d5691ceaef
+EBUILD systemd-236-r5.ebuild 12985 BLAKE2B 13b9cd1545d7aec213f84c165031b1c07a60b16723ebe7c9ef06b8cb066c0542e4b36faee64b48f29cc12521ca3d145ed8c04c4dbe3299935aa099824acd9eb7 SHA512 4acc78aab5f23c0b620b62551135329940a89dbc4c1cc105fd4cec49c1f25240ef399d568e243a512e6b6fe3e212bfdc4df76eaad20a953089987f3ed8a898e5
 EBUILD systemd-9999.ebuild 12925 BLAKE2B 44e3ff49e2898a8199a1d106de12ceb286e33dd810e6fcc046ededd7f720914c355f5ab189af07b2f8d4951dbee1ad4046fc403fc357d6d6a13c67e67045d39c SHA512 f31ee8d40c1eb31af6a06b58a79c3121b824eec0ecbc0e8d3a37ba77368d8c3f3b96e2167f1d7ca10690c1963da37a0394989c0d4ba8789e39666924c5188b26
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild
index 6066595bd1b7..961530f55ed2 100644
--- a/sys-apps/systemd/systemd-236-r5.ebuild
+++ b/sys-apps/systemd/systemd-236-r5.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~floppym/dist/${P}-patches-2.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 6451da8c54d7..ddf41eadfe79 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -3,5 +3,5 @@ AUX tcp-wrappers-7.6-headers.patch 5419 BLAKE2B 6d56c77652299c8bc75ea76ff42c5dfa
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
 DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4cdae40c2900b098a1e40fc1b74e6b5565183fc71e25306e8dd0863fb16e6e52a6c471aeccb73c0b7c42d6f3f98aa9f95274583fb SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.22-r1.ebuild 2646 BLAKE2B 703b3f92cee57f3d2387b9d99ee347476518e05420afe587880bbabd97e23e3f7c3bc5b3854a8f104af848d95e81cc1454e16a3d8452f1b91822f049289b9a92 SHA512 14ee69fbebc7a93bd887284f110d67c33f6079f91d41b9e6b9819f758d73875c300c557378dc1f3146b736730de843be7cc94b7534bf34f5ad81bd23ef828115
+EBUILD tcp-wrappers-7.6.22-r1.ebuild 2634 BLAKE2B b9477640f2ba6f1d5de3638d8782e4f96e11e7154093cc0ff0a7427cb85fd6669da6d3b7a3312979e015499704323ab37dae545085c4f058c28b38ba5e7bb94b SHA512 f3a8f5608e4841841eb3d9df67c5fb4a7c1fef9de59c403d561e2336c2f8e4d84312ba7b3d995e9943f9440c670906afc89ec9e4f39ff37edc20f3301c058352
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
index 041dd954900f..44faddac36fa 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
 
 LICENSE="tcp_wrappers_license"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="ipv6 netgroups static-libs"
 
 RDEPEND="
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 61c6dc00c30f..743a53f7b6cc 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -2,8 +2,8 @@ DIST texinfo-6.1.tar.xz 4520376 BLAKE2B 3b96ed431288815df4261fcd0266f2be01d27f82
 DIST texinfo-6.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79aa2654dbb527ef10db54b8417af9e1a58a270683956624049c2fb624b29bc2f22763c79bab9858cdcf5e2edce SHA512 ef6c5878d9db497d7963bd9138418b30c39a5605c215bf2f4e8f1f083d93c3c99f8c459aa675f7da3b78da6189cb6bbf3cf19a2ee1d52e569de2f6ce82762bf4
 DIST texinfo-6.4.tar.xz 4497624 BLAKE2B 7081131868f748036c39812674fa8b962144fe6b96445ff72b5a88537a9a044c45cab33bfaf0d3169c0bfb6ce60832c908e49a04ef04d7631ba345002b552f92 SHA512 628e7fb64c4cb6d4ec879d5593e3660dbbbf41915c7aec68b6af209a1c496bee8a3879a69e4e047c3bee0cb476540ffd6ebdef5ec7b712edd191a82ce9ac4006
 DIST texinfo-6.5.tar.xz 4503048 BLAKE2B 9e194115a252500fe6048614a96c6992b6fbf9f3557265d8bdda143e10f781769ca5e97ded2d330da7c0ae1581bfdebbf2dbde736689412980b098ea935d9580 SHA512 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc
-EBUILD texinfo-6.1.ebuild 1118 BLAKE2B f6148426cb8877028d7dd1922f7c3156f3b9d2f670c8b83b2ffda6bd09f04795d7849f07c53f3ef8988f40a3397d7a9b2d25a1dce675c7f1b2488b33bb6a415a SHA512 6b73e1c59c2e8ef12fa8ca5699a5c5b1da4e5f97b969fd5e31c292625a60fa09c7f9301a172a919e127de9287fcd2279a672459c0009d21f6686b2a1152e8165
-EBUILD texinfo-6.3.ebuild 1118 BLAKE2B a0798af983fa3aed9601049874198e02b2609af1e2a41b8765e096d35092f9f3f094da6cbf7490b6ee1301a831e8fa1cd597c47c925108223db99ea283fba790 SHA512 88823b265dcb5ad8dbc185372922338cdb4e8492054c14ac7c4e1f811bdf2a24077f698e2afa0727cee85552326885359d32d56c55bee8b4f085922d7a7983b8
-EBUILD texinfo-6.4.ebuild 1131 BLAKE2B f9fc3ecfe6cfc405fe223a0fb43436df46b3250e89c63fc680446fab541d2adb52c1ac2636b2deed927d1f9e99eb6340b1ed79292aaf370711a07d5ee26fe381 SHA512 b6500793ac06068572006959e5a029b06fe12099b2a6b34fbef76f6ca5f555400595e422ad8b4526ffd07d9c44d1e6ca8702e84b5c470fc9818d0a4abf92b7ad
-EBUILD texinfo-6.5.ebuild 1165 BLAKE2B 56fb3747536631391c7db2e9ea855c02575f8952be4f6bdf6999545814758e88ef8e0e65672df09dd971e2174ed5b093fe5b32b1584462081b3387c97bd04027 SHA512 e60fda9767bd71c97c52bebef5f4fc44369aef6b5a06a75f5368d74ad930976d45191770a56d282376442e5188fa9baea605df4ec90d4b8e21fdf0f12569c57e
+EBUILD texinfo-6.1.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2
+EBUILD texinfo-6.3.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2
+EBUILD texinfo-6.4.ebuild 1119 BLAKE2B 3758a080518277f705a6d0726015e5bb9f1dfbeb3b14bdbee668f3641acbf564d4d41f147a827011f358b0e739307e2fd5994af3fa93210275e717e588c82382 SHA512 3cb88782ece710208c38b506fdb028e03390c6f798fc13a9bf8e2891d0096a8bea5531d16e454b091a6227b905ffc73f4d2d786f3fdef7102637fa3023de7530
+EBUILD texinfo-6.5.ebuild 1153 BLAKE2B 114c01323863fee4903830e36f798eff5b525f3d67618100cfd713ec06a3edc79d960e66ee2973622f5d11d711f7a35880185c103d8da40fa79fc21f8a17f3ad SHA512 5968b0d3b4455e5c6b32c52540c17014566a1a2f7604dcb26ecf01736da6077a002dbf3b17a5170909c26c4ac46ca48b85f07c66fe415c85fcc07d52d4adf991
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/texinfo/texinfo-6.1.ebuild b/sys-apps/texinfo/texinfo-6.1.ebuild
index 3eb60888fe80..eb694ae0d9c9 100644
--- a/sys-apps/texinfo/texinfo-6.1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: if your package uses the texi2dvi utility, it must depend on the
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/texinfo/texinfo-6.3.ebuild b/sys-apps/texinfo/texinfo-6.3.ebuild
index 2528cc03f8a6..eb694ae0d9c9 100644
--- a/sys-apps/texinfo/texinfo-6.3.ebuild
+++ b/sys-apps/texinfo/texinfo-6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: if your package uses the texi2dvi utility, it must depend on the
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/texinfo/texinfo-6.4.ebuild b/sys-apps/texinfo/texinfo-6.4.ebuild
index 596690fa8512..f710186e798c 100644
--- a/sys-apps/texinfo/texinfo-6.4.ebuild
+++ b/sys-apps/texinfo/texinfo-6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: if your package uses the texi2dvi utility, it must depend on the
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/texinfo/texinfo-6.5.ebuild b/sys-apps/texinfo/texinfo-6.5.ebuild
index 6e53f592081e..e7a4ae266926 100644
--- a/sys-apps/texinfo/texinfo-6.5.ebuild
+++ b/sys-apps/texinfo/texinfo-6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: if your package uses the texi2dvi utility, it must depend on the
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/tuxonice-userui/Manifest b/sys-apps/tuxonice-userui/Manifest
deleted file mode 100644
index 39a9765515bd..000000000000
--- a/sys-apps/tuxonice-userui/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX tuxonice-userui-1.1-freetype-2.5.patch 947 BLAKE2B 3518851962800934a1183b45246ddd03768eaf47a53b0a0fb44a08e3ed9b75f7d5239098aff7ecde501e25cc9b3e86117386ee8df359c5c65a94c8dd36f57d28 SHA512 7dd5541e61b9093ed4d89de6905ab59f865e305a0f263a92c5978200556e891d6c868fd9eea0737f74274da253c54e118686e8d881ec1af916ad0750d84fd3bc
-DIST tuxonice-userui-1.1.tar 3317760 BLAKE2B 1890802442b84f00bfdad92b8853ec041e1ec04c178ea078564245834e9d8f38b4a416b4285cb33b005a98e240a4277a06da9e47c1f21b1fad6ed699769a996c SHA512 b837e3302437ccfcc7e984817c52576be27c774681abc18b1ad34990eab342b5d11ec13cf48cfef07f419f425c111715843c7ca427a1d4778bd48f1d7352684a
-DIST tuxonice-userui_1.1-2~exp1.debian.tar.gz 7628 BLAKE2B c3bec47cc1c85f440db79274a180c82610a88893973aba89b7e5628c89ebdfe2057df8d257b9aa0f72334124f585480054017007416b7fe19eea529d2cb3c6e7 SHA512 5aebc331452f9d8cac3f3d4db9fcc04c5a68759df2236a70a9fdf5c6e03da27170b1db71031b4b9bb2939c4e5a98c4755d26b6ebf0f81362a71c35e77b688f0b
-EBUILD tuxonice-userui-1.1-r2.ebuild 1484 BLAKE2B a57bb9064ac2798fd0ed22add66697f6a8272cc48adb3a971023aadbc70648f7d9f0c5c968c455934534537261744c106159f6338d322c7c61b0af75207ebc81 SHA512 4ee5a911ac596c1d3b5df7f584105777c5783fc0249fb97bc3080d951938e2021fa4092a28a348999466745a0e49dda9b596797b6677ac776ebf598ba99bf04a
-MISC metadata.xml 567 BLAKE2B 180e1ed20fea8a2ac504eb4638418393eb7dcd43cbca7b95f7ab15ece5057b5ba633968e61c749ced0674f47a596b9e615dcf7090aed1072beb0909440753836 SHA512 748cfd9c9d26b2e92401c08c3d025b93e541a24bceca9bd89a7970b8cd7d2e61966759159a2fcd39a4916a37c740f0953e8adc50a2acdd6523ce91eb14dc1bd0
diff --git a/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch
deleted file mode 100644
index f86f99a650fd..000000000000
--- a/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From ed1b73cf2f073f39200be79c633deb292cb8d4af Mon Sep 17 00:00:00 2001
-From: Damjan Georgievski <gdamjan@gmail.com>
-Date: Mon, 6 Jan 2014 03:06:18 +0100
-Subject: [PATCH] fix #includes for recent freetype versions
-
----
- fbsplash/ttf.c | 3 +--
- fbsplash/ttf.h | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/fbsplash/ttf.c b/fbsplash/ttf.c
-index 384f400..1dd841c 100644
---- a/fbsplash/ttf.c
-+++ b/fbsplash/ttf.c
-@@ -27,8 +27,7 @@
- #include <assert.h>
- 
- #include <ft2build.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
-+#include FT_FREETYPE_H
- 
- #include "splash.h"
- 
-diff --git a/fbsplash/ttf.h b/fbsplash/ttf.h
-index 034bb9e..6a4da9d 100644
---- a/fbsplash/ttf.h
-+++ b/fbsplash/ttf.h
-@@ -1,8 +1,7 @@
- #ifndef _TTF_H
- #define _TTF_H
- #include <ft2build.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
-+#include FT_FREETYPE_H
- 
- #define CACHED_METRICS  0x10
- #define CACHED_BITMAP   0x01
diff --git a/sys-apps/tuxonice-userui/metadata.xml b/sys-apps/tuxonice-userui/metadata.xml
deleted file mode 100644
index 8dcef3c457fd..000000000000
--- a/sys-apps/tuxonice-userui/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>arfrever.fta@gmail.com</email>
-		<name>Arfrever Frehtes Taifersar Arahesis</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="fbsplash">Add support for framebuffer splash</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">NigelCunningham/Tuxonice-Userui</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
deleted file mode 100644
index 3de4429bd9e1..000000000000
--- a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="User Interface for TuxOnIce"
-HOMEPAGE="http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/Tuxonice-Userui"
-SRC_URI="http://tuxonice.net/files/${P}.tar.gz -> ${P}.tar
-	mirror://debian/pool/main/t/${PN}/${PN}_${PV}-2~exp1.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="fbsplash"
-
-DEPEND="fbsplash? (
-		media-libs/freetype:2=
-		media-libs/libmng:0=
-		media-libs/libpng:0=
-		virtual/jpeg:0=
-	)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	local d=${WORKDIR}/debian/patches
-	EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
-	epatch "${FILESDIR}"/${P}-freetype-2.5.patch
-	sed -i -e 's/make/$(MAKE)/' Makefile || die
-	sed -i -e 's/ -O3//' Makefile fbsplash/Makefile usplash/Makefile || die
-}
-
-src_compile() {
-	# Package contain binaries
-	emake clean
-
-	use fbsplash && export USE_FBSPLASH=1
-	emake CC="$(tc-getCC)" tuxoniceui
-}
-
-src_install() {
-	into /
-	dosbin tuxoniceui
-	dodoc AUTHORS ChangeLog KERNEL_API README TODO USERUI_API
-}
-
-pkg_postinst() {
-	if use fbsplash; then
-		einfo
-		elog "You must create a symlink from /etc/splash/tuxonice"
-		elog "to the theme you want tuxonice to use, e.g.:"
-		elog
-		elog "  # ln -sfn /etc/splash/emergence /etc/splash/tuxonice"
-	fi
-	einfo
-	einfo "Please see /usr/share/doc/${PF}/README.* for further"
-	einfo "instructions."
-	einfo
-}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 99eec9ab989c..130e3ac92ebc 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,8 +6,8 @@ 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
-EBUILD util-linux-2.30.2.ebuild 6106 BLAKE2B 2b0dabe265e415e43075cb9fec515e53a1cf1983f9d94141438bad1f1d9cd3c0f577a16a4b8ff6179909edae701ee82e75ecf6ab06799085919154bed8f92fdc SHA512 7a868edc01fd28a910ceea86b47c1c9d663bedb04809ac7cd70b19c80af3f97b53699fa3959fb99a318fe745afecc5862ea590538e9e2bd1555259427bc81e52
-EBUILD util-linux-2.31-r1.ebuild 6218 BLAKE2B a99d0b36f48496caeab7d478664748f6844c9f696c66520927f7b38177daacb88daaa67830216aabc34dc7ef93ab0cf309acb4ce4353dbdec060491ce5c139bf SHA512 7a10a69393c664a9467c254e44b0049352ab4a3c7f72f8187177a415a91a7bf0ed8956a026f41afd5fb94e58d5b236876b25e00e8d2e6f447ef741acdf466a49
-EBUILD util-linux-2.31.1.ebuild 6141 BLAKE2B 6011ed4d8ea642b73ae1d0e30508ba18d53034b0b3c5f5a331836a37a2fb258bdac304a86cab175fb4dff26a0a9df4e888ffcd4b2d8bd44704ed6b8fd052d7e6 SHA512 e2d0d9eed1874f7bd50b467433a6e8eb4c49d9f60d5401dcdf16e6e8154756cc04a2ad6f34b8cd5086f9ffcd83ed71e063195a7d62faaf3032036adfd9d7e438
-EBUILD util-linux-9999.ebuild 6108 BLAKE2B 92ce3d425be12339dac8fb7296dc2e51dc2acff2d7d3382f4103b6c971a72c346564a2be31dcea835b58d5c88292cae7b2b8944408ab96d5d39d3db872e43ec7 SHA512 206118f5ff5fa5d4b21c734965c967d5eaf5934d57aef26199196b9800b89f252d17d676d4c288846062a0ff3d5304edeeda005f7dd62a427b3f6e19bc049da1
+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-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.30.2.ebuild b/sys-apps/util-linux/util-linux-2.30.2.ebuild
index d3177f65d394..80a2fbe2a628 100644
--- a/sys-apps/util-linux/util-linux-2.30.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.30.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -52,7 +52,6 @@ RDEPEND+="
 	!sys-process/schedutils
 	!sys-apps/setarch
 	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	!<app-shells/bash-completion-2.3-r2
diff --git a/sys-apps/util-linux/util-linux-2.31-r1.ebuild b/sys-apps/util-linux/util-linux-2.31-r1.ebuild
index bcacb9a8876f..963e973d2779 100644
--- a/sys-apps/util-linux/util-linux-2.31-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,6 @@ RDEPEND+="
 	!sys-process/schedutils
 	!sys-apps/setarch
 	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	!<app-shells/bash-completion-2.7-r1
diff --git a/sys-apps/util-linux/util-linux-2.31.1.ebuild b/sys-apps/util-linux/util-linux-2.31.1.ebuild
index e9e1cbcda502..ee5b6efcc218 100644
--- a/sys-apps/util-linux/util-linux-2.31.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.31.1.ebuild
@@ -53,7 +53,6 @@ RDEPEND+="
 	!sys-process/schedutils
 	!sys-apps/setarch
 	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	!<app-shells/bash-completion-2.7-r1
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 6c4f284810f7..998ce9b3d728 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,6 @@ RDEPEND+="
 	!sys-process/schedutils
 	!sys-apps/setarch
 	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
 	!<app-shells/bash-completion-2.7-r1"
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index 14fbeefdbae9..d24cbfbc2b05 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -7,6 +7,6 @@ AUX xinetd.confd 90 BLAKE2B 4fd6cce15cffc6de5b59e83646cafbf52f61b203292ac4ecbbae
 AUX xinetd.rc6 721 BLAKE2B d273c33bdd9df218f8dfdc765c0e3a788baaee0fbb3fd20e63be0f1d4b587b19550107c1818015077ce9fa194fca7180748b39089c51101f10ceeb6066a323af SHA512 bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604
 AUX xinetd.service 192 BLAKE2B e13bdc35380da5805e9fbec1a1d05f7290bc154b1adea73b23468f909eea22c411be11cf3e2c68757e8120db73ccc8ca624c808c6563859a29c095b94c10bbf9 SHA512 c2b324c1116485996c414543f67c5dae89de3f82ac85634009da4dc04ea720a860626f6bb0ece0bb734616c6e4394e31ca00a71f697dc93e38b05fbad06dedc0
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
-EBUILD xinetd-2.3.15-r2.ebuild 1501 BLAKE2B d8ed4a6eedd43ecd2e0c5e41dd3ec9d4ab4b893e2f3351fab30f7ad567fee2d4b6d8be5c9c1466711635b06c741de58dc40d8a47c14341b93a1f739613895802 SHA512 17ca405368e7cb718666a1bd1dfee814e0551c83dafbdc29d62b1d843459e8a322d119751363f38ae1dbc95cb4539964a5bba37d02ad71af79f808b96c4901e7
-EBUILD xinetd-2.3.15-r3.ebuild 1596 BLAKE2B fe521dceb32ddf84b2de3b68ed095daed9f9d414fb728f68a23504b28d1b52550d255ed1b68351e749f27a7c9c5782db0b7e1833a051508f98d21ebe6712b817 SHA512 9c4ba8e6a4536d170850070c99db88e3267099b9c467a569e65576a80177335f75a7d0c1b257a89cf63c97c26361065c8c266c6a47c687efed95a22b072589d2
+EBUILD xinetd-2.3.15-r2.ebuild 1489 BLAKE2B 0e692389c82eaa474c6068ef4b2f3d96713dc3c9c5174c2265632f3904d6021ba966c23d0a7f7eaa7ce50ae026bf954407764351c62298556311f705949cbbf9 SHA512 552f0cda59c778ba6a576df1cba0befa55ff909e1f9fdec092dc7ea666be8371e956f2d34fdc1364c997db9eed36dd9c38ebcc10db0d5dfe8fbd576ed8ea0d8d
+EBUILD xinetd-2.3.15-r3.ebuild 1584 BLAKE2B b50232148f4aa38bd767715958ee7da6b0a4a8b35f17138f9422ad98546edb301aa87e1182b6feef7fb491fbd84c5072ec5ca4df213065f78b098820d47d921b SHA512 2ed014285abf51f3c745f94c0dda14233f0ca7e971c94fa4bcffc8ecf83265f9bc48388639e7caaebc2b24bbb07b87e4e672c30ea3bea209ef38258718a11c85
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
index a80e21a8c194..bd8c5d93a129 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="perl rpc tcpd"
 
 DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
index b22a4d57198e..31d86d05cec9 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="perl rpc tcpd"
 
 DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )