gentoo resync : 30.06.2018

69 files changed, 1964 insertions, 1112 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2f2dcdacf97f..9451ee6d299e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apply-default-acl/Manifest b/sys-apps/apply-default-acl/Manifest
index 0126f04dcbfb..242670b29092 100644
--- a/sys-apps/apply-default-acl/Manifest
+++ b/sys-apps/apply-default-acl/Manifest
@@ -1,5 +1,5 @@
 DIST apply-default-acl-0.0.6.tar.gz 112220 BLAKE2B b0cc21ba3cb9c8112e9b8b02a9cb2eaad81e7ebee2bd0505e1925ce73d97f328b4ce0519d5f8c44b841407f73af1ce32d5ca8a629d244acde969a3ed10c8e75e SHA512 6034de13db1867372b8529e29e8b1a3d002619d4522a5eab346a7940946a1c74adc3eec952bc72bf62c736ae89d5631748153a87feb45353af27ec46c71176f3
-DIST apply-default-acl-0.4.0.tar.xz 245540 BLAKE2B 5f3cfbde56fff48714c4d66a40286137255e02923b1928e13b849c5b3cca50c90491cfa42d0c62b7c019deec2673a7ff84cfffb59ac84ca3ff901b6ab4a6c816 SHA512 6c2c62586ef2999450d14825eee3ef12d8e20b8c2984074a9d8a4aa199d0d385acf0c25c303e643f2323ce5b65bfc220757ce76f278ad16200137b2e45e5eda1
+DIST apply-default-acl-0.4.1.tar.xz 245936 BLAKE2B 40ddc2a3393a7812f753d88baf1750627a09443ca90c6ad3e7207deff26e22c6ed01a0798abef1991f4b7642550cf855ee9e91432778b4ebee0ecfd868a58216 SHA512 b95999b5775f3ccdd9662fcd8dbbc021bc6372a8f50e4c370919f80d27159e3d07cbaeebf3da717c0314880f210a3cc056767715d55cca71cd3fb950f42ba9c0
 EBUILD apply-default-acl-0.0.6.ebuild 523 BLAKE2B 8ff9d888cd4934d731874a6fedf8881e74dfb5a2e3d3462fc3050a0acd7011cd5a771a3fbf525ab041d2642a5d938bc34474855d4b4d50a681c2bea0251f4a12 SHA512 be23e98716900ddbc133417b4e033d9963b1410a4b9206a0df963fc623ee1c452adb0621b851521755aa167e2846454195eaf7fad39c56fca43828f26ddaf80a
-EBUILD apply-default-acl-0.4.0.ebuild 525 BLAKE2B ae50dc57320ddfbf68b507abb6be75a899a24ff6f34fe0f4f2247a4f37e33c77738e7a0d9473d203715e268f8e80effa78002b7d1515b9017d3e7bb6f2f491a8 SHA512 bb5eebe5d361de4de5e12118163dca38e256990e50b27fde43287efddf221d463369caa47d24516b5c66967cfd66b61d380a9b5e53ab51bd63b2148e66c56519
+EBUILD apply-default-acl-0.4.1.ebuild 525 BLAKE2B ae50dc57320ddfbf68b507abb6be75a899a24ff6f34fe0f4f2247a4f37e33c77738e7a0d9473d203715e268f8e80effa78002b7d1515b9017d3e7bb6f2f491a8 SHA512 bb5eebe5d361de4de5e12118163dca38e256990e50b27fde43287efddf221d463369caa47d24516b5c66967cfd66b61d380a9b5e53ab51bd63b2148e66c56519
 MISC metadata.xml 409 BLAKE2B d120f8236355cd9c5534402178c29eb8879f341053686f3d44c7c08f44d8e15abe905e8567b9154f6abb324aa1dbe5a3095e4a8d5377ea14c4906e932d5ee6b1 SHA512 ccf6bafbdfc01736cd151ee30fe4d2e7124ee633463052aa41e0a8ef687793d358825b53b01d21aa9cc9a64633ec37b2bd2b7a27aac20a6d56b12f79eff56b18
diff --git a/sys-apps/apply-default-acl/apply-default-acl-0.4.0.ebuild b/sys-apps/apply-default-acl/apply-default-acl-0.4.1.ebuild
index dac225d9c5f4..dac225d9c5f4 100644
--- a/sys-apps/apply-default-acl/apply-default-acl-0.4.0.ebuild
+++ b/sys-apps/apply-default-acl/apply-default-acl-0.4.1.ebuild
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
new file mode 100644
index 000000000000..0d8693aaeefa
--- /dev/null
+++ b/sys-apps/bolt/Manifest
@@ -0,0 +1,3 @@
+DIST bolt-0.4.tar.gz 113525 BLAKE2B 4d6b25b60a35bbeee724e4549a49709ff19d99457c8a35c02c66026cdca999359220d09812f8e9f44586b5e3cf3dda2e3ff30f35a4f37ed6d815535e62af39f3 SHA512 3ea6b748768b5d9df60425274ecdb4ccd5ce6599e01f0648a24704643fbbadd7a114d4a1946ee3b7bd8866935758cbfe4494734c26c12ccc508c205a036d5317
+EBUILD bolt-0.4.ebuild 790 BLAKE2B fff0dd5bf06bf2d27a466bd20beb5bfe17c10f800174b22b2f4f58ee793efdb9bee1dd783ab54152807ad684001ebc4a4e59ed433157c3275950e1e89d6f6055 SHA512 51f2c1ea1c13aab602649e49211a73750756efa46d3a41036463c5cb7a48b4775e18e1453a0b7bdd1c4c3f9fcca80480dc36d291730d10c244539adca4fba70b
+MISC metadata.xml 387 BLAKE2B 9c5d99308a9bf4340ad48310dc9cc5f67ad7db1683f54794f025b90667dfb2f178b25c1d9a3d0fa0a7fde249ea8bf40cb608265e96aca30e547f3e2e536b91f0 SHA512 16060e68e59d82a6a556bc0149f5e365a4092b14edadeb09dfad8278b19e28e0d1835fcb24a2f335809d1ec910c788cc69d579d7aaaba9ff32b4090a904c7706
diff --git a/sys-apps/bolt/bolt-0.4.ebuild b/sys-apps/bolt/bolt-0.4.ebuild
new file mode 100644
index 000000000000..43fd351f9483
--- /dev/null
+++ b/sys-apps/bolt/bolt-0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson systemd
+
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3."
+HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0:2
+	virtual/libudev
+	virtual/udev
+	sys-auth/polkit[introspection]
+	doc? ( app-text/asciidoc )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Dman=$(usex doc true false)
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--sharedstatedir=/var/lib
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/boltd
+}
diff --git a/sys-apps/bolt/metadata.xml b/sys-apps/bolt/metadata.xml
new file mode 100644
index 000000000000..f67393ceb5f7
--- /dev/null
+++ b/sys-apps/bolt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		Userspace system daemon to enable security levels for Thunderbolt 3 on GNU/Linux.
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index dd715ffffc31..5712482b279c 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,6 +1,6 @@
 DIST checkpolicy-2.7.tar.gz 65967 BLAKE2B 6918187363cd74a1a23df41f0af23a2231c7087c696d3935db65db4c6750cf7dfa7613b1d569dc76b80f9781fed9f58ef8d41e6ed4325086a10fb322f7f8f754 SHA512 fba8a4132f90c98f8222de563dc15aac1b739d3a6207779b6a4715d2813e7553081351c54f42371a1b704a1f5038d40821b61213c4ad53eb705823975858cf7f
 DIST checkpolicy-2.8.tar.gz 66243 BLAKE2B cd4b5ead13606df9888260a15d982eb43d59c659a6f021a18c598657b2a07de5e70a9eacee6528855f26256d26b27bd8bec27b95a7366cf2e44ba5d426369582 SHA512 d1a52dffefcc8f9f879214290f01beb5f4978f1764ab6378ee03a62ef924206b9a6f6a512001ae556034ababcd3a0043d455f5aef66b5629a4f152cd2c9f0b7a
 EBUILD checkpolicy-2.7.ebuild 1232 BLAKE2B a2375ca69a96de38a648904261277d54222ef50fcef3722deaa9430995c62a8adcd24cc06a9b86b868f932d95b5acb27e076115ad73b0e76f6e9630f37e3e38f SHA512 b671810da7baedcd74e6456f53cdd63afdf73cbedab7d5f942023534d863aef4d536ff8e6acf370964352707a86c0b72bd3530601025aa27f96395b29ff3c1f8
-EBUILD checkpolicy-2.8.ebuild 1189 BLAKE2B 868ae87c0d8b18c1a05eda749727c4c5c8a2814f8b8d50087d0ea45330829c33ab9f7aac2d9f551bbe0f9b57922357db1623d60bbf79bf7462005cd9a9f3b2a2 SHA512 4810db1d1a63e4836ef1f239b47ee7f4359e3d3eeb6d0d698cf529c8ef11af4475b56d10decc3c61b5fceba572d12e7ec8b5135653ce84dec21a04ec4c40e3e1
+EBUILD checkpolicy-2.8.ebuild 1187 BLAKE2B 1114b1ac3e3591dfc7b1d68d3ddba13e693283e0cf1cf11f8947e49c62b35e520ac85fc0c014b335d31642585c3dc7385b6812964d2d6f329d9fe9913f1e0d50 SHA512 9e2e4cefd22c41bfe102048f88d84883238c826cce1fd186bf4ad0a95d7cbfcde3be1db446f9aab23859e72292efb919882681a2bd984d3b3696d1f9595d32f7
 EBUILD checkpolicy-9999.ebuild 1189 BLAKE2B 868ae87c0d8b18c1a05eda749727c4c5c8a2814f8b8d50087d0ea45330829c33ab9f7aac2d9f551bbe0f9b57922357db1623d60bbf79bf7462005cd9a9f3b2a2 SHA512 4810db1d1a63e4836ef1f239b47ee7f4359e3d3eeb6d0d698cf529c8ef11af4475b56d10decc3c61b5fceba572d12e7ec8b5135653ce84dec21a04ec4c40e3e1
 MISC metadata.xml 308 BLAKE2B 9147e4199ebd94dc7cb5d04986bae70ecc5bedf765fa6295546b894df249fa074c66e96a7d788295d912f49e9b0c5c305eb404c98d9b04646ab12a7597d4877f SHA512 e07f79eaa348cc35ebb4eac966f6b59ff87cde6c2b9694ac996da971c45aed834f34b8a9325b205fdfe590d7add0d46013cc551af166a9ca2ca59e0feffbc9bb
diff --git a/sys-apps/checkpolicy/checkpolicy-2.8.ebuild b/sys-apps/checkpolicy/checkpolicy-2.8.ebuild
index bd892103a73b..38200e9cff45 100644
--- a/sys-apps/checkpolicy/checkpolicy-2.8.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-2.8.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 846c89564fa9..3dd4503b09f9 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -5,11 +5,13 @@ DIST dtc-1.4.1.tar.xz 107920 BLAKE2B 523173f0adf812f2d4789b1891ad34d10dcc9f3189c
 DIST dtc-1.4.2.tar.xz 112480 BLAKE2B 922e4924bd9672b7b5a28fbe6a02a685bcb87909356130788f72dd029a3abd075a45e9cc28bea1db5c793422e4ce093433c597f753d6fa6f7183d51d6b132e73 SHA512 af536fda543a2516e10c45b80bd1b5797a33ab43e08fab6953ec861fc98a73ee232cdd3f5053e889f6e760d238a5a221c2716b8a6fd22b627cd01efac99915b2
 DIST dtc-1.4.3.tar.xz 122732 BLAKE2B 94fe96dc846937ff8e405c4be36a32f0f320bdc6c608e95845227b6e9ab3e4c02643dd1169fd0c8c64777fa2ead8dd1cf0fc1cd2173450c23af124645f2c8b10 SHA512 ce9f39cef11f3e7048e8491f01844071bf54911ec36a0d2f2e1ed6c736b7e1a67be83cd2527895a686882d895142db020bf5131a282e0d68d1f4d32dc772db42
 DIST dtc-1.4.4.tar.xz 122748 BLAKE2B efef8ae46033bb2012aabc414ca4af78a44b1d2534be23c58004d970245a219d7d0d86c1c44cfb834f07410240dc5b8c8f926654cf73d018e5e1d625045f4d2f SHA512 20689f7b0489fa945c4df4e27084dfd46fd5512a8dff9b28d60e0cd0e9e79bbd9944e4d70a1aba86a026481b35bb5441ed6b63d306a4a8f7581517f7359fa9bf
+DIST dtc-1.4.6.tar.xz 137868 BLAKE2B a2c7e5bf1afa70f827ed5b7dadc2dba58d7b67ebf3334386ff782c46688a9ffdc9c969523225de2c32fbcaa5db0ebaf157bbf8a0be182b13cfbcafdd981b04d9 SHA512 b52862159cbf9e6e8e1ecb5844e16c81a0b9c4df255366f8a48b15cb7e080754c142da7432de2542485fce70bb2a4fa76df6d1f93cbf0118e8dbe677153b9da8
 EBUILD dtc-1.4.1-r1.ebuild 1126 BLAKE2B 36cde85023f009b326e607a617f0a3bc25e23ded7e12cd26087f8a38a8e290942ab5d6db99f47edb61ba908b73530d6b0c30776c651567f8b56c844b0fc65a64 SHA512 6daeb7a14955c341a914e4ed37f26ca9c5670c8a70f9927c234f8ce8e6c9c44c07b403536677ff6bba91f42aaf0f02ab4a6887debae5c4d6ead81abfa6ed05a1
 EBUILD dtc-1.4.1.ebuild 1030 BLAKE2B 436b96829a79350fafbdf65e187ac0ab21b0ca70199a41d641582a40a6ba265b5686040332b6e677a876803c7c4fa1990a998de77346352ec3493a8553d6560e SHA512 763ae7ca11d522cbdeee7ea5675805ddf7d17d0cf773091bf0978b30bf7fec1ebef64904a8e0b291eb3139e4295cb1dc1d833a8afc5d6aa09760fb0ebe5fa72b
 EBUILD dtc-1.4.2.ebuild 1055 BLAKE2B fd0ea82524a6b633ccaf8a21d68e56ed7965e31587c9d25a5dabea7db98e510a58086b09f642a208c867ca757fb5cfd4d31ef02477f6f6f5e25d1298441041d8 SHA512 caa47d8d9a68a473712aac7cbbd6cea0d6bbd3cce9e598236be8d13f7d64013516ed9aa1a91099117f204bd9a12e91e7d907a04fb490c0c2895ff1391b0ab9dc
 EBUILD dtc-1.4.3.ebuild 1123 BLAKE2B 0ce6d8ff290534e99b3236173b704f3cd5a8c3810b35823f1d98054ee6fa6b72922da2ae7fed79b705d91d70ea947c873901b6d5cfee849b9aecf77827a67be7 SHA512 a22759aaa334a1276e2f7793787f357f4b9e72e04df87ed21debb904d713415574673832e8fc87ca60d45eb7bb3e69b549463a610c63ec0a471b5010c3603930
 EBUILD dtc-1.4.4-r1.ebuild 1181 BLAKE2B 4ea4eb40173c5e481fe2d7e935df40e53cce6b79440bd0a12416e6e775e5d367401bc7e040230f43228d8e06a6c20dead191eb30da98454a751877304c011be7 SHA512 de6b2dbd04270c132fce691dec8a1dd7b25c75717c89075091a85d98c3c15f9b154568f4b7beb0d35cd60bd8e775c45a606c7aaf31570d899d64efc85bdfe83e
 EBUILD dtc-1.4.4.ebuild 1121 BLAKE2B 0e6226dce63ed1b6bc6dd96deb179f8451564f99e6a91aeff689a25623a4085a9ed706a9495f8ee59e9a9e415cb8b8f559d8474ac7670f61deec48e9582424f4 SHA512 bea9060f27a2fbfddecf0d3b58ca26c429166e5efe71678f6f3cdf3a59b71c4e27ce6f9ef84806c6527d8804ee7a0a1ceb323c81e301c5f44f3aafef7aa5721b
+EBUILD dtc-1.4.6.ebuild 1217 BLAKE2B e82baa485e5139389f870dd2ecb83c6883af617585c2aa38bf6f1f26fd62c9f1c3c45888f1d305b53a3ba69a5e6c1511284289132499ea5a7b698286d156bcf2 SHA512 06acd8e5b7e8d26acfcc174d158f19a17fcf7f8fe5e5e597b309064773c9424d4032fdcca78eab02ccb3e8894d489ddd0ec8db88081f3645026b5488e7dc43ba
 EBUILD dtc-9999.ebuild 1181 BLAKE2B 4ea4eb40173c5e481fe2d7e935df40e53cce6b79440bd0a12416e6e775e5d367401bc7e040230f43228d8e06a6c20dead191eb30da98454a751877304c011be7 SHA512 de6b2dbd04270c132fce691dec8a1dd7b25c75717c89075091a85d98c3c15f9b154568f4b7beb0d35cd60bd8e775c45a606c7aaf31570d899d64efc85bdfe83e
 MISC metadata.xml 335 BLAKE2B 123cf55da545acd9b0b568ca010eba5f7818f43bf020f412a479397f08cfb571f7cd83f4b8c63c97d3ab3216278b62e6eff03a8c349f3b6758b1a41d559787b4 SHA512 757b9539f0dd59ff4c25127df262c6f030c3e4ddf4a4044a77bb7e2ee126001adff606a683b3af24f11d23604919366fa42cb496941ed232a5169ed2eac7c631
diff --git a/sys-apps/dtc/dtc-1.4.6.ebuild b/sys-apps/dtc/dtc-1.4.6.ebuild
new file mode 100644
index 000000000000..e0f94cb15729
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.4.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/software/utils/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Open Firmware device tree compiler"
+HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs"
+
+DEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+DOCS="
+	Documentation/dt-object-internal.txt
+	Documentation/dts-format.txt
+	Documentation/manual.txt
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS =/s:=:+=:' \
+		-e '/^CPPFLAGS =/s:=:+=:' \
+		-e 's:-Werror::' \
+		-e 's:-g -Os::' \
+		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
+		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
+		Makefile || die
+
+	tc-export AR CC
+	export V=1
+}
+
+MAKEOPTS="${MAKEOPTS} NO_PYTHON=1"
+
+src_install() {
+	default
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index 9b19dd09f0f8..54c05b05f480 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,5 +1,5 @@
 DIST fakechroot_2.17.2.orig.tar.gz 463307 BLAKE2B c13e0bb649dc4ecafed1d1f7aa487659631bfae94b2fdc91aee8b23910954e46a74ba6f3d50107a9a282b9e7cb21bf4edb372257adaf157f43c4055738ddce49 SHA512 bcdcf8e77aae46b567acddb80e6817a118c7ef250ba7b6962982e60a6a5e3b8c1eeef950dc33335f31466c3f53ab6b7260bc64a1da9c4b156a44d811ef8cccd0
 DIST fakechroot_2.19.orig.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
-EBUILD fakechroot-2.17.2.ebuild 588 BLAKE2B 1aec510a554865e5db274a48268fa533ff59e9ad0a5f09832472cf744bb5acea273fe4fa034a2bc8848f63913c2fee9c00873dcbf289d05b04a817ad9f12ec2e SHA512 c0ce568bcc8c33cc217f39caa1f23a0d0ffca332da3bf8f453a01ac2ba649b2ad772b96b1dfa2f164a880781585905be51a71f95f1027525cda5ba8be5c01902
+EBUILD fakechroot-2.17.2.ebuild 586 BLAKE2B a19038407cd5be5f4facb1dadc4543a6d1bb19b30e1e003d20603eeb154db97caccb1633be9b564ce887ebf8131d686d6182f353e07be82c1d3419f5e00031a6 SHA512 b2fcfa6605167ffc457c273ab13aad743d7a92b51e7444ef9edc4744692b97bb608dc2529c73cc5441d6d458cbbf5ffe7ad843e1396c0b02a21fd142c737e296
 EBUILD fakechroot-2.19.ebuild 600 BLAKE2B 179d2856ab8c47c96d9e631687d93b2b3f9faaff2f909d0bd3e85cc83f461e585e8e706f575079af351a8fac0ca4d37f5c9741ac70408314a8224ec56da44502 SHA512 6aa29b0cd72f33de0a5b602bd953eff30be823a11c28dd1bbf3fe100944407da729a5a0f520dc55546a868a3b7d50f881827dcd116878c3058f37a6df1303b50
 MISC metadata.xml 345 BLAKE2B 3471b0985dec02f4065149b788a8edb64d5a90741719c02bb4c87dffc27ee6f61f4d231df83e716382f36d2220e7cb7a4797cd3960db955761ee4852c76b80e6 SHA512 940ab52cf3ad5ef13f24f093fcc41e4c39dc9cd484eaf0dc0bb0d29306cbab474044cc72898ddaf49604a63032d7a089e2f308c9ea94e79c6a16c27970aba08c
diff --git a/sys-apps/fakechroot/fakechroot-2.17.2.ebuild b/sys-apps/fakechroot/fakechroot-2.17.2.ebuild
index f5545ea15ca1..631cda56fe82 100644
--- a/sys-apps/fakechroot/fakechroot-2.17.2.ebuild
+++ b/sys-apps/fakechroot/fakechroot-2.17.2.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index c4c61431701a..a37d11ad3ace 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,5 +1,5 @@
-DIST fwupd-1.0.5.tar.gz 1564037 BLAKE2B 1b97cf35e2531fc11b901f061dc30ac0c6b745f32f0b2f756e428509121ac3269d8d51c273566290cba2b840c890ce1274a268d46c35bd6486a932454c2d2cfa SHA512 dbbd0ae574c493de5d89f58e0050e44fd3cd1353807131d7e821ae02cffd4da594855df0ed35e9ceb72bdfc9c4b670e022d184c24897bf2ed370ce545c578621
 DIST fwupd-1.0.6.tar.gz 1569675 BLAKE2B 1e6b4acc52696cc08086647ce69d4901e78201817423a53f1a6af5f9c5b7be658a5f343c88aa358788aa9d51859b29d8ea7269ec855841652a37a88ba577e01e SHA512 8daaf5d5cb91260c443448a874f92d948bf878dc44c586dbd4a75323dd834ba3b106fe570e30c7a0aefe4c4a7008b6db1ec2948a948b3fb94906ef1fe3f2e35a
-EBUILD fwupd-1.0.5.ebuild 2447 BLAKE2B 41d784772438221fd54e43a66ca563742bd2dbb3d5771394a0e3b283e52149532d86f43c8810da7e659a0201209e2c3579053553b155365bdb3424268988cc54 SHA512 4a4441e3da906e7fde5face91abc2f792ccf9a8ee8070a9a4fe5baea108ab40841955b160f7923cc4456b8ef88039108ffbd685301d4a7a9095d66f12e818c61
+DIST fwupd-1.0.8.tar.gz 1584132 BLAKE2B 7744d14a02bd9847c0c1efe8ff8365abccf9d5213150687815d3e1236844ec71dbf161e5f5d7be32103c3613640680b5b2a017f1a60a30df93fc55bf5d765f74 SHA512 11bdc1dd77697b690e849bde59e54cf289cde32f410f9f7e8911a874f0a265b091ac2e335f784f54b64f835f2750a63a74092cc5eaf7a6c70eaa6d06995d131e
 EBUILD fwupd-1.0.6.ebuild 2487 BLAKE2B b752c547e695bfec356468b7fb5089ca75f75e3ea3c782acc50200024a0adc46d51ab1906d00e1a812fe10c9855ea48093e6005c5f94bee73997ff2804c5fb46 SHA512 6cf5280743a7123c18f0be9c58021d08d36a09f39251386ba1f34232b40471cbed9830b38dda676806098b280d8ed48c1d7328c7dcb048d2df0994903b66174e
+EBUILD fwupd-1.0.8.ebuild 2621 BLAKE2B 1996f358cf376ae14baaace3623a987e7a045bfcb9a3d3d38895c429e298439d71bec424feb03288309c0f47dbbf6014a8ecd1262e827f7c8d95f753870b2ad9 SHA512 792633ec3514a0189ea83da3e6e1a1e52b13a491b3e29b93329e014ffb750554636c3c17dc09eae4cdac0eb98f37b20e1e78477d89009185e5b3b31a46608b6e
 MISC metadata.xml 834 BLAKE2B c71e6a3c51d232413bc726375abfc6716b82a8228644c0032aae613936b47f0aa44d61c7c4d34b00b78b70dab6a1e8a0e8cb9d19ba0555cdee231310fb60230f SHA512 ac8f92d0d9dee26834fb46635451a7b053866d01614ea53f00d37281d34165d462aeb867cc770006b2abbcefa0051eeb3fa2cc9751c0017c72d31fedf6587a90
diff --git a/sys-apps/fwupd/fwupd-1.0.5.ebuild b/sys-apps/fwupd/fwupd-1.0.8.ebuild
index c5747fe2cd8f..b1dbd1d0395c 100644
--- a/sys-apps/fwupd/fwupd-1.0.5.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.8.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=6
 
+# Package requires newer meson than eclass provides
+MESON_AUTO_DEPEND="no"
 PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
 
-inherit meson python-single-r1 xdg-utils
+inherit meson python-single-r1 vala xdg-utils
 
 DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
 HOMEPAGE="https://fwupd.org"
@@ -15,24 +17,24 @@ LICENSE="GPL-2+"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="colorhug dell doc gpg +man systemd test uefi uefi_labels"
+IUSE="colorhug dell doc gpg +man pkcs7 systemd test uefi uefi_labels"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
 
 RDEPEND="
 	${PYTHON_DEPS}
-	app-crypt/gpgme
+	app-arch/libarchive:=
 	dev-db/sqlite
-	>=dev-libs/appstream-glib-0.6.13[introspection]
+	>=dev-libs/appstream-glib-0.7.4:=[introspection]
 	>=dev-libs/glib-2.45.8:2
 	dev-libs/libgpg-error
-	dev-libs/libgudev
+	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	>=net-libs/libsoup-2.51.92:2.4
+	>=net-libs/libsoup-2.51.92:2.4[introspection]
 	>=sys-auth/polkit-0.103
 	virtual/libelf:0=
 	colorhug? ( >=x11-misc/colord-1.2.12:0= )
@@ -44,9 +46,10 @@ RDEPEND="
 		app-crypt/gpgme
 		dev-libs/libgpg-error
 	)
+	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
 	systemd? ( >=sys-apps/systemd-231 )
 	!systemd? ( >=sys-auth/consolekit-1.0.0 )
-	uefi? ( >=sys-apps/fwupdate-5 )
+	uefi? ( >=sys-apps/fwupdate-10 )
 	uefi_labels? (
 		x11-libs/pango
 		x11-libs/cairo
@@ -60,20 +63,21 @@ DEPEND="
 	${RDEPEND}
 	app-arch/gcab
 	app-arch/libarchive
+	>=dev-util/meson-0.41.0
+	>=dev-util/ninja-1.7.2
 	virtual/pkgconfig
+	$(vala_depend)
 	doc? ( dev-util/gtk-doc )
 	man? ( app-text/docbook-sgml-utils )
 	test? ( net-libs/gnutls[tools] )
 "
 
-# tests require some ominous "certtool" which has not been packages for Gentoo yet
-RESTRICT="test"
-
 REQUIRED_USE="dell? ( uefi )"
 
 src_prepare() {
 	default
 	sed -i -e "s/'--create'/'--absolute-name', '--create'/" data/tests/builder/meson.build || die
+	vala_src_prepare
 }
 
 src_configure() {
@@ -83,10 +87,11 @@ src_configure() {
 		-Dgpg="$(usex gpg true false)"
 		-Dgtkdoc="$(usex doc true false)"
 		-Dman="$(usex man true false)"
+		-Dpkcs7="$(usex pkcs7 true false)"
 		-Dplugin_colorhug="$(usex colorhug true false)"
 		-Dplugin_dell="$(usex dell true false)"
 		-Dplugin_synaptics="$(usex dell true false)"
-		# requires libtbtfwu which is not packaged yet
+		# requires libtbtfwu which is not packaged (yet?)
 		-Dplugin_thunderbolt=false
 		-Dplugin_uefi="$(usex uefi true false)"
 		-Dplugin_uefi-labels="$(usex uefi_labels true false)"
diff --git a/sys-apps/fwupdate/Manifest b/sys-apps/fwupdate/Manifest
index 2cd69c6cc35d..fad357917378 100644
--- a/sys-apps/fwupdate/Manifest
+++ b/sys-apps/fwupdate/Manifest
@@ -1,6 +1,5 @@
-AUX fwupdate-9-objcopy_detection.patch 1616 BLAKE2B 88daad5739b7bc1e7a5fb2d9c96a4e8c3157b42e654de23061ea871cbab85d4d02c18066b213aeb9817a5926794eccfd83e30eed9d1b047c47ab29c7f3c263fc SHA512 d2e790aaf3a3e10d4154507d1243d429e3fefb914a1fdc3677ec8f7450b3059c34c6d8aeb48eba96647165d95b41adebb849dbba398be07031759499de4a3052
 DIST fwupdate-10.tar.gz 55899 BLAKE2B 34e74386de5151a977d0e136ac4d022a42d339775c77525fa26a2669ad7b10da2c0882435ac6093cd69d56473b83234c9d808f12565ab029a4f14c006ce6a1d8 SHA512 7c01a41a8c2876a954a1047790b45999c07416eeafffdf5a0802c53a877ca300811bc2282cb9398e46df53f761404a8fe4ef8caa1995f326122dbae2af1018da
-DIST fwupdate-9.tar.gz 41698 BLAKE2B 72026feab48f39e25548dc2475c10f11ea74d88228dffbb99f58f00bcc8052a90522ebb572558bffc538524a0791a78e9f7aa8fefa76f3a05ee6a09ad93e1878 SHA512 bcb7783944aa007450a28f71cb4e3c8b06220b3ad04dd90a9505273224ba192369fb63ac0d72bd1efc06c78a5f6f38f2eea2c4affe915eff5f2b7c04db0847c8
+DIST fwupdate-12.tar.gz 61523 BLAKE2B 4adb26e50b69f4c0aeef9e0287dd520f396b3e433e4018651ad125406a1bd160e673da55923c2764c126c1d53d1f12a65c2dd7d9b9e688411ca31426e7b7103f SHA512 1681e97982b22084cb3ca38e2965ce25c4cf72dd0afd2268f0a2612c6aa90b3030e4b6bfa64f42e504a680d60c5e623462238fa148a60359725db0a835dac193
 EBUILD fwupdate-10.ebuild 852 BLAKE2B fde9ce5e48019e4b33907fe2c6c6c5887a02676297fb59282b90dd8ebbc69263d9634c5674218d56a0fa80cca4732950c92b28622eea54c4ddadfa62310c39c9 SHA512 40d3e3498c3797d230d3a38cd1ce9e5c8355942baad10f99d8f8d549d5416639f3375e6317f9762a42a5d477355f0016ae8286cbc7517d8c1c27a7d976e349dc
-EBUILD fwupdate-9.ebuild 901 BLAKE2B 3c6e68d44c4de562e43cfbc808624f0c06ad94a98d67ca4b7a4e78694680eae5be4681add956c0dce9c5a17850edc0809a612f64ff676856c63350fbb1e3006a SHA512 fe51dd20e9b7e8f23d5d76b48c027bb6b13df001b705d780c4a24fbc5b435d040d5c6a8bbac2293092e032d7625bfe9976ec5c1371ae5e80a469eba6560824df
+EBUILD fwupdate-12.ebuild 876 BLAKE2B bdc849d79ff4f9b101093fdf64fc490a7fc779df53c0234778f4b6bf3a6e21afd640713b9598cc17adefcfd49cfba083fd9e77df997d2182c2c118846961aaed SHA512 2b151bc40e98f4d704aef4c1f6c87f26778db5009f269802de6b8842684b1c632d7c4bb55f25827c8a0be885ac8a2158dd5943c3b3ddfad5826d17a33d481748
 MISC metadata.xml 346 BLAKE2B c1ac02b4846e985ebd37bf1cd865b1ca889ed8c7b06efc75dc293fe28b443f3eb886e1c31c461776f567288702923c0b9cf4ce644c31fe5064321b194a60c210 SHA512 55ff3da29bf22afc47434b7079e8559e72d34f769ecdfd198f84c051e6ba68e91751c23c36c841b6c0f81ada4fe74854dd7f1fc0e579e96e43ba3b35bc164dcf
diff --git a/sys-apps/fwupdate/files/fwupdate-9-objcopy_detection.patch b/sys-apps/fwupdate/files/fwupdate-9-objcopy_detection.patch
deleted file mode 100644
index d41462397ff2..000000000000
--- a/sys-apps/fwupdate/files/fwupdate-9-objcopy_detection.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From affc219a5bac93cb6e774879c874c203f755ba11 Mon Sep 17 00:00:00 2001
-From: Raymund Will <rw@suse.com>
-Date: Mon, 13 Mar 2017 12:57:07 +0100
-Subject: [PATCH] Fix regression in "objcopy version check" (AKA `expr: syntax
- error`)
-
-While commit 8418fee4 may have fixed the check for "some distributions"
-it broke the same check for others, like
-
-`GNU objcopy (WinAVR 20090313) 2.19`
-`GNU objcopy (AVR_8_bit_GNU_Toolchain_3.4.3_1072) 2.23.2`
-`GNU objcopy (Codescape GNU Tools 2016.05-03 for MIPS MTI Bare Metal) 2.24.90`
-`GNU objcopy (GNU Binutils; openSUSE Leap 42.2) 2.26.1`
-`GNU objcopy (GNU Binutils; SUSE Linux Enterprise 12) 2.26.1`
-
-(some more, some less relevant... ;)
-
-This version is meant to cover them all (or at least be easily extensible).
-
-Signed-off-by: Raymund Will <rw@suse.com>
----
- efi/Makefile | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/efi/Makefile b/efi/Makefile
-index 920c096..faf8ee2 100644
---- a/efi/Makefile
-+++ b/efi/Makefile
-@@ -15,7 +15,15 @@ CCLDFLAGS	?= -nostdlib -Wl,--warn-common \
- 	-Wl,-shared -Wl,-Bsymbolic -L$(LIBDIR) -L$(GNUEFIDIR) \
- 	-Wl,--build-id=sha1 -Wl,--hash-style=sysv \
- 	$(GNUEFIDIR)/crt0-efi-$(ARCH).o
--OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed 's/^[^0-9]*//g' | cut -f1-2 -d.` \>= 2.24)
-+
-+define objcopy_version =
-+  $(OBJCOPY) --version |
-+    sed -e '/^GNU objcopy/! d;
-+	    : loop1; s/([^)(]*)//g;   t loop1;
-+	    : loop2; s/\[[^][]*\]//g; t loop2;
-+	    s/.* \([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;'
-+endef
-+OBJCOPY_GTE224 := $(shell expr `$(objcopy_version)` \>= 2.24)
- 
- FWUP = fwupdate
- 
diff --git a/sys-apps/fwupdate/fwupdate-9.ebuild b/sys-apps/fwupdate/fwupdate-12.ebuild
index 74e9ccfa61bc..4f3674c54d8a 100644
--- a/sys-apps/fwupdate/fwupdate-9.ebuild
+++ b/sys-apps/fwupdate/fwupdate-12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit mount-boot toolchain-funcs
 
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/popt
-	sys-libs/efivar
+	>=sys-libs/efivar-32-r1
 	>=sys-libs/libsmbios-2.3.2
 "
 DEPEND="
@@ -24,10 +24,6 @@ DEPEND="
 	sys-boot/gnu-efi
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-objcopy_detection.patch"
-)
-
 do_make() {
 	emake \
 		CC="$(tc-getCC)" \
@@ -49,4 +45,5 @@ src_compile() {
 
 src_install() {
 	do_make DESTDIR="${D}" install
+	keepdir /var/lib/${PN}
 }
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 1e45fb425789..f73d766881f6 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,15 +1,5 @@
-AUX filefuncs/Makefile 1112 BLAKE2B 2aac64b80953a3253730209b9496164cfa2d3e9d18c90547cc7290329e2639ba4499a7d9c9a87b79c05f31a8cea3ace1663de8adaaef5d75d6b25ab8017951a0 SHA512 9bf5acfca439e6589247db3b4b16985765e748bcb66577e7038247830f92137929f139f6ab72ecb9e2b3b03f9406c8ecf7ca349329979ee8d70fbf44b4feb2b8
-AUX filefuncs/filefuncs.c 10875 BLAKE2B 7da403cea52ba69b3822aa892ad8faa12fd59d64d434f35048e34a38273f57fac73a42d74d88e68c33feae015ac241395c2f71c3e7e7e99b526814d9347d8c73 SHA512 48da0dce39759a8d57097b286dcee2ebf1e1799b694a4a7926716df727eb294a7912117c405e1b63a1722fa3a2427cb2139d92fac723ffd8d2e697632719f974
-AUX gawk-4.1.3-bsd_configure_readline.patch 1899 BLAKE2B a7c8ce8aa8fb25ce3adc74fb195bf8c9dbd7b83084f4f901c61758f5a51969510aa3ae8c9f2668266d798d43563f6fcb7e8659ae9f7cf7514f86de2f5443fed6 SHA512 ed3b6c4efe5bcb53bca6eeb50df0e3871eca266dd3d6ea4369f42dce31b771ed0a4f0aac03b09124706539d18c8d1dfe549e43d2ef4cf80a45353e14238ddaec
-DIST gawk-4.0.2.tar.xz 1626808 BLAKE2B f66ebc3650c7288d46ed4548f07c83cbd591873a5d364965d6768e6455f64334cb03cb91e83a110d5edaa917c7fed714cf66154cea5c0ec22ef982429ad03265 SHA512 069f68b6792521d94d4003764006ad8fbe9a17c60a88212629204d9a5eb3f662903fff6d91dd3c1834597b76c18f9d3231c93a033f456c59c0571ac13eb77b27
-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
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
-EBUILD gawk-4.0.2.ebuild 2076 BLAKE2B 73d9ce392a42ee14556b70be84ed284108212c471d7e31faaaf07305c525ed73d16df7d3bdc12539ca50352c861a4ed7ca291a376e7516c0f4facf1bc1e813c7 SHA512 69f941d2eb134277c70b4e7ea4364a8902d7522903064192c7f306219128fb45f0a2d42ed79c852da918acb0c740e49052d36a5e27d331d239c6e6d811b7cc41
-EBUILD gawk-4.1.3.ebuild 2003 BLAKE2B 55c637567276e73fbb4032c3d297480a769ee0769a354ec491a857da2afb9708ad650d5f70db1224d315dd82675316cff38ef0ac3af83cbcf280dbfbbc24078c SHA512 87b224aa2cd9b231eb088b588242860ef323913ec64cb403f7622504f82e8d4431fc7f0b53d5bfe33df5c2852b5b6390b235870d4a9e3058fd4803dab2eeadd4
 EBUILD gawk-4.1.4.ebuild 2090 BLAKE2B 157b0b2d6eed94587109451db8aeae9b809f16e2adff1735d9111ff486ccacdeb0f0add59cb23f58ef80e72fbd746bdf80ee029bffd1ccba5219f6609b124d00 SHA512 59ba5329f4334688408e6afd9fcc0556f87e46bc5f860ae140197c7b0a2a62dfc6236199a9588c1ee57f4ab946ee924bbba804abbfd0125f8acf4dbecaeb9589
-EBUILD gawk-4.2.0.ebuild 2217 BLAKE2B 7167b9d789eb38036c4ae2d46ee00c8ab29dcf959920e92a3529380fd132126c27ef5125cfa52165551fb6134217230512f98a31259316f4977ff5013df56038 SHA512 8711fd432cb13b920561bf5ced80694c3cfdca84932301bf5ffa505a3fdc0d1d07f108534ba18cb386cc05061afa00466d301d46b69abc5502f315d094a982aa
 EBUILD gawk-4.2.1-r1.ebuild 2574 BLAKE2B 887cc51f129b56ace31986b3718c3ffadb8f19a197aa59427ccc706032e4373d0bb80ac6484405da2f2fd8417e8d7759a07d7b895ad59d415d6d9889ccdb6920 SHA512 4abd41cb11ba0cbbf8ccb2ef9459678af6ac6507a400a8cbd7d96f41045847101ab22721ffc2637e2717bf88f591f04adb817ae91360e8573ded16ea16c4c31b
-EBUILD gawk-4.2.1.ebuild 2204 BLAKE2B 82c60e85badb8d968c796c6aa83ed366b0b399fb32342bfecabc6aeba7dbfce73361b5a7968d9a61269d0c25cfda7c5add6159f62aee7dd6fc35f4f1bf93445b SHA512 b814c89f185cf3086c7a06f2bfe2a1bae616a9b5bfd062ab9c230c043f9072ead65ab438295b5c7abb430bcbc9a5c601ce41eb8ce1a0b8e429fbbb9a3881bb6d
 MISC metadata.xml 465 BLAKE2B 4ae9d07b535014b76695db5d04b7a8b984c045dd78e90c8e7b0b3215a3021e5b190bfd89ca3f0dd5d9d8f1b55340ac57e40e02509e0d65288032458a0a247096 SHA512 517baceec7b9ea9311d1a946df59da35e6a5619344426ecdca6ff56e0da876ae1e6f793417e5d563da0f4528c535026deedf451eb6da8c7140db69709342a3cc
diff --git a/sys-apps/gawk/files/filefuncs/Makefile b/sys-apps/gawk/files/filefuncs/Makefile
deleted file mode 100644
index 498793805c08..000000000000
--- a/sys-apps/gawk/files/filefuncs/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-
-CC ?= gcc
-LD = $(CC)
-
-MAJORVER = 0
-MINORVER = 0.1
-
-AWKINCDIR = /usr/include/awk
-DESTDIR =
-
-TARGET = filefuncs
-TARGET_LIB = $(TARGET).so.$(MAJORVER).$(MINORVER)
-
-LIBDIR = lib
-
-# Gentoo specific cruft, you like it dont ya idiot
-ifdef D
-DESTDIR = $(D)
-endif
-ifdef S
-AWKINCDIR = $(S)
-endif
-
-DOIT = yes
-ifeq ($(USERLAND),Darwin)
-DOIT = no
-endif
-
-ifeq ($(DOIT),yes)
-
-all: $(TARGET_LIB)
-
-$(TARGET).o: $(TARGET).c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -shared -Wall -DHAVE_CONFIG_H -c -O2 -fPIC -I$(AWKINCDIR) $^
-
-$(TARGET_LIB): $(TARGET).o
-	$(LD) $(LDFLAGS) -o $@ -shared -Wl,-soname -Wl,$(TARGET).so.$(MAJORVER) $^
-
-install: $(TARGET_LIB)
-	install -m 0755 -d $(DESTDIR)/$(LIBDIR)/rcscripts
-	install -m 0755 $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts
-	ln -s $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET).so.$(MAJORVER)
-	ln -s $(TARGET_LIB) $(DESTDIR)/$(LIBDIR)/rcscripts/$(TARGET).so
-
-clean:
-	rm -f $(TARGET)
-	rm -f *.o *~ core
-
-else
-
-all install clean:
-
-endif
diff --git a/sys-apps/gawk/files/filefuncs/filefuncs.c b/sys-apps/gawk/files/filefuncs/filefuncs.c
deleted file mode 100644
index 04c9db7fe107..000000000000
--- a/sys-apps/gawk/files/filefuncs/filefuncs.c
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
- * filefuncs.c - Builtin functions that provide initial minimal iterface
- *		 to the file system.
- *
- * Arnold Robbins, update for 3.1, Mon Nov 23 12:53:39 EST 1998
- */
-
-/*
- * Copyright (C) 2001 the Free Software Foundation, Inc.
- * 
- * This file is part of GAWK, the GNU implementation of the
- * AWK Programming Language.
- * 
- * GAWK is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * GAWK is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- */
-
-/*
- * Copyright 1999-2004 Gentoo Foundation
- * Distributed under the terms of the GNU General Public License v2
- * Author:  Martin Schlemmer <azarah@gentoo.org>, Nov 2002
- * 
- * Extended with: do_symlink()
- *                do_unlink()
- *                do_mkdir()
- *                do_rmdir()
- *
- * for use in the Gentoo rcscripts
- *
- */
-
-#include "awk.h"
-
-#include <unistd.h>
-
-/*  do_chdir --- provide dynamically loaded chdir() builtin for gawk */
-
-static NODE *
-do_chdir(tree)
-NODE *tree;
-{
-	NODE *newdir;
-	int ret = -1;
-
-	if  (do_lint && tree->param_cnt > 1)
-		lintwarn("chdir: called with too many arguments");
-
-	newdir = get_argument(tree, 0);
-	if (newdir != NULL) {
-		(void) force_string(newdir);
-		ret = chdir(newdir->stptr);
-		if (ret < 0)
-			update_ERRNO();
-
-		free_temp(newdir);
-	} else if (do_lint)
-		lintwarn("chdir: called with no arguments");
-
-
-	/* Set the return value */
-	set_value(tmp_number((AWKNUM) ret));
-
-	/* Just to make the interpreter happy */
-	return tmp_number((AWKNUM) 0);
-}
-
-/*  do_symlink --- provide dynamically loaded symlink() builtin for gawk */
-
-static NODE *
-do_symlink(tree)
-NODE *tree;
-{
-	NODE *oldpath, *newpath;
-	int ret = -1;
-
-	if (do_lint && tree->param_cnt > 2)
-		lintwarn("symlink: called with too many arguments");
-
-	oldpath = get_argument(tree, 0);
-	newpath = get_argument(tree, 1);
-	if ((oldpath != NULL) && (newpath)) {
-		(void) force_string(oldpath);
-		(void) force_string(newpath);
-		ret = symlink(oldpath->stptr, newpath->stptr);
-		if (ret < 0)
-			update_ERRNO();
-
-		free_temp(oldpath);
-		free_temp(newpath);
-	} else if (do_lint)
-		lintwarn("symlink: called with not enough arguments");
-	
-	/* Set the return value */
-	set_value(tmp_number((AWKNUM) ret));
-	
-	/* Just to make the interpreter happy */
-	return tmp_number((AWKNUM) 0);	
-}
-
-/* do_unlink --- provide dynamically loaded unlink() builtin for gawk */
-
-static NODE *
-do_unlink(tree)
-NODE *tree;
-{
-	NODE *pathname;
-	int ret = -1;
-
-	if (do_lint && tree->param_cnt > 1)
-		lintwarn("unlink: called with too many arguments");
-
-	pathname = get_argument(tree, 0);
-	if (pathname != NULL) {
-		(void) force_string(pathname);
-		ret = unlink(pathname->stptr);
-		if (ret < 0)
-			update_ERRNO();
-
-		free_temp(pathname);
-	} else if (do_lint)
-		lintwarn("unlink: called with no arguments");
-
-	/* Set the return value */
-	set_value(tmp_number((AWKNUM) ret));
-
-	/* Just to make the interpreter happy */
-	return tmp_number((AWKNUM) 0);
-}
-
-/* do_mkdir --- provide dynamically loaded mkdir() builtin for gawk */
-
-static NODE *
-do_mkdir(tree)
-NODE *tree;
-{
-	NODE *pathname, *mode;
-	int ret = -1;
-
-	if (do_lint && tree->param_cnt > 2)
-		lintwarn("mkdir: called with too many arguments");
-
-	pathname = get_argument(tree, 0);
-	mode = get_argument(tree, 1);
-	if ((pathname != NULL) && (mode != NULL)) {
-		(void) force_string(pathname);
-		(void) force_number(mode);
-		ret = mkdir(pathname->stptr, mode->numbr);
-		if (ret < 0)
-			update_ERRNO();
-
-		free_temp(pathname);
-		free_temp(mode);
-	} else if (do_lint)
-		lintwarn("mkdir: called with not enough arguments");
-
-	/* Set the return value */
-	set_value(tmp_number((AWKNUM) ret));
-
-	/* Just to make the interpreter happy */
-	return tmp_number((AWKNUM) 0);
-}
-
-/* do_rmdir --- provide dynamically loaded rmdir() builtin for gawk */
-
-static NODE *
-do_rmdir(tree)
-NODE *tree;
-{
-	NODE *pathname;
-	int ret = -1;
-
-	if (do_lint && tree->param_cnt > 1)
-		lintwarn("rmdir: called with too many arguments");
-
-	pathname = get_argument(tree, 0);
-	if (pathname != NULL) {
-		(void) force_string(pathname);
-		ret = rmdir(pathname->stptr);
-		if (ret < 0)
-			update_ERRNO();
-
-		free_temp(pathname);
-	} else if (do_lint)
-		lintwarn("rmdir: called with no arguments");
-
-	/* Set the return value */
-	set_value(tmp_number((AWKNUM) ret));
-
-	/* Just to make the interpreter happy */
-	return tmp_number((AWKNUM) 0);
-}
-
-/* format_mode --- turn a stat mode field into something readable */
-
-static char *
-format_mode(fmode)
-unsigned long fmode;
-{
-	static char outbuf[12];
-	int i;
-
-	strcpy(outbuf, "----------");
-	/* first, get the file type */
-	i = 0;
-	switch (fmode & S_IFMT) {
-#ifdef S_IFSOCK
-	case S_IFSOCK:
-		outbuf[i] = 's';
-		break;
-#endif
-#ifdef S_IFLNK
-	case S_IFLNK:
-		outbuf[i] = 'l';
-		break;
-#endif
-	case S_IFREG:
-		outbuf[i] = '-';	/* redundant */
-		break;
-	case S_IFBLK:
-		outbuf[i] = 'b';
-		break;
-	case S_IFDIR:
-		outbuf[i] = 'd';
-		break;
-#ifdef S_IFDOOR	/* Solaris weirdness */
-	case S_IFDOOR:
-		outbuf[i] = 'D';
-		break;
-#endif /* S_IFDOOR */
-	case S_IFCHR:
-		outbuf[i] = 'c';
-		break;
-#ifdef S_IFIFO
-	case S_IFIFO:
-		outbuf[i] = 'p';
-		break;
-#endif
-	}
-
-	i++;
-	if ((fmode & S_IRUSR) != 0)
-		outbuf[i] = 'r';
-	i++;
-	if ((fmode & S_IWUSR) != 0)
-		outbuf[i] = 'w';
-	i++;
-	if ((fmode & S_IXUSR) != 0)
-		outbuf[i] = 'x';
-	i++;
-
-	if ((fmode & S_IRGRP) != 0)
-		outbuf[i] = 'r';
-	i++;
-	if ((fmode & S_IWGRP) != 0)
-		outbuf[i] = 'w';
-	i++;
-	if ((fmode & S_IXGRP) != 0)
-		outbuf[i] = 'x';
-	i++;
-
-	if ((fmode & S_IROTH) != 0)
-		outbuf[i] = 'r';
-	i++;
-	if ((fmode & S_IWOTH) != 0)
-		outbuf[i] = 'w';
-	i++;
-	if ((fmode & S_IXOTH) != 0)
-		outbuf[i] = 'x';
-	i++;
-
-	outbuf[i] = '\0';
-
-	if ((fmode & S_ISUID) != 0) {
-		if (outbuf[3] == 'x')
-			outbuf[3] = 's';
-		else
-			outbuf[3] = 'S';
-	}
-
-	/* setgid without execute == locking */
-	if ((fmode & S_ISGID) != 0) {
-		if (outbuf[6] == 'x')
-			outbuf[6] = 's';
-		else
-			outbuf[6] = 'l';
-	}
-
-	if ((fmode & S_ISVTX) != 0) {
-		if (outbuf[9] == 'x')
-			outbuf[9] = 't';
-		else
-			outbuf[9] = 'T';
-	}
-
-	return outbuf;
-}
-
-/* do_stat --- provide a stat() function for gawk */
-
-static NODE *
-do_stat(tree)
-NODE *tree;
-{
-	NODE *file, *array;
-	struct stat sbuf;
-	int ret;
-	NODE **aptr;
-	char *pmode;	/* printable mode */
-	char *type = "unknown";
-
-	/* check arg count */
-	if (tree->param_cnt != 2)
-		fatal(
-	"stat: called with incorrect number of arguments (%d), should be 2",
-			tree->param_cnt);
-
-	/* directory is first arg, array to hold results is second */
-	file = get_argument(tree, 0);
-	array = get_argument(tree, 1);
-
-	/* empty out the array */
-	assoc_clear(array);
-
-	/* lstat the file, if error, set ERRNO and return */
-	(void) force_string(file);
-	ret = lstat(file->stptr, & sbuf);
-	if (ret < 0) {
-		update_ERRNO();
-
-		set_value(tmp_number((AWKNUM) ret));
-
-		free_temp(file);
-		return tmp_number((AWKNUM) 0);
-	}
-
-	/* fill in the array */
-	aptr = assoc_lookup(array, tmp_string("name", 4), FALSE);
-	*aptr = dupnode(file);
-
-	aptr = assoc_lookup(array, tmp_string("dev", 3), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_dev);
-
-	aptr = assoc_lookup(array, tmp_string("ino", 3), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_ino);
-
-	aptr = assoc_lookup(array, tmp_string("mode", 4), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_mode);
-
-	aptr = assoc_lookup(array, tmp_string("nlink", 5), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_nlink);
-
-	aptr = assoc_lookup(array, tmp_string("uid", 3), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_uid);
-
-	aptr = assoc_lookup(array, tmp_string("gid", 3), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_gid);
-
-	aptr = assoc_lookup(array, tmp_string("size", 4), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_size);
-
-	aptr = assoc_lookup(array, tmp_string("blocks", 6), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_blocks);
-
-	aptr = assoc_lookup(array, tmp_string("atime", 5), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_atime);
-
-	aptr = assoc_lookup(array, tmp_string("mtime", 5), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_mtime);
-
-	aptr = assoc_lookup(array, tmp_string("ctime", 5), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_ctime);
-
-	/* for block and character devices, add rdev, major and minor numbers */
-	if (S_ISBLK(sbuf.st_mode) || S_ISCHR(sbuf.st_mode)) {
-		aptr = assoc_lookup(array, tmp_string("rdev", 4), FALSE);
-		*aptr = make_number((AWKNUM) sbuf.st_rdev);
-
-		aptr = assoc_lookup(array, tmp_string("major", 5), FALSE);
-		*aptr = make_number((AWKNUM) major(sbuf.st_rdev));
-
-		aptr = assoc_lookup(array, tmp_string("minor", 5), FALSE);
-		*aptr = make_number((AWKNUM) minor(sbuf.st_rdev));
-	}
-
-#ifdef HAVE_ST_BLKSIZE
-	aptr = assoc_lookup(array, tmp_string("blksize", 7), FALSE);
-	*aptr = make_number((AWKNUM) sbuf.st_blksize);
-#endif /* HAVE_ST_BLKSIZE */
-
-	aptr = assoc_lookup(array, tmp_string("pmode", 5), FALSE);
-	pmode = format_mode(sbuf.st_mode);
-	*aptr = make_string(pmode, strlen(pmode));
-
-	/* for symbolic links, add a linkval field */
-	if (S_ISLNK(sbuf.st_mode)) {
-		char buf[BUFSIZ*2];
-		int linksize;
-
-		linksize = readlink(file->stptr, buf, sizeof buf);
-		/* should make this smarter */
-		if (linksize == sizeof(buf))
-			fatal("size of symbolic link too big");
-		buf[linksize] = '\0';
-
-		aptr = assoc_lookup(array, tmp_string("linkval", 7), FALSE);
-		*aptr = make_string(buf, linksize);
-	}
-
-	/* add a type field */
-	switch (sbuf.st_mode & S_IFMT) {
-#ifdef S_IFSOCK
-	case S_IFSOCK:
-		type = "socket";
-		break;
-#endif
-#ifdef S_IFLNK
-	case S_IFLNK:
-		type = "symlink";
-		break;
-#endif
-	case S_IFREG:
-		type = "file";
-		break;
-	case S_IFBLK:
-		type = "blockdev";
-		break;
-	case S_IFDIR:
-		type = "directory";
-		break;
-#ifdef S_IFDOOR
-	case S_IFDOOR:
-		type = "door";
-		break;
-#endif
-	case S_IFCHR:
-		type = "chardev";
-		break;
-#ifdef S_IFIFO
-	case S_IFIFO:
-		type = "fifo";
-		break;
-#endif
-	}
-
-	aptr = assoc_lookup(array, tmp_string("type", 4), FALSE);
-	*aptr = make_string(type, strlen(type));
-
-	free_temp(file);
-
-	/* Set the return value */
-	set_value(tmp_number((AWKNUM) ret));
-
-	/* Just to make the interpreter happy */
-	return tmp_number((AWKNUM) 0);
-}
-
-/* dlload --- load new builtins in this library */
-
-NODE *
-dlload(tree, dl)
-NODE *tree;
-void *dl;
-{
-	make_builtin("chdir", do_chdir, 1);
-	make_builtin("symlink", do_symlink, 2);
-	make_builtin("unlink", do_unlink, 1);
-	make_builtin("mkdir", do_mkdir, 2);
-	make_builtin("rmdir", do_rmdir, 1);
-	make_builtin("stat", do_stat, 2);
-
-	return tmp_number((AWKNUM) 0);
-}
-
diff --git a/sys-apps/gawk/files/gawk-4.1.3-bsd_configure_readline.patch b/sys-apps/gawk/files/gawk-4.1.3-bsd_configure_readline.patch
deleted file mode 100644
index 3bd267efd179..000000000000
--- a/sys-apps/gawk/files/gawk-4.1.3-bsd_configure_readline.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-http://git.savannah.gnu.org/cgit/gawk.git/commit/?id=ac0ef52fe407b89c7968b927c7b2b513cc13963a
-
---- gawk-4.1.3/configure	2015-05-19 15:38:35.000000000 +0200
-+++ gawk-4.1.3/configure	2015-05-19 15:38:35.000000000 +0200
-@@ -10825,7 +10825,46 @@
- 
-         if test $_found_readline = yes ; then
- 	   case $host_os in
--	   *bsd* )	_combo="$_combo -ltermcap"
-+	   *bsd* )	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
-+if ${ac_cv_lib_termcap_tgetent+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltermcap  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char tgetent ();
-+int
-+main ()
-+{
-+return tgetent ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_termcap_tgetent=yes
-+else
-+  ac_cv_lib_termcap_tgetent=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
-+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
-+if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
-+  _combo="$_combo -ltermcap"
-+fi
-+
- 	  	 ;;
- 	   esac
- 
---- gawk-4.1.3/m4/readline.m4	2015-04-05 12:19:19.000000000 +0200
-+++ gawk-4.1.3/m4/readline.m4	2015-04-05 12:19:19.000000000 +0200
-@@ -92,7 +92,7 @@
- 
-         if test $_found_readline = yes ; then
- 	   case $host_os in
--	   *bsd* )	_combo="$_combo -ltermcap"
-+	   *bsd* )	AC_CHECK_LIB(termcap, tgetent, _combo="$_combo -ltermcap")
- 	  	 ;;
- 	   esac
-            AC_DEFINE(HAVE_LIBREADLINE,1,
diff --git a/sys-apps/gawk/gawk-4.0.2.ebuild b/sys-apps/gawk/gawk-4.0.2.ebuild
deleted file mode 100644
index 4108ca1c6efb..000000000000
--- a/sys-apps/gawk/gawk-4.0.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-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 ~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
-RDEPEND="!<sys-apps/baselayout-2.0.1
-	readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	# use symlinks rather than hardlinks, and disable version links
-	sed -i \
-		-e '/^LN =/s:=.*:= $(LN_S):' \
-		-e '/install-exec-hook:/s|$|\nfoo:|' \
-		Makefile.in doc/Makefile.in
-	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327
-}
-
-src_configure() {
-	export ac_cv_libsigsegv=no
-	econf \
-		--libexec='$(libdir)/misc' \
-		$(use_enable nls) \
-		$(use_with readline)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h || die
-	rm "${ED}"/usr/include/awk/config.h || die
-
-	dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README README_d/*.*
-	for x in */ChangeLog ; do
-		newdoc ${x} ${x##*/}.${x%%/*}
-	done
-}
-
-pkg_postinst() {
-	# symlink creation here as the links do not belong to gawk, but to any awk
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	else
-		local l
-		for l in "${EROOT}"usr/share/man/man1/gawk.1* "${EROOT}"usr/bin/gawk; do
-			[[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}"
-		done
-		[[ ! -e ${EROOT}bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT}bin/awk"
-	fi
-}
-
-pkg_postrm() {
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/gawk/gawk-4.1.3.ebuild b/sys-apps/gawk/gawk-4.1.3.ebuild
deleted file mode 100644
index 26bb3ec3627e..000000000000
--- a/sys-apps/gawk/gawk-4.1.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-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 ~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= )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	# use symlinks rather than hardlinks, and disable version links
-	sed -i \
-		-e '/^LN =/s:=.*:= $(LN_S):' \
-		-e '/install-exec-hook:/s|$|\nfoo:|' \
-		Makefile.in doc/Makefile.in || die
-	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327
-
-	EPATCH_OPTS="-Z" \
-	epatch "${FILESDIR}/${P}-bsd_configure_readline.patch" #507468
-}
-
-src_configure() {
-	export ac_cv_libsigsegv=no
-	econf \
-		--libexec='$(libdir)/misc' \
-		$(use_with mpfr) \
-		$(use_enable nls) \
-		$(use_with readline)
-}
-
-src_install() {
-	rm -rf README_d # automatic dodocs barfs
-	default
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h || die
-	rm "${ED}"/usr/include/awk/config.h || die
-}
-
-pkg_postinst() {
-	# symlink creation here as the links do not belong to gawk, but to any awk
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	else
-		local l
-		for l in "${EROOT}"usr/share/man/man1/gawk.1* "${EROOT}"usr/bin/gawk; do
-			[[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}"
-		done
-		[[ ! -e ${EROOT}bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT}bin/awk"
-	fi
-}
-
-pkg_postrm() {
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/gawk/gawk-4.2.0.ebuild b/sys-apps/gawk/gawk-4.2.0.ebuild
deleted file mode 100644
index 920298905c47..000000000000
--- a/sys-apps/gawk/gawk-4.2.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-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 ~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="
-	dev-libs/gmp:0=
-	mpfr? ( dev-libs/mpfr:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	# use symlinks rather than hardlinks, and disable version links
-	sed -i \
-		-e '/^LN =/s:=.*:= $(LN_S):' \
-		-e '/install-exec-hook:/s|$|\nfoo:|' \
-		Makefile.in doc/Makefile.in || die
-	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327
-	# fix standards conflict on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i \
-			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
-			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
-			extension/inplace.c || die
-	fi
-}
-
-src_configure() {
-	export ac_cv_libsigsegv=no
-	local myeconfargs=(
-		--libexec='$(libdir)/misc'
-		$(use_with mpfr)
-		$(use_enable nls)
-		$(use_with readline)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	rm -rf README_d # automatic dodocs barfs
-	default
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h || die
-	rm "${ED}"/usr/include/awk/config.h || die
-}
-
-pkg_postinst() {
-	# symlink creation here as the links do not belong to gawk, but to any awk
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	else
-		local l
-		for l in "${EROOT%/}"/usr/share/man/man1/gawk.1* "${EROOT%/}"/usr/bin/gawk; do
-			[[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}"
-		done
-		[[ ! -e ${EROOT%/}/bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT%/}/bin/awk"
-	fi
-}
-
-pkg_postrm() {
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/gawk/gawk-4.2.1.ebuild b/sys-apps/gawk/gawk-4.2.1.ebuild
deleted file mode 100644
index 58bcb228179c..000000000000
--- a/sys-apps/gawk/gawk-4.2.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-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 ~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="
-	dev-libs/gmp:0=
-	mpfr? ( dev-libs/mpfr:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	# use symlinks rather than hardlinks, and disable version links
-	sed -i \
-		-e '/^LN =/s:=.*:= $(LN_S):' \
-		-e '/install-exec-hook:/s|$|\nfoo:|' \
-		Makefile.in doc/Makefile.in || die
-	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327
-	# fix standards conflict on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i \
-			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
-			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
-			extension/inplace.c || die
-	fi
-}
-
-src_configure() {
-	export ac_cv_libsigsegv=no
-	local myeconfargs=(
-		--libexec='$(libdir)/misc'
-		$(use_with mpfr)
-		$(use_enable nls)
-		$(use_with readline)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	rm -rf README_d # automatic dodocs barfs
-	default
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h
-	rm "${ED%/}"/usr/include/awk/config.h || die
-}
-
-pkg_postinst() {
-	# symlink creation here as the links do not belong to gawk, but to any awk
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	else
-		local l
-		for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk; do
-			[[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}"
-		done
-		[[ ! -e ${EROOT}/bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT}/bin/awk"
-	fi
-}
-
-pkg_postrm() {
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 5789d6aa9954..273b13c1e66a 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -2,9 +2,11 @@ DIST hwids-20170328.tar.gz 2049249 BLAKE2B b9dd6dc98c9eafd4f1eb1e129a53bf10ebc4b
 DIST hwids-20170715.tar.gz 2091853 BLAKE2B 66e930346176d3501ba0e5f802b7e44fe327a4bbfcd250ac3b96259b3c2eefbade8b0555fcffeafc35e46ce07551bdc6d26d25d9913d7a584945b52f7e744dfe SHA512 6f1d2e3d7b7fc260f02b3cc87b46385292503dda2a46dea4e69b02915e9d411e9682fb98ca921eb45289e416320a8ef46a3df0753f8f820d20c719663076bd88
 DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a
 DIST hwids-20180315.tar.gz 3117949 BLAKE2B 34b6349d7adf38da8591a0f75e98ce09f0217bb284d1bdc70d7c1bd0a13f0c21b46b2a40ea363dfcdb7524e2a06e94d8ca3a63f5dce6f4afac2b20d05229e944 SHA512 2c52b88b74d231f7c563079b02fdbe29ff70c4df5aae64f1241ab0e1bd3ab9c3ca925e102474e32d3dc8dcb833e3451f0698024a8fff808a987ce468af281898
+DIST hwids-20180518.tar.gz 3150553 BLAKE2B e7d1be88349d04dac09e44bba728d1b371be66628d0143a5ab9d98f9ac5ce14bc21c272bdc93e88cb2af8f640f2f5d0497be8a33a136bcb8e69112a998be3827 SHA512 5a8e65b226026b59008c714df79309a888f728198ac5ab71c5908b69a1fd5365a0834afab0e38423affbda59ded04b662a09dc544b4d96695671f562aa0c5ec1
 EBUILD hwids-20170328.ebuild 1442 BLAKE2B de4a2b9d8395ce3c5c0a09f3f735519b0fea7166faf60439d67da84952027fb47fc2aebcb9c0ba5960d0b6c42874bc4833371596ceb99fe394a49c4af8df54af SHA512 3dbde4bd8f65b1822da919b5cea69e20d9173e2e14f26054dfaf08ee0a24839d867a699a3950de2249a88cb17848747983c3bd38e86f2deed14615c844ea6c29
 EBUILD hwids-20170715.ebuild 1455 BLAKE2B 48b2ba621d627158d3cee3c1e96cdae5327620431e894314677ea3c0341282d41d87cabf045c1dca24a1c1c7055dd3365d700b5fea973eaab5f18ee0dc7c13c0 SHA512 3460a0646dcb649b10d7c02b98f50719d298a00f224df3aa06dd79235ea1107c914b20f07a53d675ee9bed3f76fdf30befcb5b33fc61c1d10b952122a2e9430c
 EBUILD hwids-20171003.ebuild 1706 BLAKE2B 9e5ca6bef971a2b88fd85470abfc24742b809a225640ca777990780a2fbc598ac26125d4b3ad51e7b02fecf668b3d648bc9d02d68f3818a7bcc438c7e1c83227 SHA512 ff3c5693b5d81a0d486d269b14c54e9489ae9e959f5c57d9268d2fb2b17723bc764b41ec62660eb7483efd91e8a28fa47a56bb67cdac4fd09ec3e947ead0b5a0
 EBUILD hwids-20180315.ebuild 1750 BLAKE2B df4293882c37bd67f31031e6f57a4f530b219e79ed97a588176adb363f789cce5df1d639a4a16cbba346db05fef0d5449733d6ebf0054f9501d4b4791f56ad97 SHA512 be1425858d953975464bd1131741b791778d0399249ae2bde4d71ca92db32bab4d188a46fe5ba1fbeac1dd1d9a1351d74a377dd5a19fbbb9cbc108b116181857
+EBUILD hwids-20180518.ebuild 1750 BLAKE2B df4293882c37bd67f31031e6f57a4f530b219e79ed97a588176adb363f789cce5df1d639a4a16cbba346db05fef0d5449733d6ebf0054f9501d4b4791f56ad97 SHA512 be1425858d953975464bd1131741b791778d0399249ae2bde4d71ca92db32bab4d188a46fe5ba1fbeac1dd1d9a1351d74a377dd5a19fbbb9cbc108b116181857
 EBUILD hwids-99999999.ebuild 1750 BLAKE2B 37d13e56d50016ec2ec0d02c6c9aa5975036ab904f3e5e8b74cc13d888d73164e92b85b1e68dd82140b1fb662c1c0b5a68429c90cf4a2be2e6b48204772d3a16 SHA512 84fcacd98a96fd5c1f6ef2f13dec9ce46a6e3a0bb942eeb3c041d6bbb8ce0d4c63bf392f747f0e6473fe15420143170aee147b52941fac40b903c375b43bdda8
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20180518.ebuild b/sys-apps/hwids/hwids-20180518.ebuild
new file mode 100644
index 000000000000..3b0cebed2957
--- /dev/null
+++ b/sys-apps/hwids/hwids-20180518.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit udev
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+if [[ ${PV} == "99999999" ]]; then
+	PYTHON_COMPAT=( python3_6 )
+	inherit git-r3 python-any-r1
+	EGIT_REPO_URI="${HOMEPAGE}.git"
+else
+	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+	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"
+fi
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+IUSE="+net +pci +udev +usb"
+
+DEPEND=""
+RDEPEND="
+	udev? ( virtual/udev )
+	!<sys-apps/pciutils-3.1.9-r2
+	!<sys-apps/usbutils-005-r1
+"
+
+if [[ ${PV} == 99999999 ]]; then
+	DEPEND+="
+		net-misc/curl
+		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
+	"
+	python_check_deps() {
+		if use udev; then
+			has_version --host-root "dev-python/pyparsing[${PYTHON_USEDEP}]"
+		fi
+	}
+else
+	S=${WORKDIR}/hwids-${P}
+fi
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999 ]]; then
+		git-r3_src_unpack
+		cd "${S}" || die
+		emake fetch
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e '/udevadm hwdb/d' Makefile || die
+}
+
+_emake() {
+	emake \
+		NET=$(usex net) \
+		PCI=$(usex pci) \
+		UDEV=$(usex udev) \
+		USB=$(usex usb) \
+		"$@"
+}
+
+src_compile() {
+	if [[ ${PV} == 99999999 ]] && use udev; then
+		python_setup
+		_emake udev-hwdb
+	fi
+	_emake
+}
+
+src_install() {
+	_emake install \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		MISCDIR="${EPREFIX}/usr/share/misc" \
+		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
+		DESTDIR="${D}"
+}
+
+pkg_postinst() {
+	if use udev; then
+		udevadm hwdb --update --root="${ROOT%/}"
+	fi
+}
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
new file mode 100644
index 000000000000..3da29edd1808
--- /dev/null
+++ b/sys-apps/kmscon/Manifest
@@ -0,0 +1,5 @@
+AUX kmscon-SIGUNUSED.patch 385 BLAKE2B 0384e96bb5809d7b8c702f2cfe79e885bd469b4bfc44eda7f313c0b4caf0b72e278a537c5b0d4a053dcef604baa3cf6acacba61e636c23fa6cf46803d38642f2 SHA512 5bbdbd7f3f8a11d4fb8b5ff01455214de2aef5b65ee04c8da868d62ab1bba75f4bae0f348d15cee8667586d935afb7a8165a041f2c7df5f5e79d1f6fb6baaa36
+AUX kmscon-sysmacros-fix.patch 339 BLAKE2B c088bf8bad2ac171af219e763f404b6311c67541ac4febf0e8a02349783c49720912eebbc31f0a7c124b563394477ef9de4e2461931a20ae8c4448a1dd0ea593 SHA512 2b227b6cfa959002938209e85e0aac85d4bd4c567a7023ce0734f5d2131b001f29bdb3a62304d295747adb487ff10da9df4080c87139120da2eb9c8dda6f18df
+DIST kmscon-8.tar.xz 950068 BLAKE2B 7c4bbcc6eb0967d8e38e05a3e6fac60109a0ce468bc8967364b621274a9af4dd12a31af692be2efe0cc234af36f760836ec421b6567460efd4b7b1c3d913f44b SHA512 ac1581c2520a9c30406848dafc27231b38d392b2176e3ed4dd95b03cd54e256dd22f09e04057fc089effbbe08eb25546164bb885e0e5cbdbd752d4c27d07a41d
+EBUILD kmscon-8.ebuild 2647 BLAKE2B 9ae4595f9fb0d8a016deac51a8aa9f25ba5ca9f4698147cd9f9f89dffe4aed1692d24b9d4916568c50972769a70aa95518d08cba3d81129791d224f98fa8cafe SHA512 a1ed419e71d2123b6b1c7794b63448a23b4a0785bb98539cecadf1456a3334f69eb9deba78c96431faaad0998733ab2b97eb87e43584b585a46befe75933712f
+MISC metadata.xml 664 BLAKE2B 7c1efe65339f48a43b2fe2134fbd23c3145a73671bcec300af6f6700454b9c1a852f5ff9a5e17a94c263186f31e7703853973da5b5489ede6e59c5648f890f8d SHA512 95cfea7cb2c3c2e07a234af335dc708be83f3e6239231faf28c4e9544a37cb6ae8f619000b15382357c26fd01e2656666f8b13f0717e8b529999ca347d8b8230
diff --git a/sys-apps/kmscon/files/kmscon-SIGUNUSED.patch b/sys-apps/kmscon/files/kmscon-SIGUNUSED.patch
new file mode 100644
index 000000000000..dc69f7700c67
--- /dev/null
+++ b/sys-apps/kmscon/files/kmscon-SIGUNUSED.patch
@@ -0,0 +1,14 @@
+diff -ur kmscon-8/src/pty.c kmscon-8.new/src/pty.c
+--- kmscon-8/src/pty.c	2018-01-10 09:03:09.477962638 -0600
++++ kmscon-8.new/src/pty.c	2018-01-10 09:04:21.620658836 -0600
+@@ -299,8 +299,10 @@
+ 	if (ret)
+ 		log_warn("cannot reset blocked signals: %m");
+ 
++	#ifdef SIGUNUSED
+ 	for (i = 1; i < SIGUNUSED; ++i)
+ 		signal(i, SIG_DFL);
++	#endif
+ 
+ 	ret = grantpt(master);
+ 	if (ret < 0) {
diff --git a/sys-apps/kmscon/files/kmscon-sysmacros-fix.patch b/sys-apps/kmscon/files/kmscon-sysmacros-fix.patch
new file mode 100644
index 000000000000..cd8a374e5ca1
--- /dev/null
+++ b/sys-apps/kmscon/files/kmscon-sysmacros-fix.patch
@@ -0,0 +1,11 @@
+diff -ur a/src/uterm_vt.c b/src/uterm_vt.c
+--- a/src/uterm_vt.c	2017-08-12 12:14:46.213183769 -0500
++++ b/src/uterm_vt.c	2017-08-12 12:16:12.011069210 -0500
+@@ -40,6 +40,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/signalfd.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <termios.h>
+ #include <time.h>
+ #include <unistd.h>
diff --git a/sys-apps/kmscon/kmscon-8.ebuild b/sys-apps/kmscon/kmscon-8.ebuild
new file mode 100644
index 000000000000..ca585cfb9a23
--- /dev/null
+++ b/sys-apps/kmscon/kmscon-8.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+
+inherit autotools systemd flag-o-matic
+
+DESCRIPTION="KMS/DRM based virtual Console Emulator"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/kmscon"
+
+LICENSE="MIT LGPL-2.1 BSD-2"
+SLOT="0"
+IUSE="debug doc +drm +fbdev +gles2 +optimizations +pango pixman static-libs systemd +unicode"
+
+COMMON_DEPEND="
+	>=virtual/udev-172
+	x11-libs/libxkbcommon
+	dev-libs/libtsm
+	drm? ( x11-libs/libdrm
+		>=media-libs/mesa-8.0.3[egl,gbm] )
+	gles2? ( >=media-libs/mesa-8.0.3[gles2] )
+	systemd? ( sys-apps/systemd )
+	pango? ( x11-libs/pango dev-libs/glib:2 )
+	pixman? ( x11-libs/pixman )"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xkeyboard-config"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( dev-util/gtk-doc )"
+
+REQUIRED_USE="gles2? ( drm )"
+
+# args - names of renderers to enable
+renderers_enable() {
+	if [[ "x${RENDER}" == "x" ]]; then
+		RENDER="$1"
+		shift
+	else
+		for i in $@; do
+			RENDER+=",${i}"
+		done
+	fi
+}
+
+# args - names of font renderer backends to enable
+fonts_enable() {
+	if [[ "x${FONTS}" == "x" ]]; then
+		FONTS="$1"
+		shift
+	else
+		for i in $@; do
+			FONTS+=",${i}"
+		done
+	fi
+}
+
+# args - names of video backends to enable
+video_enable() {
+	if [[ "x${VIDEO}" == "x" ]]; then
+		VIDEO="$1"
+		shift
+	else
+		for i in $@; do
+			VIDEO+=",${i}"
+		done
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/kmscon-sysmacros-fix.patch"
+	eapply "${FILESDIR}/kmscon-SIGUNUSED.patch"
+	eapply_user
+	sed -i -e 's/\[libsystemd-daemon libsystemd-login\]/\[libsystemd\]/' configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	# Video backends
+
+	if use fbdev; then
+		video_enable fbdev
+	fi
+
+	if use drm; then
+		video_enable drm2d
+	fi
+
+	if use gles2; then
+		video_enable drm3d
+	fi
+
+	# Font rendering backends
+
+	if use unicode; then
+		fonts_enable unifont
+	fi
+
+	if use pango; then
+		fonts_enable pango
+	fi
+
+	# Console rendering backends
+
+	renderers_enable bbulk
+
+	if use gles2; then
+		renderers_enable gltex
+	fi
+
+	if use pixman; then
+		renderers_enable pixman
+	fi
+
+	# kmscon sets -ffast-math unconditionally
+	strip-flags
+
+	# xkbcommon not in portage
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		$(use_enable optimizations) \
+		$(use_enable systemd multi-seat) \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--with-video=${VIDEO} \
+		--with-fonts=${FONTS} \
+		--with-renderers=${RENDER} \
+		--with-sessions=dummy,terminal
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit "${S}/docs"/kmscon{,vt@}.service
+}
diff --git a/sys-apps/kmscon/metadata.xml b/sys-apps/kmscon/metadata.xml
new file mode 100644
index 000000000000..796abf1fb7d2
--- /dev/null
+++ b/sys-apps/kmscon/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+	<use>
+		<flag name='drm'>Enable Linux DRM for backend</flag>
+		<flag name='fbdev'>Enable Linux FBDev for backend</flag>
+		<flag name='gles2'>Enable GLES2 for backend</flag>
+		<flag name='pango'>Enable pango font rendering</flag>
+		<flag name='pixman'>Enable pixman font rendering</flag>
+		<flag name='systemd'>Enable multiseat support via systemd</flag>
+		<flag name='optimizations'>Enable optimizations</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index b0a90d610ff1..b4d9465e613f 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -3,6 +3,6 @@ DIST man-pages-4.15.tar.xz 1622184 BLAKE2B fac4895411bead3f2ce7ce642206f80ec7422
 DIST man-pages-4.16.tar.xz 1630064 BLAKE2B 7c436ebc01d5248378f40fa8f8004bd2e0760a8409b419d4d7aadf8f0075bfa9b89801172b328856ed0f0a70b75523a489957a9aacba66e893698bea1ac98efc SHA512 df282a0480e2c1cc74e4ba02d6ff02ba95886b6583058c737028ea609b916270ba7dcaf075e0c450fd4b49b335979765abfc7d0a75f5570eec5fa2381c10201c
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
 EBUILD man-pages-4.14.ebuild 1656 BLAKE2B 6fa0129e7c8c1d11245ee519595377d1fb6a5c3a894c7b340d73c22121928b498f1b0612806a97010bd9c44a7958fe9d3ec334e5d0769ef73310e06870fd29e2 SHA512 e39d42d12106ef69a497bd48326e9d2a20528a4a8e329e8fbd3f8a3dff57acc3b3481971763598ca1f89f1cb27f4de486268ab4e44bb1e3b3039250ebf8957b5
-EBUILD man-pages-4.15.ebuild 1669 BLAKE2B 3317382390ea2b5186ae194d7d9f301ea5aeb6f9cb50e7ecca17a2f5be140c77a51c672205618f05ef5162a19446938e01192075c81de46cc679df676bd36e76 SHA512 be4068e5cebe0a97b615bd9b00f9f9911ed98f69598d37ae37d4c74da43e6791b19c4c3814ecc2032d8301e48a7cb1afb99c54c9f4db267729208542d16609e4
+EBUILD man-pages-4.15.ebuild 1656 BLAKE2B 6fa0129e7c8c1d11245ee519595377d1fb6a5c3a894c7b340d73c22121928b498f1b0612806a97010bd9c44a7958fe9d3ec334e5d0769ef73310e06870fd29e2 SHA512 e39d42d12106ef69a497bd48326e9d2a20528a4a8e329e8fbd3f8a3dff57acc3b3481971763598ca1f89f1cb27f4de486268ab4e44bb1e3b3039250ebf8957b5
 EBUILD man-pages-4.16.ebuild 1674 BLAKE2B 535811be8d0e7f17d8af2272e66e8623d21b546e4c820207adb27545c1730c7d14ed3e40e3a8c05559224600d9be0c82af8809cac7778caab64cb02c3935b208 SHA512 b166a38aa5517ba146016734260b8e0137b65260d59ae27408b6960f1db9187c27184ddcff54776149094afbfc627cbcfe732ddcf774943fd8837277f5bf1ee6
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-4.15.ebuild b/sys-apps/man-pages/man-pages-4.15.ebuild
index 71b675c30b43..c29ebeb71310 100644
--- a/sys-apps/man-pages/man-pages-4.15.ebuild
+++ b/sys-apps/man-pages/man-pages-4.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 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_L10N=" da de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index cfd20e1336ae..d4a1bf2659ed 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -2,6 +2,6 @@ AUX mcstransd.init 659 BLAKE2B ef74c438407efa47a066a18a1ba8d7cad2b13240fbf39d838
 DIST mcstrans-2.7.tar.gz 41137 BLAKE2B 83f195dee4bf61c36f65b009cf40dd58459e01d75222fbd7fe15c61ae7942315373a4a0e9a1cd0a654efcf471c3c7166f76c87837085ef6a4136567d4b52fc73 SHA512 2e59f26fad3423a0c8e2ea49d619f99022c72e1aebb00e842defb4fad56f187f9ed0f069ef78d3b209ba76f5ebdcba1668f51ff881b753dada5716ee942519b3
 DIST mcstrans-2.8.tar.gz 41385 BLAKE2B 08cdb2588ab2cb48824816fd3eb578a77bfb6696f00fac7b808250ae88a5c85ae02824f047ac6cd6f3653d4b8550352f3570b63969ebfef5b396478ef191b97c SHA512 b20b369fea926ed55db4e454e82ef842fd39a8194190c9feb063b36126f6334f9d3401ef1c3636c03230a813c69648b5efbcc35b163387495175cde80dd6bd39
 EBUILD mcstrans-2.7.ebuild 1217 BLAKE2B 3b6414b7e668a2d7ec5c7ee5bb0c5d0b859f2360ab88fc88db0c1c4a7f06f539e5b881b02035aea89cd4e75e98e7bd6a42d035d1bd3dfb0f810b1191477b454b SHA512 d26037fd0d2f2ef722a21da5ba974410a5441608e32fb35d8674ebae48dd2eb485b30af50d7f54a3d3181b8c7af838e03d744336181f8bd3b8d8b8a47a906250
-EBUILD mcstrans-2.8.ebuild 1134 BLAKE2B dbf77ca7936dfe814452ac81efe094c5fcde8ee0f7c7f431cf8e2b4c746ac1daef9a621c75685b06002f7f4fbe9b0415fb1a2e2689eff5b622e47df67cf8f98c SHA512 b8933e5d30dca6f97e1c1dfc7a9987095023116ba62e392c7e8f4d958ebc8333a72571b773617950e19e2ec25dfc3b700a0f1240c19df06258826ebcad156be4
+EBUILD mcstrans-2.8.ebuild 1132 BLAKE2B 05f10514a2be3196f0d6c64c2288af8252ef151f3c9b6d0bc1ea39ab2f5d9213164de8bacbdcf0d298f9e917654819e5df5bf80d72cc3851669c9d6e743c1582 SHA512 e328c1d9aa6d5b63594bf72b9899fa2ddbb8fa0c9426b1025d0a5422b2087ce6de33b353a4542dc83bb317b75bd3d858f584bb508e762d1a48299884ef10005e
 EBUILD mcstrans-9999.ebuild 1134 BLAKE2B dbf77ca7936dfe814452ac81efe094c5fcde8ee0f7c7f431cf8e2b4c746ac1daef9a621c75685b06002f7f4fbe9b0415fb1a2e2689eff5b622e47df67cf8f98c SHA512 b8933e5d30dca6f97e1c1dfc7a9987095023116ba62e392c7e8f4d958ebc8333a72571b773617950e19e2ec25dfc3b700a0f1240c19df06258826ebcad156be4
 MISC metadata.xml 451 BLAKE2B bf8e87dcdd8c3dfbb33728600b986bf96e2243a9e9916db87ae4b4d69508f6397915929b24c4b7381d711a7754987402f0abd8ee8217621479d6970c91922189 SHA512 9d1f5669661c1fe232b18517a954640350c8f0c606d3ca91e429f53790532bfc9b73d7c18e575c4055d3ea7ba4a5ade632d1814700ed1d3d000fe5ebfa065744
diff --git a/sys-apps/mcstrans/mcstrans-2.8.ebuild b/sys-apps/mcstrans/mcstrans-2.8.ebuild
index 7de09ec4120d..f6bf04c6353b 100644
--- a/sys-apps/mcstrans/mcstrans-2.8.ebuild
+++ b/sys-apps/mcstrans/mcstrans-2.8.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 0e7c07f80069..b9142f25b167 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -2,9 +2,6 @@ AUX 39_memtest86+ 1610 BLAKE2B a27eed85f2678e84faa3d4a025d7e53bdf9018b095b9c7590
 AUX 39_memtest86+-r1 1702 BLAKE2B ba73cef5d026a242ab3e5ac54a98cf289ceedfbe174a9d2109cab785e0b0fc9b9e59aa3c80d276255cc8c18bdc3567f02e644652512e194e3c555436d42be8e3 SHA512 ef2d86bd902f44905921880c630a85d3c9763bea3b79211f64346f1f55a5f31ed0b20a80f9f0c3914de1f33b7bd7d3471762f17065183ced185de52d34f2068f
 AUX make-memtest86+-boot-floppy 2499 BLAKE2B 1076e5d3e3a139c46c684f7ed29658cd815525e56fae03eb4dd1e36fda0c751a1aa78c891d040aeee979f8b79a8b0db8453e4e26f2efd9963e7bfa10206b5c86 SHA512 28649d630c4624573a5cf4279f6207cf44707978d8a18f2c614997f641038f2da731bb5c3b26066812a5c02d926c40020e74820b1a4eb2b4732a76686c52c260
 AUX make-memtest86+-boot-floppy.1 1165 BLAKE2B 974a5c70009031517bbeaa06155a7da411ce1823ed2b7dc31a1843618058cbcd1c1a51f9c9012dddd843579b588c619c6448e65ae369ba2dc6441a991bf8d9b7 SHA512 8b5b6397e50cf4d48aeda31de4c1f72493e97db52ff45966716df8f9b0fbbd8d4ed71e289c0113ef53fa52a7ea6df4c107c63ca70f90c951dd085c05b64db147
-AUX memtest86+-1.70-gnu_hash.patch 485 BLAKE2B 6569f99879324cbb33602549587a2d8a4211b99cea2d6db86909448f2d07fec67f9285037bd782c0ccd1c43329f9256db676b535fa87e8db1f6d140ea5949070 SHA512 3988daa31cefe88a207aaa56afcb9e1f70a7bccbf9c943e992084e43507497f20bcf72b06f6768ce436c36306b773ba4271d247bef17ab5ab529666d036823b8
-AUX memtest86+-2.01-hardcoded_cc.patch 1209 BLAKE2B f948d50e940b3f6e5b311187e748a1e7624a971d406cfde94b74e0a6e7c2b556e0dcee98860e8f6829f095a806b704d13becd7f442014bb3d844a1234d1aa4f3 SHA512 2295e2049e439471ae2d5700c92e0142060c6a0f6fa9c3814c0fe0d6153f575a4530b5effe6f2b17ece2589ec360f69d79eff396149d9c0a4658847acb588c2c
-AUX memtest86+-4.00-hardcoded_cc.patch 1217 BLAKE2B 08575ef86b9c838da59d9cef6064165351717d52f23cf0c4d8b7e5706aae31b6ea686c799598135480c88af154078eb37eb90e3994e0ead3488b18e56f21a30e SHA512 d362b4f57209d6437c48f079b5820449badd88ee5efee3e83417cdfdf249804d17ccea6cb5ac7b4047e95466bbb50ad1c6725b3d0e51845ea3a32309965ac1a8
 AUX memtest86+-4.20-hardcoded_cc.patch 1222 BLAKE2B 603879ad2f1a6dc7bd2d603c59fa60f924d651cae9d5d6ec8083811f300945014eb6fade69f834fef42b071954bfbcb175303b971a70e5f253a9febb15680ef0 SHA512 ae15a6505af65ed176464f30f3beeb78a62799fb4f945e2003598fdbfcf54b75cd859afd868e9a1e9e4cab729411f072bf0a40bd296b9d770f6de140de14c7f1
 AUX memtest86+-5.01-gcc-473.patch 1308 BLAKE2B 7796745ddc5a11ea14958d762201873e7d8ab645aaee9c96804c6f0e94bb8b341a4db2d1434ad9b7365f486c097b8ab4cdcaff01114344abd5a288c456fba722 SHA512 94427ae0b78c9e24a8f4db6285a04ec468d17b6b4bb26550abb006a9fa37b52c871cb4cfb0fb2489e373b0ea9748106938f7fb4ad0f31968e151e37294199a55
 AUX memtest86+-5.01-hardcoded_cc.patch 488 BLAKE2B ad978b2c1a15dfefc1f56953be62d7943953351b3c291a392cffecaca2757e4aba46961570077761fa2796a81b4d1d5b8341527245fe9beb52f9c135efe7c713 SHA512 ccd348f253aece4530051c54f94d1ca3185cdf98df928807fed5ab6be8632828d53049b3829a6f147103ed05a5a482a8e273cec17bd1d539d06cb56a3fa53721
diff --git a/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch b/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch
deleted file mode 100644
index 5a9e06dc06d7..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naurp memtest86+-1.70-orig/memtest_shared.lds memtest86+-1.70/memtest_shared.lds
---- memtest86+-1.70-orig/memtest_shared.lds	2007-01-27 13:34:16.000000000 +0100
-+++ memtest86+-1.70/memtest_shared.lds	2007-01-27 13:41:30.000000000 +0100
-@@ -18,6 +18,7 @@ SECTIONS {

- 	.dynsym     : { *(.dynsym) }

- 	.dynstr     : { *(.dynstr) }

- 	.hash       : { *(.hash) }

-+	.gnu.hash   : { *(.gnu.hash) }

- 	.dynamic    : { *(.dynamic) }

- 

- 	.rel.text    : { *(.rel.text   .rel.text.*) }

diff --git a/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch
deleted file mode 100644
index 3b07731daadd..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp memtest86+-2.01-orig/Makefile memtest86+-2.01/Makefile
---- memtest86+-2.01-orig/Makefile	2008-03-11 21:04:28.000000000 +0100
-+++ memtest86+-2.01/Makefile	2008-03-11 21:05:25.000000000 +0100
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
--CFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -m32 -march=i486 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+ASFLAGS=-32
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o linuxbios.o memsize.o pci.o controller.o random.o extra.o \
-@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
- 	memtest_shared.bin -o memtest.bin
- 
- reloc.o: reloc.c
--	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+	$(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
- 
- clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
diff --git a/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch
deleted file mode 100644
index f2950b64e807..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*rej' --exclude '*~' memtest86+-4.00.orig/Makefile memtest86+-4.00/Makefile
---- memtest86+-4.00.orig/Makefile	2009-09-21 17:35:46.000000000 -0700
-+++ memtest86+-4.00/Makefile	2009-09-25 09:04:23.000000000 -0700
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
--CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+ASFLAGS=-32
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
-@@ -47,10 +46,10 @@
- 	memtest_shared.bin -o memtest.bin
- 
- reloc.o: reloc.c
--	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+	$(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
- 
- clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 7671d57f5992..33b05611a11b 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -5,9 +5,11 @@ DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582d
 DIST openrc-0.35.5.tar.gz 241784 BLAKE2B 6f63dcf30c430949f25108b0ca808f2317b2e58440419fa5c2aac04ed614c5b22105bfa38d51d54ee0d293be8b11f15b756b00d805ab71f9a2e92f44b98ce6e1 SHA512 655a0a32650ed46998ae84473e8a82aadd9de09904c5173cd9b9e2500fc8935e96539672b513a883c077ae862ece12ab768d4f379dbeb4389a7067ce7121dc0d
 DIST openrc-0.36.tar.gz 240179 BLAKE2B 1361d22782d6063e7fce61a98ef1e1f754d0208ec58de02ae60a0950531d248ac6e65e1ed45b412c89288103f6848b24aa51dd66232aa46e7900b339cac21a57 SHA512 f4730489e595a9ac4477c2b410e034b4eea2b8111c12c2695916aa04102020f8c84cb24220d3aa552709898035aa196e2fd48cba9b12a71dff1f5c2b03c3d424
 DIST openrc-0.37.tar.gz 240928 BLAKE2B b802260a3bd71e6d8e6d54b21007024481d42a4f179eff824a39fb91f5b1cd4f7a2fd52d9e7f23b1077965b57d319a99a5b39b8cd2d7f66dfe272b4497d53a22 SHA512 16235774ad28a66308dd1ea00238b4025a4d26c9c0bb6cdb032f28d00479520c4c5fdb349f82d33a535eee3d491d0349b5871b15cae30ef296ec476883965b83
-EBUILD openrc-0.34.11.ebuild 10145 BLAKE2B 44747f052ca54517722e08a8877b36bb12985ef703ccd7608faecc7b9f6727e6f9157aad51f563ccd1b9346945f56cb553e47fc77dd369c5e635a80da5f2a4dc SHA512 6f71094d74e5ea02e87427619a6b55883ef5de3e8d581447c9662a46f0c1b0a6f49cdb00737a7a0ed8ca9d3ce23418f1d0068832ab58a268398781d4aabccd15
-EBUILD openrc-0.35.5.ebuild 10049 BLAKE2B 20a347eb789266d9462c49509ba62b26963a982a4f586a91ff073cafdf4b0dbacaab9bcbe47a36a86b33228c34adc9117a42a9e4f4f2aa0226993e0b50da05b1 SHA512 8a54f2c6c96766d03d69a0460635fb29f064edda9a96baa27b9057f2e7406f87f397001169148fb874df0555826589c4aa23d5f78d58df1861872ce8762548e9
-EBUILD openrc-0.36.ebuild 9921 BLAKE2B 9a0485f892bc56f65c4292846452da4ba4ec9d894a79f891e24cb1979f03dfc9747e4f77901cb79d0d0e9a6144c0258ebe91c0ff269e673a42d7cd52993fe293 SHA512 b71c20036a4d8b157e7b01e91750541af058ab888282cf438b810ed79bf990a166f2baaf7fae55249ead1bf1f7325413cb184ee3d304979f5b6eca72fd78a9d1
-EBUILD openrc-0.37.ebuild 9921 BLAKE2B 9a0485f892bc56f65c4292846452da4ba4ec9d894a79f891e24cb1979f03dfc9747e4f77901cb79d0d0e9a6144c0258ebe91c0ff269e673a42d7cd52993fe293 SHA512 b71c20036a4d8b157e7b01e91750541af058ab888282cf438b810ed79bf990a166f2baaf7fae55249ead1bf1f7325413cb184ee3d304979f5b6eca72fd78a9d1
-EBUILD openrc-9999.ebuild 9921 BLAKE2B 9a0485f892bc56f65c4292846452da4ba4ec9d894a79f891e24cb1979f03dfc9747e4f77901cb79d0d0e9a6144c0258ebe91c0ff269e673a42d7cd52993fe293 SHA512 b71c20036a4d8b157e7b01e91750541af058ab888282cf438b810ed79bf990a166f2baaf7fae55249ead1bf1f7325413cb184ee3d304979f5b6eca72fd78a9d1
+DIST openrc-0.38.1.tar.gz 241574 BLAKE2B 74ef47159ddad11bec2cf4151ec71492fbd6c9ac74b01050aab236ede23e2471563365dd68c665a54d47ee534a3f2f55a8d7e607d966e6b2bb5b36b85892553e SHA512 3fc4fef60e25ae34039753c3de6471baba89a7ffcd25f6756cf00954ab63262d07c749441a53198099678e5769c9547179074152872aebc66fe7a220d0302804
+EBUILD openrc-0.34.11.ebuild 10072 BLAKE2B 5cc312d0a7ebe0f776f815d5b3cd4bc3b68812552393ae82fe270a09b010f0549ef25ec6926bc17205e06d20a9f51a82406d806f5fd597a7caf397f020f2fa54 SHA512 7e76a682408bc28df1892424aa3843f2cd3a38eeec7d5920cbf5de6229ec5bec1324c85a0fd6fdbdfb29e9b785415c59f80a86c39eeba413d82cc8d6124b8844
+EBUILD openrc-0.35.5.ebuild 9976 BLAKE2B e3c47e0f95115e34d7b9084ba2985b854de17030c11301a8ea1b8f6d89a28a2222665737ed2eb8c5f84a282b9d1587bd98ece6965700ca9d85c89815e7a862e6 SHA512 a78575665626eb2c56870429f84eddfae6ceee4ff26fcdaf525584989a538a40266b3dd741d444301b021b615fd401713fca8a24735a126c0a5ca98932bc57f0
+EBUILD openrc-0.36.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
+EBUILD openrc-0.37.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
+EBUILD openrc-0.38.1.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
+EBUILD openrc-9999.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.34.11.ebuild b/sys-apps/openrc/openrc-0.34.11.ebuild
index 83b1d927468a..4e2ed59e45f4 100644
--- a/sys-apps/openrc/openrc-0.34.11.ebuild
+++ b/sys-apps/openrc/openrc-0.34.11.ebuild
@@ -213,13 +213,11 @@ pkg_preinst() {
 
 	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
diff --git a/sys-apps/openrc/openrc-0.35.5.ebuild b/sys-apps/openrc/openrc-0.35.5.ebuild
index 820ec13085b0..9247eced8206 100644
--- a/sys-apps/openrc/openrc-0.35.5.ebuild
+++ b/sys-apps/openrc/openrc-0.35.5.ebuild
@@ -221,13 +221,11 @@ pkg_preinst() {
 
 	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
diff --git a/sys-apps/openrc/openrc-0.36.ebuild b/sys-apps/openrc/openrc-0.36.ebuild
index 18aa6cade207..7babd0045d3b 100644
--- a/sys-apps/openrc/openrc-0.36.ebuild
+++ b/sys-apps/openrc/openrc-0.36.ebuild
@@ -214,13 +214,11 @@ pkg_preinst() {
 
 	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
diff --git a/sys-apps/openrc/openrc-0.37.ebuild b/sys-apps/openrc/openrc-0.37.ebuild
index 18aa6cade207..7babd0045d3b 100644
--- a/sys-apps/openrc/openrc-0.37.ebuild
+++ b/sys-apps/openrc/openrc-0.37.ebuild
@@ -214,13 +214,11 @@ pkg_preinst() {
 
 	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
diff --git a/sys-apps/openrc/openrc-0.38.1.ebuild b/sys-apps/openrc/openrc-0.38.1.ebuild
new file mode 100644
index 000000000000..7babd0045d3b
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.38.1.ebuild
@@ -0,0 +1,326 @@
+# 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
+	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
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+
+		# 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/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 18aa6cade207..7babd0045d3b 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -214,13 +214,11 @@ pkg_preinst() {
 
 	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
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 45d2d09ffb73..0917ad19ef29 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 3780 BLAKE2B 9d3c990aa4f87bb45c3fbef6796fd4c33f373e9475cf78760fa7ad2599faee12adcd015957a5a390ff98dec4bbb37d6622a94356a2c85744d7c3a7c4f87a1d24 SHA512 64abcb3081658b9e4c391559fa1b22aa5729f20b7a7bbf8967819fb760e626bf01e90ed078699e97ad73e700880ce636db2ba472f30039666a219285783d69de
-EBUILD paludis-3.0.0_pre20180214.ebuild 3780 BLAKE2B a60ff73b536770d6d8404e894123f88c32c597b303cf1486de9d4585b42b002eacc7dfe5d48ebdedb7dec9b85329f4967b1834955b95ca51e4f337676e029ea3 SHA512 a994bef998c33e6c90a87b6796ef6b2e3f20635ac945cc1a4455981e70c03cc500d82b35b88a0532ace9c4cd02e44c0393c335fac44d50e800c87974e5ebcf03
+EBUILD paludis-3.0.0_pre20180214.ebuild 3779 BLAKE2B f4e8313c5f5fb3253dedab218400bd6d72ec17a5869888d506a214f940af7cbe268ab97697d09da140f0bd69632818295a60d728b8329729e42b6ddc026fa1d3 SHA512 931f67be3dedb323c81d257d54cf667204938bcf9509eb660356b073175e54325d9950a5d8099fbd225b3632b7d800097fd648149edd1211c5ed0d2782c6bc69
 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 6e9bec6bc7b8..b4cf05b00236 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/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 58c67e065ac4..568c902ec5aa 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -3,6 +3,6 @@ DIST policycoreutils-2.7.tar.gz 2796707 BLAKE2B 4b1c03f2d12252b453950c3d6bcde757
 DIST policycoreutils-2.8.tar.gz 2796775 BLAKE2B 36115cc2faf72a4b647312f8faaf4762d7f2fb56bf0531ccadeb46b100c9e577f3148fe6890925d3fed94ac22803dc61729781e54bd0ddeb1539ccce2ec2a29b SHA512 2b4a70836fd8727a16b8f8d4afcc39c9461ab6f5bc1ba5ce5833d41150da921ebb3c9bdbd1cfa7dd31fd382ba18b5433ca9b63bce58bd290db81fa9bedfe29f3
 DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346 SHA512 c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
 EBUILD policycoreutils-2.7.ebuild 4966 BLAKE2B 1e252c86aa33e9ac68c14d859ced7e277fc0cf5f5ad6aa335ae7b334b5ff56417ed8ff973a57e2858bae832dde946a7080d1d9eb72e7b2ed0e583b1badf8ccc9 SHA512 f068c7fb1d918bcf305b8f8a72433774e5dcc23e8b5a22fee2e64fbb54cd4e14d897da33c893b948247600350bf4f54ab64f6d81be405d2c6930ea40176dc729
-EBUILD policycoreutils-2.8.ebuild 4875 BLAKE2B 691beea03598aab075177fc4c77233e483e14b62f65990c56fd127eab6983d207e197caa8948d6a2a2a8cbbafb02f23b6521145c15e4a2542d985a71dafc53fe SHA512 b65baf0542890f20e28f72a8971fd940eb704796a289bb6889fe68d843d9aff02836596caf7c8d5b2d7b66c14886126d29f0a673d02b52578b255c3619bab520
+EBUILD policycoreutils-2.8.ebuild 4873 BLAKE2B 5e43e9a43917e935d6a34f6756135f4cff6d978963d998d5bbda8bcde273bf3051b575e10e837ea003b99b63f5f0bbb9ada12989fe1e98db558b89706cae5a70 SHA512 1aa16f096647afbeb78218d4b9a1a1f408d8bba250afbfca4f16149d32b20d3e35f08b502df2c441c0775ddc834af1e6e4f015c7cbab137a3dbc825e95a093ef
 EBUILD policycoreutils-9999.ebuild 4875 BLAKE2B 691beea03598aab075177fc4c77233e483e14b62f65990c56fd127eab6983d207e197caa8948d6a2a2a8cbbafb02f23b6521145c15e4a2542d985a71dafc53fe SHA512 b65baf0542890f20e28f72a8971fd940eb704796a289bb6889fe68d843d9aff02836596caf7c8d5b2d7b66c14886126d29f0a673d02b52578b255c3619bab520
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-2.8.ebuild b/sys-apps/policycoreutils/policycoreutils-2.8.ebuild
index 307c82a9c3eb..1a29b60298ca 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.8.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.8.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index da993d37169e..e11cc16b02b0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,11 +6,13 @@ DIST portage-2.3.24.tar.bz2 959266 BLAKE2B bc15f10599c694ad29f5a55264e929d0a04a9
 DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f82cd46aa1523eb0f70109551009a422546f2fbde1beee7a18dad4ecbfc6465b3b3052a25720196950f7da81adeb66d87940f2b477fbeca27afba56fa18e SHA512 b0482b8dac8af97b841ded426001872c1c708f649dc7774bd3c7003179888fd4d126ece33d001d127b643d88b8a70b9af75bbeb36beeaca7b8ad308f92ff72e7
 DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9
 DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
+DIST portage-2.3.41.tar.bz2 996250 BLAKE2B f76c9198b5a4f00a5d67c85613b182dcb30c8ff568cd74b798c230945294532ecac65a682e97b64da28dd297b6d985445b7f3999b84d5152e4241f22e8813330 SHA512 113113a982e346c31e65c326326913458229c05d443f531c1d1897a679dda143d80223cab8bfbe831f4d92b6db9d09fc451ae3c7753e4d73b33736cc4f34c5e9
 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.19-r1.ebuild 8415 BLAKE2B 2f317c8d4c636a870ed27cbb4dbdc3a0cba6decbef29944f5eec3d8091e6b4fd098033da44bffe55a312c23de2e9dbd16b73a9d69ba2d3c2d2ce05ba0d6cf033 SHA512 b4d363547eab3e074da48d9050b1dd091372114ded9ff146df3f0168264f7cc7781d4b5968df42f3a5dea8fcdfa1c483a5e3ecdefc59222503f7daf441c9da20
 EBUILD portage-2.3.24-r1.ebuild 9269 BLAKE2B ba60aee1fba595b80a91ee183275cd0b29d13fb78281c8d62a5b5509a557f8ddbfbd6a641fb2b7c6bc7459f35bd12574e396355363574fc1463081a8e42d22fc SHA512 a2938faf430e68a03bdf42bdfc00ee08392e18bb07ecb9b43dafca26572c0e64b3e74e55fdc8b63d85b3f2cca686df431714ddebac78163586c36be620eee1ea
-EBUILD portage-2.3.40-r1.ebuild 9951 BLAKE2B de2bafe395fa6ecda5d82a412d7c61165967f903238fc7d3cb22295fc0e014032792924a7d20366ac26b409927c218b2772fca039f184b87db94dcaf4bed86ff SHA512 8b788b7a29586cccaf87893db60d78789e29b9a45f88721a2f1cd49d1d29b8d28b21e9bfbb1249884899f18b662540d4b2e8ebcb3cb7daba75bd27e4fb5a2ba8
+EBUILD portage-2.3.40-r1.ebuild 9948 BLAKE2B 148e93c0bda6febdcabe74eea89aabae4d9be7ad68fa284824b78d1b32bab8404b89904a791ba487c0152270d0578a2dd35a07160483703eeb5ccab330f5a54d SHA512 4c184513337bc67deaf118986b5be94e81bf8dba02ade64a767c796525c51e66754674e4e323c0d89c0002b83cf99b5ad56f290fe764ecf1b19a6af84b79dddf
+EBUILD portage-2.3.41.ebuild 9322 BLAKE2B 702e4104d52fa5f2e159cdccf9f8ff2103b5db4b6b4ebd984a77029642da9626914eeb353122dffc1852e3e3cb68ce4041c7df0cb402737067b05c1d930273b4 SHA512 0153700fac90fe752ab925c8bcc4d2ab362a5730a1724a36d8166ba4468fecc888eefad83dd20328ead52375ff23e9c598985e11a6fe42fe6553be0d986953be
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8829 BLAKE2B e28682fac496521e83599633424ae0cad64dae33849acc131c3641bfc93627f343b4b44404ac833b91c2214f4b7a23e5e58b9a631d544a93996cb9384c23ac36 SHA512 7d6b0e36d43dab7d824c420d6a7a0f1aeaa736e5e153be5c57f30c91018b89629ee4be3d05e2b3179f1cc1d841fee473683f8cf194b6de6767d576607a1702a9
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.40-r1.ebuild b/sys-apps/portage/portage-2.3.40-r1.ebuild
index 1272e6845db1..ac3cb5f359ef 100644
--- a/sys-apps/portage/portage-2.3.40-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.40-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.41.ebuild b/sys-apps/portage/portage-2.3.41.ebuild
new file mode 100644
index 000000000000..08db0a649a22
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.41.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# 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
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+		rsync-verify? (
+			>=app-portage/gemato-12.1[${PYTHON_USEDEP}]
+			app-crypt/openpgp-keys-gentoo-release
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i pym/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! 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|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use epydoc && targets+=(
+		install_epydoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
+		has_version "<${CATEGORY}/${PN}-2.3.3"; then
+		SYNC_DEPTH_UPGRADE=true
+	else
+		SYNC_DEPTH_UPGRADE=false
+	fi
+}
+
+pkg_postinst() {
+	if ${SYNC_DEPTH_UPGRADE}; then
+		ewarn "Please note that this release no longer respects sync-depth for"
+		ewarn "git repositories.  There have been too many problems and"
+		ewarn "performance issues.  See bugs 552814, 559008"
+	fi
+	einfo ""
+	einfo "This release of portage NO LONGER contains the repoman code base."
+	einfo "Repoman has its own ebuild and release package."
+	einfo "For repoman functionality please emerge app-portage/repoman"
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index b2092e4b938b..eaaa1cd2a0de 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -2,6 +2,6 @@ AUX restorecond.init 650 BLAKE2B 507c65c11f756d5cf11045ba75d40a39a9fb6a527c9e040
 DIST restorecond-2.7.tar.gz 17753 BLAKE2B 793a41dbfd0a33d79e15c62e79f4fbbacc4208a8f2057813d7c3e2d16a3435c12e0c29ca60a3b45cef33ec13b5aacd28c8ad95ddcbf47a812654d3a59fcb6c89 SHA512 c81950e4f748a729c8951b13a4075ab1003530f8ada7a9d3fbe6428f76070df4819a37daaab557b63fc234aa8c8320ec41757fbdb24b76fa2c11747bde0038ad
 DIST restorecond-2.8.tar.gz 17740 BLAKE2B ad873acbbb7c56c29a8523a42dc053ea79036a15bed71b47a690d01d4012394b5ecf74ae75b27affb4007d754935ec90246f22ef3e0b9611556ec7baf59670db SHA512 5d72336782c3ad095746f8e6fa67e36448e5e76ca29586d8fe4962c64e505fa95c1458e8fc8f7d5bd589fff71b4be3758fb0cee3dacd2ccd0bc8476423e2540e
 EBUILD restorecond-2.7.ebuild 1250 BLAKE2B 7ae1b18d0eb9906ace64c5e2191c894fe424e69fe4f38f14238b3706c426a8272ea7f35ba5237a3375f7329d2140b78c02161cc855460e70f09d7c3f4850a51a SHA512 c5bbc404f56d756897433561485a6c90d5bdfb70958181cf5b670bb4a3dc9b428f91b8960e0960251d7acdd35f0e9b6141c5f4056f90d934a913b5b5ebfc6af8
-EBUILD restorecond-2.8.ebuild 1167 BLAKE2B 8abd796a13078dbc295d7609a0687d5b9d0ada389a1fde40d77dbc93e738e63cf1845fc6648dfd65b18422218912030ec3613befaf36f62cd5951d9b458cba60 SHA512 60366fd70b14a718858e4a18bbcd4e6b3d2d74c61b0339d0f78df4c5cdfb13817301e7559019cd4fe16c5130f8217c9b68ddb07f49bd19df80677a42752309ca
+EBUILD restorecond-2.8.ebuild 1165 BLAKE2B 7834d473f312d93be8885bfba2cd3930268bb7a056b6d968253f70259d959699a7246436ed8810e41ade5c24e312b0a9c86a8c078df652bfe032cde7ec03b2c5 SHA512 9f488cf1e460aed3c48e5e453bde2940a6132dec29e5ee599a21928543bd2549c21800603129a0847c5c85071216144c87b45543abbc57f6658e03f3976c2852
 EBUILD restorecond-9999.ebuild 1167 BLAKE2B 8abd796a13078dbc295d7609a0687d5b9d0ada389a1fde40d77dbc93e738e63cf1845fc6648dfd65b18422218912030ec3613befaf36f62cd5951d9b458cba60 SHA512 60366fd70b14a718858e4a18bbcd4e6b3d2d74c61b0339d0f78df4c5cdfb13817301e7559019cd4fe16c5130f8217c9b68ddb07f49bd19df80677a42752309ca
 MISC metadata.xml 460 BLAKE2B d0de63ca5ac8e0c1c061f418ea9dba5472644626bbc5799499ce70ff0c2d1c7e49b023e3855cc7c767e78f5fb6f62429f5aab59dd272d9a906dbe026895e2e46 SHA512 0e4910de5e3932eb2914ddf4ef3250ae919885428337b1939f6827037a4dc5a75b13c97531c7b81748b1c90e3eb2b10a4671c76ede69749dbd1955bc67b5ca0a
diff --git a/sys-apps/restorecond/restorecond-2.8.ebuild b/sys-apps/restorecond/restorecond-2.8.ebuild
index fe377bb27bd6..81f376e3f14d 100644
--- a/sys-apps/restorecond/restorecond-2.8.ebuild
+++ b/sys-apps/restorecond/restorecond-2.8.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 2df02177f12e..4cdae5f97769 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,6 +1,6 @@
 DIST secilc-2.7.tar.gz 175733 BLAKE2B dfad83618f3dd14f4a710d27b6ff3dbe188c9e1eecabe29dd16d9b0ba35a2aa2c5777d999fb378159624f7b7af9af152592e69f9212d2ae6dc6e52dbefcba056 SHA512 cd828ad34e80151951f94414d27246b480cd4831d1d57cb35d5958ce23c30fe74f26ec1c4b29b51fe382bf03ec3144311b35ca645ffc6b914b7abfe677684c06
 DIST secilc-2.8.tar.gz 175893 BLAKE2B d1e588c82d8be68efb66abbcedf28b3f99ac58edf58df238d970243b7a9c94109fcfc6958907fd4f614381e9ee4e248796b556a37a283d6f0e602a98349c1dd9 SHA512 70b92802af8bdfbeb458ccaaed74e00e8a1edfcdbb48a0b422cf1e98ce467db1a586c800574ae61b0fbf006330c603b44d022091d7bcb6b0963ef1b1c6e547c1
 EBUILD secilc-2.7.ebuild 922 BLAKE2B 0316d98a09d332cc1781f25776e6408fcac8cc4b3d3fa76ed0f1e897a7aa1bd7dcde16ac55f200a04e941d5dec63e6cc8f6c319ae0f2f96d6b828e5ea63b898b SHA512 dc913463e0a5d9c3367712c4e4d7a096b0ae84d0e188086f3328a66d081a92e45f2f12df86e8d5e7e175e9196ac6c3a3acbcf29870ca04f5e23aa8aa46715b28
-EBUILD secilc-2.8.ebuild 924 BLAKE2B 6e71813361b90f35e5cbad6bfc91d44c1e1c9946c12db18f87a6e10685b4eb97c7463ee278a20da7b482069410c96ba2fbcc20934fb82575a3dad229d6f87525 SHA512 0e252228f316d76c3cc544edd8dcb13e46b27556b23c22e8220e33ac8027fc1c31bb06e4ceaaf588ca8ee2f67811fd1cbd168704d3bb255fbb6fd700caf1266f
+EBUILD secilc-2.8.ebuild 922 BLAKE2B 6a6a35a5da397a04f27c69f9f709961290a10c83c544db6ce42e9b5339e80b98ec9e92ec0e6c1dd3c54ac26e767060e07d79eb042d9abe5d064bf2559ce00308 SHA512 67d657753cbe856e9c6afda6fbb1928366acae73d81af547f5bc2838dacd94d3e5bd451f67e79113100049fe13fe6fd0219e3fc5095bb34a4f5751df9d69b28d
 EBUILD secilc-9999.ebuild 924 BLAKE2B 6e71813361b90f35e5cbad6bfc91d44c1e1c9946c12db18f87a6e10685b4eb97c7463ee278a20da7b482069410c96ba2fbcc20934fb82575a3dad229d6f87525 SHA512 0e252228f316d76c3cc544edd8dcb13e46b27556b23c22e8220e33ac8027fc1c31bb06e4ceaaf588ca8ee2f67811fd1cbd168704d3bb255fbb6fd700caf1266f
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-2.8.ebuild b/sys-apps/secilc/secilc-2.8.ebuild
index 8ff2138afafc..a54a310c99dd 100644
--- a/sys-apps/secilc/secilc-2.8.ebuild
+++ b/sys-apps/secilc/secilc-2.8.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index b92b61697ead..ef9512987e21 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -2,5 +2,5 @@ AUX sed-4.1.5-alloca.patch 413 BLAKE2B ace3926149e5190bb800a1e1871d70613fee6ef5e
 DIST sed-4.2.2.tar.bz2 1059414 BLAKE2B aebe0bf90e9f9c7907e0baa8a4d1a16e59a5893198382fb9fe08ed66cab670921c0db1e07f668bf3db8dfe9bb4f0e68b9c34fd7228c70df24be043d3e7ea8d92 SHA512 dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573
 DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196
 EBUILD sed-4.2.2.ebuild 1680 BLAKE2B 5091750a04cdaa6b5c340cfe27c74a3b620d21b3be451755104d93774f73060d92a70c367ce4107407dbfc3a4edb8fefbcbeef3876e3bc9707e481f5b20cb3eb SHA512 331c709e673cd26b2c3b5a48094ce5e2cb4d486b5eca2ac6733fc8e39fd525342be2494384922da920075f94fe2ab81a625795ea094769ab71548acb93089d99
-EBUILD sed-4.5.ebuild 1781 BLAKE2B ff572137ab7c9ff94132c27bbaa71ae7d9c631bb6d6341b020981b5806354588dd6263e6117e48a5d212b809b0a32a59e461aa9f4f02af716e7f7f662a41ef70 SHA512 e5406687ae67346e58f91f1b1149ef1a2c20de111a14d728f8f1f1576fb104ebecead916c8712df8642d24dac72949c0061304f35f2e10459c1aef1727f5980c
+EBUILD sed-4.5.ebuild 1776 BLAKE2B df963a59bce049101826f79df324566bc8554c714ff03357edcdbd81b763e5f4de7e7c54d2c78fd49efc64b33e25cd0111f23f9e647a7772830268ecf5099fa8 SHA512 3e57199639a6e3aed9ddf9b29c1552845983d5c7df86fca0050fa6361471ff793d93289f325693977bcfd91781ba179c17cc753a2ba16bfd8198d4ca59869535
 MISC metadata.xml 599 BLAKE2B 1e3e9343805c40b2f8ba3be494c1280395ce8edfb85d93b53e136269c774312b5b27d63cd628eb1ca57faa2c1a3849a7b361c9fa68850f47d70d618995b57667 SHA512 6aa22a76f9ec43142548e347dcea74b4c0b02bf0f8ccaff581265ba4b97fc16fca5d01bc3884e27523d138eec3b809bae6b379c7c0d38b344db2f7175e5565d5
diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild
index c2387e587926..ec5f65f082e8 100644
--- a/sys-apps/sed/sed-4.5.ebuild
+++ b/sys-apps/sed/sed-4.5.ebuild
@@ -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 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl forced-sandbox nls selinux static"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 31c30bbeeb86..ca55f6155418 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,6 @@
 DIST selinux-python-2.7.tar.gz 2068004 BLAKE2B 57c7f324a8faddf57a576f9ec5c46c8dbbd085a3aff4355df645b0f391a0c2db718e8adb2719515cc4a9c386e11c3df053b5303d3f91ff4958fb91e80d440b51 SHA512 df8645e7ac9ca568f0c9d81c42b93d0abadc43c22f14d38451ab262b52132cfb7abd7742e3a00ab9c153f95dd5b23b3a496d84875debcd9787f75d940eb45c28
 DIST selinux-python-2.8.tar.gz 2068101 BLAKE2B c28f12e4bd453955148a6ba82fd28621d1a4600f872ac63d97372f2e0153091adf1cf871f89765dd300bc6b7b2d610b96f87e3fc5accbfad713ed8a0d8f76f5a SHA512 e695c11122f7f8105b75d1ef98355fd2b82b40d93c2fd9e733dcd95d4d7c392f60b646df81203c43ad2a0e8447f9901083007e1572b78e17368ad2764ffa1aad
 EBUILD selinux-python-2.7.ebuild 2673 BLAKE2B 14692ea38d55be1eb9b17dde7b4f1c7195139543347314896527c442931812bdac4524cd75c66b654d9b778ed4d6d213d21f2b8b1f3dc424b4bf8101da08bb07 SHA512 ad6d6047b551c82464d58de569cbe7c4137d0e5c87125164690bab4aac5bb48fa01059e31e1cb6de99a0abfd942c7294fefecced7e4b19d8dc4715b398c788c6
-EBUILD selinux-python-2.8.ebuild 2585 BLAKE2B 8e01d08781d9c53b2832b939073f0e720abfadddfa5de47a64e69fe4e99c813e1e94db5e593031981aba443b374f130fa0ae6d95ae6cf9178e64bf21b5183941 SHA512 cf4ac70801dcd0bb15c292c7b85e3818e34146d09176446a9068ab5826fe82d7167e8761f5548825f3a36b2545447c85f067d48468f70d52a094757a39811f4e
+EBUILD selinux-python-2.8.ebuild 2583 BLAKE2B db435532e1b00e5dda43f060753be5302b1c3ac490580e56756ee5f65f5ec1477de27afa9368c03f4501c789c071c44dfb926c5c8d26540bd709a6982099d97c SHA512 6a3c712d563d14e0bf203976a4251178bddb08a24725cab1b95c07664fd874631698c9c59c446499d87a2950bb1c29b2bf97e67465e3e2afa07f6cafdac101bf
 EBUILD selinux-python-9999.ebuild 2585 BLAKE2B 8e01d08781d9c53b2832b939073f0e720abfadddfa5de47a64e69fe4e99c813e1e94db5e593031981aba443b374f130fa0ae6d95ae6cf9178e64bf21b5183941 SHA512 cf4ac70801dcd0bb15c292c7b85e3818e34146d09176446a9068ab5826fe82d7167e8761f5548825f3a36b2545447c85f067d48468f70d52a094757a39811f4e
 MISC metadata.xml 718 BLAKE2B ca11527a8722aa1c1f74f1731409e950f866094492f15e9345c117622da63f06bb5681e806545083200a494d3b65f0c4f31e1454aea5fed923f438ef01aa91af SHA512 a45a1c3e516dd956e60be67ddce632d055a98ff0fb45b920adfb5d1253da77822286f9742865027a47e94386dad2a1478a5b51f2bf9a97e2c2571470fdb34e04
diff --git a/sys-apps/selinux-python/selinux-python-2.8.ebuild b/sys-apps/selinux-python/selinux-python-2.8.ebuild
index 96a4fbaa8e14..26e11a5ad06b 100644
--- a/sys-apps/selinux-python/selinux-python-2.8.ebuild
+++ b/sys-apps/selinux-python/selinux-python-2.8.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 9895ee97d48b..06ae61f7f172 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,6 +1,6 @@
 DIST semodule-utils-2.7.tar.gz 15447 BLAKE2B 44c28ad634ef2ab9e478edb58020547c217a01be0aa75cf3a2432be419efb626f0a5742ba1bcec50ba11c132c207a42c05836eb2749e1f80d4a8142fb9e34a9e SHA512 5c7c2a2224949f50c1119edba90d937363e22af52a38f06525e957b29f5310a3e3444d03980b2f808ce995de0f9fc0a9dca8b6167bbfde29c1a33b9bc786d3c8
 DIST semodule-utils-2.8.tar.gz 12536 BLAKE2B 93a2f8fee887eba72b009071549a687fe86045344979e31493b3f17041ddf3f31c29ea3c754a31f6029847798dfe26d63b02fadc1042bc68aa414050b283d208 SHA512 13d79a22115f5448dafc5202dc3dec66b9ad826051d61d7c126defe823407959511db35713d97c7dfe9e79de96193fec91a10b98c13743e06a1213f5734f4ae7
 EBUILD semodule-utils-2.7.ebuild 1123 BLAKE2B b94f20dedd85eabdb4cc9ea37ed8060ce68f044e3a463f1d255cdbcda0e0187686d8d3c2b6be0f0339eb034a04e2c42050eb1633ac0e9546f4436e4585a34e4d SHA512 66d018f1a8a2c16f6083972fb80d14806cd2671ab8150fd676fd164d21bfef12d43eb70b1f1e99a972f15cc19ed0c78d518788a79ca8805f9ce31dae9d10a38d
-EBUILD semodule-utils-2.8.ebuild 999 BLAKE2B b5cd5f3d695c333c82dc7ece4b0ffd85ed19d903cf8fcf2ee1d09b1f6a79a66de16f172cf547cb3f5df72bce4e27346eb7dc78a1ac28115225628d5f2b8984f1 SHA512 e9bd04833eee2e666ddfc67fc2b70a0391467b6947fb952143e536863c4405f7abd0d6ba06b38b8dfe533f33c88b5d74d8821b391b7bc0305f6d7b050f9a3ed4
+EBUILD semodule-utils-2.8.ebuild 997 BLAKE2B 90d4e8740267ebc4f9e6bc3453dbe70ebbab54fb9025665c79e46df829fe8df4a754beafab46ad13b32273fa4dd527014ad47692e4858eff85672391dcd9c02d SHA512 689ec194b0852d3eb75f0f618a1cf4db0927718d408e4040a5240b874548169d326ec17be7233f78313ad4c5c8f12e5c02428aaccef12170e8ba3efa2afefdd3
 EBUILD semodule-utils-9999.ebuild 999 BLAKE2B b5cd5f3d695c333c82dc7ece4b0ffd85ed19d903cf8fcf2ee1d09b1f6a79a66de16f172cf547cb3f5df72bce4e27346eb7dc78a1ac28115225628d5f2b8984f1 SHA512 e9bd04833eee2e666ddfc67fc2b70a0391467b6947fb952143e536863c4405f7abd0d6ba06b38b8dfe533f33c88b5d74d8821b391b7bc0305f6d7b050f9a3ed4
 MISC metadata.xml 521 BLAKE2B 5785152e6b947a78aa09c12816bdee5f0c93e718d0a3cb9244b1b769dab19bb057db91c49179990d06e8cfc6bac692b5223ddf2137ea043a13ee58c41b2ade1d SHA512 e15b382ddf7059ff9c82887d636522dcc993e580e715d4a822106ed27c7fdb75b32e96c8c32a34cbdbbef4ad0f9c49bfb7c7420ea97852fa82e7740c4044a689
diff --git a/sys-apps/semodule-utils/semodule-utils-2.8.ebuild b/sys-apps/semodule-utils/semodule-utils-2.8.ebuild
index 9c11d6fc2ec9..2d1aad84d516 100644
--- a/sys-apps/semodule-utils/semodule-utils-2.8.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-2.8.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 54132d91f3d7..2b407b682b92 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -12,7 +12,11 @@ DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
 DIST systemd-238-patches-1.tar.gz 47512 BLAKE2B 9edf8835ec7bba43bd00b1481b23bc5a4148030724633a8bfe1e82ec48b79699d4822b0bc5ea3a979b404e706efa9c0eae8e0460d76658ba2e901c4853da0c04 SHA512 809d8a3a9a023217b509b738e0d341d060f1343df6159e5acfcededfb452986de140ddf4b879a5157fba1a5646d00db8b6537aba8358c48f75fd6527f881a14c
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
+DIST systemd-239-patches-0.tar.gz 14007 BLAKE2B a1653ac6cb46347fa1e1a4a81a7003af0e565ac2ba43e1aaed9df87d7e4bd13cdcf26ffc9527f46defa226d7d11b03fbc6b018f0734a6654a0f4bf88bf4ef6e7 SHA512 a640a446db153523a2ca97b811e20bc42c8273d2c494ebd8a6c5cd33718c714e37544533749cad57e887c17635cbfca01b86b52e9f5a12878ef70f2e95fc7485
+DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 EBUILD systemd-236-r5.ebuild 12925 BLAKE2B 7af4a9109f2273d2ddb7aa777e7e2e6d055e7b3bf7c6c56b6b02faf3c010af467d09477d7c03efbf58a9511ba4cd2cff3a1e92d0a7f793419d41fe87fb0b5d97 SHA512 ab0bb749a02f9e296d6a4dffc481616bc286127b970122d9d1337cadf3cfe40be44e9f76cf95d0f89d758ef329f4c06bb734643e40f16afca00329b71780449c
-EBUILD systemd-238-r7.ebuild 13149 BLAKE2B 0d022de012f3356c3212fa58b7a3f06850ff3a556fad82ac07e48d3da95ad3e99a7417d509c32c68ac7bf036f378e2d5e2da8922d824c1e000ddcbf7f0b7a517 SHA512 dbcdff2bc64142faec96b493057f09d1f2d60825c851e1539a5f71508c56b14f206ab59d40450df5f74b0ce05cdea4498a5649b56a6face6111a246b5ccb1f25
-EBUILD systemd-9999.ebuild 13122 BLAKE2B 478c90259a73810bef9d1c81acaa3db7a4bb9b91265ab545821622933dc61c2f7de4460b3d98a6e68967400be101db93292741d4dd116b4a0ca216db728d4e78 SHA512 061994cc6c2783e8b00049f8679592de30d608f1e95032d91150c738583f54acb2ff0e3e1f9573d1b7b50875b58ea499a2ae78eb6b87fe91ffdd84daef088acf
+EBUILD systemd-238-r7.ebuild 13147 BLAKE2B 0fd72c09cb7d7648d5a48722a13443924de26f6810b05aa196cf4f757bcfed60d7e4750b10a7e87104441ecd737fe3bd897d89b9b58b9a7acb926f5df2c887e3 SHA512 8917208a24c8a8866854812c1e3157cd8976f7875b8304e0fa08d75b25f850fb2185947f4f7ff0a040e389f7635288b30edaed1849b542a51535909c9bd10a11
+EBUILD systemd-239-r1.ebuild 13235 BLAKE2B 2bf23f3b9c55789cfad9a12419f7c18cdd922fa85db7e40a087fc13f2af52b1f33e978b408c7a24db2774d68aa718e97688fb42ca58676687ca6d9a3fe9482dc SHA512 a0c183d6514d6dad30dca20bc49d4dfbd99080f5f74b6c988d460caeb7767895f5f348aad6e8fd27e16f9a814bbdbc31e1fe7ab419603131e526a4a5a1eb6db3
+EBUILD systemd-239.ebuild 13174 BLAKE2B c704d7a943b0ee21ffb56aa3b738aba283f5ee94d64f0a25982053cbcc593025271c7db75082ad797d36ea26eed578efc5a816c5a1d19be41a521ec2a0852928 SHA512 209b339a8b5e398c7f9abfc92e854f33205f168e3b14e97524fa6e7d96f1a41f0ecbf572e46fb2f42e91ea802c52117daa8d6f4002f8b5ba4f4e2af19864b833
+EBUILD systemd-9999.ebuild 13174 BLAKE2B c704d7a943b0ee21ffb56aa3b738aba283f5ee94d64f0a25982053cbcc593025271c7db75082ad797d36ea26eed578efc5a816c5a1d19be41a521ec2a0852928 SHA512 209b339a8b5e398c7f9abfc92e854f33205f168e3b14e97524fa6e7d96f1a41f0ecbf572e46fb2f42e91ea802c52117daa8d6f4002f8b5ba4f4e2af19864b833
 MISC metadata.xml 2062 BLAKE2B bcca3d75829a25da2a4b3b987c7b14a5295785987d5e4573c19cd39aa165080d71f9a581190365a595567d5f20b58f054de5631480a8dec34c3a10d04f1498b5 SHA512 287b000a32b1b8ddd8041c8303857249317e74492c22e3ac59d237c9c9b511a612a90ab0fdaa209fc8ee092b00a0db0edc364053c1efc42a28f538dd4c3ee7d1
diff --git a/sys-apps/systemd/systemd-238-r7.ebuild b/sys-apps/systemd/systemd-238-r7.ebuild
index 52bfc26bf58c..e18151acc1b8 100644
--- a/sys-apps/systemd/systemd-238-r7.ebuild
+++ b/sys-apps/systemd/systemd-238-r7.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~floppym/dist/${P}-patches-1.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
diff --git a/sys-apps/systemd/systemd-239-r1.ebuild b/sys-apps/systemd/systemd-239-r1.ebuild
new file mode 100644
index 000000000000..1fc28a80c2aa
--- /dev/null
+++ b/sys-apps/systemd/systemd-239-r1.ebuild
@@ -0,0 +1,447 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz
+		https://dev.gentoo.org/~floppym/dist/${P}-patches-0.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=sys-kernel/linux-headers-${MINKV}
+	virtual/pkgconfig
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-Dkill-path=/bin/kill
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	if multilib_is_native_abi && use idn; then
+		myconf+=(
+			-Dlibidn2=$(usex libidn2 true false)
+			-Dlibidn=$(usex libidn2 false true)
+		)
+	else
+		myconf+=(
+			-Dlibidn2=false
+			-Dlibidn=false
+		)
+	fi
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED%/}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || 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
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED%/}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+	rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
+
+	local udevdir=/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
+
+	rm -r "${ED%/}${udevdir}/hwdb.d" || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-239.ebuild b/sys-apps/systemd/systemd-239.ebuild
new file mode 100644
index 000000000000..08a0c54c349b
--- /dev/null
+++ b/sys-apps/systemd/systemd-239.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2:= )
+		!libidn2? ( net-dns/libidn:= )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	pcre? ( dev-libs/libpcre2 )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=sys-kernel/linux-headers-${MINKV}
+	virtual/pkgconfig
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/gentoo-systemd-user-pam.patch"
+			"${FILESDIR}/gentoo-uucp-group-r1.patch"
+			"${FILESDIR}/gentoo-generator-path.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-Dkill-path=/bin/kill
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	if multilib_is_native_abi && use idn; then
+		myconf+=(
+			-Dlibidn2=$(usex libidn2 true false)
+			-Dlibidn=$(usex libidn2 false true)
+		)
+	else
+		myconf+=(
+			-Dlibidn2=false
+			-Dlibidn=false
+		)
+	fi
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED%/}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	if ! use sysv-utils; then
+		rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || 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
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED%/}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+	keepdir /etc/udev/{hwdb.d,rules.d}
+	keepdir /var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+	rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
+
+	local udevdir=/lib/udev
+	use split-usr || udevdir=/usr/lib/udev
+
+	rm -r "${ED%/}${udevdir}/hwdb.d" || die
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 779db468b79b..08a0c54c349b 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -312,11 +312,14 @@ multilib_src_install_all() {
 
 	if ! use sysv-utils; then
 		rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rmdir "${ED%/}${rootprefix}"/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
 
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED%/}${rootprefix}"/sbin || die
+	fi
+
 	# Preserve empty dirs in /etc & /var, bug #437008
 	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
 	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd