14 files changed, 449 insertions, 16 deletions
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 2eb960aa5ac2..114a6cc44cdb 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -3,7 +3,7 @@ AUX accountsservice-0.6.43-elogind.patch 3677 SHA256 b78dec4892c0e63e5348d1a2ce4
 DIST accountsservice-0.6.43.tar.xz 381008 SHA256 ed3ba94aa38ceb822a0e1a1ac71bf1a8123babf90be049397b3a00900e48d6cc SHA512 0673430b7e5fd726397a9358d60d5c34542afaa786b795d3c8b544dc2bdab151c74f9a3daa4bcd94dc7669400a78cd4cddc453cad78ee8e431bf7c1f417138e2 WHIRLPOOL e704d9dcb5b7c0c6ee7c1ab5ed310ab2428e94d061663367f213c5903f68768680492d651524ef1e7594417335de529463d63b8d8a4d1cc8b6445358f1b97a33
 DIST accountsservice-0.6.45.tar.xz 382740 SHA256 fb0fc293aa75d59f5ef5db719d37a21831c4dd74a97526ee7e51ce936311ef26 SHA512 09975f9fa03a3177d923de6d6f6e6acfffeb2ff4924c45eaac78c994c16974427c8e936a87034747ba494d2bb3df6e8a92ff44db387761b06e06e311d7cf105a WHIRLPOOL 5dce6fc957da0d039f03ba0f9bf06710ecf4d39d81cd6d745bea5358b7bfb582d124a43f7df7603b61d699337ff29c7b0e3c8296da865aa6f260f566e8f86145
 EBUILD accountsservice-0.6.43-r1.ebuild 1536 SHA256 c6dc8d8d24a82f2453b9776f701f23436789a824d8d3d0ae9fca50544c12d076 SHA512 3150d720a6452bc8edbbb79fa7cc9d4aed6fe28f1e80aca1eaedf6d699c16226cc72ad6ffa2e75793356dad667d70dc7213808d95c1c01b36c889dd317cdad71 WHIRLPOOL 5e19535f4793b0c1d87982d06b61edd120d700bb04e8d39e75d82ae6cb23b62fbdae266fb82b904274d90825ec6bf84947efb4834e8788e4bf1b8063150ed48e
-EBUILD accountsservice-0.6.45.ebuild 1548 SHA256 5074cb1fa2695a51c57e7b4c571e4014a236c070e6a95041e44ccf841840508b SHA512 9e271fabe2a6cee6c1837528c359eceabe95716fbd701e0262bf48f25daa987ab91220e0ee74efaaf8253dec77e0323b1da51687a7563a869dfd696de98f2591 WHIRLPOOL 68838f7362182a1ccb7d0407b941a423c9811011f05a63399b185e6c95e73dc4970ba62cbe659e06890f43f3525b34c32ba668aebd0250818b65e55e8f9fd461
+EBUILD accountsservice-0.6.45.ebuild 1546 SHA256 2b2d9c48463b47a809632230c034f139bc1e37d842201f341df4be72ca3c4458 SHA512 3323433d134cbbd9d6e654f755fa9432aaf1b27b376b192658eb41a50c7e5c9695ac509c3847fe5574815f6af90f108b098fd16dd69b6f636f85aeaef8938f65 WHIRLPOOL 89ad6ee81478bee1157efa239a7a73920a7e7afc9cd689746778c77af903865e5fc92c07afe4532a0642e7420bb418698fe68c7eb1c41b6f095baf442dd1232f
 MISC ChangeLog 4660 SHA256 75aa7970a9f01c40b551539d2acd056606172c27b1172adb97f4be7ef3fad5da SHA512 56ee730dac1b25cd14d3d018a8b362cb80c333add0f832a573030e0576ebf93014211a64ca6106801e768401af9e8de4ab5652952848ff0065b4a0e2ac4ee994 WHIRLPOOL 31471be4823697718fb82a1061b5cbf7a77cb864df07ea72ca100cb756acd5cd5bf15bde5091b32c554c3e365d0cc656fb61b32205b884b5183d5664f7cc2229
 MISC ChangeLog-2015 10553 SHA256 3447f0c217130cf71afaa81fe09c153cc5ead192811825a4c3b5d84b1462e218 SHA512 dcedeaed8b2ae2498e9bf69315e1f1cc10681e26a9417300dd2bce763fba9c4cf3846c5c54a45801e0333cd977d9374307c86ca3cd5aca599ad1a513958f63a9 WHIRLPOOL ab3202c4e0f174029916b89e676e95b6ca1b86c2820ce58941933d4ad059add5be5f5a15cc96b97c28fc842071ae5fd25f47214e1b82310c13cbd76f80882354
 MISC metadata.xml 524 SHA256 c1df2efad39b5d939c4fc58523088160d252a5a23eedabf675261fb4a10e2a3b SHA512 a0c662b3c0c45df43780f160b6db6db67561a1b2c84ce60929707d94cd9f1bf76588420189b91e0eafe58001a61d8a313f2a4b421b980a7c7f988c95e782ee07 WHIRLPOOL 6584ed3c6ba861aa01f56ef558ba5f4a8852243b7fd72e454d1ec3bf2edc1f61313bca357ebbb56f91919cdaf7917710fa3060542c91fe8485511d44d310880c
diff --git a/sys-apps/accountsservice/accountsservice-0.6.45.ebuild b/sys-apps/accountsservice/accountsservice-0.6.45.ebuild
index fb05d15bebcc..441edab3483b 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.45.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.45.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86"
 
 IUSE="doc elogind +introspection selinux systemd"
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index f05554ea793d..18e32b20c25d 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -2,8 +2,8 @@ DIST baselayout-2.3.tar.bz2 32266 SHA256 e7bbd7d71ede6820a37738fd2e9010d54545fbd
 DIST baselayout-2.4.1.tar.bz2 31307 SHA256 d75ae329ba47f26e7c41c6e060f57a8f1f1a97420d39e6a49ab2bdb86c4a2c00 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1 WHIRLPOOL 9057ab259c8ef61bb56d13b237e343f6a7aec8fef61a0a9872fc7e0aa34a7dc772cd4701a76341d170eaa3ba328ad0b693d098189ca7f4aa9e5e32232f1d1801
 EBUILD baselayout-2.3.ebuild 8346 SHA256 f81ee2b6b46b6ddd2f1098f02d31095d8a76b030b20395654dc5967cb5617bed SHA512 c2efae56623e39a6dcb13a064810c900bb22bdd9b04f31b1837c4a56a48cf2135eaaa3340c72e2ebf4ac5800d8ba2ee03083d2edf0c3181ff465b6a87cc7d4c1 WHIRLPOOL 4b6783f5b2204cc1b2efa2e29b0d1b4eb41864b47bbfff7d67b4fa5200ec2b6cbe22696c1bdabfc49c696bbeb9753f2f7b56a1265187bd6b6a93ef805cafefe5
 EBUILD baselayout-2.4.1-r2.ebuild 8567 SHA256 26630dedefe8ef21c3ebcffe7afe2aeb43cd757f687bfb8a6d51aa2bc5a18a02 SHA512 54b918555d24639073a1526324fbd12273e5e8f799e7a2a591c5c1eb4e70bbbc161e4056b62a2de2ade1d912b5d1b2736e84a5c4cb552b7ffca7dc1427ee781b WHIRLPOOL 0bb44976d077bbba1489c7b77762596276c75adfb5767c48960892bb0bf990e5fbe179c636115a831aaee4878a25d590ad6640f45525b6e6bd0d550820e8e09d
-EBUILD baselayout-9999.ebuild 8688 SHA256 965513b4fb9f6396d8bfe457de1890af36a130a84b3935189f87c1c39ff67b15 SHA512 0e36fe35bcfef3e6df92c43b3eb7111c8a5fa1003264529ce56332972cb5fbcda5db94f64f0f5fca74145eff953bea80685d053ff0ae265672912bff0c5278af WHIRLPOOL d945dac37e2ea93e4cdae684f9f4b1b8e3b8c2a667bea933be8da98962a14757a28ef2a80b5b2a8691e047e220200b9564b35c8da0650c8d5ee21f735b13d486
+EBUILD baselayout-9999.ebuild 9168 SHA256 bfefd742efd8d87c3f2da89601a8ef2620b578fd2212995b382d92b7410a41e1 SHA512 7901912868396280249acaf517c6dc915a5eb443e11eadd42e64368ebd34997635fe033db3fcf27c14fe9685699c96b64a2bfc130faa96bc6851aea84113884a WHIRLPOOL ebd4c7576a6be14d09dad356e08889169bce313a76f8b72cef8de940599566e80a6cc381340d5ccf6a4e8f13c8da388172b31db03f6761d255edd4c15721ba6c
 MISC ChangeLog 4857 SHA256 f10de10caa066cb3c6f2471c29bdaf6bad0de254216efda4ad288e46b254b970 SHA512 bae6a38f8780a29d06fb12b39479f36403392a63600ebd9032c8490fc51aa3bb1d162cf7a472fd38e0aa87770088e12a1d4df8d9591b8a28275bbf690fa62f4f WHIRLPOOL ec46fb22de2a7b079d4d1090526baa50519fb23575953a19651674ddec808318664eb3d462c2e89bcc6309cbb47211fb07f5a88e95819b4518c8e76c7529442b
 MISC ChangeLog-2008 101952 SHA256 cb360ccdd6458e3faa54214ea6370ade92265bafa1b1aa7789165b5dfee3e5c8 SHA512 d888de07f955094603497e06a083ffe33d3bfeeed7aede59bca5cd60a6c1d5334d691a8d0a7ae7534af6e82fcd8dbf522f9ac3024a468f5035a9245024cc726f WHIRLPOOL 97ee6ca2c4b9a3fc0a919cd6f286165b1eec32e32acb7f2c81e04464fd7a34cc5847e7087795479a5475bc25eaea89ae28b56bcfd11f3d51c6153d83c26f9bdb
 MISC ChangeLog-2015 10095 SHA256 a8ecc0cc040723fa4d9a740e520286b574cf05ef977c06ca6cfb10ab27bbcfae SHA512 106ae36b21ec3806f06ed2b1e3a39e4e88f2dd004915e3b56765bbe43751a00d14188c066ff31a8465684db9fd918d3b6046686a1708435a2c91eb6fec754a07 WHIRLPOOL 2e154d06840d6b39ed1a968820352dfd713d257abb2e2e97a5db53c6c4816a4a9ad2288e6cfc61388d22b22049503855a9e6402c576785f53fb62a506bf6e6c4
-MISC metadata.xml 358 SHA256 b31b751b50e8a91d4e0569671cf55e89dca561c724db408f3015d544d66852b7 SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f WHIRLPOOL c1d2fd649ef108432ddc6c251df0afcc444b14b90da75a48e93bd6eb0b04c3f35bf703bdc9371e5537144ee8392c7c7868895b50ec0a815c4e1403c898a2283c
+MISC metadata.xml 447 SHA256 6e1e531b3bf0e6fcc15cd6d216d4bbc84ff6760cbd1e6032f04aa862c3060071 SHA512 df8ef8945e71112074f70af3fb2ffc0d83ffd0b25827f802b96924436b6a7f184ffcfef495d543bddc3007e7a1ea5429ca696e2ad6dfb09a0541e504f7d135d1 WHIRLPOOL 2171397c67f23fc03ffb39768b7df87e8998ea046a8c2b2a2fe32e4f8091b8dd96b685de54ed212a296a095821961240eb3da3c5d5114bfe74378516140313cb
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index 98795ba6d00f..7e43ea7af598 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils multilib versionator prefix
+inherit multilib versionator prefix
 
 DESCRIPTION="Filesystem baselayout and init scripts"
 HOMEPAGE="https://www.gentoo.org/"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="build kernel_linux"
+IUSE="build usrmerge kernel_linux"
 
 pkg_setup() {
 	multilib_layout
@@ -26,15 +26,22 @@ pkg_setup() {
 
 # Create our multilib dirs - the Makefile has no knowledge of this
 multilib_layout() {
-	local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	local def_libdir libdir libdirs
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
 	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
 
-	[ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
 
 	# figure out which paths should be symlinks and which should be directories
 	local dirs syms exp d
 	for libdir in ${libdirs} ; do
-		exp=( {,usr/,usr/local/}${libdir} )
+		if ! use usrmerge; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
 		for d in "${exp[@]}" ; do
 			# most things should be dirs
 			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
@@ -56,8 +63,13 @@ multilib_layout() {
 
 	# setup symlinks and dirs where we expect them to be; do not migrate
 	# data ... just fall over in that case.
-	local prefix
-	for prefix in "${EROOT}"{,usr/,usr/local/} ; do
+	local prefix prefix_lst
+	if ! use usrmerge; then
+		prefix_lst="${EROOT}"{,usr/,usr/local/}
+	else
+		prefix_lst="${EROOT}"{usr/,usr/local/}
+	fi
+	for prefix in "${prefix_lst}"; do
 		if [ "${SYMLINK_LIB}" = yes ] ; then
 			# we need to make sure "lib" points to the native libdir
 			if [ -h "${prefix}lib" ] ; then
@@ -115,6 +127,13 @@ multilib_layout() {
 			fi
 		fi
 	done
+	if use usrmerge; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+			fi
+		done
+	fi
 }
 
 pkg_preinst() {
@@ -135,7 +154,11 @@ pkg_preinst() {
 	# Also, we cannot reference $S as binpkg will break so we do this.
 	multilib_layout
 	if use build ; then
-		emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout || die
+		if ! use usrmerge; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
+		fi
 	fi
 	rm -f "${ED}"/usr/share/${PN}/Makefile
 }
diff --git a/sys-apps/baselayout/metadata.xml b/sys-apps/baselayout/metadata.xml
index 53e04953d604..452b01304667 100644
--- a/sys-apps/baselayout/metadata.xml
+++ b/sys-apps/baselayout/metadata.xml
@@ -9,4 +9,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name="usrmerge">Activate the /usr merge when stages are built</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index b2178d6308a3..8b83bde0e358 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -3,7 +3,9 @@ AUX haveged-init.d.3 322 SHA256 5ee06c49764ecc4aaa9a88a222ef7838dbc065d049279693
 AUX haveged.conf 147 SHA256 c5460e3e4a6346476febb43f4e7775ded892e2c23305e2de9df94abbd25c7500 SHA512 052696a31ab7b9a0dda06ccb24c08524bef0cfa9c601a1ba6819bb2e42886a6b3d9b77710880d589534fae3c600d123304586f825fac554e68ce50d8b5acd563 WHIRLPOOL 86636296d06fbe9b8ac7409c2075543329b1859992ed539fd98d1dab8946ade3d8ff4ba305a9989be963c61f806be22a9d50d3d53ae9cbcba179af0512031e0d
 AUX service.gentoo 322 SHA256 715adc956ed6331f3c77dae844579b51d8c11d6aa1bb67f073ce902197b54c4b SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88 WHIRLPOOL e94d9577651af7431e53999e9b2840e094dbc9caf9f5a34038c090d4f3419ae794607d87f504494bcfc5d39b2f3e52ef331249ab22d60f9c5a0c5b6cea402709
 DIST haveged-1.9.1.tar.gz 474845 SHA256 9c2363ed9542a6784ff08e247182137e71f2ddb79e8e6c1ac4ad50d21ced3715 SHA512 267d62cfeb886ea00fa412de1a91a34821460d0f4ad789dcfb3547018300e1cbf480917571b19652f2d449369293031d9534f9533bbf6a59560f4f10608c9cd2 WHIRLPOOL a930d0a007c91dbc3b7c83a1ccfb659f53aa3f151b8b3984dc7208697ddb1f73ce7012c7c968dd5295b2e90e62db03e1c582267c1b8b5230745735f462a1f757
+DIST haveged-1.9.2.tar.gz 473890 SHA256 82d5d23551bb79476e01ea55eadfd83410f6b24ad7349a238a08ea3c7e190234 SHA512 623df6a5d55b9ec5c7da013c73eeb3ce047c2037d0b643047a5c43772e63ea4c2d9df7c3cfe1ce748bf7c5d2f08fa1ddaf64af6b9e46229b6fde73558edc1fe4 WHIRLPOOL f19b931788e15258df97d9f1e6fa0f99f2e52c94ec7525bb8b7401a6724b525d6fe959ef65b4576446d0f11d7485bec8d047efe0883a370926fbbfaa172cced1
 EBUILD haveged-1.9.1.ebuild 1002 SHA256 fa0ef41c14e8c159640315f9159d230a357f8f7891343ce3f2354a7e48d7c22b SHA512 f156ac90f991ccd4b090657055e323123915398a9e8877dc4363b297b192709d3240d68cab397a7d8de96465f08e5b833370ea19e0b5673cc3b9638e30f0af59 WHIRLPOOL 71a006ee67bbcd0075f9cfaa43bcc47bcc680625175826365af65e7888f090f6d027851e5d51d045a6b06f0b09ab7bfddfcb9f52f506337b14d159f824592e39
+EBUILD haveged-1.9.2.ebuild 1005 SHA256 ef60c7f7b34660450565140f9732ad085ccf172a06d21a651a394245e58b4c4f SHA512 cd381536a02f1d37fe66f60e1918dfd6847140a5ce4882c8cf5a4ca67ee7ce9bc7834955eda31b896ab06f10b789b784e0dffef148bede476706a0a991ae93ed WHIRLPOOL f3dbbc3faf60e65e0ea6ba44c89858e090e4169a5fd1c2520dfc3fb2baabe758b5a04871c1c8be272399a34dfd475592b96496dc9d30aa3360db1e1b88fb112e
 MISC ChangeLog 3664 SHA256 8d45ff274b31c21fbc867cea8694dae0ee929fac39c85c3b7579bc1a052c17fe SHA512 3454a10b27cc4b3d38b9d383a6165f054d1a25d35997538691e302961f38a8febc559484d80ec73e771765a6a49b8e70af92c17c2a18c6d394b062cf438f8bd3 WHIRLPOOL 5b763bf58f3f35f2f9388124f42c677f960541b031c93bb58805bdd59fcd1495d3404300ca5a2578f7d7a4689e79b29fa18afb1df7aaf8b6e4b32476f05eb8e2
 MISC ChangeLog-2015 4721 SHA256 891d6206f396f0fd8db7bf1c012ea23b1a02ca6ae0816c37e96db30e87bf7217 SHA512 5116b80597b8f2ab459cd3b0db0fa300a06dd3a8e97a2f1e1e9747625a7ea49e8a1cc371935022e2d095bcba7d9cd4862fda6879e42d66233c97180ce3195841 WHIRLPOOL 22e50056fd166be1091e73b09ff672081c8edbf484c8e56eee5ff2345e1a9884c9ec2400e50cef25f6ad00f7ad20470bf501b89d718d544b7dab75883e85fa2e
 MISC metadata.xml 371 SHA256 ba67734d1cb09ee2e4b944add07462c0da58f2d1b9b350628f22e72008e43aae SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0 WHIRLPOOL 080d05b46f2ee39b2ed3a69af79fe6030d3a37b55937110131905fb11ce2c174e64398368e88b76040d6615dfe26fe270bd0fd9e1183233bfa5ecf330ebaa490
diff --git a/sys-apps/haveged/haveged-1.9.2.ebuild b/sys-apps/haveged/haveged-1.9.2.ebuild
new file mode 100644
index 000000000000..2541023e40a5
--- /dev/null
+++ b/sys-apps/haveged/haveged-1.9.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils systemd
+
+DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
+HOMEPAGE="http://www.issihosts.com/haveged/"
+SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="selinux"
+
+DEPEND=""
+RDEPEND="!<sys-apps/openrc-0.11.8
+		 selinux? ( sec-policy/selinux-entropyd )"
+
+# threads are broken right now, but eventually
+# we should add $(use_enable threads)
+src_configure() {
+	local myeconfargs=(
+		--bindir=/usr/sbin
+		--enable-nistest
+		--disable-static
+		--disable-threads
+	)
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	# Install gentoo ones instead
+	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
+	newconfd "${FILESDIR}"/haveged-conf.d haveged
+
+	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
+	insinto /etc
+	doins "${FILESDIR}"/haveged.conf
+}
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index 9894ecce0f69..fbf1063272de 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1,3 +1,3 @@
 DIST init-system-helpers_1.49.tar.xz 42660 SHA256 845ed218f1cb54d5b10ea850620e5b6b3905fb248163f97ad4670a55100cedae SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16 WHIRLPOOL edacb283ccbc33ead7dda578138831f3631c6bfdf4498a97c76a8929b61cb3ab48404effd36614fcdc36cccaa22dfed4ce1d7242289bdeff446d6e2dfbc1476a
-EBUILD init-system-helpers-1.49.ebuild 798 SHA256 58ea08972abdb05299e1d297a17296b1bf6fd589a0f005eea911c2f1d0f2aceb SHA512 f2a1b4d5214a2722ad3b48d36f546d394bac4b784b689c79289fed31f3e24cd63cb3597b27b014f127eb9ace2373e435d4d586962862757bba4ad904e9ad21e0 WHIRLPOOL 85c125166799b975255ecec8972946436ca5df5b80e9e59e5ca7c333ab33f0f02820d5bb916b392ddcbd4ef59eb000da1cf53302210dd524c3ddbc916a302241
+EBUILD init-system-helpers-1.49.ebuild 815 SHA256 6da712d07527e906637f4470d56499162061b252e7a72759ffbc75d019c1d199 SHA512 85dab1d5da36a44623e5ab695d9d51ea060bafe8096b0c0ccfb4139b3717dc61f1660d0545fb6515b3cd11a059ed627fc06e2e69741f2e16621230c06e067900 WHIRLPOOL d30a5d5daaaf9ab9bb82a63e74ace1f8e4af0b831c5b20e082ad53bdb2d1385b91dc765734588d795c8d77a6cdc39a95197051751bc784f42b4fc5e4b0dfa80d
 MISC metadata.xml 251 SHA256 19c92189b52ab81b016ed5b235b2ab63d5679ba744a12e638a8df967b6ba373f SHA512 307528de6c03f6a97b95e189cb88eab281d278ad8b09833cf8c6924fc88fc38b17179a47fc463dd809e5f077b3b2bc74640e28816e50ab712b1989364b9d3bf0 WHIRLPOOL 5a109cd25597841c90ef88052fd9e76ce0ff1b18abd9a24c1a44647f6af43a4863b6b00187b4b9b9ed47fde68b026235fc386e64b06f08f8615c98f47106f022
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.49.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.49.ebuild
index 540a0b31b766..5d7222aa8dbd 100644
--- a/sys-apps/init-system-helpers/init-system-helpers-1.49.ebuild
+++ b/sys-apps/init-system-helpers/init-system-helpers-1.49.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 372d4deda485..5ab6404808f2 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -20,6 +20,7 @@ DIST openrc-0.34.4.tar.gz 227129 SHA256 b9d70a8e32a9fa4078864a9aad4e60efba3c0ccf
 DIST openrc-0.34.5.tar.gz 227278 SHA256 dad1ccddd3adef9ac3039e1402ad530cc5a54b351ceddbfefc3ad1b96298f97e SHA512 2e743b7d8f287bab8c74e9cac46935a7895483fd181d969a8e3a6709ccd6d222255b509730b9165f191626774fc372e426049678796d72e4d43541b8232674c7 WHIRLPOOL 855497ba5a444afa3eb1445f92169944115385ba9637ccc05da1bb8943c49fcee2eb7378be3d33d2bff420d8b5a663e2c6176a036a71bbfb08e15213dc9dcd9d
 DIST openrc-0.34.6.tar.gz 227096 SHA256 e4e6a1cb1e764c0a81831be72e08009ce6c1381adb3b96f115a2f8d72a666e2c SHA512 2e17fbc628c0753f4459678764911d787b8d40f309f978ddbdfdc4dfc5d3033a2ac35be00fb9ad558030249d215b9494a0e5eb43e41d3123aeca032032c82541 WHIRLPOOL c41365081fdc1eecde817e23ec665f80c28065fac72a1d58edeee676b83c53db7a422524a00ded35de818a1d775f9719afb7ce608d3d974a5e3e89fc86844f3b
 DIST openrc-0.34.7.tar.gz 227270 SHA256 e45e5da57088e31c31d936c8c1f8573584787c04a72829b12924a2843439a454 SHA512 2cc8feb18a57418227aebf08224f23561b161766bdacc956c1a8e9b054272538de3ab3ec5245b7b8adba80f242019d56bcb94c390ed1a483015d7720fe3f4f73 WHIRLPOOL 349e2092b32ec41d9bdb975369aaee0be71a1833b36a83cc1a0c1d1000ffc83733e35441089c890673fcca78100afb93e14af6c56d10a5534d76a2ba96d78955
+DIST openrc-0.34.8.tar.gz 227636 SHA256 d8af528f165bdda39599f06ffa75a6f0e8178e754cccd26bc29478158fbd1b02 SHA512 2309e0d330c35467dd6008f1458ac9680207a4c783d4f4e6008a84a313088cfe796dd134dfec79699b8f9c90002b0ae621bb78a9925b987ae98fbd8ad75b947a WHIRLPOOL 003ee07cde6fdd9578393a44f070f8dac90a9dec863e014dc46bca16ccb2addd5647779cb2f4eb26801d393fc6412a083408fffa25e1cd02bc7754736a9d491b
 DIST openrc-0.34.tar.gz 225678 SHA256 fa95e111d884f60f967bfa78353f683615f599bbf449b89c0663eb173769fc73 SHA512 8ff0e3234db06ddeb7c930251f13ec9e4488e4c9776dfe46bb0c1af09835cb34655084bebb6638eb07e47a7f5ef95c1aaed9d06dfa3eaef9e36e9b7a7910f820 WHIRLPOOL aacc1b4636bbbf29d091d7322154898c98cd13947450a0d81cacc080803c1241fe3cbe3e731553c94e5e5ddb2e9c626de53efa9885a4e7be23399637099f1e4d
 EBUILD openrc-0.27.2.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
 EBUILD openrc-0.28.ebuild 10123 SHA256 850255977878f273ec0fb3f0bfa117f4637dc3507f855e5d549b3eaad904f6f2 SHA512 f32502ebbd8e1a8e13044cd23d8b0e136eaf26e86001ae5f225640f085069c78921392a492614d3d1b734542bb0f99a9c781706158bdf5cd1ec91634d9f89e72 WHIRLPOOL 40fff2659443e04b037a5d722f0380423977c70001cd10076020ea5a6107ab8c7436ea0727ad00a0371a707daa90dda840bd4143ba5e2b180165dcc07fd15186
@@ -38,7 +39,8 @@ EBUILD openrc-0.34.3.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7
 EBUILD openrc-0.34.4.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.34.5.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.34.6.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
-EBUILD openrc-0.34.7.ebuild 10165 SHA256 db6ca6c9a8f2b42c5848682ce4fd1fed7ffdad5a917dfc851095a32638972b4b SHA512 7d226e47fe7a1a6a8b92da7d47f695baff0722db5c3b49651dd7dfbfc49f98755296683f0de69d90069ad064b37dbdd474a3ca98fdaddac79642634c02f9b3cb WHIRLPOOL f23f75cb621701eb3d4fb7c47a080caae5f921f6964fdc6f20ed89e5aac4e159812f127fa4eccbd2414542251e134f891a7d3ef58e21a66f8aa82fe820ea7026
+EBUILD openrc-0.34.7.ebuild 10162 SHA256 d688c49fe8446296fd469a97276c25b793d10421fd3fe7ee044e9f6cdecb387d SHA512 8fbf8406cb499dfac756ba1c7eb040e61eeefc61d6d294967864651e10edb862d16fc81f81e4d012c7df248c651305866c3656f39d9c5ccc3d884c5bc3e77eb0 WHIRLPOOL 069d82afdbc2d52c5fee592839ad3f550cb11342d694bd61c1587769991304fdcffba9a04b650a1ec096681cf8d1db0e69aafdf9455a7fd4e366af53ceb93089
+EBUILD openrc-0.34.8.ebuild 10163 SHA256 e0f96aa3cf6eaf28f20ffbc5007e0853ef8eda666cdaa6454bf97568f6d0b861 SHA512 6539e8ea661747904ea0659e4f5b76e2e55792a24a31f61fc00fb17fa464204ab293127907874686defbaf47988f6d74163acf9fb155136463bdfb388f9ee713 WHIRLPOOL ba94f93f1bf7d42c3dfd55d1daacd64ccf4dbc6127cbaef66d596369017a2310ed173c5d2b952cf454850cdec1efe4678eee2c0e99d24c5837d21690d01e8505
 EBUILD openrc-0.34.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-9999.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 MISC ChangeLog 18468 SHA256 b0c4464a2179009f3683606b8c9ed6b6f1e5c543e5dee53d0b44e9cd51804d94 SHA512 f1269f5f534a2fb2c5643b8cb5735e969e4bc18f2f8474c23784cfebc92ac72a3ed77f00eafa7430ec2944b4a5476a4688172d9fc47a32eb04bbb43893a80143 WHIRLPOOL a912f296cb7272dded544d045cc9dee06c9319fc500dbdef9e000300c3fc73aaae4e72c7574428ce4dddeedcd2055e594acf315cfa53db95d48aaf20c8a8907a
diff --git a/sys-apps/openrc/openrc-0.34.7.ebuild b/sys-apps/openrc/openrc-0.34.7.ebuild
index 3a1ab1f50a87..f54f45f0fd3f 100644
--- a/sys-apps/openrc/openrc-0.34.7.ebuild
+++ b/sys-apps/openrc/openrc-0.34.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.34.8.ebuild b/sys-apps/openrc/openrc-0.34.8.ebuild
new file mode 100644
index 000000000000..7c2ce709177d
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.8.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 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 ~sparc-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
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)"
+
+	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 /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=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
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/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/pick/Manifest b/sys-apps/pick/Manifest
index b243934606b0..f898e82dd763 100644
--- a/sys-apps/pick/Manifest
+++ b/sys-apps/pick/Manifest
@@ -2,6 +2,8 @@ AUX pick-1.8.0-cflags.patch 204 SHA256 fef0fe1ccfe02906ba0ece20aa49ada01ee0bdf18
 AUX pick-1.8.0-tinfo.patch 783 SHA256 42a64432e7eed679b5ee47c498d1dbfc2d27bba14fd77ae16193580ff9ff6dc5 SHA512 bb7fb6308fa92bb0481fa1757041373d3dfbe09baa3e6e1f44c3630b771a35c272a6532ec2fea21d13eaf9831f2577e38a22ed07f93c2b0e864f5c91f9c8f19b WHIRLPOOL b83660f7067f46370c6cb1b357ca249776ddef8600e7d39d3708a4df3588ab17084fe325b73ecdd7d950c6867fef2735d82435781e88d965fc89a08f0a473ddd
 DIST pick-1.8.0.tar.gz 101366 SHA256 7834d3aef9e575ce07414f961d1f024776b49bb23c5dc3b7bb8f6b734131067d SHA512 ed8198dfefeafc1397cdc9f80f8b1b88e7fb813f044ae296b8e6ca2789c8790149d334fdf305bb0e57bb0d42262ad73c4f1e9201132ef059f6b1c289989c3c9f WHIRLPOOL 8cd4617635b7e5e0f3e5cd99e3657cb6f37230a34880275178774bccd081047e38c641e156b0af874176b2d0590ef42aed6f8889e9aa5b295d1143537b22cfe9
 DIST pick-1.9.0.tar.gz 106379 SHA256 97d3f310eb7de44fbe50ad3451c49d859d607fa14acd0c584aafae97eea65267 SHA512 78b799be40f6ba8c312edf7f970d6bd304c6fdf24531182c601ef04465806f5697ffa78015547b8908dd5df57d1c08798b5dc27146eef818425a476fdc247085 WHIRLPOOL a8549e48cf140ba133fe30bc161e11cb479fa1e50f05f67c58a9aac3dfc482bb1837195c9aeea0e4681f452677d17db9d67c8b0b9dde844809bd2afb6fd7ddd7
+DIST pick-2.0.0.tar.gz 107860 SHA256 0e87141b9cca7c31d4d77c87a7c0582e316f40f9076444c7c6e87a791f1ae80b SHA512 ac5783902895fd76b5e936faf811c40b46ceb136a2383c4e1fc714f5e59c77f41591694241d9a42807cd78aabfb4d3a237d41f04e1c941e5aac40fe9ddfa4545 WHIRLPOOL a881f3073d792d06f7e73ca8292417e4d2150e069e37718eb801dea476baff03f5aa76ecd064f760de2b0568c679795e154d73544934904bd0d9e3ba85af0f4f
 EBUILD pick-1.8.0.ebuild 572 SHA256 db187b75129083410146356a78532a6ad4a5942b718e984b153807a5dc67c8d5 SHA512 dae5178511753a06e2632a6951ca34f385370bff17d1fb1e80d7c11f8c8b4a6f9347b6a8847d45db7c4ae341641e2166603e9956bd28aac6862665396b696370 WHIRLPOOL ff548663ebc291e63f34453a2520a7245676a577e3c5465dccaba2651994a28f85adb3e1fa0f7eb0696511728080c9a078376f4517d9f0acbada0340d535f685
 EBUILD pick-1.9.0.ebuild 547 SHA256 baaff9a8d5180c2f5ec1aa22dedc5780531dd8e8811a64a9ee6c3c99dcffbcb1 SHA512 f12167e04fee7a4fb0e38a796271afd6c334e9756a1c0a15ad2ee91f41da324df760ffdc64d6921c5b9b8bea46a335ba66e849051a21af79b7c52ad973de8730 WHIRLPOOL d4c87a9f4360582ee8f28c8c63200140a6e9f398dc81f8b20e5c8f4378d1496f7317c10b325490f2ae60a73bc1276721b7fd4fbc3637d63915347e022163b1b8
+EBUILD pick-2.0.0.ebuild 547 SHA256 baaff9a8d5180c2f5ec1aa22dedc5780531dd8e8811a64a9ee6c3c99dcffbcb1 SHA512 f12167e04fee7a4fb0e38a796271afd6c334e9756a1c0a15ad2ee91f41da324df760ffdc64d6921c5b9b8bea46a335ba66e849051a21af79b7c52ad973de8730 WHIRLPOOL d4c87a9f4360582ee8f28c8c63200140a6e9f398dc81f8b20e5c8f4378d1496f7317c10b325490f2ae60a73bc1276721b7fd4fbc3637d63915347e022163b1b8
 MISC metadata.xml 331 SHA256 df361a75ef3ddcef74052eeeea0dd69c7850ab9b7b45ab3f63910f58c738774d SHA512 1cb3d78ef16d0587d81c649e338e4ff6136e57f6a735198a790935ed3b301292caad7dd1040e532f4892d65f12b9bc36050b18676014feeaccd463d65d04f5df WHIRLPOOL a90336404fd6f09909d247f4c4c026286cfbaf16adf2b79b1e84864c689683a7704739418ca15439bb99ad807cbaecb9709edd985e1cb647a03eacb3febea8ae
diff --git a/sys-apps/pick/pick-2.0.0.ebuild b/sys-apps/pick/pick-2.0.0.ebuild
new file mode 100644
index 000000000000..88c100aa3408
--- /dev/null
+++ b/sys-apps/pick/pick-2.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="a fuzzy search tool for the command-line"
+HOMEPAGE="https://github.com/calleerlandsson/pick"
+SRC_URI="https://github.com/calleerlandsson/pick/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.0-cflags.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}