gentoo resync : 13.03.2018

32 files changed, 419 insertions, 242 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f4bd208c60a5..6292680b3c82 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 3d992ef554c1..752a1885ed6e 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -22,6 +22,6 @@ DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e345
 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 9294 BLAKE2B 565b3e0c14828b11523e5e785a1cdaae508b3089a90337f6c2385386020eee20c18b537182c1fd0c44d06066b0c2185d8b65b4a32e505e238c66fec4db0f0ac0 SHA512 5f99b124d2589068e962c65a51a2f8aa625fd358856019b76f91c6c3bd5c724489a911164e6edcbb141b3c8885c7da4e8672219fb3bdde0aa1fc14ae05df5147
+EBUILD busybox-1.28.0.ebuild 9293 BLAKE2B 619fd35a6388d82930505fba9b7dbd9788b088ee287274676342f9e36d9f6e283cc56447a278dc0730d2b230a76445a7f4624f9d03c7bae95321fbe9f5695333 SHA512 77c30310b1716c1b7eb1246c134aecdd50cc5516f9b9f83b987c7246f82e06e4fa9e8f168cc5f70750af7125c6b562d7776b48d43d0f636b52cc895a0b0f51d0
 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.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild
index e8a511253d15..01ebd90c83c0 100644
--- a/sys-apps/busybox/busybox-1.28.0.ebuild
+++ b/sys-apps/busybox/busybox-1.28.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 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"
+	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
diff --git a/sys-apps/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index f825784ac46b..7ebe9e2e373a 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1,3 +1,5 @@
 DIST colorized-logs-2.1.tar.gz 9997 BLAKE2B 5d6b184102c63dad8526f1feebbd84531a18f2505801f4bedd62cbdfa04bd919b750b60b37fec5449b1a5b98500dcbd7feec7b7155ca0c779d31ea66d8305e28 SHA512 d03919cfa19d6df41bcb9dd6bb29e436febff4ed4d50d9ce83910bfdb61acbf323ecd4dcf9eaa9cfae3bb338b2107f1d156815848b8da8b470c50651650dfee1
+DIST colorized-logs-2.3.tar.gz 10270 BLAKE2B 3b0798139e96512b4d544c76bcbece81283a77dd7deca8b018bb0ddd9535eb80f88b8f10a9a9a20c4f98b67cc97bb7673de80339bcc45c5ce46b8e8dfe53a53b SHA512 a15616f0548c0a91dc290fb6a9c6a8376b66ebc2fb1af21e1caed03c95c07b8536d8a81dd9e199d54ffa5339d0f777cabe75e23fda3bb916575fe3ac31bf51f9
 EBUILD colorized-logs-2.1.ebuild 654 BLAKE2B 071c425ab82afe77eeebbf396dc06febd8b517a700ed4f33ac84ca4489fee4c09f714763c4e4a46edc410330df9b8854a9039218da8c9ef606402e00311804bb SHA512 0b3354ed6b78821856f61b70a9925ee2bb27972a44c1982bd287a539674bfb7c961016f3d8685a751b4a1e3262c7fb2753bc0faa3ed143eb335d7e9abb5b8bc3
+EBUILD colorized-logs-2.3.ebuild 656 BLAKE2B 09244339e9bde0e720701a761edd70dcd3b4dd3a87c57c306b67fe16e2acad1ba41c4db9e8c02c989fcd7735157c1e7a3e795db9af5d1b59ea2571668623e6a8 SHA512 85028ef83188725dbe0a17ef341ca9f4f550453b5cd4aa92560b1e8cd9e36dc311e0cbe58846ec73bdb1b2f2bffe7cd542a0b120b0054360c9ce071025c7c28a
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/colorized-logs/colorized-logs-2.3.ebuild b/sys-apps/colorized-logs/colorized-logs-2.3.ebuild
new file mode 100644
index 000000000000..bee91bfd74a9
--- /dev/null
+++ b/sys-apps/colorized-logs/colorized-logs-2.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Tools for logs with ANSI color"
+HOMEPAGE="https://github.com/kilobyte/colorized-logs/"
+SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake-utils_src_install
+	# Rename to not collide with dev-python/ansi2html
+	mv "${ED}/usr/bin/ansi2html" "${ED}/usr/bin/cl-ansi2html" || die
+	mv "${ED}/usr/share/man/man1/ansi2html.1" "${ED}/usr/share/man/man1/cl-ansi2html.1" || die
+}
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 03553ecbe7d5..6b6cdcabb3eb 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,8 +1,5 @@
-AUX 2.12-supported-smbios-version.patch 1349 BLAKE2B 7c0ef55ab1b70945f81ad75cc536dce214e2f8f191e1568055eeedead87d0a7d4d7297fda17796665718a29651f2b4c36c6a06258db865d70ea685c433c97745 SHA512 797c05cf5a5982559b44c83080702f93046f4d9f3ffdde033f7817b6b9c0d221ffa7be311c65ead3e5cb1e836636a68c979f9472e60c83794c3f063f8f40a5f8
-DIST dmidecode-2.12.tar.bz2 55191 BLAKE2B b04ecd5d53a17a5bab60754651ddc90030f3d99c851a747983c92adf0faeec7f92ac9864d6c54cf70893aaf90db8567f60b8d0c6d9f8d4330b6981fe7f26d278 SHA512 15d5a6dca04de48267f969f6866079915964a8a3abad083b1720a4425723f9c100770d05c0d475df9609c5b54741f231a587761d1beb1ae6de4b2836d60724c4
 DIST dmidecode-3.0.tar.xz 58704 BLAKE2B d3e22cfeb8f537f461523d0927cc5eb5fa6214638b8a9360b2159abff1b9f60c8a8753f24a233a77f7c413b074f9a910f000a0c49ca166ebf3297ad673e9fb93 SHA512 fa31190e43ae7a0b61f6313b45f5eba3ab66390accd587129419e48fca931b631cbb331d6893cf0c1bfca94c86ff8c557215166e0881dee93b3af10a86878eb1
 DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9
-EBUILD dmidecode-2.12-r1.ebuild 1198 BLAKE2B 089188a9d4ab38d2dbb5b9a5e47199c6fd3a692cd4628edbd898525448f9a175d5f07cddbca31347e7259b9df7d5f3eafc44084de61f49f9a9525e4060338b4f SHA512 568afe3fddf1a9c65a9ad7b2281a5a9fad174eed6e2d41a080a7b4e9e1622584324778ba4d6709b4e27f12048bf38f096c64bd55d006815c124785819fdfdaee
 EBUILD dmidecode-3.0.ebuild 1145 BLAKE2B 874b9c55f5e927b9418f7f4a41bdc97cb8c461c279007052a3bb7f182154ad7602508eb406a20c5d4e786662e1aec90d01536f5727cf0bc4e172e9f441729433 SHA512 9a361a7c80194bb062b6d27d9f06bb8446298da1a09801223ab9c52e275904486945229a769b8441c51eb0c508982ee6eae116027ef3b22bded76b9f132edada
 EBUILD dmidecode-3.1.ebuild 1150 BLAKE2B ddcc97a6acecf8eb5ba62ab5793c2e409ee89da09218c2b1d5c7bb9ac52265b4cf7971e8e01d78b28004105e63a3c4c4d99a7aa27d5df93a93e27801b4edf1c7 SHA512 650cfd9c23c74bd350ee72d08ce53c9179d93b215539e5f1d168a944ef090eb32281e9448b90a93d2892d286320cf2f0cbee6bf8b7eae4ee3520bcbd3fce563a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild b/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild
deleted file mode 100644
index 03c53646f8f5..000000000000
--- a/sys-apps/dmidecode/dmidecode-2.12-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="http://www.nongnu.org/dmidecode/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-supported-smbios-version.patch"
-	sed -i \
-		-e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^docdir/s:dmidecode:${PF}:" \
-		-e '/^PROGRAMS !=/d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		einfo "dmidecode needs root privileges to read /dev/xsvc"
-		einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
-		einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
-		einfo "information without requiring root privileges."
-	fi
-}
diff --git a/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch b/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch
deleted file mode 100644
index 84feaca79ef9..000000000000
--- a/sys-apps/dmidecode/files/2.12-supported-smbios-version.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -uNr dmidecode-2.12.ORIG/dmidecode.c dmidecode-2.12/dmidecode.c
---- dmidecode-2.12.ORIG/dmidecode.c	2014-05-06 14:24:27.703057950 +0100
-+++ dmidecode-2.12/dmidecode.c	2014-05-06 14:24:43.136058719 +0100
-@@ -69,7 +69,7 @@
- #define out_of_spec "<OUT OF SPEC>"
- static const char *bad_index = "<BAD INDEX>";
- 
--#define SUPPORTED_SMBIOS_VER 0x0207
-+#define SUPPORTED_SMBIOS_VER 0x0208
- 
- /*
-  * Type-independant Stuff
-@@ -712,7 +712,6 @@
- 		{ 0x3D, "Opteron 6200" },
- 		{ 0x3E, "Opteron 4200" },
- 		{ 0x3F, "FX" },
--
- 		{ 0x40, "MIPS" },
- 		{ 0x41, "MIPS R4000" },
- 		{ 0x42, "MIPS R4200" },
-@@ -729,7 +728,6 @@
- 		{ 0x4D, "Opteron 6300" },
- 		{ 0x4E, "Opteron 3300" },
- 		{ 0x4F, "FirePro" },
--
- 		{ 0x50, "SPARC" },
- 		{ 0x51, "SuperSPARC" },
- 		{ 0x52, "MicroSPARC II" },
-@@ -1176,7 +1174,7 @@
- 		"Socket LGA1356-3" /* 0x2C */
- 	};
- 
--	if (code >= 0x01 && code <= 0x2A)
-+	if (code >= 0x01 && code <= 0x2C)
- 		return upgrade[code - 0x01];
- 	return out_of_spec;
- }
-@@ -2236,7 +2234,7 @@
- 	if (code == 0)
- 		printf(" Unknown");
- 	else
--		printf(" %.3f V", (float)(i16)code / 1000);
-+		printf(" %.3f V", (float)code / 1000);
- }
- 
- static const char *dmi_memory_device_form_factor(u8 code)
-@@ -2338,7 +2336,7 @@
- 	{
- 		int i;
- 
--		for (i = 1; i <= 14; i++)
-+		for (i = 1; i <= 15; i++)
- 			if (code & (1 << i))
- 				printf(" %s", detail[i - 1]);
- 	}
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index f8c2d1a065e3..a00991f6ad23 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -7,7 +7,7 @@ AUX keyutils-1.5.9-endian-check-2.patch 1131 BLAKE2B a5fd6fd62dd94be2bb23b3b60ce
 AUX keyutils-1.5.9-header-extern-c.patch 1154 BLAKE2B df4ecd72145c8634b2ea043e45e05ca95374234a0aa2babf0eaabfd429997c96099f6698d33104ad45cb9e90a83316a2db93b0f73b9138be7618591bc1b1e235 SHA512 f6e91c6eb9785ff8e661fc80ab275a3a35d87cfc73ab9cc45195734aaa5126e5ddc219dce8a78834869b67448a730265f2b72390f0b517dedf6c729bf22d828e
 DIST keyutils-1.5.10.tar.bz2 74190 BLAKE2B 8eeab02ef363b785152ac4576f1ce9792711f482e27c3ba71d906624ecc88ef4ce2ee909d7bc3a35b42b50e971c0bd0600cfdefa9a3db35b25553bfcbe7d2d13 SHA512 7f6f956c7e76cdc2aeb52e74fe670b20a5f9a5d9b543fd2ce971d80c48745f37d05235a42f0a8f152b1128a109c7d8bf07e751282a20d2d3f433a99a5308ae8d
 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.10.ebuild 2840 BLAKE2B a2c5e97bf4a87b1e8d5a4b7546004dc32c172c5bd0771721a5469aab7f2f198c3dec04eb9d48ae32d5f941a96881c9753ab374b278838afbef7b751934b36e55 SHA512 e3bb4180cbf4b6331c0f48ca2a9c3f636d1a4d28f731678a8db8eb92c7f0b377dec220894135bd8fa90f4a641ee99f80f4f09e4bc39220e39972aa1e8c09f078
 EBUILD keyutils-1.5.9-r1.ebuild 2293 BLAKE2B 6839a041eaafe1ea4cfd4706970694883ae01e1c8a39bd031a4368378ded11fce323e7c56e23025e1e523a81ee382bfdfa9ee3f5deddc156440c29d95d30d6d4 SHA512 fbcf7923a757dd2247cb0d1c644e865f03c31f09fa3c880264d1e0b5631e7b8f4611c6206286d8fbba616bba9c0f553d9c1c714744d94e454f309f64ed37980e
-EBUILD keyutils-1.5.9-r4.ebuild 2949 BLAKE2B d119b431de3a0e095bc66ed70813683ff290a6c8e71e3a409c42b5243ccc19439a528f92e83b9717282a6867be2a3240d9deadf6d8464e77616549a79c860b13 SHA512 ea2027236e51ec208d418f9383d6f86657d883f62748056f2c409bb669ac049b5036cd0ad178cd638b275324a2763c8252cc12957bc2bfd77a0024b8c81e9257
+EBUILD keyutils-1.5.9-r4.ebuild 2984 BLAKE2B f93ee7c4a4fc0cd4f623d13f2007355294e0a9dc6b6f86ee8afce908569db146e166a2e90565891ed396137d5f8dcff762287674e3f36167b7d377177f36d591 SHA512 0175ceb620c7ffe593145ac41303a200584bb8212fb1df3767ed23a1a99c6027afe457da33a1fbb4f18b6bd19dd0f22808fe39cadd921a687a7464602a55019d
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/keyutils/keyutils-1.5.10.ebuild b/sys-apps/keyutils/keyutils-1.5.10.ebuild
index 658882242f2c..298b6bed808c 100644
--- a/sys-apps/keyutils/keyutils-1.5.10.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.10.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
@@ -25,9 +25,12 @@ PATCHES=(
 
 pkg_setup() {
 	CONFIG_CHECK="~KEYS"
-	use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
 	ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
-	ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+
+	if use test && kernel_is lt 4 0 0; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
+		ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+	fi
 	linux-info_pkg_setup
 }
 
diff --git a/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r4.ebuild
index 4b42896f7325..2526784ea7bc 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=""
@@ -19,9 +19,12 @@ DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
 
 pkg_setup() {
 	CONFIG_CHECK="~KEYS"
-	use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
 	ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
-	ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+
+	if use test && kernel_is lt 4 0 0; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
+		ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+	fi
 	linux-info_pkg_setup
 }
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 1c2fbd2322f2..075c187860de 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -2,7 +2,9 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
 DIST openrc-0.35.2.tar.gz 241600 BLAKE2B 09517a33ea7faf2e59d3a194876a3bb55a2477dde5f7f30915f77c24104531a27e752a59a049929878a115710ecbe1ed116e4283357f88c65cbe130787b88220 SHA512 61282509bae087a6c94a1947a30eddfa633cd2dbc91392511daa7240318d9f0c0a231005e329b6e46eece194fe497071f40387bea46d27ef09db9eb6e92f07d6
+DIST openrc-0.35.3.tar.gz 241587 BLAKE2B e8560243adb6ba4e6e463ad8906f203282ee9e0d16a22c0cf28e3ac7fe22321bb90f5292998745a70c269cee2a82bc6c899cba9ecf07a2e28bd4dc02c0fc737a SHA512 2f247241fb6a7abb972efbd308c47f5621b7a10b11fce2fbbffe6ccb73c6d054bd2d1b860bf9d7bc38f6e2f0ed204a60eecad312347f394efb85b096a513eff1
 EBUILD openrc-0.34.11.ebuild 10145 BLAKE2B 44747f052ca54517722e08a8877b36bb12985ef703ccd7608faecc7b9f6727e6f9157aad51f563ccd1b9346945f56cb553e47fc77dd369c5e635a80da5f2a4dc SHA512 6f71094d74e5ea02e87427619a6b55883ef5de3e8d581447c9662a46f0c1b0a6f49cdb00737a7a0ed8ca9d3ce23418f1d0068832ab58a268398781d4aabccd15
 EBUILD openrc-0.35.2.ebuild 9966 BLAKE2B b931796a166d874bcb7a74b1a05cc8480b43657458e9b60377e133d440f9b0089a97cf7525265c6e420840abc614a57b4c3bc029a4d32423b1091deaca568c7e SHA512 959cc20911fbf11799ef85923fb74275969131680a3fe6a570b53fd0e965647a209af4765f5f13ab50c82b3b87907affce999fc4bcdf99f936ca08b83a6c2a22
+EBUILD openrc-0.35.3.ebuild 9963 BLAKE2B e820565f8be3bbcf21ed330e3b1ea02f8590372614c7d6ac5a001636cc6d56708cae5ba181e1ecfa521deaed8996de0edee602579e28719d810e3830e9eb0d3b SHA512 da4193b443398edcf3f7da57e370127236b504078cdd685952d2aa65b0c4e60d82b130f5ecd0f1bcfb2d4eee89ba414b59f82c4ce5f5dbe9cfc7fbe9c5beda94
 EBUILD openrc-9999.ebuild 9953 BLAKE2B cbcdcf1ccfd81c1e060a64b686f8aed344cb99723a4e04326438c5e23c11b980b6700be60dc7e34fc7efbc9ad26513a28df3bbfd06e7018b4b0e27a8bba282e8 SHA512 6d25ad312e4526bb82efa5754914a57e8cd8b222455aa7b8ec434106eb04746b4aa3a90afc760fd1b1a1c3b5858bb7dc052acf2d48843c0789bd4bd208b65560
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.35.3.ebuild b/sys-apps/openrc/openrc-0.35.3.ebuild
new file mode 100644
index 000000000000..3420adf2a4c3
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.35.3.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	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 ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)
+		MKZSHCOMP=yes"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /lib/rc/init.d
+	fi
+	keepdir /lib/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+
+	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
+
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	elif ! use kernel_linux; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 36419e7da225..03974ccf45ca 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,6 +1,6 @@
 DIST paludis-57881321fa3d5d82a9260db54afd608fd61dd533.tar.xz 1004012 BLAKE2B 0bc65918b277ae4203fb5dc66fe3a84caa142b5e97b9e1f1b9a5f2e1b9c27fb4c60109c0bc1c058e095850bcf488075e21ab080bc5c4f2156e4c901923856ddb SHA512 ed9053b933172dea0122c171a14965b0d183affa8d3f2aa2be5cc2a2cf11f81f8a693b30bee93963dd890ebe41f454cf5ec5ab38f0b7924318b8bd8d1c37f5d9
 DIST paludis-f8e58ee1d02d2476ae92ebc3737e42b8b6a36891.tar.xz 1004024 BLAKE2B 1c34c93815efa41298cc2916c4428971d1f54242cfd759c771972bdcde94986c6af03546372c7eda277a343851b38ee93c0a103e519457b42e48cc7bed87b755 SHA512 813592b6f164d7994000ff1740e003049e040e7d58832bb1393a1f4facf428806b57bbf97855b830f75acf4b20e963093e9993b110f76f44e25afb9a8a1eaa1e
 EBUILD paludis-3.0.0_pre20170808.ebuild 3781 BLAKE2B 41ada11076e248393068b4c539b89c7a42b6b36c6cdd8d684bc695456e78b07bf80f8155216d508d582d7f6a07a101535e6bbb305c87108f45bc1acd74f5a4f5 SHA512 6947e1a370a606159c0077bdba03d0eca7675e89a19eecc2952a329f460de4e17373d93777c3824699b43fa6074b010b1338643e319b4ee47271e800182af7a7
-EBUILD paludis-3.0.0_pre20180214.ebuild 3781 BLAKE2B 304dce8fa19a5d1ff731ea6b8cb39256ac4fba72107826bf86f38b83163adb7df116f92d55eb4b9166b5d495cbeff571484fea7fe509e153f001a9535c2cff8d SHA512 7efe60fd1d35cc760f9f922a4ed6ce2159de6627905de097940d2992d822dd6d94011d0b492ea8315ae260e8e9e97cfc4de0b7c69b8e2a3768756022c035a540
+EBUILD paludis-3.0.0_pre20180214.ebuild 3780 BLAKE2B a60ff73b536770d6d8404e894123f88c32c597b303cf1486de9d4585b42b002eacc7dfe5d48ebdedb7dec9b85329f4967b1834955b95ca51e4f337676e029ea3 SHA512 a994bef998c33e6c90a87b6796ef6b2e3f20635ac945cc1a4455981e70c03cc500d82b35b88a0532ace9c4cd02e44c0393c335fac44d50e800c87974e5ebcf03
 EBUILD paludis-9999.ebuild 3633 BLAKE2B b27ba87915d6a019d6503c97eb23fb5ea87dc85df20e0ce3d29973117a961c7f477bad0b21c660f6689f9c1eebba178b4f2797e5c8e40d8c5fe23f3d46a12e1d SHA512 5ecdff9a67ac467dbc7c925f2ad77eb98344f01d0b6ccfda938a3ee3a6681d4af7f108713d2764154cd5d7b251078fce2c70c6aba0629ab40efbd090e265962d
 MISC metadata.xml 706 BLAKE2B ec2963b467d0fbab598fdf44b021cc10569e9a25305ad22c08d129c17f36db1a0759edb6e89119cd687fc36b2b26c4844086ab1cb8e249b6883df8fb9858b830 SHA512 ab32599364fb289dc43d8dc1574ee472585f014c663d2c80209700596b455e074346ab35e69bd05fee86a451902852790f1bb9dcd37f2118e8e8bc24b90a01ec
diff --git a/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild b/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild
index f2a2976a3d9c..6e9bec6bc7b8 100644
--- a/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild
+++ b/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://git.exherbo.org/paludis/paludis.git/snapshot/${MY_P}.tar.xz"
 IUSE="doc pbins pink python ruby ruby_targets_ruby${RUBY_VER/./} search-index test +xml"
 LICENSE="GPL-2 vim"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 COMMON_DEPEND="
 	>=app-admin/eselect-1.2.13
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index a599a168fd6f..e033bf9ea28f 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -9,7 +9,7 @@ EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2
 EBUILD portage-2.3.13.ebuild 8197 BLAKE2B 0d4dc660b6169ea2c69c35ff9d44ce8ae3d25d18f15f529bca80140e20fae2905598cc2668c5b9fdc9bac042144bdbf7c8ccffb0e2680cff28ceef13123ac228 SHA512 1dea3d8545bdb72b4b0acbaf7377404be97630335ec1d22430e2a872c550a45abde63b03cc2105cac70627e0c5b5481448bcedfa0b7702e11ed79f29c2f4b3a2
 EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
 EBUILD portage-2.3.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
-EBUILD portage-2.3.24-r1.ebuild 9270 BLAKE2B 99de62bf141172885fed5ca28a9107ea0204471a3b66878032b2b247ef187e2a309af562f46175db9a058e32c6bd0010927e470c0be9ddf7626f9f43b73c2eae SHA512 431ad49b8d66c20f95c56b9b386f2a65faafee11345b985327e603e82a8239e9fcef2aeca1f353b3beccfa78d5e4d512714e64d5e058f210e35ebbeafa7b45c1
+EBUILD portage-2.3.24-r1.ebuild 9272 BLAKE2B 6d9c9789fc49280ac9d39904ae77f11ff5479c1b032d687e2c98a84a677aeed3ea9b6abb70ab4309c574f2a2a88b783cc141897d37987afd6fb08d3c88a68778 SHA512 89612299b7791ab44d4f382f42ee195fdcc122338248eec46770d70673e67becab500b004dd2f813fd989eed1760e41a13cc45a342e590a5ae4afc3cdf9036f6
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8795 BLAKE2B 82b5c300a67ef35dc2e57e2680efec39cfe4247e5ae8b6e469bfb022275076056b0ec05f280d4925a4537588d94b471397d8a065c2a80e6e64b5e9c51cff2ec7 SHA512 fadc6f2da2fc363438aee4a04b0c36bad372d724c14591fba943b6f9f7602d820300192dd1ca9d78f32bf2279a27aca0c74364a2563a58a135f684adfbaf1910
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.24-r1.ebuild b/sys-apps/portage/portage-2.3.24-r1.ebuild
index 5ae50b68d9d0..36b6e0929318 100644
--- a/sys-apps/portage/portage-2.3.24-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.24-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions rsync-verify selinux xattr"
 
diff --git a/sys-apps/raidutils/Manifest b/sys-apps/raidutils/Manifest
deleted file mode 100644
index 0d420c7e8ff5..000000000000
--- a/sys-apps/raidutils/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX raidutils-0.0.6-gcc45.patch 300 BLAKE2B 7ec1bd912aca27468eb47c82b9ef9f1fe7e7ca600e40394a08913d306e2f9758642c71b45ad43a42ce8f3d713170f69f212e33cea864aa98b370677fb6aed78e SHA512 a6074f7b70d536232f6b78fb39e886fd28b8c189c3827a491a664339fa9e8d47e72e3ab9f712216539692894ed21f5683b3b9d9e4ebedc132057018c148887bf
-DIST raidutils-0.0.6.tar.bz2 968898 BLAKE2B 1f93eb0a00e1c4924cd905afa15b15d6d8bd6e7a53db275b5015a49673a2914d5e6e44f5666380389bc679a5a0e85139c715e27619ad0182431437e82a66bc36 SHA512 8d6fc74a4fc20188a00b3ea8b91048ee9108bb772efd4b1e5d141f4d674cbb9a04a76f9a414f4ae74d09d58d672e2f7aa8c1476715bf5aa94c3ec7eeb105f892
-DIST raidutils-rpm.patch.bz2 6809 BLAKE2B af505b36237bd83c1ce4763b0ac00de903673833eef7ab82fc36433a8f10a8a05a911d4982932041ca004db3f5bd8dd2b8f4ad4ab28379182b315ee9b7e3f86c SHA512 3d0f9e4b3722e26de835dedf86e00f2f7b56a885d5ac677bc1f0fc5009f5bafaf4c3ce67ae6abf1007973edb9273acea97e40e4d5bd3244d097c60c4c39b0f91
-EBUILD raidutils-0.0.6-r2.ebuild 853 BLAKE2B 21d6764a7be2824d1bac1b5940348a7119814c49cfb817ebaedf62fa7654c8640965e92c3b65263007e44852c2475cab264316d4268edcf5d08fb37525073dfe SHA512 1cbf62f5d0e1dca686b9bab71e48abb867d03e4f96d160d3eecb914fc22fab47facd78f019ae7acd056b690b27b1cd7b958b1a8c9f8bf1af0a7ade8bb40e9de2
-MISC metadata.xml 560 BLAKE2B a7321502b6d17667623379e062e72cd23bbcdf9e035dfef5510b67a7565d2babb2a4fc0ec16eec86d4b749251ea86e976dad68d1a2a00d445cbcfecde99e91bf SHA512 2071cb86949806ec07a26ec136b2b6107e12534d0b2f01a98bc011bbe82147d051fbed47f29d32b653a639ae7e85362647b4af0f7db170e07464d6575c56db2a
diff --git a/sys-apps/raidutils/files/raidutils-0.0.6-gcc45.patch b/sys-apps/raidutils/files/raidutils-0.0.6-gcc45.patch
deleted file mode 100644
index 91c52270ee40..000000000000
--- a/sys-apps/raidutils/files/raidutils-0.0.6-gcc45.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- raidutil/flash.cpp
-+++ raidutil/flash.cpp
-@@ -177,11 +177,7 @@
- {
-    ENTER( "Flash::Flash(" );
- 
--#if defined _DPT_UNIXWARE || defined _DPT_SCO
-    Flash( right.source, right.Resync, right.hba_Num );
--#else
--   Flash::Flash( right.source, right.Resync, right.hba_Num );
--#endif
- 
-    EXIT();
- }
diff --git a/sys-apps/raidutils/metadata.xml b/sys-apps/raidutils/metadata.xml
deleted file mode 100644
index b509cb5f1c84..000000000000
--- a/sys-apps/raidutils/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-    Suite of programs to manage some I2O-compliant RAID controllers; in
-    particular some Adaptec hardware; to be very specific those using the
-    dpt_i2o kernel module or CONFIG_SCSI_DPT_I2O driver. One can create/delete a
-    RAID array, add/remove a hot spare drive to/from an array, activate/silence
-    the alarm, and query array/disk status.
-  </longdescription>
-</pkgmetadata>
diff --git a/sys-apps/raidutils/raidutils-0.0.6-r2.ebuild b/sys-apps/raidutils/raidutils-0.0.6-r2.ebuild
deleted file mode 100644
index 77bb29a70db8..000000000000
--- a/sys-apps/raidutils/raidutils-0.0.6-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Utilities to manage i2o/dtp RAID controllers"
-HOMEPAGE="http://i2o.shadowconnect.com/"
-# http://cvs.fedoraproject.org/viewvc/rpms/raidutils/devel/
-SRC_URI="http://i2o.shadowconnect.com/raidutils/${P}.tar.bz2
-	mirror://gentoo/${PN}-rpm.patch.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-2.6"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${WORKDIR}"/${PN}-rpm.patch \
-		"${FILESDIR}"/${P}-gcc45.patch
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS
-	find "${D}" -name '*.la' -delete
-}
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index ee083e215e16..1a22542bd881 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -5,8 +5,8 @@ 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 1703 BLAKE2B 85de6422cc772bb64b6e4ccb3a8e385e21314f266497a30753dd37f193c95ec57f0522488efb6e956f582e34182ae38d13492b01cb3fe90d504b6af4f9ca25ef SHA512 83ad39ac0a61046ddfb1ceab35284b776bf1bac6656f7a60d3e4eee8070febec7bdbfe23138934d0b6fb688142759825deab25eb6988c90b54d269b553cc274b
-EBUILD sed-4.3-r1.ebuild 1471 BLAKE2B ccfc211be1e8ee18580188db738958243c13af4ed0a42934386628a086199bb48ce1edac9609098545f599b352824fd3bbf1e984fbc02dc928676150f010c16f SHA512 a87cb60ca1b125d0db8b90f5cd4211b5f90316cee63d5543ab92e089a1c6782599d66b9fcea2431523126a1e7b1b1230d14c396fdf2c6de1d2704aacee08ea87
-EBUILD sed-4.4-r1.ebuild 1731 BLAKE2B 0023f4b656ec18b2b4ee250e387ee978fe377840e130b9a9d1b72255ead62ee3b799b5c1dd55c56cf29a277460f0abe7b7ac1c2646377e62692e501ede065345 SHA512 0c75b2e7d8c33c4fcd87199b7e76c44baf1e7c84f616c60f6d8a1d3667c41a443397fbf270033e585d739c78d40fc67ea3c8ae3e543feda3bb63c45d173ed37d
-EBUILD sed-4.4.ebuild 1431 BLAKE2B 81ed2cb028f7f748629b8c9b73a2786ed48bab298e92ad10c1b6b5436ac03d515766ad1223d1cff4c8157714abaca950e9791b498fbb1558dbbe8f2609039dda SHA512 d1cc340b33bb8d5ac0565136d9dabf84d261f5496fb0ebfe27f69a2d37dc8031bedb43e610e744d7bd60de0b672afde5e6fbdb4862d556ed960de832f2f7b94a
-MISC metadata.xml 454 BLAKE2B 3bb53d0a0a1d85cb0415e9c81db669e048c980923b6aad172ab2e666a995ff7e88dbcc4290f479613a60b83aeb62d1b7d9bf9b5d4ea9ee8a190bea6a87dff7e4 SHA512 4c30d1ec7669e56902672117382e8617718858e9aaad078a6ed298428f55396a81d336963560d3f4679499a0f1e291f99462601ab0c76768359086fa9bcb9b55
+EBUILD sed-4.2.2.ebuild 1680 BLAKE2B 5091750a04cdaa6b5c340cfe27c74a3b620d21b3be451755104d93774f73060d92a70c367ce4107407dbfc3a4edb8fefbcbeef3876e3bc9707e481f5b20cb3eb SHA512 331c709e673cd26b2c3b5a48094ce5e2cb4d486b5eca2ac6733fc8e39fd525342be2494384922da920075f94fe2ab81a625795ea094769ab71548acb93089d99
+EBUILD sed-4.3-r1.ebuild 1448 BLAKE2B 8d3099ed84f4a936f2cd4f6f176220b1f6a316e28ff833010ceb6f5b66d8220d4c8834b65b99b62a474cf0be7e9830d7461f0cc14ddc382b00f69a0046137f4e SHA512 7e21eecbc7dba0c69f0f03966c9eb0fc62fc2c5504d8c49714edde437909cb9c823c59c0c2ab956bce38121d0ddc7a8bbd7be52f6bd2a87579dbf042b32de98b
+EBUILD sed-4.4-r1.ebuild 1784 BLAKE2B ba803b69441a45db55fb1dbd392234379203984af141310d42a2eb580e8dc98dce2315b8413b892a7279418317d2f58f168eb126bc759969cde5641a0b86424a SHA512 bb7e23c0467e298cdfb5b292efda9d057617db74cf43b7796e890aab5dd5045fc86ffd310ce015ec1d71e71839cbce9082740efee7fecbcb91e6e0a537f27e01
+EBUILD sed-4.4.ebuild 1408 BLAKE2B 5b8e91c2459c0fff944b1f320069d6b2975fe627fbc5d65f149e1f1c34c6c19871f198cfee928cece9fdfa3d2f62324af37f3ad86eb13fa75d89d6296f456008 SHA512 eaa3ea74e58db3499f05f45f8c4f16552e36d9fc72b75fe3c7b19a59fc6a0c073184d3e2cdd168aa297d9253cf9b698ea281af557e6f413d40338e97098e68aa
+MISC metadata.xml 599 BLAKE2B 1e3e9343805c40b2f8ba3be494c1280395ce8edfb85d93b53e136269c774312b5b27d63cd628eb1ca57faa2c1a3849a7b361c9fa68850f47d70d618995b57667 SHA512 6aa22a76f9ec43142548e347dcea74b4c0b02bf0f8ccaff581265ba4b97fc16fca5d01bc3884e27523d138eec3b809bae6b379c7c0d38b344db2f7175e5565d5
diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
index ea2a7bdbf75c..504b6a5e4649 100644
--- a/sys-apps/sed/metadata.xml
+++ b/sys-apps/sed/metadata.xml
@@ -9,6 +9,10 @@
 	<remote-id type="sourceforge">sed</remote-id>
 </upstream>
 <use>
-	<flag name="forced-sandbox">Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands)</flag>
+	<flag name="forced-sandbox">
+		Always enable --sandbox mode for simpler/secure runtime (disables e/r/w commands).
+		Note: This may break many configure scripts, so it should be avoided on dev systems
+		(and generally used on binpkg/final systems only).
+	</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-apps/sed/sed-4.2.2.ebuild b/sys-apps/sed/sed-4.2.2.ebuild
index ad3f071a2b1b..b6da5a256ce2 100644
--- a/sys-apps/sed/sed-4.2.2.ebuild
+++ b/sys-apps/sed/sed-4.2.2.ebuild
@@ -22,13 +22,11 @@ DEPEND="${RDEPEND}
 
 src_bootstrap_sed() {
 	# make sure system-sed works #40786
-	export NO_SYS_SED=""
 	if ! type -p sed > /dev/null ; then
-		NO_SYS_SED="!!!"
-		./bootstrap.sh || die "couldnt bootstrap"
-		cp sed/sed "${T}"/ || die "couldnt copy"
-		export PATH="${PATH}:${T}"
-		make clean || die "couldnt clean"
+		mkdir -p "${T}/bootstrap"
+		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
+		chmod a+rx "${T}/bootstrap/sed"
+		PATH="${T}/bootstrap:${PATH}"
 	fi
 }
 
diff --git a/sys-apps/sed/sed-4.3-r1.ebuild b/sys-apps/sed/sed-4.3-r1.ebuild
index b0be9297fb01..e70a45187922 100644
--- a/sys-apps/sed/sed-4.3-r1.ebuild
+++ b/sys-apps/sed/sed-4.3-r1.ebuild
@@ -26,13 +26,11 @@ PATCHES=(
 
 src_bootstrap_sed() {
 	# make sure system-sed works #40786
-	export NO_SYS_SED=""
 	if ! type -p sed > /dev/null ; then
-		NO_SYS_SED="!!!"
-		./bootstrap.sh || die "couldnt bootstrap"
-		cp sed/sed "${T}"/ || die "couldnt copy"
-		export PATH="${PATH}:${T}"
-		make clean || die "couldnt clean"
+		mkdir -p "${T}/bootstrap"
+		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
+		chmod a+rx "${T}/bootstrap/sed"
+		PATH="${T}/bootstrap:${PATH}"
 	fi
 }
 
diff --git a/sys-apps/sed/sed-4.4-r1.ebuild b/sys-apps/sed/sed-4.4-r1.ebuild
index 26c3858da53b..39c3d130eacf 100644
--- a/sys-apps/sed/sed-4.4-r1.ebuild
+++ b/sys-apps/sed/sed-4.4-r1.ebuild
@@ -21,14 +21,12 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_bootstrap_sed() {
-	# make sure system-sed works #40786
-	export NO_SYS_SED=""
-	if ! type -p sed > /dev/null ; then
-		NO_SYS_SED="!!!"
-		./bootstrap.sh || die "couldnt bootstrap"
-		cp sed/sed "${T}"/ || die "couldnt copy"
-		export PATH="${PATH}:${T}"
-		emake clean
+	# make sure system-sed works #40786 #650052
+	if ! type -p sed > /dev/null || has_version 'sys-apps/sed[forced-sandbox]' ; then
+		mkdir -p "${T}/bootstrap"
+		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
+		chmod a+rx "${T}/bootstrap/sed"
+		PATH="${T}/bootstrap:${PATH}"
 	fi
 }
 
diff --git a/sys-apps/sed/sed-4.4.ebuild b/sys-apps/sed/sed-4.4.ebuild
index aa52e2921cdc..3bdb8e28ac20 100644
--- a/sys-apps/sed/sed-4.4.ebuild
+++ b/sys-apps/sed/sed-4.4.ebuild
@@ -25,13 +25,11 @@ DEPEND="${RDEPEND}
 
 src_bootstrap_sed() {
 	# make sure system-sed works #40786
-	export NO_SYS_SED=""
 	if ! type -p sed > /dev/null ; then
-		NO_SYS_SED="!!!"
-		./bootstrap.sh || die "couldnt bootstrap"
-		cp sed/sed "${T}"/ || die "couldnt copy"
-		export PATH="${PATH}:${T}"
-		make clean || die "couldnt clean"
+		mkdir -p "${T}/bootstrap"
+		printf '#!/bin/sh\nexec busybox sed "$@"\n' > "${T}/bootstrap/sed" || die
+		chmod a+rx "${T}/bootstrap/sed"
+		PATH="${T}/bootstrap:${PATH}"
 	fi
 }
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 3844eccab66a..da895e67e87d 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -20,6 +20,6 @@ EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 82e15d7171054d46049bc9a50a8482bc1ebbe
 EBUILD systemd-236-r5.ebuild 13008 BLAKE2B e3613cb1aeac22a92ba2f8c6ae47acad59281493ffb044d9dcb2417de9db1f00f29cf197b0fca764911edfc6c39ae7a49c56593770dd4fbba23adc35130ad3ac SHA512 259156a807ca41bc2fe36a87fa1b425ea5cd1b8c9a6f648487fcdeb1d8a8b7f607723b2cbdc2a5bf9b7d59f23716ab17b2032e41b214dd2fe71628c3272c96de
 EBUILD systemd-237-r2.ebuild 13075 BLAKE2B ff45dd6aa7ff3c27ad18495eb44a8ff04c67d8dddc80546fafa52e3845f1f3ded10f47f9b4e6c46b46786651d3c387f0e86e87ebf09f52045d62054fd9c5f403 SHA512 8bd6fb56e66284ef26f5ad525a38ce67e74d2b48d57dd15a1c67dfd60805da57745b837342d45c96406bef4c7a26aabf0de0db6f60fafb026268a6a154f457b1
 EBUILD systemd-237-r3.ebuild 13136 BLAKE2B 78e7a0488497d3fd8be87f640a5f9fb7c7547e4c1c95ae21ff36a42998ef5ca75e16e7421335b5a979ef05c273c9b69e1915afc77637d5f5836ca26579627591 SHA512 61522415b4d25c8d83ab2c598a06df60dbf8d545091f304dc86b42378e62da2c5a7eee3113e11e6b5225aa98f7287ba77917c1a2c3468635d0fc2bdf503d3462
-EBUILD systemd-238.ebuild 13177 BLAKE2B e0929870bcf56bdc9f7d8c77a1b9928b189974e6fef2784c760e2e03d7ce1ea401331ac0de940db856e4f50c6db7b7dea1f889d9415e3f4eb4199c655f3331b8 SHA512 e33daaf2bb3250215e75f5d900d6ce13aea966ce864cb66e8cc7b97ee93b6041471fcdbaa0b37cb4efb3e894c7bf69af9533a3180ceec5a994464e8634588696
-EBUILD systemd-9999.ebuild 13020 BLAKE2B dcba36f9056f996c5aba1be98786e050be0ea128a03b4deb73d9e3d8f5ec6bfe9f2e0b1d9b6be105269dc7a93f34d967e55d5b9ec30c8abb22a6443c06f8f3ec SHA512 0bb205a1421d6bc733794c6db488d58d5855ba972c7f9715253a4d584f02c103ce445171d4fedd5651fc81aa492d696a49c05aea6130840ea0b6f7f931b78259
+EBUILD systemd-238-r1.ebuild 13058 BLAKE2B 4d3e9d09c8d62a646df76641ceca518744f067d86b05e6d4dc8768d4814aa55cb223f9bec993e2a3b906caa6c08c85ef42b259376b06acb00bc3592a3efb753c SHA512 653a87575a6f57452104ad8f4ba763063568e2aa03ba5349c6559aba5b0113a615848aed06f963721648ba9d4ce85412e8f0eb1c18e2768fc32c3c0adf95a813
+EBUILD systemd-9999.ebuild 12901 BLAKE2B afcf2037823b319f9841a706f261f07d95037af089b78f4867d4d9d57de4e02c938566988072f66146b069ca7301e0859ed37b3eecae8aba5917abf0ea1abb06 SHA512 6708dc71ef3bd713ab158770fac5129c5da98c5613e6ddcc9b3e3c7755ebfb9541abb019ea0ba966260da674d45f07caacb65c5b119d568ed1f5edee82241857
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/systemd-238.ebuild b/sys-apps/systemd/systemd-238-r1.ebuild
index 00e28112485d..d32d1e9d3d39 100644
--- a/sys-apps/systemd/systemd-238.ebuild
+++ b/sys-apps/systemd/systemd-238-r1.ebuild
@@ -302,17 +302,11 @@ multilib_src_install_all() {
 	einstalldocs
 	dodoc "${FILESDIR}"/nsswitch.conf
 
-	if use sysv-utils; then
-		local app
-		for app in halt poweroff reboot runlevel shutdown telinit; do
-			dosym ../bin/systemctl /sbin/${app}
-		done
-		dosym ../lib/systemd/systemd /sbin/init
-	else
-		# we just keep sysvinit tools, so no need for the mans
-		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
-			|| die
+	if ! use sysv-utils; then
+		rm "${ED%/}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rmdir "${ED%/}"/sbin || die
 		rm "${ED%/}"/usr/share/man/man1/init.1 || die
+		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
 	fi
 
 	# Preserve empty dirs in /etc & /var, bug #437008
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 60dd1f8efd11..6c34c1b92a00 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -300,17 +300,11 @@ multilib_src_install_all() {
 	einstalldocs
 	dodoc "${FILESDIR}"/nsswitch.conf
 
-	if use sysv-utils; then
-		local app
-		for app in halt poweroff reboot runlevel shutdown telinit; do
-			dosym ../bin/systemctl /sbin/${app}
-		done
-		dosym ../lib/systemd/systemd /sbin/init
-	else
-		# we just keep sysvinit tools, so no need for the mans
-		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
-			|| die
+	if ! use sysv-utils; then
+		rm "${ED%/}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rmdir "${ED%/}"/sbin || die
 		rm "${ED%/}"/usr/share/man/man1/init.1 || die
+		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
 	fi
 
 	# Preserve empty dirs in /etc & /var, bug #437008
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 389a01e4a0f4..b85d4dbf8188 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -17,5 +17,5 @@ DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2f
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
 EBUILD ucspi-tcp-0.88-r17.ebuild 2467 BLAKE2B 6c7e824f9b04f39482eeb87f0bc8dc8b3a92eae7366647b3c06912ca945041fbd963eee67cef8dd9d5aa4fb9d50dde7659e2b0f2dce59ad2040ea259e9d0ef3e SHA512 5691a29591259022e80a6cfbaba6d4755846223b14bce64c7df0e0e7ef08c57877f612b6e2b19da7d90a0c4dc8b3d8d5c8885a1b21eac19bd48bf527739e10d3
-EBUILD ucspi-tcp-0.88-r18.ebuild 2113 BLAKE2B 724f305153b225f1aade08b794f5279567edbf58bc11535c22880dd7c129f809184c11814db71df61bd79c076fee825a672fd72d1611592fd077b8c2c1fcf2bc SHA512 10411cb5f1c4449f2773cae6ff157170c2ada1cddb632f809c7f6936da677f8dbbc3737a8790304ee31e690c385c1c1b6e21e0cb6ac1be065a2f9ecef7e93699
+EBUILD ucspi-tcp-0.88-r18.ebuild 2112 BLAKE2B 24151b662deb996b6845484fb9a2411b8ab637559051bbc0cd13ab2b568965175c54bf16dbfafef965052d6c64e736a252e8dc81c8788aa5fc5c6c2a5b951d8d SHA512 857bfbb0a9972492a5af1c4732211a43e42f34b20e72bc76037f587b202f955d32a8ad55db9f6accb47967a3b3a49f870be9972481b70883f518f6e341d561f1
 MISC metadata.xml 677 BLAKE2B 099199a467eb6f06daeece058d090c48825fecb5474425c4cec45ab90a981608a5948a7c4d11074966e7b72d80bc7d826ec8ebe2a93cb54ae90d91121deb5244 SHA512 cf774ef0c4584905cbac057f7239138025e6a92e55a6ae006a91aa438d9dcf0bd0cb9939b4bc6eb7ac1cc2ae67c7804312b5011da3d91fbe1d95f9205ea456ac
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index 4574e2a734ae..e2bb5d96ff7f 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"