gentoo resync : 29.10.2017

53 files changed, 2833 insertions, 423 deletions

diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index fabed385d9b5..af5d333ef81a 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -2,7 +2,7 @@ AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 SHA256 f1a308a364db53e
 AUX accountsservice-0.6.43-elogind.patch 3677 SHA256 b78dec4892c0e63e5348d1a2ce401583ccf9b46e85c626f5f19f2cd7ac147f5d SHA512 bbdbc77918de27d17c3c0effd1a1f0319f338f312408136563aab5633f5e7f9b705d3348462b3dfb88996d2f40ff382ed6faeecd25b717a2d25d72c44087f7c0 WHIRLPOOL 67105abf3070eb5d86c04b1aaa6fd89135fa7006f2758ced7179ebebe5c136ba8f77dbdc4488b558f78f5d778245c1f0606321a64a2b5697622d1534663f5682
 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 1538 SHA256 c107ca21b7a4d0844cfc5e8f39ccde2a9498fc9369edf82ded479e77db47f25d SHA512 1e4b22e1ec47f4617493d47a21d8e4ae99157384200571b65cfb246679c2856f481ee5b1ca17a76765c9f07b1c85cb57378b5db3663342a14dd43f316f71fe63 WHIRLPOOL 4aef63e1770e1805533a529cb2d96ef116c997d9de45830f67a84e401788825db03b880ffa317ba3c6bcf99d2260e2da8a76fad39c261c285cae923620276445
+EBUILD accountsservice-0.6.43-r1.ebuild 1537 SHA256 a98834c2188399afac390514026f40bc6650062ecad29879c1ba4fe98c160f2f SHA512 27a2e24139384fd6a3da1643af91f35d736eee8f96a75d0a41b485120836462699d4bfaad7845b64723d1fa75a90045b20d0962942474ebd0a69794d6727450d WHIRLPOOL 0d346b0059e3d95d5bc9653675f162afbbf1aeb9affcded4994c7713ff5e017bc02a5879b364eec4024d91a0e214ff085c17cb1b8c8802f728c9f9c00a214be9
 EBUILD accountsservice-0.6.43.ebuild 1350 SHA256 c28aede58cd4c3f4b4c5b122cf1df93c1329bc9610f82b779aa32a364be325ff SHA512 e73282aa0ac8272e653a2c249a691702e0eb71cce80dacdc89c9b3650b23e1fafd5dd6a1cd915a39e2a8bdcd76eac0188a00bef02948d622b4cdba3afa815660 WHIRLPOOL abac720ecb05bd04f00212c32362546e39c03455da1a9b8ca93e9c582bc9e505933ef16990e754e71dba950db0839036b35926465966daf18501fa95b524e6df
 EBUILD accountsservice-0.6.45.ebuild 1548 SHA256 5074cb1fa2695a51c57e7b4c571e4014a236c070e6a95041e44ccf841840508b SHA512 9e271fabe2a6cee6c1837528c359eceabe95716fbd701e0262bf48f25daa987ab91220e0ee74efaaf8253dec77e0323b1da51687a7563a869dfd696de98f2591 WHIRLPOOL 68838f7362182a1ccb7d0407b941a423c9811011f05a63399b185e6c95e73dc4970ba62cbe659e06890f43f3525b34c32ba668aebd0250818b65e55e8f9fd461
 MISC ChangeLog 4660 SHA256 75aa7970a9f01c40b551539d2acd056606172c27b1172adb97f4be7ef3fad5da SHA512 56ee730dac1b25cd14d3d018a8b362cb80c333add0f832a573030e0576ebf93014211a64ca6106801e768401af9e8de4ab5652952848ff0065b4a0e2ac4ee994 WHIRLPOOL 31471be4823697718fb82a1061b5cbf7a77cb864df07ea72ca100cb756acd5cd5bf15bde5091b32c554c3e365d0cc656fb61b32205b884b5183d5664f7cc2229
diff --git a/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild
index 48024bd413af..bd2ef560e8d9 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.43-r1.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.43-r1.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"
 
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 3f3199152974..010989a5dae3 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,6 +1,6 @@
 AUX ack-2.14-gentoo.patch 431 SHA256 7da2f216647e650c63c27b9ff116e977b43a4665b7fea2a44c10b60491f0dd38 SHA512 5eeceda1a764358b4d7f8836cce41d21cdb895f2763325ddfd7ad7456af3d55807113a3702834f097fd513fef20db8de4003344d9ea73a58dac64d4c68e0e99b WHIRLPOOL 7b3e57c7bd937cdfd35038de94db500bd06c9bfd83097b22d8dfc17f2e2baaafd51a4999e296ae83d449b1c668d9eb6e7f21cf812397c2f5e6913eb1c0ae374f
 DIST ack-2.18.tar.gz 232279 SHA256 fb4a0a11a5411cba5764163b8d074a447c2a753758821151b31dc7533663f058 SHA512 4147161baa8d82fb84b29980d5eac7cf3197733192ca827d3fa4e8f55fa9df29d92b2ac21beb69df00186eea03c7ae6fcb85d6e4334a0a21c232ddeb4933bcf5 WHIRLPOOL 03354c31968f39b72b1c88649e4c3ce00619fa1e86540c12ec6f4f9a819e67e5e431358818526c931baabcf3ad8292acfc87c951f8c227aa2acd8487a85f5241
-EBUILD ack-2.18-r1.ebuild 779 SHA256 55a4c2ec1434cbd7c0503dd6460f990da20314ed83e457fb05bd0eb059494db9 SHA512 425f9a474dba32f7871224806905a7fb553110c50c7d7546a9b42209227b495ae2b8e839b097f71e15b7a1f3bae19336b32522eedde483975cd7b428a82edd4c WHIRLPOOL 235c653ccfcea93db4e679ebb94bae554926f8845026ba9e71d1ee82a23029f662220aed3d2d1f00d706ee66a0c16d6165c1097e2de3a5ad822cefa7ab90466e
+EBUILD ack-2.18-r1.ebuild 776 SHA256 455dd84bcc99b5edeac1e71bff6f6db077f57509a4709b7088e87f10a124c3ce SHA512 25979e6b277a49c9b087b987ccc14192d53f9f55ed7efbd55a491f14c2219f7fdeb0ed805e835ea58c893277ea35cc5f43f0974f65454e6fed352c570b468ffe WHIRLPOOL fd08891851c667efb7a09e232fd022451ea502fc82796f6759d8d6e544a117a48567872d05d4e29ae2930e79841f4e12a0497c7000e6e0a2b1e853887e921869
 MISC ChangeLog 2192 SHA256 d1231d87436e984d2cf3e5c90a31c4211aa2774554d2a39341cd4f3610f83303 SHA512 b0159a5e1bbc8f84db3474e3f0f3ba6f67965144f043a99de0fd521ffd94239cd8d3d74071f2e7b7550aedffe61c4289ddd545458d12ebff779e88cffbf4f66c WHIRLPOOL 694c1b633a6a506bca68659d8a236957cf73320dbd744d5b9dcc371812532c7e32d9a3ae8a502dc570e283c33e78bf52355c0f9d20cd0fb9403ee57106fb32a3
 MISC ChangeLog-2015 5290 SHA256 4347b335ae56dfd45f6f753a174223b59c8d472d839587e64b026c7aea741ae0 SHA512 3eb6609c018d0faed1c791280f1d95130c3d66c682f585d5445d77fec07da5a33f8cdddf2a9c5b5ba36198d22272cfedfb817a41daf0461f71c3cd31db8ca1f6 WHIRLPOOL 6170df88e4ac50b99eaae35f71245a7d25f357458b2e35f0fb34920098e7d8150b87c386aa24c2b8c8117672fbb3a4d742967d7e408608d05cb3dd10fe52422c
 MISC metadata.xml 1725 SHA256 ea17e6f8fec12500f0de51c0d6b7886fb1a414bac570af8bbc594ec893376d8a SHA512 9ceab2bd4b599aa83b1b780b322b753a5bdfb51b4883aa804907f5d5d8420276c75a04ae717f8520778cb3fc25ba4c4a710a64ddd49193f050992436c0faeb8f WHIRLPOOL b863ba820547021aa6ca1ac215c39c03dd4c948de3fd99da5b1f785e4b787403a8dc490e6f5399127b3992f881a03d5e0aeec56463c753a17d72a4905afe9c2b
diff --git a/sys-apps/ack/ack-2.18-r1.ebuild b/sys-apps/ack/ack-2.18-r1.ebuild
index b2905c70da31..7dcd5501bd7a 100644
--- a/sys-apps/ack/ack-2.18-r1.ebuild
+++ b/sys-apps/ack/ack-2.18-r1.ebuild
@@ -6,7 +6,7 @@ DIST_AUTHOR=PETDANCE
 inherit perl-module
 
 DESCRIPTION="ack is a tool like grep, optimized for programmers"
-HOMEPAGE="http://betterthangrep.com/ ${HOMEPAGE}"
+HOMEPAGE="https://beyondgrep.com/ ${HOMEPAGE}"
 
 LICENSE="Artistic-2"
 SLOT="0"
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index ae8009673b21..fb3980227ab1 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,8 +1,12 @@
+DIST c-dvar-7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz 28454 SHA256 07377af5a5ab46e2c1cca5c7a7c743a9e9e34c68b1409c70e7c9b654c9b88f51 SHA512 b6d69b11b3e47e8538c8eab04780966480db3881bf642f732b883f0b995ba374382fff54abe81eabe377d029445cc4af5bf52c8740282b0c03b959d8d5ae944d WHIRLPOOL 9d0af964224e28d62f598355c9c9e477db957a5991e9ed077c1d3b4c586604004ccf4477c5e024c1d220ad7e978dacb93099e1cc5955fd5758a2c1d4a4139645
 DIST c-dvar-e1c94e3c3c42ca9bcb336ccd7c3693bcd330c6fc.tar.gz 28449 SHA256 9004cb8073292beddf6ad410ad029c447d2732a8f2cf5243b0b43538e5f70d33 SHA512 a752a5d8c67c97d672502e814c6930c60d9588f7f77f38a6d027dede71c11cb18e7debcf10fa2f405a117123af386944bb7cf70c90504aed874056c8de1fab05 WHIRLPOOL 2510dabf7273f68c78487cdd354be184181fbdecfc3a15dd32093cece56924c6c83bec2be569d27c2dbc30fd1f87dcd24b131b68c383cfe04a11f507d6cfb769
 DIST c-list-9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574.tar.gz 20459 SHA256 5ed9fc0286507a08f4e4aeae436be45ee05d0c071c1d8418fa77ed777e2f5a25 SHA512 d45630c8a54ca9145862b673afc3a15a19d330f46c9a1eb451c2282c2701d596cead45e6bb57a9e32aab344a3732f70ff8fe27d13065ebd8b402dd37a252ad05 WHIRLPOOL 21fc689d1d7551bfc957e83630ad81b5093b8e67c3c754e2b4173681829f78835ef7fcc94f46c34f7379c21ebdb96ebc83cd50d4e816a25179c60274c9c0c2e0
 DIST c-rbtree-6181232360c9b517a6af3d82ebdbdce5fe36933a.tar.gz 24927 SHA256 5831113e793af5e583cc7844a8961b05ded70dc487877b64bbbf0fef0869c711 SHA512 4ff8d8def07882850b1983f8eb9b4c82e444429beafbf249385717805a5a89427bb91bde6dcfb60565866f90ee3daa8d35e681ab65cb0a1f20dcb96dcd9e0756 WHIRLPOOL 5c8d42a9601362197ba890bc056d46b3cf7f0a99dd07189fd2c1c037a339b58726e5929b7e22d0c960ad6ba380f134b2040fb32aa9da2a95fbe192d3c8f575e0
+DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 SHA256 4041b610d0bae181ce8998ccba5114f7caf19269d108ded28c778022b94bbbd8 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e WHIRLPOOL 58b22aedf2c15224acf23a2a5bbb89673ed28097b655f5ed4b503b12cb0f5db5026b2d8df79970d1cbaa088bf37fc0d45b8be169b6edb9d040658f47f6da2458
 DIST c-sundry-644ea3c2ce5b78d2433c111694f5d602d1aa7fa9.tar.gz 26611 SHA256 9ebf3f9e90004b7483d71bf41e2786586e0b192feb1d397536730b0d2304c7cc SHA512 503da82b8cea9eddffbea70ce05c8a6b2684a90a104f6df46a5183ab46844543db1d02e8aaabc4e5d50aa21e239af147309fa9abed5f13cb751bcee310c8234a WHIRLPOOL beff440ecfdff3d636710ab197d73cd628ba3615d6890540ea5014d0fcc318353f083b0d4885a88d3fef502c0fbf801fac7bacaaf0cb4939a7b4251b838309d9
 DIST dbus-broker-4.tar.gz 148231 SHA256 165fab697e0f9ef66588688758edb601c89b65ee3240d462cc278f0755c6e122 SHA512 d4c9974e730d0b6374edb2afb6f928f35e3912f7d5d7d908429581e235ebc013dbab1bd0f0c446547d2a960e762868e2d98ab1cd3ff5e1169240f3e6886236d8 WHIRLPOOL e25075a2cee78bc0be56267a9140a0392bf12ed69c23ea3a8f0b9f8abdc9f86581428a7dbcb8afffa9fba8f03e9b588f896e95ecd53a8317c51030cd94940192
+DIST dbus-broker-7.tar.gz 150606 SHA256 7114ef715b9ea18fea3ed0994e50fa8c0468451f3a1c4d4abaeaa67eeda73fe0 SHA512 529d5b6de402185336eeafb37d70f3fafe19a059c6b766f173eb17c375d3b298871bf7ba36ec3a27cc9e32c1af2669715d9707ac3fdd43f8f8cb8f24740f8c74 WHIRLPOOL a416466e6ac7cfadbddb77ee91a53131da15129451ef5dfe60155a516f402661812143248c25365223b5e0bcf5c88d58323f79c053026ff3b38d74a57de2e1cd
 EBUILD dbus-broker-4.ebuild 1878 SHA256 9b9f020a5f8a76aa6cf85f1889ee74ea4d8ee9b2f021a3d34ba509ace5b871bd SHA512 ab9a8ba244c13c3e836675a841ebbbe2cceb0df0389f5ec2541f04464bce0f74beb31f5eb033e7df7bf918091bc66cf9195e315e7a35d6f4411729c3979eaac3 WHIRLPOOL c80aeb18dea1e256f676df572f189c21b26a82510918105796c91ff4810c036d6003f9655ae431f4b8ea784c9ec22fdc2f02193781c2a49bf140b4dd448b20f9
-EBUILD dbus-broker-9999.ebuild 1878 SHA256 9b9f020a5f8a76aa6cf85f1889ee74ea4d8ee9b2f021a3d34ba509ace5b871bd SHA512 ab9a8ba244c13c3e836675a841ebbbe2cceb0df0389f5ec2541f04464bce0f74beb31f5eb033e7df7bf918091bc66cf9195e315e7a35d6f4411729c3979eaac3 WHIRLPOOL c80aeb18dea1e256f676df572f189c21b26a82510918105796c91ff4810c036d6003f9655ae431f4b8ea784c9ec22fdc2f02193781c2a49bf140b4dd448b20f9
+EBUILD dbus-broker-7.ebuild 1887 SHA256 7c1e3840e589756eceb30bf683564a4cc2a9e25df7b1cdae2d531f9a9583e708 SHA512 68eb24dbfcc75d32953258a6d2fc91254872407a6b5f2bac03a8b3d6d2998c2cfba829890b5495bcb406b7c9d52898f59a36668f4827332472573775340bdcf8 WHIRLPOOL 4befbbdb2cf31246adec47b774448b7b3a7d8144e935c4de9c6a994dacb95a88f40b3cf09efd77c8905ae07552506a411859d42e774f8af2115fa2da7d678c3e
+EBUILD dbus-broker-9999.ebuild 1887 SHA256 7c1e3840e589756eceb30bf683564a4cc2a9e25df7b1cdae2d531f9a9583e708 SHA512 68eb24dbfcc75d32953258a6d2fc91254872407a6b5f2bac03a8b3d6d2998c2cfba829890b5495bcb406b7c9d52898f59a36668f4827332472573775340bdcf8 WHIRLPOOL 4befbbdb2cf31246adec47b774448b7b3a7d8144e935c4de9c6a994dacb95a88f40b3cf09efd77c8905ae07552506a411859d42e774f8af2115fa2da7d678c3e
 MISC metadata.xml 327 SHA256 555a246c137ae0586dc4f3be05f103eba8415e7cd8aafe2336c5b9b659493d8e SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1 WHIRLPOOL 6de0c19b78e79898cd78488c3f9d780f26684dea03924ce8efcd532ddf25cc5e1e82477d2069fd0c53f796ce46d0a1348e4a2128dfca0b764102fab35937404c
diff --git a/sys-apps/dbus-broker/dbus-broker-7.ebuild b/sys-apps/dbus-broker/dbus-broker-7.ebuild
new file mode 100644
index 000000000000..ba718173881c
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
+else
+	dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad
+	list=9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574
+	rbtree=6181232360c9b517a6af3d82ebdbdce5fe36933a
+	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
+	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz
+		https://github.com/c-util/c-list/archive/${list}.tar.gz -> c-list-${list}.tar.gz
+		https://github.com/c-util/c-rbtree/archive/${rbtree}.tar.gz -> c-rbtree-${rbtree}.tar.gz
+		https://github.com/c-util/c-sundry/archive/${sundry}.tar.gz -> c-sundry-${sundry}.tar.gz
+	"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Linux D-Bus Message Broker"
+HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="audit +launcher selinux test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	audit? ( sys-process/audit )
+	launcher? (
+		>=dev-libs/expat-2.2
+		>=dev-libs/glib-2.50:2
+		>=sys-apps/systemd-230
+	)
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig
+	test? ( >=sys-apps/dbus-1.10 )
+"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry} || die
+		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
+		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
+		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
+		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
+	fi
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-D audit=$(usex audit true false)
+		-D launcher=$(usex launcher true false)
+		-D selinux=$(usex selinux true false)
+	)
+	meson_src_configure
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index a71009e17e72..ba718173881c 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -9,10 +9,10 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	dvar=e1c94e3c3c42ca9bcb336ccd7c3693bcd330c6fc
+	dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad
 	list=9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574
 	rbtree=6181232360c9b517a6af3d82ebdbdce5fe36933a
-	sundry=644ea3c2ce5b78d2433c111694f5d602d1aa7fa9
+	sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz
 		https://github.com/c-util/c-list/archive/${list}.tar.gz -> c-list-${list}.tar.gz
@@ -40,19 +40,20 @@ RDEPEND="
 	selinux? ( sys-libs/libselinux )
 "
 DEPEND="${RDEPEND}
+	dev-python/docutils
 	virtual/pkgconfig
 	test? ( >=sys-apps/dbus-1.10 )
 "
 
 src_prepare() {
-	default
 	if [[ ${PV} != 9999 ]]; then
 		rmdir subprojects/{c-dvar,c-list,c-rbtree,c-sundry} || die
-		ln -s "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
-		ln -s "${WORKDIR}/c-list-${list}" subprojects/c-list || die
-		ln -s "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
-		ln -s "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
+		mv "${WORKDIR}/c-dvar-${dvar}" subprojects/c-dvar || die
+		mv "${WORKDIR}/c-list-${list}" subprojects/c-list || die
+		mv "${WORKDIR}/c-rbtree-${rbtree}" subprojects/c-rbtree || die
+		mv "${WORKDIR}/c-sundry-${sundry}" subprojects/c-sundry || die
 	fi
+	default
 }
 
 src_configure() {
diff --git a/sys-apps/elivepatch-client/Manifest b/sys-apps/elivepatch-client/Manifest
index ddaacbe64183..9be02e9af836 100644
--- a/sys-apps/elivepatch-client/Manifest
+++ b/sys-apps/elivepatch-client/Manifest
@@ -1,3 +1,4 @@
 DIST elivepatch-client-0.1.tar.gz 88031 SHA256 f529a0872eb42a077909f2b0597d4faff308ed8072ae6932c4f29c164b2c6d3a SHA512 c2e324f2be6d75ffe4b2f329875f6f81ba3e4657aa1c4e6514188d5269fd68f7d50b7d823281b1bb585804f84fda639931fcd349d168c169f736ee8613f9f451 WHIRLPOOL 38e4e30bd3d0302bae742198fdbb4bc31047140f1161bbc90215d8d311380f78ec5fb7100ac7271a44f29dc2d33d4c2867230cb47c5cf5f5fa4ff3047ce91a42
 EBUILD elivepatch-client-0.1.ebuild 620 SHA256 da82c3bba32df4bd028d853ca8cefb66804723276fad8443d2151718ad5eacc6 SHA512 9b54202d494a65590af00b8b230bc4721ef76645e687bcd904bf09374cdb41c82fda916e22aeb51f547adde5591afaa70df01fa70e385c3338cdebfa0d896339 WHIRLPOOL d7d3598ba760a5da1deaf04dfddda2bdc849422dabd06bcd8186335aba6aa3834f65a396230a39999918c30ad785ab022f030e045fa884a694166509e93a8d9d
+EBUILD elivepatch-client-9999.ebuild 742 SHA256 f1fee8966df0462370e5922db135b59a154a282407bc200fe60dd4c786255676 SHA512 751c77df848d7d7588687a1b4e59eea2c2e8336164f20a63b047fa1b1a1d3d2cd34ca3b617987e09f00e587aa1cf36987e8b3c0a2cc71c759711ff0b78ac19a1 WHIRLPOOL 2445a684bb4596310d6f7ffd8010abfb704aacb32e7118341438bdfa62bc5bfa896f435d6c93219ed8edee1cc7c17b8862af73648b1f1231524e4d7fb7286a78
 MISC metadata.xml 311 SHA256 ef38a7066ba3faa55bee1d6d854000420e9ed118a384df44f33d0a886d6f04a6 SHA512 d53e458f4c2a4844c50d65b8c75f18cf637992dbe78b17dcf20a8a0f15113df8b89c197d2f11f6160fcca7db23669db009028deec039cbf32911e966e6210e98 WHIRLPOOL 651cb1c5b367d755a2a949c94e8bf77cc7c98f3354eda0449ca2b4919848abcf2fb70859812cd79b08c997b83097850ef47c6ef69c2446c6c9e1fe93f6c58805
diff --git a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
new file mode 100644
index 000000000000..efd08c9166a8
--- /dev/null
+++ b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Live patch installer client working with elivepatch-server"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Elivepatch"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/aliceinwire/elivepatch-client.git"
+else
+	SRC_URI="https://github.com/aliceinwire/elivepatch-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	app-admin/sudo
+	dev-python/git-python[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sys-apps/elivepatch-server/Manifest b/sys-apps/elivepatch-server/Manifest
index dc4f8204aac5..6296af5eae0f 100644
--- a/sys-apps/elivepatch-server/Manifest
+++ b/sys-apps/elivepatch-server/Manifest
@@ -1,3 +1,4 @@
 DIST elivepatch-server-0.1.tar.gz 11564 SHA256 8ce02c1284b5822fdb4c762fe45b6d3ea8d9f360bce5c59f42c96b3aa41e4908 SHA512 d469fbc32df7a586fa899c6e587832bd53c1984c97b973e3aad4f6bf62962846142938a6e6e5729fce39d3f7d486c5ed9fd9f484425d863a40a1199f170830fb WHIRLPOOL 98e7a30c8cfda908fa010185e5a508926e57c813a610156d163bdca116d6ef6e59ba31fe8a427a84a558d84a0d9f7ad7387db7b9536e5651a91de22d46648246
 EBUILD elivepatch-server-0.1.ebuild 784 SHA256 720611d8879281df92e63f5fed8f11b3d2cb939140a829a8e7f74febe47a6e3d SHA512 f766177ba4ff6b57cc6a5e08715440907d8d2066262354029cf16cf0339bd21cf0aa594200731c5302b73d93ad648d356dc2562f0060b1c648f4d14d1c48dabd WHIRLPOOL d18d3f7757e8cc00c932daa09f2cd0dc6831c4f6400b14fb123a38dda83c1de93fc502651ac4a7b282fa40fa9a5884917be6270e0646243a2deab4b1b311ee5a
+EBUILD elivepatch-server-9999.ebuild 931 SHA256 207625820eeff6c174d3fefcc6d3c4f8cf9f26e0f8c2b2f35a38b941a6c431c6 SHA512 2e2f23160931fdb4216b29db2b64b1d48607247662999ab9600ad5fa544de66e48d64dc1bc2b36b43473f7a4ad1cc2d9c3cf3f5d89063c4b50c5fabccb371f25 WHIRLPOOL ac70f6fd7c05efc84bd84bbdeddbe8796fff213d7f72d6728f3193e479c7a560d5b5011a1a9326399d2a95896e2d2014044eba731736271e63f6b6b7788eb057
 MISC metadata.xml 311 SHA256 d878cdaabbcbecddf41582de1894e7e967b3fb7a86d70bbd700be2ffecce03b8 SHA512 5add2dd39169c27b7688232595ceabd5e23a82d03f122d33d56cb19be11b3b98136a17437b0602adaccb7b61ee338f19df25e339a75ac362db072757106ea070 WHIRLPOOL 7e8c088c06e84f6615ec247022df8abfd39560dbeca05bb1ee77b4b73167306a2c455bf6c4c366ebd1516e705145642919569552221a2fbbbff0a14dbf5daf5a
diff --git a/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild b/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
new file mode 100644
index 000000000000..572a789c43c0
--- /dev/null
+++ b/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Live patch building server with RESTFul Api for elivepatch-client"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Elivepatch"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/aliceinwire/elivepatch-server.git"
+else
+	SRC_URI="https://github.com/aliceinwire/elivepatch-server/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-restful[${PYTHON_USEDEP}]
+	=sys-kernel/kpatch-9999"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	newinitd init/elivepatch.init ${PN}
+	newconfd init/elivepatch.confd ${PN}
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 3a616ec2a7f5..8b4e7305998c 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -5,6 +5,7 @@ DIST ethtool-3.4.2.tar.bz2 200731 SHA256 e2cb6e7977c804b0fa387ba41a04772d37efeb2
 DIST ethtool-4.0.tar.xz 199548 SHA256 904887acc7d2f9c35dec04eb0e8a727a3205f346af4f4c95560ea3798de5ecff SHA512 708f7df17f04339d1f6e9f80e0e9b4d7855fd71b974a833e5644ee4b7a431032ce70ceac85e37e59847eb0bea4226c0467b12605e16a005f83d75c33367a6ef2 WHIRLPOOL c1649c83146ded3d245d1e96783f1fc79d51f2d2fdbf877eed6968d5c7a37d4bb3855d45d4110369199d95bc8a4b807fe4707265f89e4a8e1e883b843739e322
 DIST ethtool-4.10.tar.xz 216320 SHA256 f0009726ecf34128b9a8238b71a652847dbc06bd1b877656699b0592b95c74ba SHA512 6766c468e141300b4828e6bdc98e7e720d35bb122405fc05d4ae94bbdce50b98e48ddd0505b09c990040da67e942e08a88b28b46d94aca8d544caf0aee4aac36 WHIRLPOOL 327d133b8c280a64a88f628b4e7f987dab29919e696a65eadd28c537d0caace0cf381f9410063ee43c961c19d80721738b1c577f7c3dc03580a700d86c1369fa
 DIST ethtool-4.11.tar.xz 216976 SHA256 12d8edaa8064966b8ef19cc44fecc096a68828035b6a1f2c67a27531a718e1b2 SHA512 177bbb725abc725dece99b4198f673b57ac9fc5c466aa36ac9e2a66b5535c82b5a27e916ef3e489232709e0b2d27d821acb4bea17d9b5a1940bf83e6a13ef445 WHIRLPOOL 4ce489a2c205cbe3a3b2a5c53cf6e67b865f00fc197174ebe9a2c8195c6626a8a96f27a838be4e9154814b6b9bf8d0c362c8e5466e8a3868f96ef961c2c286df
+DIST ethtool-4.13.tar.xz 217472 SHA256 b7c1a380007d30eaf261a63b3cfc000f9d93f9eb7626dcd48b5d2a733af99cba SHA512 d0f881b88379b959cd34949c924b0e4d4fb1af0873192cdf8ec9cc2d2d677a4de13021efabb0a1aea1932ef38a6952d9f3eb040c478a9af770054a6170777789 WHIRLPOOL 2d4323046b7b5a6ba540d2cd0f73f60b8af2ec6bf8e8f3827294e36ed3ccc97fe7c84cad9794e0dbdeb570a40c794135bc7d2b1b67e320d0afcf05b6ffbe9d5e
 DIST ethtool-4.5.tar.xz 204244 SHA256 bb2834332c5ac7f5bbe1c9f78f4fa851e4a3fe6397b124d58467c9ccee9fca3b SHA512 fa5b4547de0315c54113d9c7baea53dd4bb6e46c9340255cecf9a39f549190cb5de9db98ad4330a6eeced3a1f9ed6f2ae42cf5a602c0ef1c5a9fd17c825558a4 WHIRLPOOL f8923518cba1e66428ac883c85ca88ea6bae74943edfec4867f21873397f034286a8572ca75529aedeaeb1cd0ad2399307f94920e541de7f494beb3bf3af2f67
 DIST ethtool-4.8.tar.xz 214932 SHA256 403dfe288e2d8031eab0be3f5d0ca9128e120d61c52c3dc434474fa026eb4a43 SHA512 ab1f13db57129fdef6018d8d8ee4ad9733041813aa0b7a29d46407e93d3c264a42aa24e2f1892084d523ed9946c62c6b9d2ae886629aeb013a58a0946fd6be96 WHIRLPOOL 4d162bb10b5da6aac7993def99b45c300792fa700ae38d5f1bc0109a2a7bfbc84850da5ee08f147f454aff77d48afb33220b2afe907ae3e0067ee89973ce618b
 EBUILD ethtool-3.10.ebuild 456 SHA256 27394a7797549dc2f220546c09a86a4b51ed81e4776d54412746d8445c258859 SHA512 64d39e8e01b77c4e8b931e9f3ac84626bb6e85ae84037fbf3ea7cfd4e0e67ce0ad25428c9dfd994c5ced26a244f515337b5095dd80f1bf3be407283894821396 WHIRLPOOL db05f56d05539dc1ad0aeae32d27f7a2d6c40e4f444b9b67abbfab483d35d8e7d5f25f5ce1a4189ab5a6ada881855746e44c91b3e8a065b4985686a2ce15d65e
@@ -14,6 +15,7 @@ EBUILD ethtool-3.4.2.ebuild 437 SHA256 0a32bdf649e69c5a0a151d42608facb9621a7fe68
 EBUILD ethtool-4.0.ebuild 456 SHA256 2e6d1655df780abb963cfa46700c433c2e4bf80c5c4e60d28e6844ed8c092b6a SHA512 0628af197f5b89e9a3747004cb3e3f81c7cbcc73df3eee0e51f2460b07804942a4bc4d560c4a5855fe5d6f9fc618a75e2469ac9bcf053111e77597cf8c101eba WHIRLPOOL 3d1c0636168e8ecbf78f5a31851e92561ee81ef9427fb0bb028d51379a7cca3b33c8cd63c0d351e60cf9d3d2ed2b9d19c5e788b5fa34abe17af94baea22d9920
 EBUILD ethtool-4.10.ebuild 463 SHA256 3423ccbf866dc00ade8a62c3f62be222cb40f088b93ab0184cac93e0a2aa96b4 SHA512 6cdaf830de48e35773664091b1d249cf5648afe6717f02f225d380578cda2c5fc344acd2c2729ae1262c898979149da9bd34bf67e3e65ca2253cf0c48b86ec0e WHIRLPOOL 7d56af51b1588a2c16503d7c169e8b7c46eecaca6fb8b18771774a654d770e1a8727c6772d7dfca4f8dff166190e54c55b46519263c006aae8958a4a9fece968
 EBUILD ethtool-4.11.ebuild 463 SHA256 3423ccbf866dc00ade8a62c3f62be222cb40f088b93ab0184cac93e0a2aa96b4 SHA512 6cdaf830de48e35773664091b1d249cf5648afe6717f02f225d380578cda2c5fc344acd2c2729ae1262c898979149da9bd34bf67e3e65ca2253cf0c48b86ec0e WHIRLPOOL 7d56af51b1588a2c16503d7c169e8b7c46eecaca6fb8b18771774a654d770e1a8727c6772d7dfca4f8dff166190e54c55b46519263c006aae8958a4a9fece968
+EBUILD ethtool-4.13.ebuild 463 SHA256 3423ccbf866dc00ade8a62c3f62be222cb40f088b93ab0184cac93e0a2aa96b4 SHA512 6cdaf830de48e35773664091b1d249cf5648afe6717f02f225d380578cda2c5fc344acd2c2729ae1262c898979149da9bd34bf67e3e65ca2253cf0c48b86ec0e WHIRLPOOL 7d56af51b1588a2c16503d7c169e8b7c46eecaca6fb8b18771774a654d770e1a8727c6772d7dfca4f8dff166190e54c55b46519263c006aae8958a4a9fece968
 EBUILD ethtool-4.5.ebuild 456 SHA256 140aeac3d2b086660d3e50dcf8e1437b1fbf2d76ae4bb500ce5b3e10d0cfa540 SHA512 e366a4fcd39d80312df50324883dc72338622dc08aa0f0ed758a9ecddaa0cb6aa9d6bd805996d8b9d51f8fa8b3235c3259064342851eeab4c434315cef59220e WHIRLPOOL 2c3b864170a8161d0d805b0d58c470bd31c3e7aa1efbe364707872d9c427fba607834a32360a7bc98f6ac07f23a73c2a87ed081ca2f127f452024e5e3d45006d
 EBUILD ethtool-4.8.ebuild 453 SHA256 c1112244f6b0357b440d1cbe8df3bb473329919265d0b75fb665202867b96dfe SHA512 f5ebf39536df9e46be717e5e42334472c7f30d02a3dd9f8b1fbab8e2242cb0c67e573fb829fbf74f115d431b777a83ebc17005150751d83f8e681e5966e8fce2 WHIRLPOOL 58d64ed48025ae9a0dc6ce4c131db35be5e862bd15ffe0c9a3e3c39461c31a376722b4fb2aa0cc618eb647eb112da4092de2c2a9826a091567a01277ff3ed1ab
 MISC ChangeLog 4752 SHA256 ea802cb2ea25bc266921a12be5e9ad8f5bccca9241bab59b52fff29c7f4201e5 SHA512 541543960ce4a1c98520f15f2c49c80d8656359d445ed459e583d4e8659673069581459878e048e676a9a711e3d8f533a82cbca65ff3914726ab43fb6c08ec87 WHIRLPOOL b467f50f108c5563c77065f353b557a6fe23b01bc31b4e6f7678ed96048db8cde642e75fa6233d73b8197d29e51a13d172a3d066dc5df73ee6b2f3e0cae8a80b
diff --git a/sys-apps/ethtool/ethtool-4.13.ebuild b/sys-apps/ethtool/ethtool-4.13.ebuild
new file mode 100644
index 000000000000..04f5d5de3b2e
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-4.13.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 079156938238..c8343d1415e4 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -9,8 +9,8 @@ DIST gawk-4.2.0.tar.xz 2948108 SHA256 d4f3cd31c001fd0ed52832d4fbfbdfeaa38ad541c1
 EBUILD gawk-3.1.8.ebuild 1794 SHA256 b794beff4f8ce3bb31d416ea4e7cffa083ee432991e4f6b86a1a071b63444845 SHA512 ca82d7bba5d88aadb4616817d0d55f001446a90da3def7fd49fb817c5b2674cd389f5a92efe82736e562ea0f46c9a214286f96137f324ee2be2149d09f298f61 WHIRLPOOL 9b2abe1d8028961d76032e39a359ae76d82ab647008e48d79c887e6ad3b2bd017ab33d7e877582fb34868ee604ed78d8169134c75d1dbfc6b466507847eb2a78
 EBUILD gawk-4.0.2.ebuild 2088 SHA256 aeb7bc3dda2def791ba830ff3052247292249a6fcb270c81412651a5fd013761 SHA512 b15b3c32c04c724e7b0c5c6f8d7cae86e3118c1560ca2fae0f5ded39fc098afa29987e425733e96daedbf1db5757e15fb21059a023c5158498f5b6168809f063 WHIRLPOOL 0197d1effc02f2668e3834108eab717407fb02bb880fdd1a964fdbc0a5bfb44a0f5cd1ab6893af0da3aadd0e22c1e9444af46a98b2fdd74b341877d7d9fd00fd
 EBUILD gawk-4.1.3.ebuild 2201 SHA256 e973870920b273d6f516ccb6a47265d0b793916d60a3a72aa8c7153cd90ff8c3 SHA512 fd78556fbd0d2ba92c2816d4a82330a365ca99985b042a3431e075e7a1390954bec0139d7dc63370c564eb90ab3f0a97c6966230a7309d46462d5e934b090d0b WHIRLPOOL 8c4ab7736911b57077dda94446831b6bb1b7fe1c839f6d06b22f42b6d7cc0b763a94e2b5aca899ae0b6641bc5b9a0dc79aafc07f325a885a9ea9f2aa336c7d1a
-EBUILD gawk-4.1.4.ebuild 2296 SHA256 8ba9a172a00dcf57ff3ed0b02fe89f17988e9e099e0c0692269824c5262a6b9f SHA512 9476683c0ea1c8a87462aebeb5512c8068c43786b85e2e6da414fe2f061a05e17bb14eb9b8c8cc425e85f928f1e8de6a9ca8b1534e8357ccbfde99ba969d4a29 WHIRLPOOL 8a02f42e9f42a1cfd7b78d86b9388ca34c416198cb97ab75eb6d1f5eb88da96cd64c18a9ec9d2e75e21b053882746a1106af255194dc6127cc6c6ba1a0f1fd8e
-EBUILD gawk-4.2.0.ebuild 2370 SHA256 f8860f720eba40291cfcd692fbdd34a6c4147d940caf3765fb0ce63d865caa45 SHA512 c5bf4b2ca22f4d630105f091a80c5c41dbb63189c794ef7c2b42c960b714b87bf927e9c345dcc86bba40931597f72f66d5177a59a9080a336e81e04ac0ece31d WHIRLPOOL 80f680fe852472fc45e974e6ac32a26eda5f0951b738dc8c758818b6417e95b5a85954bb11a210c3fbd6eddcfa48979b024a445ef9a398900f5f2edc33636571
+EBUILD gawk-4.1.4.ebuild 2293 SHA256 edf0cad817aac13c71da74b8b9fdbdb17f48796d29834007c44c817ec0178d99 SHA512 26a6c96d66ad7a0e068aa6503569648363a6a27dc6cf17b1cdaf19598a6e2a3ca27f0cd090201018f0009b55d91cc1b280ce55f175d2b3092548b8175052ea9f WHIRLPOOL 3571b72b02f32edc66aabdb4145981efab7dd240d02ec08052317630148497a88e45075c173f275b89d23c83d83002b7318d6e5428103c70b5dd7f9d7b44776b
+EBUILD gawk-4.2.0.ebuild 2415 SHA256 33204233f9e40c868ec3897d0bd4ebe9c6e5c215b42ab67adab14b38a19be84f SHA512 02b2dbba4b6a240c8d48a94b6f9037a556bb5182009b8318bd1ec0fe60caa341ffff64d8d33b9baba9ed2b3626dac6c097e1bfdd4fce7bcccb32528c8f276943 WHIRLPOOL de324755f7a586fd2ba9503843bea3c92fbedc3dd780463830ed9eb61db050c3ed972c5d3be29ff7c705b1289ecd126ce007dd443a1543a25b062e879003ee4d
 MISC ChangeLog 5037 SHA256 d91b8f1506cf9102f4f46dbdd03d6c757ed521c54e08b1f03c70ea61d950ee1a SHA512 22fec5534ecd42063f666080c6e9690197120700d23277ca718181306715c41e2253f684efb4c9cdb4456c1a0609d6b45c8a644c4f2e3b86f5e9f5f84a5ec3d6 WHIRLPOOL 69b1294e44f270910dcf450bf3a83167d1665d195b8767f950f45443ab5c5e187afa22c8d49246a3a5c1721650698983407c9e80fa9e964290fc7ca35b0e2f7d
 MISC ChangeLog-2015 25235 SHA256 bde68cfbf1ddb7ec621042d675bab7b5aeffed7f3f092dc278b0c0ac2cd602de SHA512 243495808dbef55124b5a8d02e27b87550ad40104b427ed9bb63d3c8785a84d0acd3675a8d15c8579553c22f06809a47d19530eea0300a0b616ed2e3fb527dee WHIRLPOOL 70afaf3d02a4f5a3e4b4b13bb3c9f912d55c4b4c6f06beb10412f52b59fd82e5b6bfb9548fbe1a625e933750e903cb179cf31267b4abba103b3539d95622e8d8
 MISC metadata.xml 347 SHA256 cfaa5b9985d20997a4800b7a60f7804bf8660d217ef2421732c2e296532d6862 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e WHIRLPOOL f4cc92f281dfb2f436c979257347ac8694056a8d9a4a3c794056027a12c64f6cf04023641b0462d57a376335d93c55f3b6722504e7f7e32baf702c4c7578e5f9
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
index 874191eef68e..89c4624dc17c 100644
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ b/sys-apps/gawk/gawk-4.1.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="mpfr? ( dev-libs/mpfr:0= )
diff --git a/sys-apps/gawk/gawk-4.2.0.ebuild b/sys-apps/gawk/gawk-4.2.0.ebuild
index da57da475731..231bcb851dcf 100644
--- a/sys-apps/gawk/gawk-4.2.0.ebuild
+++ b/sys-apps/gawk/gawk-4.2.0.ebuild
@@ -38,7 +38,8 @@ src_prepare() {
 	# fix standards conflict on Solaris
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		sed -i \
-			-e '/\<_XOPEN_SOURCE\>/s/$/600/' \
+			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
+			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
 			extension/inplace.c || die
 	fi
 }
diff --git a/sys-apps/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index f11dae52056e..bbc4b219ae1d 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -5,7 +5,7 @@ DIST gsmartcontrol-1.1.0.tar.bz2 683898 SHA256 90c9ead852255f5e1a74a3ff6c265d1cb
 DIST gsmartcontrol-1.1.1.tar.bz2 667372 SHA256 2e39ad330829ae93824732f1b663303ac9ea1223f703901fae28549a3b2d7518 SHA512 fc180b85a9db232add4260856e078a578801e11b87df417a5572fab284e992c85009ab9e7d9d6213b2842097067fc119fa0183d5b0dedf8dde71fe4e9e0b38cc WHIRLPOOL f38414b454e0a72904cb1b19a1d10ed6fc7ec3b75422427e1a9f9aaeb6d67946fe773927195af3772ea5320bd613fe984bdecd96313b09a34b0fcd35b3153324
 EBUILD gsmartcontrol-0.8.7.ebuild 985 SHA256 ed7f7e0d2b23abf6d0b565e6f81323a36dbc74fce20b7985520f26e53a509308 SHA512 7b75e313a0d31f47a7de2811bb79cdf2db4b2e8b6c7a2018067d86c94ac5bca69dc728884aab1345dbf22d0839ac4da500f5261db42657e8800e376c7cec8279 WHIRLPOOL 8c17a544bace66004775f3b043ed7d2f7069b2cd99ca154629dc44561ad6ebd9bd7d19c690fd586bb6ca1cd1e24fceb7ab4f665379337ec9bbb0c068ef423f4f
 EBUILD gsmartcontrol-0.9.0.ebuild 987 SHA256 8a58316fe685d64e8b1d6617d6a4fb4a34407eba5465ae1525133e1cb18639d0 SHA512 dffca954984e0a59e03a821b4958f8a12e3c9aab39c2bc6c134122bb7c61e4d119287923241dd4f67875506b8814529bfafd85da2fbebfa7cd8b2e8b5f4166f5 WHIRLPOOL 13034b74c2fac89b91956cd584668f8dfb55acd94ee8e8347e5dea29710eb4a6aecd9b880ee64c9b43e27162c0f9db0e32b0c8c8fd9262c0d601dec6f0ae49a9
-EBUILD gsmartcontrol-1.0.2.ebuild 987 SHA256 e11460d797005ffe97eb4c6226157c7f4d68461e61d88076a43f0a451e7400a0 SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6 WHIRLPOOL 4238fae00560a3d19c860945aaa30feaed7af0dd98e6034f6a10c15b8bd5d329ba6a9141e4aa775381d51b85d6777bb2e26013bfb8c42cbdd6b508dcc0d8df61
+EBUILD gsmartcontrol-1.0.2.ebuild 986 SHA256 6d737f7456fbaf687c0e20a193041cbadd9e3f7d8de9aa61a0d3a81d56511bcd SHA512 34ccc6bb8a72a61acb488f457700088ea5ede23cadabeaaa36c54919215538dcefe8ac20dd42f3cd466779f65eb664041d919278ca85ed4ca7721a8d38feb0a4 WHIRLPOOL 77eea63da5203d4a084382ac2fd4820ca67509b44e023bb5982b2dc943c0bffb5e47c074c389cdbc5e7980b7d2f400bbb98db983244360394120d223c2978f2e
 EBUILD gsmartcontrol-1.1.0.ebuild 987 SHA256 e11460d797005ffe97eb4c6226157c7f4d68461e61d88076a43f0a451e7400a0 SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6 WHIRLPOOL 4238fae00560a3d19c860945aaa30feaed7af0dd98e6034f6a10c15b8bd5d329ba6a9141e4aa775381d51b85d6777bb2e26013bfb8c42cbdd6b508dcc0d8df61
 EBUILD gsmartcontrol-1.1.1.ebuild 987 SHA256 e11460d797005ffe97eb4c6226157c7f4d68461e61d88076a43f0a451e7400a0 SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6 WHIRLPOOL 4238fae00560a3d19c860945aaa30feaed7af0dd98e6034f6a10c15b8bd5d329ba6a9141e4aa775381d51b85d6777bb2e26013bfb8c42cbdd6b508dcc0d8df61
 MISC ChangeLog 3071 SHA256 890cbb0f3bb1b6e679ae0e0700cad3a2fe41aaff68e7f5d5ee066c1ef7dc9b0d SHA512 3b9ccdf4120c06af0e90c7fe8ed5a4e49795b1d8695bb2271bc477fb564f3aa103a94c46f7f3aa1fda5f0410ca7262b0baab67c3be62fa37967b1ef74e14a851 WHIRLPOOL 2e0c8d3c43c2716907dbe9d997ef7082be9bf273182b62f6d14308f6b26437d716c6a5f0cce445901194f7f80b44759d9f300197ba5a476e6c041e788c665580
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild
index 4757ae7e2385..e2010e17fc25 100644
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-1.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 2a7ff64f1790..916cf7318181 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -3,7 +3,7 @@ DIST help2man-1.46.6.tar.xz 171044 SHA256 615ff5ac38369ddb3707c5fd71672ab122639f
 DIST help2man-1.47.4.tar.xz 189456 SHA256 d4ecf697d13f14dd1a78c5995f06459bff706fd1ce593d1c02d81667c0207753 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd WHIRLPOOL 6e7bf1f1dcf3552bd97c3975e6bd2dd404f5e3bcc62f00c04225e3085f0705882a16fe54ce45e0558ef6e592f54183b89794abd7135eb4b683408108189ee0a6
 DIST help2man-1.47.5.tar.xz 186044 SHA256 7ca60b2519fdbe97f463fe2df66a6188d18b514bfd44127d985f0234ee2461b1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7 WHIRLPOOL d31885c3a8f5602e0d38a3676e17ee76139a0ab26fc1da61a57609eacad465ae973c8bf8930c22fe7922f2f07882721a0a8d52592d918c81b450f9c6265f7be5
 EBUILD help2man-1.46.6.ebuild 961 SHA256 3c331f54724e6908285c53de6f997b7dd1f55ac2aeea72122c211b88513f81ed SHA512 73e75acc9f8980950a9257e4e08c11f17cd67bf9965d9917e46c43ffe6ccc66aac1c0ae14df72f6b3f9e1fa4c7ca85d96ce260f76a6648f8fdc7907b70185881 WHIRLPOOL 0fe1068673e1db82dad12e3c4fff3e6e2d30e4c860a4b4a95dcb11a3bf8542e5bc45436a81eb184f1b95a5335c75fad49d5e4c22af7f7adae5614c4c2301567a
-EBUILD help2man-1.47.4.ebuild 1098 SHA256 6c5ffd85598bf25e0b237b9a0b9df26866d4b4732e838e8506021785ef075d66 SHA512 ed0f7c6414ea6f0d90db8797c67774a6adcb8b92e638640a92b6bc08e0d568a57c369b656d2e19d63017ce24f16ffc223934b08ab8386fbced68698e030f3de4 WHIRLPOOL 2ac924b65f4c8f49ffd9c1647d7454fff9c3ced266db236b9406da1bf589434980b075fa79ab6adac0da02b7e5490953fa7a488a9c6f1438a099f3e6863b1b4d
+EBUILD help2man-1.47.4.ebuild 1097 SHA256 4ca1b8cb2984c7b435fa1e14656f4ee8d44eb379b833393c2f7bfd2829083876 SHA512 aeb8da2e473032d185a0ad1a8aef98e69650843ba50685528021a48c1f61a753d9aad9edea6a7f4aae1e53dc8588145ce66eed865486c10caba8b87bddf60cba WHIRLPOOL fb15a3d0c7a8d3be9d7bd11d463a7def04b190913f8ba76d76246503ba4705685b70c3b075ddc4f1d559938d823d02bd8316a1bfc2c21152cabcfc57288024c2
 EBUILD help2man-1.47.5.ebuild 1077 SHA256 7bf7f5ba74027acb8fec7b61c4932c2eea2f65b7c3c3d5c3bff610554918bfae SHA512 8dc708b304aae08f8fad597a1e0537e3f709deda7ba7568c1acdfb3d37fe1c338376310160c16cb2a1e02661687f52ebb68fcc0987a418c57121e78376d2bcb0 WHIRLPOOL 827a15c654d03d1056c8d805d72b4ae7dfeef13d78e0db31352931eeb84e97fc513480155668489653221ed998068ff05f719bcf60ab34d3153927f3905ab1bc
 MISC ChangeLog 4770 SHA256 da7132e6698cc6baa760860068a789ce487700e3febb29bd95e380c1243097d1 SHA512 f616a3716e5cb1d2d8ab75b8ab9f5d4950f0e66d68787e7c7b85e95585cc473e528476e94e3301c8a3c0034d37a74a0e8ebb985dbc10ba1aa7b9d3a2ab917919 WHIRLPOOL e1164de772bc476b1651a79b2f2264a0a161593936e44998508b0138598f9a84c8655b7ae993e1d2e54a5d9c54e02f79396432f4bbdaa97a7f092ddef642cd23
 MISC ChangeLog-2015 17647 SHA256 e33c324b885960677a805d9be1545e0dcf8b2d6cc42c6bab19f45a989a30854a SHA512 36341130eb3b9ada5f5b67e03137983b150b5e41c165d4cc3e08651e6120dc0a298957b1e47e0ce9649a62c8fbeaf48095e255815d6adfd4becac0882a0cae5c WHIRLPOOL a7698bca661c97ffb4c1ac4163015a03f3a9ac65a57017d4129aa8fc9c233d392292e628f29bd30688005d36f5eb13d0f005d559d1118815f55fdc3991673c80
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
index bc50c66549d6..2f979facc7d3 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 38ac74a4fc19..914c39a80495 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -13,6 +13,11 @@ DIST openrc-0.32.1.tar.gz 223808 SHA256 ef037a468d87009c8a21a62f04c3b5fa5eb56ce2
 DIST openrc-0.32.tar.gz 223935 SHA256 d452f5c8dd49a0819de368e7faeb56bd7460f8704cb029d9cc4e0b1dc56e791e SHA512 a355ba31d50b1c58f724d446449a8e31bb6f4c13b2da886880579e2666bcefe612a4eae64732f3ef7549fbfc84f3e088c4ca98e6be30108adfbf0a6d648d2635 WHIRLPOOL 451d9e549a175d14b5ed23c9b16e2cf7815e8cf7e616d964161b1e583e899ad0ac1f7bfe4cc4fccd4e1f5155d1c85f8d77f206d083bc02a0f2ad6a1348ac776f
 DIST openrc-0.33.1.tar.gz 224256 SHA256 915865565be249a88895a7bdc7a23d917a7b2adfaea7a5fcbc32f8b517b22664 SHA512 87388e96e2e4a1100699ed816a4bd71307d237b9e8013d48ecaaf453170cdb27bf642a6a227a3f934580e1f1f5985337fab50164b69b28489ee7f2813802f883 WHIRLPOOL e86f0140e3de1a9b4ca8636bcaf312d08ce3feb5d02beb4ec76afec3ce530a73b3000a83077c443f7e9376e97e5c6c2d0b4b9630a734e06ba1f63f1ff46fdd31
 DIST openrc-0.33.tar.gz 224148 SHA256 4e136fe328a5f8b1225ec5c5c34a42e472ff5676c95b334b5be9b064adaeaf2a SHA512 6c4b27f3c433f418ae205074214697697b8e124110db2985200a698b4123bac468aa962026ca638c2c1b71e5b3121bfe5280a34d7a954a0aa1ede0b79dfab18e WHIRLPOOL 1345b51597cd1424c800957c0d79ca60cad8cd68a964544a9fc1d14bde0518523763b3c53867948d1f0c5b0c40867ed2c66c84a782d40f2e900a0eab7252e5b9
+DIST openrc-0.34.1.tar.gz 225744 SHA256 0150e8ce70cd80e3701c4b86bb6edbab1fbb647d278af9ef8b6bd12cb139a9f6 SHA512 dbb6fd3af5c3020a16b010c7b242c7506390ad53dc961c32339149b89cca597c34c632d0ad71b450034e2466221653bed29b3e1e6c6da15987d04c6981c0392d WHIRLPOOL 02abe6dc0ce4b3323f3d70d923e24f7708f27818cb96df2abc69777d734cd45f2d82790d4f2f82da34de8d4d61d797d9c74904753dd0f1cbaffa963a08168e4d
+DIST openrc-0.34.2.tar.gz 226006 SHA256 f2b81f2661a1834db6477f5af9363334370874fac477cb81063326770cf7385b SHA512 67a26babf5e0026aaebed45eab1ac667531c347f2ba76ad6d3fb60731d95880b831a330f4ac8996188264bdf563b583b6cdcb0002d7ace8327928b78226a29a1 WHIRLPOOL bef8189be3ba6906e5fa3c1998c81418f269b351e09407095444f39ea2e842c7b2331dc95be7e53736a6319440f67ce95a07adba4785f5376579d88e9bc42fc4
+DIST openrc-0.34.3.tar.gz 226693 SHA256 8e4c1f99727b7b91766fcd65e0a303240528bf0cb123a65e33adc904c67bf2bd SHA512 516849d20fba93cf560aaeb51b29fa495265b317b37fc48e193876b131f770665235560fcb2e64e7c7a8046699daafee170887cdb19144938cbf669724505f3b WHIRLPOOL 286ecab65a1a1de429ad5f9a4241b25d0aef146d3a47429550d05f7cc68fdc4c36bff933eaff77c6b1bfa3e18a313e19dc5a531fd35cace825e54e67d0f7d163
+DIST openrc-0.34.4.tar.gz 227129 SHA256 b9d70a8e32a9fa4078864a9aad4e60efba3c0ccfa54ac777a538f62a2c1eebe5 SHA512 f502a8411929d153d4d2e5e4f4052691c6ff85432eb0b8a5534c7880d9b58b3ac919f04af1f1be38c76cd8dec3740bc718b486c06f06f08ba41d311d963250ec WHIRLPOOL 56e34c17ecacc9b42611815a757da33db84571bf2d7c39d8cdc252b170a8c5a5b811b50c0a7d0671dd1c71679d6625deadce10f025ec066d4a6fdf559587af59
+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
 EBUILD openrc-0.29.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
@@ -20,10 +25,15 @@ EBUILD openrc-0.30.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625
 EBUILD openrc-0.31.1.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
 EBUILD openrc-0.31.2.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.31.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
-EBUILD openrc-0.32.1.ebuild 10163 SHA256 5d6e26e91a49195bcd9b8d03a91dc36a3e5dba51ae1b7a7a8cef996beaa01d7f SHA512 397f27315e03e61ad462cc985faca1a1074f40015f2c4fd99837b9b953dbb84c2260496c2b31e87924aed0dc20bf0b6f90f776aa6fc0e4275eb0450909a5ff8b WHIRLPOOL ba108da257792cf69d3028067c4b3523e015fa39e04d58d9ab980f3bc445db141473de75792e4e3c0c1fd9a2600beba7275c4a9b9a11ad0b276a13e47cffbc8a
+EBUILD openrc-0.32.1.ebuild 10162 SHA256 d688c49fe8446296fd469a97276c25b793d10421fd3fe7ee044e9f6cdecb387d SHA512 8fbf8406cb499dfac756ba1c7eb040e61eeefc61d6d294967864651e10edb862d16fc81f81e4d012c7df248c651305866c3656f39d9c5ccc3d884c5bc3e77eb0 WHIRLPOOL 069d82afdbc2d52c5fee592839ad3f550cb11342d694bd61c1587769991304fdcffba9a04b650a1ec096681cf8d1db0e69aafdf9455a7fd4e366af53ceb93089
 EBUILD openrc-0.32.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.33.1.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.33.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+EBUILD openrc-0.34.1.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+EBUILD openrc-0.34.2.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+EBUILD openrc-0.34.3.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+EBUILD openrc-0.34.4.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+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
 MISC ChangeLog-2015 57223 SHA256 df20987356d1c191a7f947374ec43989a1191abae87a47094832785ae87cc012 SHA512 314bdddce280e6a02e6c0bb8e7fc4b52e0fce8ab00ac9669c7d4dc36986017bb220d54ad743651e1b1d65a0b598f9e2f1fe34adfb755592671f4fac00a4a3ee9 WHIRLPOOL cb8531c90fd33e586741997db52abac7883ef4f128c22d60dd78e85eb01cdee6174d566b31a8ed43520e40de887b4223202f38705193215bf4cd8ae91e135c78
diff --git a/sys-apps/openrc/openrc-0.32.1.ebuild b/sys-apps/openrc/openrc-0.32.1.ebuild
index 5526180efe6f..f54f45f0fd3f 100644
--- a/sys-apps/openrc/openrc-0.32.1.ebuild
+++ b/sys-apps/openrc/openrc-0.32.1.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.1.ebuild b/sys-apps/openrc/openrc-0.34.1.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.1.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/openrc/openrc-0.34.2.ebuild b/sys-apps/openrc/openrc-0.34.2.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.2.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/openrc/openrc-0.34.3.ebuild b/sys-apps/openrc/openrc-0.34.3.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.3.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/openrc/openrc-0.34.4.ebuild b/sys-apps/openrc/openrc-0.34.4.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.4.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/openrc/openrc-0.34.ebuild b/sys-apps/openrc/openrc-0.34.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.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/pacman/Manifest b/sys-apps/pacman/Manifest
index aead3f0385a1..66673cad829e 100644
--- a/sys-apps/pacman/Manifest
+++ b/sys-apps/pacman/Manifest
@@ -1,5 +1,6 @@
+AUX pacman-5.0.2-CVE-2016-5434.patch 3938 SHA256 e09d8db1c0d7f9c3517a46693b987899e812eed6b264149f736f87d23219fd28 SHA512 432922e485a2aa1d82d7654c615333bfd8ff74c89fcb3fa5728618d8947175172e043ae231c7bf04387a0770421ccf96bb0d492a061b4da12ea7f212fe07ca30 WHIRLPOOL 247c7930f58f7e4f0e682826cfb762afbece8b14cd0bd3ae04619712f986bf414b202d91c548ae72c78992dd40ba52089c86654705ffeeb861dc22fce7caf593
 DIST pacman-5.0.2.tar.gz 3361701 SHA256 dfd36086ad68564bcd977f4a1fafe51dd328acd4a95093ac4bf1249be9c41f0e SHA512 94a8cce1a52d2365a993c72f16537f4dbea6100feb8f22e8782cc7d2c1ef8a525a63f3c40bb183294c0faedcc743e3d806d2fc3c50a21ab9b03df2910039d628 WHIRLPOOL 2419486287d1ce26d97b3ad53513b4699d876cf5823f65b10d60d8f1df6b2150bc1b742677a60891dccc32bb2105a9a9bb10b58950f5403d0bd64859b0b8640b
-EBUILD pacman-5.0.2.ebuild 2282 SHA256 5a8fce3bd79e1b0fd3253920e875bf84ec0e84acd62c73140a2fdfa03da9d19c SHA512 0c881114145f65dee9b9bf8d85a7fd1310a7831c4177a9908f5ca5f3aa146e13d0e21e95acf9c1115c4c6e43acaa2d1fd558174826a74d218f4e87f84ae06f80 WHIRLPOOL a74b8fa87187d3ee22d937b70e2d71f1579cd3e48c876b361b3c48ee583b73130b7f4493b8d47d95c6788dfc49d3e34f95c5fce81622b7851fa663e1261d37ec
+EBUILD pacman-5.0.2-r1.ebuild 2952 SHA256 4d3361d5cf06380b932efbeeed12b3026526613e0965bbbb6758df87afe78496 SHA512 451a898cef0974bd1ec2967dfc6d121021cf3176fc3632f4fa4851875d0ea16bb8bebb221cc759f9c9c18b8d9682ca000204da0ad106b83e35ed5c1b6e050695 WHIRLPOOL ade67e691038337a83e12830506b22df46c0cd975d3f335f18ae1a45ffffbdc390b18f9af3902347dfb019bc02e5a08c555f9e81994105a95be71cc9ae808301
 MISC ChangeLog 2435 SHA256 26810ec8f60f84ae82db2eb984c5baaad1dd9e4076186e8828a69a94e77cda49 SHA512 06cb7f8b965bc7f68defd5c8aece4e42a7e36fd683d0ada55cc2763f51edf04bd0b088eead32bdba7c64a226d76adc19f173753309e90ec38655794fd2bcd55a WHIRLPOOL 7c47e10bb06b7816a5664b7b2ed7fd8616a19650f01c89eb36e09155392330fa221fbad95bf51ebe53fe98df889d210af40b06ed7b3f65437e608e1f64ed71fc
 MISC ChangeLog-2015 2764 SHA256 81556673523a44e3506ece515916d6817fb2da67e2bf66a1b9b73070e5936c5b SHA512 050bc1d6055e9d7658f685cf20c5896da296641ea801c4bde46e24ef66912b9066ee308f7121bc4136dafc528a18f43908c131575e1e3017dd435402b62b11ae WHIRLPOOL b2be033315bfbad356fe5812ca716838f543cb08e670985223dea36b81e85aec26080060b56dad43f8d666c60837f1bace8dd60239a9b98399fb9a8076eaf845
-MISC metadata.xml 799 SHA256 e11079a73d41829033ae30503ae71485a8019dfd84705627fd92f0aa1dfd03b6 SHA512 268cdde83c8ed3c9ca7729c8e0348e4fe18cff5bc5e56a492d87c73aaadf50a02afebbf80370a8ae5b570cc6f6d12ea385669747ddedc173506db778c2538533 WHIRLPOOL 593539e3423fdf49606d5ed76ae8f4fc855e0d56e7c7772dc4ac282d1483d95e62b3b43e5996375ad8bbfd0868dd7eacfb07c29eccf805b964f47d982e3ed1f3
+MISC metadata.xml 874 SHA256 cc1e76531c3680df302be7023c0deb7bb1ae0bffa84f5afe7f8123694d35ef2c SHA512 ae1e64b32f52880904150c58367e119313a679e49504e9ad19b3d1fbe59b9f6a008ff7319802197002102f1112a43ab17cb1c78b3babacae12e38c9a04e481c3 WHIRLPOOL d748166334074fb5c26719e2a768f561ccfa40d9a3a3e42aaa80e2365ee55ee2fcaa82e52bba7820d96eb148569022e0399ec83aee6521c66c7fcb54c9a4f3c2
diff --git a/sys-apps/pacman/files/pacman-5.0.2-CVE-2016-5434.patch b/sys-apps/pacman/files/pacman-5.0.2-CVE-2016-5434.patch
new file mode 100644
index 000000000000..c245cb78dcbc
--- /dev/null
+++ b/sys-apps/pacman/files/pacman-5.0.2-CVE-2016-5434.patch
@@ -0,0 +1,136 @@
+From bf84fd00d3ac1ae2a43dac57f7ef689ef2e8b8aa Mon Sep 17 00:00:00 2001
+From: Nils Freydank <holgersson@posteo.de>
+Date: Fri, 20 Oct 2017 22:30:33 +0200
+Subject: [PATCH] Fix CVE-2016-5434 (DoS/loop and out of boundary read)
+
+This is a rewrite of Tobias Stoeckmann’s patch from June 2016[1] using
+functions instead of macros. (Thanks to Tobias for explanations of his patch.)
+A short question on Freenode IRC showed that macros are generally discouraged
+and functions should be used.
+
+The patch introduces a static size_t length_check() in libalpm/signing.c.
+
+[1] Original patch:
+https://lists.archlinux.org/pipermail/pacman-dev/2016-June/021148.html
+CVE request (and assignment):
+http://seclists.org/oss-sec/2016/q2/526
+---
+ This patch is provided to upstream, but not merged (2017-10-25).
+
+ lib/libalpm/signing.c | 48 ++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 44 insertions(+), 4 deletions(-)
+
+diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
+index 95cb3280..51b11df6 100644
+--- a/lib/libalpm/signing.c
++++ b/lib/libalpm/signing.c
+@@ -986,6 +986,19 @@ int SYMEXPORT alpm_siglist_cleanup(alpm_siglist_t *siglist)
+ 	return 0;
+ }
+ 
++/* Check to avoid out of boundary reads */
++static size_t length_check(size_t length, size_t position, size_t a,
++		alpm_handle_t *handle, const char *identifier)
++{
++	if( a == 0 || length - position <= a) {
++		_alpm_log(handle, ALPM_LOG_ERROR,
++		_("%s: signature format error"), identifier);
++		return -1;
++	} else {
++		return 0;
++	}
++}
++
+ /**
+  * Extract the Issuer Key ID from a signature
+  * @param sig PGP signature
+@@ -1022,16 +1035,25 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
+ 
+ 		switch(sig[pos] & 0x03) {
+ 			case 0:
++				if(length_check(len, pos, 2, handle, identifier) != 0) {
++					return -1;
++				}
+ 				blen = sig[pos + 1];
+ 				pos = pos + 2;
+ 				break;
+ 
+ 			case 1:
++				if(length_check(len, pos, 3, handle, identifier)) {
++					return -1;
++				}
+ 				blen = (sig[pos + 1] << 8) | sig[pos + 2];
+ 				pos = pos + 3;
+ 				break;
+ 
+ 			case 2:
++				if(length_check(len, pos, 5, handle, identifier)) {
++					return -1;
++				}
+ 				blen = (sig[pos + 1] << 24) | (sig[pos + 2] << 16) | (sig[pos + 3] << 8) | sig[pos + 4];
+ 				pos = pos + 5;
+ 				break;
+@@ -1059,7 +1081,16 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
+ 
+ 		pos = pos + 4;
+ 
++		/* pos got changed above, so an explicit check is necessary
++		 * check for 2 as that catches another some lines down */
++		if(length_check(len, pos, 2, handle, identifier)) {
++			return -1;
++		}
+ 		hlen = (sig[pos] << 8) | sig[pos + 1];
++
++		if(length_check(len, pos, hlen + 2, handle, identifier)) {
++			return -1;
++		}
+ 		pos = pos + hlen + 2;
+ 
+ 		ulen = (sig[pos] << 8) | sig[pos + 1];
+@@ -1072,30 +1103,39 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
+ 				slen = sig[spos];
+ 				spos = spos + 1;
+ 			} else if(sig[spos] < 255) {
++				if(length_check(pos + ulen, spos, 2, handle, identifier)){
++					return -1;
++				}
+ 				slen = (sig[spos] << 8) | sig[spos + 1];
+ 				spos = spos + 2;
+ 			} else {
++				/* check for pos and spos, as spos is still pos */
++				if(length_check(len, pos, 5, handle, identifier)) {
++					return -1;
++				}
+ 				slen = (sig[spos + 1] << 24) | (sig[spos + 2] << 16) | (sig[spos + 3] << 8) | sig[spos + 4];
+ 				spos = spos + 5;
+ 			}
+-
+ 			if(sig[spos] == 16) {
+ 				/* issuer key ID */
+ 				char key[17];
+ 				size_t i;
++				if(length_check(pos + ulen, spos, 8, handle, identifier)) {
++					return -1;
++				}
+ 				for (i = 0; i < 8; i++) {
+ 					sprintf(&key[i * 2], "%02X", sig[spos + i + 1]);
+ 				}
+ 				*keys = alpm_list_add(*keys, strdup(key));
+ 				break;
+ 			}
+-
++			if(length_check(pos + ulen + 1, spos, slen, handle, identifier)) {
++				return -1;
++			}
+ 			spos = spos + slen;
+ 		}
+-
+ 		pos = pos + (blen - hlen - 8);
+ 	}
+-
+ 	return 0;
+ }
+ 
+-- 
+2.14.2
+
diff --git a/sys-apps/pacman/metadata.xml b/sys-apps/pacman/metadata.xml
index 24ba8965c722..2eb4eff00bb6 100644
--- a/sys-apps/pacman/metadata.xml
+++ b/sys-apps/pacman/metadata.xml
@@ -14,6 +14,9 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<slots>
+		<subslots>Reflect major ABI of libalpm.so.</subslots>
+	</slots>
 	<use>
 		<flag name="doc">Install extended documentation using <pkg>app-doc/doxygen</pkg>. (Man pages are included by default.)</flag>
 		<flag name="gpg">Enable GPG signature verification using <pkg>app-crypt/gpgme</pkg></flag>
diff --git a/sys-apps/pacman/pacman-5.0.2.ebuild b/sys-apps/pacman/pacman-5.0.2-r1.ebuild
index 2cea26f9fc53..f60a609779c2 100644
--- a/sys-apps/pacman/pacman-5.0.2.ebuild
+++ b/sys-apps/pacman/pacman-5.0.2-r1.ebuild
@@ -5,9 +5,13 @@ EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 
+inherit autotools
+
 DESCRIPTION="Archlinux's binary package manager"
 HOMEPAGE="https://archlinux.org/pacman/"
 
+PATCHES=()
+
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.archlinux.org/pacman.git"
@@ -16,12 +20,14 @@ else
 	# Do *not* re-add ~x86!
 	# https://www.archlinux.org/news/phasing-out-i686-support/
 	KEYWORDS="~amd64"
+
+	PATCHES+=( "${FILESDIR}"/${PN}-5.0.2-CVE-2016-5434.patch )
 fi
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/10"
 
-IUSE="curl debug doc +gpg"
+IUSE="curl debug doc +gpg test"
 COMMON_DEPEND="app-arch/libarchive:=[lzma]
 	gpg? ( >=app-crypt/gpgme-1.4.0:= )
 	dev-libs/openssl:0=
@@ -29,17 +35,23 @@ COMMON_DEPEND="app-arch/libarchive:=[lzma]
 	virtual/libiconv
 	virtual/libintl"
 RDEPEND="${COMMON_DEPEND}"
-# create manpages *everytime*
+
 DEPEND="${COMMON_DEPEND}
 	app-text/asciidoc
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	test? ( sys-apps/fakeroot
+	sys-apps/fakechroot )"
+
+# workaround until tests are fixed/sorted out
+RESTRICT="test"
 
 src_prepare() {
-	# Remove a line that adds -Werror in ./configure when --enable-debug
-	# is passed:
+	# Remove a line that adds "-Werror" in ./configure when
+	# "--enable-debug" is passed:
 	sed -i -e '/-Werror/d' configure.ac || die
 
 	default
+	eautoreconf
 }
 
 src_configure() {
@@ -51,8 +63,6 @@ src_configure() {
 		# in its foot.
 		--with-root-dir="${EPREFIX}/var/chroot/archlinux"
 		$(use_enable debug)
-		# build always manpages
-		--with-doc
 		# full doc with doxygen
 		$(use_enable doc doxygen)
 		$(use_with curl libcurl)
@@ -60,27 +70,43 @@ src_configure() {
 	)
 	econf "${myeconfargs[@]}"
 }
+
+src_compile() {
+	default
+
+	emake -C contrib
+}
+
 src_install() {
 	dodir /etc/pacman.d/
+	# contributed parts, i.e. not pacman itself, but useful helpers and some templates and basic docs
+	dobin "${S}"/contrib/{bacman,checkupdates,pac{cache,diff,list,log-pkglist,scripts,search},rankmirrors,updpkgsums}
+	newdoc "${S}"/contrib/README contrib-README
+	dodoc "${S}"/contrib/PKGBUILD.vim
+	# create /var/chroot/archlinux
+	# see bug #631754
+	dodir /var/chroot/archlinux
+
 	default
+	# avoid creating stuff inside /var/cache/
+	# see bug #633742 for more information
+	rm -r "${D}"/var/cache/pacman
 }
 
 pkg_postinst() {
 	einfo ""
 	einfo "The default root dir was set to ${EPREFIX}/var/chroot/archlinux"
 	einfo "to avoid breaking Gentoo systems due to oscitancy."
-	einfo "You need to create this path by yourself (or choose another via"
+	einfo "If you prefer another directory, take a look at"
 	einfo "pacman’s parameter -r|--root)."
 	einfo ""
-	einfo ""
 	einfo "You will need to setup at least one mirror in /etc/pacman.d/mirrorlist."
 	einfo "Please generate it manually according to the Archlinux documentation:"
 	einfo "https://wiki.archlinux.org/index.php/Mirror"
 	einfo ""
-	einfo ""
-	einfo "Archlinux is dropping support for x86 (i686 called there) entirely"
-	einfo "in Nov 2017. Keep this in mind when setting up new systems."
-	einfo "For more details see"
-	einfo "https://www.archlinux.org/news/phasing-out-i686-support"
+	ewarn "Archlinux is dropping support for x86 (i686 called there) entirely"
+	ewarn "in Nov 2017. Please keep this in mind when setting up new systems."
+	ewarn "For more details see"
+	ewarn "https://www.archlinux.org/news/phasing-out-i686-support"
 	einfo ""
 }
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index eb4a39b33101..8ebc6925994e 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -6,7 +6,7 @@ DIST pcsc-lite-1.8.21.tar.bz2 750879 SHA256 fe3365eb7d4ce0fe891e2b6d6248351c2874
 DIST pcsc-lite-1.8.22.tar.bz2 751724 SHA256 6a358f61ed3b66a7f6e1f4e794a94c7be4c81b7a58ec360c33791e8d7d9bd405 SHA512 762eccf6a25040653f563b93bf11262ddc015323d06d759a3472ba80af0489804410ba17c7e5330ccd4b5accc8b7314c80b5e99da278561d3818d8c381e6a025 WHIRLPOOL 39c7b6217fe75da42d062a2618cdb749b78c6a1dd04f60a92c45e974d551782ffa621f78198c600b350da9c7c30666a7e92409b7248b3642bc922f8ab9014036
 EBUILD pcsc-lite-1.8.20.ebuild 3193 SHA256 ec7ef345b47bdd7f440c621daa4cb3076cab81bc560409391abe26f5bedcffbe SHA512 172634822b9c74bdfc515135b15d883566692f1ecab16f0c93a0b8eccc254d9c38d87b8b7d3647d0d60085cf39952753a442d1993f08f7e72a8c5d83e30358ca WHIRLPOOL b5a8599e9b2f6358c4bf7150e75d07aed6f88afa176c458a871b6f71e591defba5464ae6cf7797127cd5a156db340c01c3080201e635e5d51d315ddb3d4160c6
 EBUILD pcsc-lite-1.8.21.ebuild 3218 SHA256 5854c05ca9764abbfd265e89734e0e582170ad9439354f8f8d15a2626724f0f2 SHA512 e971f52ae70d2b66e237ab17e1cc5c8b6d9ec2ab1922a7ceb9b5cc125889eaa9dd4a3592feac0d02d43355d6954546cc8efaa567b3e22de908b044e73ec43476 WHIRLPOOL b2500580cdae75c1fe083d3e9790c52a8b00231bc70532dd3e90678f3a85631d8f618c41a3c5c57ce9fc0b3ce3f3b3765bdd66c1312f38c62262b471d84dd365
-EBUILD pcsc-lite-1.8.22.ebuild 3220 SHA256 6f53b829fa73f5899037fc6d3c2d77a6f27916ea28613e8fe890810ba1dae6ab SHA512 3fac370fc7cecf5b1781e25d95b93ac258277e7c6c972e29bac48ef0546397f8b88cc3d4fca3c8ffa99cf2c448af86e9bb8fee4cb31e87f8f7e8105b123c989e WHIRLPOOL 755aae71dfa7c8619923f1bc02cf0768d151b08731eb10cf0b0857ef52479458fe6694cddc4bf0aca085b745e36f092b931c7cc74dda38e21e782f06d43f7468
+EBUILD pcsc-lite-1.8.22.ebuild 3219 SHA256 371f651f824539155c756526a2ba3d8d44d720b96bbc2cd54e679a05298befe9 SHA512 f85a053a8f115302e45ae8764e1cf0af26cd37b3bd2f987a9e90bc4573caca2b60d3c5f10bd8c5d9c53fa99e41a9918a679e325dac38ef00f071363523dadd6c WHIRLPOOL 43a403039055ffb5dba34dbff2b84e43fdaf6a580374bbea53fb9750f2d0188afe3c465491af78cc546d10f7d51b69fa0a3df0eb36b3563a5fe479148db1f4c1
 MISC ChangeLog 6395 SHA256 912a7140d0708d614b80b869e94aa569a62f237bd853a61c9fd71b1359edab89 SHA512 bb4df50e966384eb04788492279c3424d7d2e8694cae1f668ee05d25b7b6dd1ebf01c598ba38781d3f17942a460118a17f1e84e8ba8fc83b1f13715a4a5d3fc2 WHIRLPOOL 9af2a40a4c521ff040b545a8911690ef485efe0934784e58693742ae411f93270d7c7e1c64ca4a5863f5ca9746c0458e9edde9e5d28f759e80143991ec65c5a4
 MISC ChangeLog-2015 28207 SHA256 b31dab1f7a1c1bdef303428db1a473edd20ae2bff480e8e89c3d997eec0db2f0 SHA512 a78a50e69f87f99b32147530d00d3a3193a6ece444aaf6cec6843e0cd3c47a2185e2d34f0bb582f9a94bf44f64d607e59d80f5edf7e4d28d84e3d54969f7863a WHIRLPOOL 0219a49e792f088937cd8208677cec68b9c532ec388e3af20ba712e6ce966723008e2237e10f9e1b88cf0f9a962de38e804656db146ff51c80233795abbeb93e
 MISC metadata.xml 1077 SHA256 c2017a8d4069341862246712582099eff835dba057d0bef24d5623f4af1039c4 SHA512 4abc19855a868236dfdcfa6d42fcb901fdf52796e08b589a1413c78b931aee74fd482121ff67da632c2cf2e1ba018ff02f1122f1dac5c2185046f98952efd838 WHIRLPOOL fe32dbc636803d126b46ac2ed16429da44093f773ec0c8f8939d5efe3b9126a2c6bda01ab43acc4bc06edb95d048898ff07310a2bda0f15082525c9a0ec848a4
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
index c16ae96fdf12..9d136110c54b 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b69ab41ab8f2..a8b558831e2b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,10 +1,10 @@
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
-DIST portage-2.3.11.tar.bz2 940732 SHA256 f2596fc8e5eaaaab19be88c5c0a92d9f304eddb14ebe1230ab6f8d841ae90720 SHA512 16047fae060eb400e0fd01ca4966d69c0413e90659b33e4511b34464a24e9beb510c4c785af713921240e893c3031d3c3c3f2332eb175a21bb34b414962058fd WHIRLPOOL b0d357e626710c3574dde9228c68d604eb70843d083917d761a0c55680702da96d2157566e04d7f7c6c900d8120909d1faa00e6ff2a8fe970d53da05288ae0ad
 DIST portage-2.3.12.tar.bz2 944929 SHA256 4a6b6c1d038131d141b932b1ad93768a7823acd0704093c6c1e5adb9f913ba1d SHA512 39f6d938e167a96b338dc85191bfc25d6db2328014f13386dd2552b9a3c36308b9b4d444dcd3342e7f6761e26d97fc0b3e2c8a9092ef7aa863d55c26bdccfd3a WHIRLPOOL 34cc7567dfe4913129a451a8e8597c48382c6c423ec1a008db1fc489f5da99d5cf371ffa48b8449d799aa98e3f0dba98f7c8b55a4b8744fdb857f914448b6f5c
+DIST portage-2.3.13.tar.bz2 945477 SHA256 f3ed1445cf2bbfc6c5986873aff055e4caa3b695f37e033930ad2533bdea8d24 SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3 WHIRLPOOL af9140e46d7e94994b276d93389c4953de77c77e9bf132c20b85bfdd477aaaeef2bb05293e94058158cf7800711ae7d1ff694d6ec9fd5e940849fd538b86c501
 DIST portage-2.3.6.tar.bz2 943085 SHA256 2f57545fcb142a4b23c2052c523d3d858754b232be21455ee6c6cd3ff0903cc2 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 WHIRLPOOL d0258c579597690e8bf2cc2a3ecc36d543e67a728c302a9b16ae361086023a7e059ac1a9e2e64f026b7d975d6b619d3b981062227042098ed3afc1b86658b636
 DIST portage-2.3.8.tar.bz2 938062 SHA256 19b73658dca848d215c5527d1d020c8106352007a84d7675e5efd0a7b9b48a8a SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 WHIRLPOOL 0c576bbd8aaf8b27fa1746c863ac02b2a5f361d9011d17250ffbe4b830a8a6bf10a0aee48b5181a8aa6c55d8ad81ad411195da2a6253e9b324d3c7397053fe29
-EBUILD portage-2.3.11.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7
 EBUILD portage-2.3.12.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7
+EBUILD portage-2.3.13.ebuild 8216 SHA256 4396a5edc8391d04c412e20694e71311dc34a288ab1dd67b1455aa29524f8fde SHA512 8f5e923a644abc5cb704ba3cc0ab54c8dc254cb77e3f9fab207d40b6aa80dcffb2e6aedeaab649108a744ebd1d88c827cde81fa131e3e94360db921fcaf853f9 WHIRLPOOL a39d650d8fdba9181c1e1220bf9868467e31360e474ceca40f0548eebb1bd3eba088203fb86f62c5a674ca8f532e9180d916ed707cf0833623f74770d81faaa7
 EBUILD portage-2.3.6.ebuild 8661 SHA256 9590a689915eea31ffc5dd347154719d70cfb4b000a60e0f6e6294fe0c3e1df7 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4 WHIRLPOOL c70770b2e9ac8b9af931d9f9918af82ac20eda198a33d9cc19c5d457701fe09c3cd5d45fb756457b05209cc0594c2b0b4efe3d544e1966d759c6a27fcf5b0743
 EBUILD portage-2.3.8.ebuild 8207 SHA256 dd61d45fccf60247d105993e2c73fb16a3ab59322add5701b636361b035ce6ec SHA512 24985286ffe9d4adc99aa65b26b4a15784b7edc84187a3a85b22751854f4845ea00573493a949f5aa6c3f270e4b52138a246006b71c9e6cc04ea402b820aee48 WHIRLPOOL e4ae75b7b4ee0ecf71328dcaebcfc4bb440e3c700156c2a17db3455b54066241285e8c625a5e2a2167c0d8ef31ec855d09219ab7cae1f5285057e95a1bb77165
 EBUILD portage-9999.ebuild 7697 SHA256 c7d91c34e7fb25283f6ac634a00686273fd3f286ecfb9fc1ab3bc685ae8fd9c4 SHA512 6b8342034752512df0345d386f67c025b0ba15439ae5758783b16973d16b3b3b4d866abfb65bac2e26424e270294bebe26e43f12539ef141891b567dc0f000ce WHIRLPOOL 0b2b3f122d57a5c9d3dd63ea09c7a7bd05e1eaf298cd5018d400543cd825469e108fdd981c06518d24a37f7a339195fb01b04480143c0d9f93cce18093119c42
diff --git a/sys-apps/portage/portage-2.3.11.ebuild b/sys-apps/portage/portage-2.3.13.ebuild
index af287ccb8752..af287ccb8752 100644
--- a/sys-apps/portage/portage-2.3.11.ebuild
+++ b/sys-apps/portage/portage-2.3.13.ebuild
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 8275f66fe84e..28174b1606fa 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,31 +1,45 @@
 DIST aho-corasick-0.6.3.crate 24963 SHA256 500909c4f87a9e52355b26626d890833e9e1d53ac566db76c36faa984b889699 SHA512 4d0d55d8a6657fe13009d66728b7417926325dd9ca4f7ad7cd5d40e59cf0a55b906cd109d724a0b385ee988526535fc64a467ded171419e452c5a8c90196ae45 WHIRLPOOL e29e10afbf4dfbd1c36fe15af475107116e83c4e85943ca48a1cf90def2556045fd31264b59eb2110ad0d2e8c7ed5fe7594ac92a8fc3328a25c9be90f4173b89
 DIST ansi_term-0.9.0.crate 11718 SHA256 23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6 SHA512 4b5297d80f2a7fa840aeb1c31e7b893b33abcc7ce7f6f54371f6d7fc8e2915b43b5e3be3baab32b0821e174d8f7b58961029569a4f9e59b8a46c05f24ecaf04b WHIRLPOOL e0287a6f23e41131613da054def04c53896a4ac0bb80bc315eead5da99a5355f917cfd9babe05f4e3c8416c1ba33dc271bb1ad68ffc3b6e0cd5cdaba41f015da
 DIST atty-0.2.2.crate 5124 SHA256 d912da0db7fa85514874458ca3651fe2cddace8d0b0505571dbdcd41ab490159 SHA512 6e6e2cede7f280a53a61c78126783ec0338c13a8e9bbabb91d4b6fc43aacc56a4f7e86556210029595acf18e444121998101992b40e35a64cce884ec08247d0a WHIRLPOOL 9fae4158651f25bb4b32d0ca31e72fc8c01bb7afca0d703770af124ab9035fa52e700e3a74a4698bf8d95ff65de9adec9a5933b82798ee9cdc06d11dc86ffab4
+DIST atty-0.2.3.crate 5486 SHA256 21e50800ec991574876040fff8ee46b136a53e985286fbe6a3bdfe6421b78860 SHA512 9c944334333ca59d28588e164d2a68750eaf889dcc6b28bc49fe9a7990e0b1694d302a685142866362b7b97ef3f36daa410b59d6222e99cf6f096836850794cb WHIRLPOOL fa0b827f4b83e158ee868043803f27f5235bdaad8aacb0074bee8549b100c5319738d2f090ca77fe2b525792d5962d25c0a28da2b06dc63fdd0309b47baf386a
 DIST bitflags-0.9.1.crate 12406 SHA256 4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0 WHIRLPOOL 4d6389fcdbd28cfddebc668e1f6fe0b2d34b77ad0b43abf4530179417498b44f8dddfcb0d19dcab84042715e000f9eb9c6f2af169679b74dc6c41dec26f9193b
 DIST bytecount-0.1.7.crate 10121 SHA256 4bbeb7c30341fce29f6078b4bdf876ea4779600866e98f5b2d203a534f195050 SHA512 2482f06b62699251c70f45a67c29efa3cfce74568d261105ab14134853396dd6ee9a35ba29dd28e3b8dab4f1398f55708c4f648590330c8aea753ab27cb59c3c WHIRLPOOL 5bf5378548a0e2a86dc70ca55806d4411ebf2ca846ba2cf42cc155f9daf3526bf07f1910310607e9f35c5f495632c199af41614839335a07990f1e7d271605c5
 DIST cfg-if-0.1.2.crate 6668 SHA256 d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa WHIRLPOOL 4b5e8a97b7dde903545e6e29e333ee7fd06435621cc6de5336974bc648e4c21da71e0a8c0b13235bc52577bd9dc230f46bb8008bf026b67f9e01f250eb12925d
 DIST clap-2.26.0.crate 180834 SHA256 2267a8fdd4dce6956ba6649e130f62fb279026e5e84b92aa939ac8f85ce3f9f0 SHA512 b1a610e889b21f8f23aa5f7d40ee50cc5721201d661feca05952b792274aa6dc3a35c54e8aa29cba1f6502596864303fdee881b6794dedb59cc9fd90355498b8 WHIRLPOOL fc2860f693743cd48403f7225afbdac2dda4ee6320db8112b965f302953fd9d2291b088462f3438797d50ccebdf1fc67fc2bd4c4eef39fe9ca930403c2121094
+DIST clap-2.26.2.crate 182509 SHA256 3451e409013178663435d6f15fdb212f14ee4424a3d74f979d081d0a66b6f1f2 SHA512 15745452263c8b39fed61f12c5f36413a4064f726262bd4cd432baa873d2c820b702d2bbff645e65a0c2fb8e054b6f0a51b0047a21c40749c9c0f631003959ea WHIRLPOOL ba46796734507fe1ad2b14ded5c034a4c817c943c9921b4c60e57cfe4aabc9dfd6afb07210bb9c28b13b45a265e48f0b31abeced83e6787b9c1e8514dde56b5b
 DIST crossbeam-0.2.10.crate 32993 SHA256 0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97 SHA512 cdefcda7626c08ca59bdf5581e0e8d3e6367081089cc32dad6e84b5f643c7cbc5b08ce47034dd925fe2f5e2dfcfd18afb51fba511265ee3598fc1844838948f2 WHIRLPOOL 764f0a48c300a587ea56b5f0f7f55d40d8330d0148cd309599b3794d8c28399531b52641a58cd65eb9fb0107ede1a2e7f119c562d4781dee3a8c360b0a5af73e
 DIST encoding_rs-0.6.11.crate 1220572 SHA256 e00a1b1e95eb46988805ceee6f34cd95c46a6753e290cb3ff0486931989d4a4c SHA512 5409fc1d6b9af953ffb246a8c119e9aa0e03ce6c3f0d6ce3606340f789e9195f376b76e724f08fc5b9975c370abafe8cfd591d55ff5fa05375654d5ff2fa6954 WHIRLPOOL 7ad862e648b9d88ae2c7a92159111b21bc61cf97371d4268038161f118981a9407c5fe75d0d801b72900fc88d94f40b0b58d647c767fd2485f752fe36abe4889
+DIST encoding_rs-0.7.1.crate 1220716 SHA256 f5215aabf22b83153be3ee44dfe3f940214541b2ce13d419c55e7a115c8c51a9 SHA512 272e4b5a5d2dd091bf33f53baca2e2afe2b9b3d77325aa6fcf27bbef5bd8f7ef5a47a443c6633fa6fb4793f990d1fb75f0c02f2be6f2e3d385bdf546b2c28a44 WHIRLPOOL 0c8377ffed75c1e0ef6b2e7395d8d208cf0a48825bb4b084700f9d2ecbe9431e1958d57d1de8a8f64b01ee6c0e4f6b2be0b2863eacb4f8ecc902927b9b5ce43d
 DIST env_logger-0.4.3.crate 10891 SHA256 3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246 WHIRLPOOL de63679ff8d1f02c57510020a459c8285ccb338f04dfa672a5cddc4718139fd4ddbc931237e81569209fbfa3eeaadc7b6f05649f58ef9018345bbdba2925d39b
 DIST fnv-1.0.5.crate 6295 SHA256 6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344 SHA512 a851ed060bf49224436acb1b5cc3125d30a3b527be9d7abd09f4170eee6243de8067b0bae5b136e62fdb8ee026e42a150109e90fcdf4cc4258f4de045d6069a8 WHIRLPOOL 31b0d787973ed378116947c8e30341a61e944be17866f17af241ce69f8385de3eb71c0fd1ea121aa1d19b1bcd67eb25b9cebb624ecb85c9d28e9bbf60156e9ac
 DIST fs2-0.4.2.crate 12815 SHA256 9ab76cfd2aaa59b7bf6688ad9ba15bbae64bff97f04ea02144cfd3443e5c2866 SHA512 626c5edadaf356ef9d13ac042ef517f317a376fefc76163e3dc7573eff024323a2ea0f9c1582db5d797eb2ea64f2d27e7877e774154f5d5dadc506c926a5dfef WHIRLPOOL 4a794853447219cf79fdf624a24f01b96169ff40be2389483e80bb1196238359c992703cb086c9be463f9b6bae170843515e01b710b9cb2e6118b00a56e48fae
 DIST kernel32-sys-0.2.2.crate 24537 SHA256 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b WHIRLPOOL 036baa6611f13d76692a5c032e7e8e8b5a82e12bdf13d5a2cdcf4d33020b003c941331f0c8aa774e7f7cc7b36ad7403bb2cbdecb739d7645cff66aeecd59b09f
 DIST lazy_static-0.2.8.crate 9950 SHA256 3b37545ab726dd833ec6420aaba8231c5b320814b9029ad585555d2a03e94fbf SHA512 21c6ea68cb40d187a19e6d960fe0d7e4671101f26b304e4cbe6124f1a3d983fc41c44c4ce9e0d9b984783b7ba94ea873236e48178bdf56cfb8c0a8cfb9ebe368 WHIRLPOOL 8350c49ad994d3404462141310d4050cbdce3ef75cdacd9ab085bf9aaf20e6db5a4dde134273d6ab0ec618275a08acf5c2d154b206d7e3c21d6d8c4fbfad67b7
+DIST lazy_static-0.2.9.crate 11024 SHA256 c9e5e58fa1a4c3b915a561a78a22ee0cac6ab97dca2504428bc1cb074375f8d5 SHA512 10a75fc071f58fd9cf4d87619ff32e94b2d53da0f414e48319c4f15c1120c018ece698a396f538f60504c85f2faa5da3e48fd17c0fcfb8f575352c70f79c9ba2 WHIRLPOOL a22d5a5b91236936636e03ad5f81a475a879c590ece3c730631554d09ea2ab868951cbde7622ebebc72999c031e6d95e000b9ea08df315abce4c765b56b83ad2
 DIST libc-0.2.29.crate 182632 SHA256 8a014d9226c2cc402676fbe9ea2e15dd5222cd1dd57f576b5b283178c944a264 SHA512 3ebb02800c2376ee4b56bc56e3e26f478e6974e826fa7c54aa105416736d5bdd1dbc46dacdb2a0ceba7c536fdee136d21122c5c6288cf10c72033241473369d5 WHIRLPOOL 96cf617bdd61b5dc0a6628eba640403bc5437c779b1af96187aa3e2ecae6b6b447d4f16bcfe16d38b1f900f751a2983f67d2d2e2cdb59c9774effee5b8ab610b
+DIST libc-0.2.32.crate 228762 SHA256 56cce3130fd040c28df6f495c8492e5ec5808fb4c9093c310df02b0c8f030148 SHA512 73115eb14e2c90757c5075c86582bb463860f4016e5c3e9a0187b63ec93ee279da8f6146f2eef7914c72c1e6fbab3362dc9b789e2706d15d9b8a486e8311b088 WHIRLPOOL 4dfebe0b53a255628a353d8f25da53ed232586c4fb4799b48a64f3afcefaf0a6eccf415b919307df5cedda7a7a496a3ff9d4dd1e01a48f2a26b8d0440cfa88af
 DIST log-0.3.8.crate 17756 SHA256 880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7 WHIRLPOOL ab37737279257682083d3335f1f05d84dea3dbbf624763f739b64da190da64458cc7a3741aa6c35ba4b71e1dad9c3fd1bc7df5334358bba3574faaf3a539688d
 DIST memchr-1.0.1.crate 8221 SHA256 1dbccc0e46f1ea47b9f17e6d67c5a96bd27030519c519c9c91327e31275a47b4 SHA512 70ee14fcba41cf896f563da48c8acc683f8cdf77c54cf9786d6a938bd14eca7bcc22c86d0d70a3cae56b2c2f9eeecad2950be759abf02fc98ef96a643af91be6 WHIRLPOOL aefc15c91d981becfdb7132c91f812430759408a6356aeb2ec3064956e55579895c59cd539ebfc4c76cd09bdf4fcaefa888f99e1ae98733e7f11654f5a8cac1e
+DIST memchr-1.0.2.crate 8639 SHA256 148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24 WHIRLPOOL e8fc1d06a6b91e57378b8b8f7408fa26c6a352ea165465905414e6f7cd206944fd9377661cea3e58851aa7494b8fd3c531b20558953f0f621ba7b8e2e845a351
+DIST memchr-2.0.0.crate 9824 SHA256 e01e64d9017d18e7fc09d8e4fe0e28ff6931019e979fb8019319db7ca827f8a6 SHA512 de1ba67ccd342cd0b5cc493b5eb67e0e4ef90d0da0c1ec035ae5daaf778fc8d16eaa620d2cdf2100f45a3861640ea174eaeb9012571c90d47e2e925300665b46 WHIRLPOOL 84ac1aaabb64b240f0c7b3b05d78fd971de0f33285e749140a8ee57cdf23a760fabc1a141e0374e6a42ec6ca5dfdee7b1f02e79b5c34ee61086119c1f48e69c5
 DIST memmap-0.5.2.crate 14465 SHA256 46f3c7359028b31999287dae4e5047ddfe90a23b7dca2282ce759b491080c99b SHA512 c2ccb0afa6795831f1a032c4995d74daeb3bd739059146007b2524ec066517f39f7a2fcf56e69d17a5d091511011b9c0794a8e3ada7322dfc5f20a3d9f6c1b05 WHIRLPOOL 2aaa34634e7aa970eeebfedf3452e10317b72c351e220701d10c162dc4828771dc9bf7aa20a2a60f129267dcc782b7bfed43a500cda2ec469745458c47c83cf8
 DIST num_cpus-1.6.2.crate 8442 SHA256 aec53c34f2d0247c5ca5d32cca1478762f301740468ee9ee6dcb7a0dd7a0c584 SHA512 6136c6cd3e4a9c0f165f037e3e6af6502a3ffcdd0cc2d38635902f243124e5c6ccbd4db8e0bcb624e2ef824284145c0dd31c1cd5f708478334bc91f842c6050e WHIRLPOOL 9d32f8b35d52028ed36a56968875cadcace904c133a9c8e43ec7ab6a8525ef5fca23c6fbbe28387bf3981488b0d1e095a2a7a49c504736bafe8981b2bb3dc84a
+DIST num_cpus-1.7.0.crate 9626 SHA256 514f0d73e64be53ff320680ca671b64fe3fb91da01e1ae2ddc99eb51d453b20d SHA512 467500989a9b1fab4922c4db049a735a6fb7ac07cb92be2ce2bbf6e0c2ad4e3be5e1af33bdf2b9d160cab5ee5a4f292addea1180d5c2a940abd85f8e624d37e0 WHIRLPOOL 54fae5b988215433e3c7e359a4c69ea26cc9648cf04feff2d19d0f221cb72984799dac1d7681564a2dda378e28c6686725e23fc4cdcc77fac3495576344ef95b
+DIST redox_syscall-0.1.31.crate 13420 SHA256 8dde11f18c108289bef24469638a04dce49da56084f2d50618b226e47eb04509 SHA512 162655d5ba07857183a75bd7aaa3e190e8d1c2e80002319e5006a67c09a105fb3f3726fed1a116b7284712bf6a2bfde1607cb8b576251233c12b69582969a9f1 WHIRLPOOL 34fb166aa2bcfba58252b62a0fd081382e66668d16d3490a46410c9c82e022bd9851aeeec4b895f3260c168730f58e667b9cc68b9f0d85febc50881e35dda182
+DIST redox_termios-0.1.1.crate 3227 SHA256 7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76 SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 WHIRLPOOL 65c2aef4a749f72bebd1fdff72f463fbafcf12fbcb3881d6bba8347071fa1cddf7a98b550d24e7636013889a2b7a188facd01990019aeb7aa5b651495e31b960
 DIST regex-0.2.2.crate 193403 SHA256 1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b SHA512 208b671d06b260e4a130718a86ced88ee7f183bd056461bc6d44a15a22260a9ee05a014682bdb8bb7ff674fd33ac4748687c7ebd847578c7fecc8efbbb1993b3 WHIRLPOOL dafb61f75a55f02dd790201156f6dbf042eadf3b54c7e71732653e3dc8db4552f43d281d96a1bf196e7336b638cc97b5d24bb43f6223caf312cb7b0351be827e
 DIST regex-syntax-0.4.1.crate 121453 SHA256 ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f WHIRLPOOL 841c41fe9ba5fdc733d93944252c4e7d07b448435bf620baefc8db28a9e3891e97f619361cb1c80adc00be5be8721bebe36b85881b68035040ab870a23615b62
 DIST ripgrep-0.6.0.tar.gz 470996 SHA256 102aff26fae9f455a8bcc435759d488f4944a34bee4b22b852f1cac3245b1b5e SHA512 219ec95598c080ddeee65233d1abf58320662ef28681a25cdf9fb63fd38bdb149c75471625545188dcd1deedf05fd58fc32e25cf39fd63943f765c57394ede23 WHIRLPOOL 0100649443d80973f102f23af115b4404756de8838eb4daad71a6ad32ff5242f8c2bfda359acc0818e5dd8394fd3409ac38653b21b15384bbb7d5f751c97703a
+DIST ripgrep-0.7.1.tar.gz 474458 SHA256 e010693637acebb409f3dba7caf59ef093d1894a33b14015041b8d43547665f5 SHA512 1d2c5b1085ebc6b2b0d1cd330583f8d09bae0789590ff3a8bbb7f79c36b106b9f4fb3c880a225fa4f8565cee55e38514db0e7751f1d14a76005ebfa7c7127e5f WHIRLPOOL 266358dda0037d1fab4c0924b1a2ed1d2086c28a8b8be6e9faaa889c589302e70c26067c8cb31780080f25e0fbf69b217161c5093af27f5cb5ddda3a1269cbe8
 DIST same-file-0.1.3.crate 7078 SHA256 d931a44fdaa43b8637009e7632a02adc4f2b2e0733c08caa4cf00e8da4a117a7 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c WHIRLPOOL efd0b9caf419b8436d54895deca5ee3d7a5191a006051b975d65c0e3d8aea32f3ee866f4481d6a2a8d4ce9b5af7de4b11a295990dd1ca7a9889a255bff345525
+DIST same-file-1.0.0.crate 8746 SHA256 70a18720d745fb9ca6a041b37cb36d0b21066006b6cff8b5b360142d4b81fb60 SHA512 75dac7dfec4f3732410b1264d8394d20860c993ac5960888f9ed1acc5f730c16215311a5e13ddc5d4f126e8cbfd8e1c5510bdf6c0be8bedfed19cdf3394d6ffa WHIRLPOOL 3486e8bc5cfc7b5b792ac7113fedcea75533fe10c52ad956323b9d3b10bab1c7c3ef7703e42e7bea4079b7f0abcd68adee9576eac768dcb9021bc80f549c4fd7
 DIST simd-0.1.1.crate 39577 SHA256 63b5847c2d766ca7ce7227672850955802fabd779ba616aeabead4c2c3877023 SHA512 ed58383bbee3d0a5bc537629cdb242d5ae8ff46d4e8911df16e34a9fe9da693f1347b89f77614d1835391f57c27176824c46feb9733de89915ed4709217466f2 WHIRLPOOL 2177fdbfb33203350e55258cf94ddd0861314e720d43147039db5b7fcb3028caeeef71a4759ba8aef59c5b3cb72cfeb05f806be3e9c6ecd36f07ec42a43e513d
 DIST simd-0.2.0.crate 35102 SHA256 7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0 SHA512 97538d8811d6627d5c8c32bb59783aaa906887fb320679144d50330e520e85bac7060d7d4e4e7074097ae8928aab66085500344bcd5c4dc8e195e339c7b4f2fb WHIRLPOOL 52adbf67f610bee4dfe4495d085f34aebeb5f87d3d7bf300c8c29bc38d92555f735fe04cc4930f6a6488eb3b89950da15627c7f654b05ab186afd5567f1d4179
 DIST strsim-0.6.0.crate 8500 SHA256 b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694 SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97 WHIRLPOOL 5fa5b91b22ed2d5ba22da674568e5ea374fb05d722796030c3d5198aa42552f7bf47b51b54ea6d62b4e9bbcfd50bdc7ef450ac23e6e2e99dc00130b972b460ca
 DIST term_size-0.3.0.crate 9932 SHA256 e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209 SHA512 a466470372c09a6152f1fdaa3d631395410f4db938d0ba1db1695d66bf1620177f4dab4a9aade47de1d48019712072bfc91630cf4c088c56a5775f4d27dded8c WHIRLPOOL 2156de368b592c3c6f5bbafe787a8163880d8a86e19fa8e1b8fa3c184534ae8e54333455cfe8acc6fbda2a08a90ca42a655dc6af60c62262178950106ee432ba
+DIST termion-1.5.1.crate 20659 SHA256 689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76 WHIRLPOOL c89d4c9278862c24fd203a72dc5d0e87773726031f4ecf68a22da745f6a5525f2f0e07198ce020015db482ba2aa3ff89b3314d46aea2454ceccd00f6cec11871
 DIST textwrap-0.7.0.crate 13341 SHA256 f728584ea33b0ad19318e20557cb0a39097751dbb07171419673502f848c7af6 SHA512 4829ecb3a0829f202c53a58ae063ff39f8f5a0a7c031ad30435b73751d5c1d3ef607e4b469e15479f980862e5cd2c947fcdb2e676963f8556a156cf4215f06d1 WHIRLPOOL 1320d3e81e5e5963080e3a796080bbbf37813017cbe179b14b864c880f311327b0aff65ad788dc3f61942eb42b4541f350803589cdacf9ccdb7b3107de75ac87
+DIST textwrap-0.8.0.crate 14903 SHA256 df8e08afc40ae3459e4838f303e465aa50d823df8d7f83ca88108f6d3afe7edd SHA512 1648a496cfebedbc6f81b150a2315a9ba588e5b10eab652c27e2d33ce265115aff9036bf3c263a656065c037e66e5a899462a6ff12b1b3a10ccea2fa0e3ba018 WHIRLPOOL 64534b92be4b1d533e57db1a9f712a30c8ac1db4f5588bf9c2090d64946bfd79ead318affd71128fd837e9a8161564713be7ea75c724abcf26e5949864fad8f3
 DIST thread_local-0.3.4.crate 11760 SHA256 1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14 SHA512 51fc5e1f5046fafe794128e6655c3ed5fa54446d9db151abb5da6e2599b6fb03200746ff4e6adffb6b8a04d015966fd4860ea3eac50bc169ec04ba33978f849d WHIRLPOOL 27c100a56cc3b1b43225fc76de150ff9835e391ec778de6039aef7d97fd2d86b7bb3734258656d6549866d3a596af9da4c0ce77855db955e69fb4480f8208a03
 DIST unicode-segmentation-1.2.0.crate 67562 SHA256 a8083c594e02b8ae1654ae26f0ade5158b119bd88ad0e8227a5d8fcd72407946 SHA512 724fb05d4c02926a535a3380f0a718e5ca0b61c71173efccee6780e878b3e890f11e7941cd970c6c1763ac756f31fe338b0dba2ff31db2aad29670bd6e8b9bab WHIRLPOOL 5dd692641038299fcdb66311adca2b5ddf5ae3f23de4c9a6cde2ff05d4475290d3f5c9d524a5af6496ec98fb106561bc81311bd2b7c05babd6d71af99226829a
 DIST unicode-width-0.1.4.crate 15283 SHA256 bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3 WHIRLPOOL ddbb1fda0e2806a6e9d4c017b9c31acce44b97b3470c2992e424e105b801d7a5d44ac9a7e2b4f2e10c79c95cef0075c416f56db485b82095e0cc44e51f79897e
@@ -34,8 +48,10 @@ DIST utf8-ranges-1.0.0.crate 8599 SHA256 662fab6525a98beff2921d7f61a39e7d59e0b42
 DIST vec_map-0.8.0.crate 13742 SHA256 887b5b631c2ad01628bbbaa7dd4c869f80d3186688f8d0b6f58774fbe324988c SHA512 7ce0c05c0b410577b489adb4d35376bc2a55c6041ce50e011b78415e952b5fb7fcff89fdd00b95e086de742f26ff057e99e55585824bbc0482e0ac2134406520 WHIRLPOOL c8756c3aee87ddd37c2ed4bbe1bdaa27791cfdf59b613ac04b619139bde62f5da07830a9f92e71864e4dcc4498bcf5a77ba677f8ab507dc8cf55f4470b5c95e8
 DIST void-1.0.2.crate 2356 SHA256 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1 WHIRLPOOL a1e8bf644e79ce0bfcccc2b05ea357400fe6cb61bcd4adb0360b109affb866ec305b30a11549aa35b765fd0f32420e7d5cc741cfccd3c2263c60f1cf7acc0136
 DIST walkdir-1.0.7.crate 17883 SHA256 bb08f9e670fab86099470b97cd2b252d6527f0b3cc1401acdb595ffc9dd288ff SHA512 d5752c39c055dcd163bd74db3495a16e1865fd32e3f0cd779455fb818e78106ee4bdf0cbbcd36331f860c5ca8de658f848988a47194c5b9e130f28a77c4576d3 WHIRLPOOL 6cb9a8ea4803cc7d4bdae8294d44faf53a99f02526ba41cc80ac4cc189308ddc34fd7fbce996039b236c1bb8984e9876e06c478c12f2c0458f1919be7400153c
+DIST walkdir-2.0.1.crate 21483 SHA256 40b6d201f4f8998a837196b6de9c73e35af14c992cbb92c4ab641d2c2dce52de SHA512 54ca4b7dd89569de8710af7ad06a631e5693ca7ddb368f1d893d544547de5e073f862324796b66849e46af9c8b0ad3fa98f81a381db8e2e394502a79be1aec7f WHIRLPOOL 1fe2c469a5e20bcbdc05949b334bd780025ed4be338ee365d7449c1cab70bd24a80ef93e5264a639cfbac8b3bd5d525a3d25d2c1a2eac741b51860ab131c267c
 DIST winapi-0.2.8.crate 455145 SHA256 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe WHIRLPOOL 3dce71a6927320e3882ba60a24630a9ba8d123b73d8da6b9330e422580af9d9b0a96748d7368767e3712185877ddec6978b924d40428341c4de19b76ed375af4
 DIST winapi-build-0.1.1.crate 669 SHA256 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77 WHIRLPOOL 036080513776fe806cc9dd68bbf5b797776b98ca9fdceaa4bd77c87c66d2e5bd0eec8b0e7f0100dab8f2ced754da058f67e651002c786b4992c2be416a5d52ff
 EBUILD ripgrep-0.6.0-r1.ebuild 1244 SHA256 e41516304780a342e06e5d5e4f876d893abc8a90f57725f7a1e9d195978e8f39 SHA512 1cf77e3b841efa4e00b522e4bb8daa02d490393d17c4d34b4a64ea3ae58804d9020d8cd7e5f272501ee2296d17d483dc8cf45fc4b9ffbc10cc6fa598b77064ba WHIRLPOOL bb97f8605cd9c529fca7f9d384e9059f63a3af66790b193abb0b4a733224ac4eadba0852a5d4d6e67b0af83558dc2cb9d6a9f70324628892468d87fb05af169b
+EBUILD ripgrep-0.7.1.ebuild 1284 SHA256 c8018bf608e9bb3525ee446dfac4ee122b0e6d5495995dbdcd14d72d470de551 SHA512 d0484855abfbaeab6f1167d2ec284847944702356200d11daef215a2a5f7791c2d74918f56eec541772f42fc7d1315c2c71afd9e9bdcd2e3e2b011bb5487cdc9 WHIRLPOOL 6d1eb5f47609a0362978184ac4c070eb47fac16b8037542b4d18524de31756b064ee60a5f3dd98d03fb1b2450492c4e5c35b5b97f533c175465078a7c611dc2b
 MISC ChangeLog 1216 SHA256 3d967bc66c95e23bf577cfabe17dbc4783cdbbeb1f8a4aefdb1c1d1ad8626cac SHA512 8767c09bb2cfd50f755b98b4a86cca864bcd9d99b2516995456141f20a755bd69ac4c9d3c0e2383232fd00b621d9303cbc0d84e4f8a1d878a43cce8d236bb1a4 WHIRLPOOL ec18b3e66ce8c8ce7a004b6ee568d7be178fd5d5bbc547d76d9b4fb345c164176d293f18702c1037cbba41077018d73bc695a8cd50c64a6992077f8889bd3f34
 MISC metadata.xml 339 SHA256 2bf4aa2d3198a58a12a261b549da995a74f5e765b19ced77c275923dc17125cd SHA512 4501066b64cc47d58915b452027ea603d319b0eae3d9bcd45642f16bcca3e5bbba3fc998fe8501ce63c4717ccf5f404392b98b54d53b93c648e8c8de116141ef WHIRLPOOL 8324e194fb3165cee2231ad3b3198d92e21f59506777cd87ad6cabe93150b33d76c49b41f23feb611c430fc34ca42f5379936675004dd57251d9a63a4406087f
diff --git a/sys-apps/ripgrep/ripgrep-0.7.1.ebuild b/sys-apps/ripgrep/ripgrep-0.7.1.ebuild
new file mode 100644
index 000000000000..5aba68b30836
--- /dev/null
+++ b/sys-apps/ripgrep/ripgrep-0.7.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.3
+ansi_term-0.9.0
+atty-0.2.3
+bitflags-0.9.1
+bytecount-0.1.7
+cfg-if-0.1.2
+clap-2.26.2
+crossbeam-0.2.10
+encoding_rs-0.7.1
+env_logger-0.4.3
+fnv-1.0.5
+fs2-0.4.2
+kernel32-sys-0.2.2
+lazy_static-0.2.9
+libc-0.2.32
+log-0.3.8
+memchr-1.0.2
+memchr-2.0.0
+memmap-0.5.2
+num_cpus-1.7.0
+redox_syscall-0.1.31
+redox_termios-0.1.1
+regex-0.2.2
+regex-syntax-0.4.1
+same-file-1.0.0
+simd-0.1.1
+simd-0.2.0
+strsim-0.6.0
+term_size-0.3.0
+termion-1.5.1
+textwrap-0.8.0
+thread_local-0.3.4
+unicode-width-0.1.4
+unreachable-1.0.0
+utf8-ranges-1.0.0
+vec_map-0.8.0
+void-1.0.2
+walkdir-2.0.1
+winapi-0.2.8
+winapi-build-0.1.1
+"
+
+inherit cargo
+
+DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
+HOMEPAGE="https://github.com/BurntSushi/ripgrep"
+SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Unlicense )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/rust-1.17"
+
+src_test() {
+	cargo test || die "tests failed"
+}
+
+src_install() {
+	cargo_src_install
+
+	doman doc/rg.1
+	dodoc CHANGELOG.md README.md
+
+	insinto /usr/share/zsh/site-functions
+	doins complete/_rg
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 1e8c6b4305af..3c0bb9c1d7f2 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -4,6 +4,7 @@ AUX rng-tools-5-man-fill-watermark.patch 765 SHA256 f286419c4b3fbbb67c9099ba99c9
 AUX rng-tools-5-man-rng-device.patch 398 SHA256 c2553914e0551e1a349b8dfb65cf02d3db66cda9e6aba5046340a7a4f8340f17 SHA512 cd4c0cbcc32f6ace0f05c0dca82461c2a676a986c000850a422c3b509d79f22ddb98732749e63a1d9ec6d90db1745b7a163a590ada61f0ebcdde07b160647d3f WHIRLPOOL 375aca63b539d4c64c5ee4c85f289b2029db2d9b38d07f001135034b725323e74d70b94e49c86722521ac846c438a0bf818ff62581deea5c3b828c4f6ab73924
 AUX rng-tools-6-fix-noctty.patch 2188 SHA256 7a1594cd968621c579efaa77a6257cef038e3d7ff53a5c5a04cd508a16c221d0 SHA512 dff3d3ef81e847d378ca45531e4eaa81f4028b2b08adc17c68bba108cb4604f3bf13daa8b0e46ccb8aec2626ff8fd983038544508f3117828cecfbb282762116 WHIRLPOOL 2893eaa2c37a91770e465344a0051cec645d1d725f903f5a3297bb359f1e24d6a3d102aa3bb76c76c42f521695c5293d90c9022ebacd44f99efab41444c0aef9
 AUX rngd-confd-4.1 562 SHA256 cdbd39f7446f12a9b78e87e9f135cfd0f6f364c4fa4ade0c96084b85c32afc38 SHA512 45e0e9cbe0180162f659bf05c15ee99fb8c1b80274cd8744384ba7f791b1c9a46a63e81eea665b4f492c13b7d5cc1fdb6e524a49a25af77f3791f527b31f688b WHIRLPOOL 87634cea70a1c8ffa7598cc8b0d93c79578433cc21b58bb13bc9144502b9502e2c4f151bcf282ad4ccef44a931f1be5d1e87ff7b9b6d07cfa0a4c288b4172ec3
+AUX rngd-initd-6 481 SHA256 b90b636d497185f1b281672de7659845326f3ba02a58c27943c9e1f956f59bff SHA512 d15b462aa333bd0d64fa827626fa953d30cadce861dfc070598218104f072ffad26d88531d48bd22b5d627dc4fe8560a2808cc9e2e27310dcd74a6efad8a9baf WHIRLPOOL 397c4caf72da627698bde2a37243f1f831828e9d53613877280e4f9775e7caff60cae2013b10fcdfaec338baa50846cc98778c8a9e9bf272d858499129fac692
 AUX rngd-initd-r1-4.1 494 SHA256 3ad9a52d86e54eb755923242b1314584d5c66ab55221f6063a16c23477957a25 SHA512 8bf9a0bd25bcc9c1cc4eacdf875077208ba0899c626a55e57f055cc93b62e23a427e0622859c5b4a31c3aebe550b180777528b43942a3efb2e2c0b4243c3c9c6 WHIRLPOOL 33365650149523b34c6ae38614038ffafd1393a1ec5c967d0e9f6b89557b84f8ebb45c76455844dd73fd0d3cb1768de69c6b9857c4b48015ce351bd61803a4d6
 AUX rngd.service 133 SHA256 a05b1075157d39302106221594e1640479fae5dee4595de09442901a3a2d1648 SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2 WHIRLPOOL 093b0cd19a147abd9fc10f366c2c5a167d31b839d755cf2e56f6ae35409b6eb764db0651858d20dc95b71fe1d90b4ca33bde88053c80e40665613d132357366a
 AUX test-for-argp.patch 1245 SHA256 56824e3d80c931c3f907486cd8bf7b5a3bcc20fa507f452a9c63286443c06756 SHA512 0fe4b37eb3d2e93ff9ce17aed8cfcaa29c7f04289ba692d10fd0f8ef6d9b1e5f64a5734a508aea548f13fd00217972a68bcbeaf6977e763087ad20c19d456ed6 WHIRLPOOL c515fc9a8adf6bd49a4a622c05881e9ad22b514634c25d4f894be96d46f67a886bdcc092cafa57521e17d53bba1f1a3995dc673c24292b0aca276792e575073b
@@ -11,8 +12,8 @@ DIST rng-tools-5.tar.gz 122182 SHA256 60a102b6603bbcce2da341470cad42eeaa9564a16b
 DIST rng-tools-6.1.tar.gz 29814 SHA256 6144818cd9c93008f72f14e2d23d8f717640d3f45afcea666a32b12bedd4dc03 SHA512 388593ffeef0b5f2770532629418cdf1b6421092ae9c5fe0a68d198a5cbd4ff733fbca8091d497e09620c61a9e8b982298fb064edfd05a0fc36fa49c22eef5c9 WHIRLPOOL 08185ebcb796daa25d4db69a2a46d2336c8db109ecfdd342a016fac6601e5feda09e4365431ec46284883b82fe1bbf4789588dfb2060bb4960233ffd8c8b929e
 DIST rng-tools-6.tar.gz 26024 SHA256 6d9c3f72824d1ea15dd2a80bfcf71f6a73c8843c6344f7f774a97a4ca7641b4c SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4 WHIRLPOOL 4e53c626288219a7cb9c94cf29d22878df5ad3298ca5ebedea46978e519d9b5b0ad94f765e217563105258f4b02b72b0033e551a7d37939ced9ca5d92f0a1048
 EBUILD rng-tools-5-r2.ebuild 1098 SHA256 a6e9a693947fdcff18969be0ea392e8171cab38be6367c6c30cda84f24137613 SHA512 b4a612e14a4e556c57c182a5e709bf497eb11c2b9ca850ca1dd32f94c313157d3273b02715eef907b570d5aaaa06e9786ce33f9085f83423d61fb5af4bbe1b52 WHIRLPOOL d27df6207498055f147981ff7b0f63c30fc1e0d458c8ab550829de00396b7772a5c50fa2d7f057764a35092ec3e30c45a79d5a48dfd94568bdc8e15dfceab603
-EBUILD rng-tools-6.1.ebuild 1227 SHA256 7029dc428b47d4d5e93a7cac1ce59efb599588623d49add2535884dc0b1aa0ac SHA512 5298ade15fe3d3e04ecc68e4a2353eef2c30fa052c16bb4bdbf0156ddeb2fe3869f30ff9a3b6eacd7357824f53d3d4397cbe84f14fe0440036cbb6377671f287 WHIRLPOOL a47c9903cfaf9706d84424d76bf523aa452eebc96a139451abf870678ad1e5b67c5b9b05ea9d6e700c0dc438c9caea2511d4fd0ebae13b994895c83a1cbfa37c
-EBUILD rng-tools-6.ebuild 1114 SHA256 b783fda920969b210d53a6b8d84f519ded1bfa5be641b2390a93732a15205f91 SHA512 e218c2147b5879418647e85103d7c0bd3f5fe3fcfd42855d64441c1228eb3a2caf462b2b4e553125e88374db64c94894497645421606853968ccbb4ddb2d5f38 WHIRLPOOL fa5a977e4949cdb582902703e3212d8feea462f27c344a5782287b4da1eeda4f58bca03ecb68345da9b5b94a34c62377867a257f60c1ed504601229b453e72d0
+EBUILD rng-tools-6-r1.ebuild 1109 SHA256 797c3f8a7637eb07eec07d935ebc3f87bb2ea6a17f8487851e326d99d58f2652 SHA512 dd9cecec2238e7fd8d1ea332e11f10dcd0fc8e4aa545fda6a4f3eae0807b273529ef40b5ebc76426b1feb5d9253ef37f2626d93a8a7e5380290d9944b0143e20 WHIRLPOOL c36db1975e5d39fb2037449194070012f9f0cf015f92737fe5589948c99db314ac5885d1ae7bd577b75aab68b0ee21e2a18d2de9dde294b357478ad44007a312
+EBUILD rng-tools-6.1-r1.ebuild 1222 SHA256 6700d0cd6ad213d75d275ea0a617fd48899894ee7eabfc6c0a2aa218b1c54dcc SHA512 c7f14868478183f9617bdada2c5b92bdbf87daf81c453cfc6cada445dd9ea437beaac8ddedd50452a6b802a63955eae3eb8516b14f680149ee69d6ddea9af3b3 WHIRLPOOL bed7b9cd14d2824766849698ebcfc9feaf85f5642a533fb4303d0355ecfb00e094381da88cae94b5f42c413c58dcbe1510d264c46051910a3bbb3c51d913d715
 MISC ChangeLog 8067 SHA256 a232bfd53ae71bba942c0065e502fa2087a6af4b14bc5664cb3177c9e0f4ae40 SHA512 b9143f297136c37d810755bb899b4353008d2982eff54d29de73f62a9790506468ba0034206877f894fe681effed2921bf9e8af54e771f46ef60d288955aecc5 WHIRLPOOL 5c62a5780931f8d50387a08076410aa815d6c7637260eec4f69b17a1ea6f51278d3d15786cefda3213527f47816f9dfaa2e296ed240bb6a543dcb70c0ecd2383
 MISC ChangeLog-2015 10419 SHA256 429b14666b303f77b8081e33cb4d2bc4da29c06af72895b37cf17ae3658381ce SHA512 9ef68cdfe956b4918d101ec0cfe3a69a9cf748b52326976edf234b58a48eb8c48fdb32b011fa8fe5e3d0cde8576b212b24d5b4003f87a4e4b327dc2cc0ff59ea WHIRLPOOL 525eb6a7d62820bda06d801c2721e2c38a9ca8af5d26d961c57a9d62c26a8dfec1ab08573f4237f3e6f4ee576de03d6d63a5514424011e773541f29c2b8e3915
 MISC metadata.xml 576 SHA256 d9a641541810a9e63447fa616d1e4d25163ad6b8937d35f962b9fc9add16613e SHA512 306d4b47230443cf82abd2c7e934b8fab73e695305a8981d3c011cbc2bbb193a87ae7a9c265a56c0454f4c0103f136211a4aabc2e35e030107b5ab2ac457c6e3 WHIRLPOOL ed537ec604e553367ad2354a787660d30c8a7ef116e94baeffe59bdf60d07199fd93994fced93a62ab08ee817a2befcc12f84f2b00bd304f9ad586f4aa9c9369
diff --git a/sys-apps/rng-tools/files/rngd-initd-6 b/sys-apps/rng-tools/files/rngd-initd-6
new file mode 100644
index 000000000000..c3b48bf22099
--- /dev/null
+++ b/sys-apps/rng-tools/files/rngd-initd-6
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	after urandom
+	provide entropy
+}
+
+command=/usr/sbin/rngd
+pidfile="/var/run/${SVCNAME}.pid"
+command_args="--pid-file ${pidfile} --background --random-step ${STEP:-64} ${NO_TPM:+-x 1} \
+	${NO_DRNG:+-x 2} --fill-watermark ${WATERMARK} ${DEVICE:+--rng-device ${DEVICE}}"
+start_stop_daemon_args="--wait 1000"
+retry="SIGKILL/5000"
diff --git a/sys-apps/rng-tools/rng-tools-6.ebuild b/sys-apps/rng-tools/rng-tools-6-r1.ebuild
index 3a559236e0c7..0dcc7e1fd35b 100644
--- a/sys-apps/rng-tools/rng-tools-6.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6-r1.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd
+	newinitd "${FILESDIR}"/rngd-initd-6 rngd
 	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
 	systemd_dounit "${FILESDIR}"/rngd.service
 }
diff --git a/sys-apps/rng-tools/rng-tools-6.1.ebuild b/sys-apps/rng-tools/rng-tools-6.1-r1.ebuild
index 2b37de32bff9..2c149789b757 100644
--- a/sys-apps/rng-tools/rng-tools-6.1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.1-r1.ebuild
@@ -54,7 +54,7 @@ src_configure() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd
+	newinitd "${FILESDIR}"/rngd-initd-6 rngd
 	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
 	systemd_dounit "${FILESDIR}"/rngd.service
 }
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 6f6d9cb45ae9..49fe68a04c09 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -6,7 +6,7 @@ AUX sandbox-2.11-symlinkat-renameat.patch 3418 SHA256 74036803fd8cc07e903abdc220
 DIST sandbox-2.10.tar.xz 417068 SHA256 019d6a2646b3a5f9b6fc3fcb6ff99332901017eb845442bec8573b9901506fa6 SHA512 178b3b8fcb54e6ff67df1c8101866739b49e4d31a66717c21ef502dd2ab609fca70f1a0c662b913e207bfc1ba6994cefdcf5c92ff32add9dd98bd9707f301305 WHIRLPOOL 5d6cffa7317cafeba02af75de9ae914d4365a62b54d3dfcc14cb272e621f2f76a60a945591ccb57dd59d6750152087cb2f21e43ded3ec181d6b42df173147192
 DIST sandbox-2.12.tar.xz 424252 SHA256 265a490a8c528237c55ad26dfd7f62336fa5727c82358fc9cfbaa2e52c47fc50 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9 WHIRLPOOL 4f3089746a11616c60057165f387122b74e8d2f30a2d77db296405a2b6f401fc625645bca73092436162f5d98a88bfb2a3b42909b0eceb9a59ab810d803441b0
 EBUILD sandbox-2.10-r3.ebuild 2168 SHA256 a76055435a8059b56c6079481c021cbaa9f42efc321d4e67069c6397e23c35d5 SHA512 13daa106179f4203616524cda931e3c79ecc510c09a0991f8165eedbb2e612569f648881183679941a75ee280757fcb3e6176cb61a0c2f2096573ac7a3110dfc WHIRLPOOL 12709e670cb48f463352ff3f6756f3f5193f21ac138b39d27171d97fe11950170c8c664d48c6e25e6187476d932652275f8656d596607d81c4b01f479fb21912
-EBUILD sandbox-2.10-r4.ebuild 2244 SHA256 2f7f43a1b62720340285ea1c6610411d5e3eaff35fdb0e6058ab30c345e8926c SHA512 82badd56d8cf1c4a7c5672bdd051bd787193f3fddf6caf92cb2b3c4a9a327cb424ba7b67ceb3f5992844d1e1ba84806dcf6983bbc0caadb0b789c89543875f34 WHIRLPOOL 1ca230c586d3675f720a7f3e1caab927108950e735354214d43741c4b1211756f8fc1746edd66a24ee6071b87543caa699643415ed1417e0a6be65da36de12c8
+EBUILD sandbox-2.10-r4.ebuild 2240 SHA256 eea6dedaad00005af50c4cbc54f3c18561d71ed8039c713bf7df9c5c30c516f2 SHA512 d93cb2854c8d2bbd8b4c2b385650327c0b0e546f1991e24c05a98f210d121edbcb7a9756323f8b9eb283420ac3e85ab7532326c49f9193017c46bbb61f9bf34e WHIRLPOOL 77fada6f8e58671b624c55c6aa30e0ae06eb81d64e3e6403c0fd1a5745cb5c7d255161f859c97a9085e0ba3cfdb128be4b0f4a44d85789ee2dc6d203eadf92c7
 EBUILD sandbox-2.12.ebuild 1950 SHA256 51a702c9e6232003be3c10345e1be943b057211eeb4f6f07fd27b9edef866b22 SHA512 f0d3e1707225171c280902e612a5109ed78703d4bcd658a827c61e48ffbbb71c3ed86d2a2ae00289d07e46b264b10fbf48a962cf8e35c4709046c9263a473da0 WHIRLPOOL 968d03aafb5a859dfd0a2720dab7db20ce4e6d055adde0dd744021047e979464a2fb48a262dadb1e99ce799cf07204086dffce32764d173b731c7280df7023aa
 MISC ChangeLog 6831 SHA256 eb110ced56d7e173fa1fabd434fdec445259453c13ccb48a554947f9b5b359b6 SHA512 879732fd45e678aa041c18148f44db585bf077ed6ad237725dffd16be0cf4abc37ecf1aa683864b89a547e835927e6a05f0b6c24aec3f034d9a8d671d39cf3bf WHIRLPOOL a9786489a8235518c08350ad190563b8a782de07221cdf44a54bced7f7b4df51867a7a2ee6f0bfa015c514cac07f75d36bdb6d17e3942ab4ec1a5b1a55cf4093
 MISC ChangeLog-2015 25325 SHA256 9e1e3512cb2dceb07f7f480661aa00528d23e41765893244a6dae27bf039f0f6 SHA512 6c714a72b2d1848381543031478dca397fd8150a8ac82febdf4017a339ebdc0dfca8adac95aef4682311e2ada9742aaf9b86d49c9bb6768ca9c802af00744a53 WHIRLPOOL ebffa03ba18522039481fcdf1bfccc2ab5936e0fd4e0d081ae56eca0c784a8e250850855635e7a20025cb38e99e8f7dd80e448bf9e1ba70e6b8295f9aa502312
diff --git a/sys-apps/sandbox/sandbox-2.10-r4.ebuild b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
index 174ab5a3403d..8562d18076cc 100644
--- a/sys-apps/sandbox/sandbox-2.10-r4.ebuild
+++ b/sys-apps/sandbox/sandbox-2.10-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 53172a8a8606..116976977f0b 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -12,15 +12,17 @@ AUX 234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch 821 SHA2
 AUX 234-uucp-group.patch 536 SHA256 b3ef6c7d40d86dfc801ff7839876dcffb299d0b6d5b11fbf081adfe51ee0d8e6 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912 WHIRLPOOL dc9bbd2879af33a8ff27e7a13052c51b4ddc1b336bbd58ed0b5e28bb63229acbb355b6316cc58555b12eee8ed2d73ba25ee21286e8e0f429d6760e70dc6de5a4
 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 SHA256 a448c39a3d172c03edf4ac303b02251d3c09a9d21c2512ae475c1a92905b97af SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376 WHIRLPOOL bd3aeda654fffd90e2b49757f5bdc483284d034a78f134f3c2b1870f11f35d9604d6105b159ff9cd879bb82c57536e363d8bf8cbba1878514cfc894ca009a47f
 AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 SHA256 0211aba9502c23e51e154fccdad7712d729caea3869f969313b9dbf08474641a SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78 WHIRLPOOL 1f3c1fcc5a161644785aae482d97e2007150d47beae4372fdb30805f291b33e21d2e8e16ea6bc4cc9cf8c0fbd3d8ddfff2504af1e568c519b2398411eca9458e
+AUX CVE-2017-15908.patch 1371 SHA256 b0651db043115e8251a4efccad369f917d4e8ffcfdd011baa93f99ebea0e03ea SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9 WHIRLPOOL f19731b7211060ffa3154bdd227840683bcac2ae5fcd6b18b1639b92a5212a0ed6c69b29b0938ea3b9c90b3c8dcaa31db4045cef6f1bf5dbc60c9ae1eacffcc8
+AUX CVE-2017-9217.patch 863 SHA256 d56929985fcabfbebc15799b38a6e9e5b298b2de0950bd75e1b49f5ac68655fb SHA512 d323c6e79f60bb7abdb4583f021041532d1bf1514500d09d07b0a429b6cfb76787f590de04446ae84d51747b0023042d575aeb07da29e4e8c0ad13656a1877a5 WHIRLPOOL e2c86993539d40c8ab83c34c7fe0678be9a87741e66b7b5b8225a60e289386c5379ff42c8c1ab71258bb5b79d74a05c846cbf8875f8b511589983207b1791376
 AUX generator-path.patch 1046 SHA256 aeb236e19bedc17737ada8953fed61272423b36fd186ffeaff0f14addc488549 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3 WHIRLPOOL cbc5eb71fe2f61c95adefca78f29f1acd7ccb7bf9ccb7872326b2c7ed2704f4c856dd7456759c3320496995bef4f94d390b0d5f6d9b2585cb99c4a27faabdf2a
 AUX nsswitch.conf 698 SHA256 56aada9338fad1b105bc5755a85761cab57dc9aba180545be2df0b993b581eb3 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a WHIRLPOOL 160d83a8a136c44d8d4d1fa9c8c321ff792746b6482c29662c93bcab720540591ea95c4c6a68252f024b449360fcdcebf4c78ee0e33be268e8801bede1286200
 DIST systemd-233-man.tar.gz 31386 SHA256 825e62eb82c4e23997061fc8f56f7ec9bb1e6ac1111d279c76c926cc2bfbf1dc SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40 WHIRLPOOL ff1f36beff377f675047271df38503e8b71d615ea73c5fdfebf465edaf1fe29b4f89e3194d65cdf84eec9b7c3156de597627fdaffa4b86018520aaa127a7a159
 DIST systemd-233.tar.gz 4660737 SHA256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e WHIRLPOOL ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176
-DIST systemd-234.tar.gz 4800186 SHA256 da3e69d10aa1c983d33833372ad4929037b411ac421fb085c8cee79ae1d80b6a SHA512 762336a7d96c6583cf71cad62efce95a0ed93cd0a0d7251f128d10dba8200c0c8df0e5a7d168179ababa5b221295a231e73b7e7ea2697cb3fb5c1b33538efa68 WHIRLPOOL 9ff9f25ce82514db969a427eee51c0483b2bcaaa611f93c1fc17c356ea25eee712217708c54101ecaafd835cd8ac988b16e8ad411b48541a32442b9a0d148f07
 DIST systemd-235.tar.gz 6586406 SHA256 25811f96f5a027bf2a4c9383495cf5b623e385d84da31e473cf375932b3e9c52 SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993 WHIRLPOOL 05e50b31f7b3b1cd756abd1580dddae0e114953857564133784fc43b9ecd0e203ee534aaf76531ca7af5c43b03b9b73c6cbbbb1caf5afb17502555cc52fe06cd
 EBUILD systemd-233-r4.ebuild 13626 SHA256 0dc86e550d767d12e945975267f4a6ff6c4a862f049253e966c9f2db699310f6 SHA512 3527bc62210aba9c50f663d8023440b73ae6185f1a90e6e31a48b6dcc13ac2dc0b312c433cbe74e942cb50ad894d4dd4212d81caf50d17971c9f965cae9535a0 WHIRLPOOL 8b4f723d82d0101b30838c5c21c89bdc1f23d18291ea3e5fd97f28357e8e35d6365725129cd4edda7d7b14f18b5e2cfe370971522a2d822f686fd61d1d08ab5d
-EBUILD systemd-234-r4.ebuild 13476 SHA256 56dcb5358bb37180167e69894032d20aa7121f2d1bf9f80d0eec780eb748956b SHA512 4276434de0bb01ac06a78b001017c91b2bf104ac0559666fcc28cad2b2d8545c8279db89afa4d1bf31d4106337f8662b3ee1c65cf75f3507081a47a52c1a126c WHIRLPOOL d8953a3b122b206f0b10f737543685ca3c429f6f6456f555fbe78972bab5c96e69b968df4cfe3a9df189a519e4ce384b92916575794e7e5ccc725acc58d970d9
-EBUILD systemd-235.ebuild 13364 SHA256 bd8997ff489058e0b60b3cef8df5a2e53e151f81bdd6eea2eda084fcf8f98301 SHA512 ebb5ffd0f473d18c5d3862fb7b944ba67028cd0d93d38ac4182074f6ae700ef02dfdeccddbbb90d69baad124f7b1870c81eb27bcb864aa7dd86cbf4787ad979b WHIRLPOOL 632cd55136ec811ffb01acaedfa01e3b0b1333f89e6a4230bcdd40e752d8a3685ee70821cc19da7403e6dde2cfa0938b3c846f8039fc8f627a178d921771dba5
+EBUILD systemd-233-r5.ebuild 13669 SHA256 6ecc5fa2a1f6b7864113e59972a3bf150eb836ea43d06c5b4f84fd1cb6eae325 SHA512 722307b55c7621f119dee2e483bb7271d5a460945bd938adee6e679345a3549eaf060c96493b54e7a5bcb94a2821ce31949cfaeb5b1a43aeef36b673ecc39d7c WHIRLPOOL f1e5aabea3ff94eb2ee4576b5d34fb411c8bda9f01293b9579215b0e51a8103c93149befd25543c68d20855f0eff9804da7074449ec0db12b93d59b6cff4625f
+EBUILD systemd-233-r6.ebuild 13703 SHA256 4a175589f8db63b05d622433d2024b1d4ae01b5ea01590f78570e60471b5a02b SHA512 9da2170e9443109ed79437c8d58ae2487ae93b7a3928d8d813391a2b520c700f563f2651a8a209359e4524f94a159454b412d468e3f1c22da82bbc72eeda5151 WHIRLPOOL 2df3ccd94ac4b913939223e7d96d197881557a7b4f634bd0592dc329e262d60e05067c23917aa371b0789e28922e48f723ed78e4037e737a4e6670a940c83ff5
+EBUILD systemd-235-r1.ebuild 13401 SHA256 bde936448268da8906d49ae5d0032cc496c38c32830414059a715af514c4c537 SHA512 240341672cc795a7bce946e5d44f9cc30f7099d6954b352fa13e142d185dd1fdf1bd665eb510355c6317c81d29e491cd7d41b5d7b28c8860f092767ea81b4ce1 WHIRLPOOL 6c707048afd34b9d7f51823661a833e312c0067bc38b6de9ed2e5afc51c3cc7134017adfa25ddc6de9aa368da7ec375238f33ef9c7b11cc0c05b37218402e635
 EBUILD systemd-9999.ebuild 13196 SHA256 0e18985198be157839accf26bfc358a784ad2f3b9b596fd8636f461bb2320fb1 SHA512 90b0283fb318638e572edcd03d04ba4545ffef50ea877c97277b43db8ddb95b9784e834072a51aa3954c8088c4a946390f5f3b2d651fbc6c959c74058b606dc1 WHIRLPOOL f790ba07e2bdb3f99f905a5dfd027891b8337e661e0ca5f88cf414c165f3e7924f9ec584e8b6baf2d8bcf053b49583d0bcac2d19e7acdf0d175fb5a681c4bdea
 MISC ChangeLog 20141 SHA256 b01beaf5824021996a73fbd2fb1749b390e13c13eb309d336934fc758a73fd57 SHA512 041097f0655b5464023c1365d6e2813def67ffcdf6d2ae28c48497280bf3ed1ba49fca24ef661cb30de4af97ab1cee53575b4f51cb985fcc700535f3d4432481 WHIRLPOOL 854111ca90d15661843afd4c026028949b7d6f8916e750a2537f22993225aef0ef4076c0ff3d818609a9b166ca926ba152e26d2e3d30510a646a5bcb6b5c04fb
 MISC ChangeLog-2015 69416 SHA256 10adffab2046e41857e68c45b411fa011fe6206cf8d4cab42db78562cecf6bd8 SHA512 bc8f0ad8ebb6a31db74be738e97d9cd1183c0cc394615d90bf15633a315778557170bb93ce7e88b63bb93237c1a748f6f3d0ab89539f014d319f30ba9a0021fc WHIRLPOOL 7052513a02364742e297fea4c595da7045b5b6a517a397314992b7cf87f40d9ffa16383c6e413d466fdfa3173e9e8769257cf46116e4808fad7ae5c0f7990296
diff --git a/sys-apps/systemd/files/CVE-2017-15908.patch b/sys-apps/systemd/files/CVE-2017-15908.patch
new file mode 100644
index 000000000000..08e5e37514ce
--- /dev/null
+++ b/sys-apps/systemd/files/CVE-2017-15908.patch
@@ -0,0 +1,39 @@
+From 9f939335a07085aa9a9663efd1dca06ef6405d62 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 25 Oct 2017 11:19:19 +0200
+Subject: [PATCH] resolved: fix loop on packets with pseudo dns types
+
+Reported by Karim Hossen & Thomas Imbert from Sogeti ESEC R&D.
+
+https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1725351
+---
+ src/resolve/resolved-dns-packet.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
+index e2f227bfc..35f4d0689 100644
+--- a/src/resolve/resolved-dns-packet.c
++++ b/src/resolve/resolved-dns-packet.c
+@@ -1514,7 +1514,7 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta
+ 
+                 found = true;
+ 
+-                while (bitmask) {
++                for (; bitmask; bit++, bitmask >>= 1)
+                         if (bitmap[i] & bitmask) {
+                                 uint16_t n;
+ 
+@@ -1528,10 +1528,6 @@ static int dns_packet_read_type_window(DnsPacket *p, Bitmap **types, size_t *sta
+                                 if (r < 0)
+                                         return r;
+                         }
+-
+-                        bit++;
+-                        bitmask >>= 1;
+-                }
+         }
+ 
+         if (!found)
+-- 
+2.15.0.rc2
+
diff --git a/sys-apps/systemd/files/CVE-2017-9217.patch b/sys-apps/systemd/files/CVE-2017-9217.patch
new file mode 100644
index 000000000000..68d0f36d4913
--- /dev/null
+++ b/sys-apps/systemd/files/CVE-2017-9217.patch
@@ -0,0 +1,28 @@
+From a924f43f30f9c4acaf70618dd2a055f8b0f166be Mon Sep 17 00:00:00 2001
+From: Evgeny Vereshchagin <evvers@ya.ru>
+Date: Wed, 24 May 2017 08:56:48 +0300
+Subject: [PATCH] resolved: bugfix of null pointer p->question dereferencing
+ (#6020)
+
+See https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1621396
+---
+ src/resolve/resolved-dns-packet.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
+index 652970284..240ee448f 100644
+--- a/src/resolve/resolved-dns-packet.c
++++ b/src/resolve/resolved-dns-packet.c
+@@ -2269,6 +2269,9 @@ int dns_packet_is_reply_for(DnsPacket *p, const DnsResourceKey *key) {
+         if (r < 0)
+                 return r;
+ 
++        if (!p->question)
++                return 0;
++
+         if (p->question->n_keys != 1)
+                 return 0;
+ 
+-- 
+2.15.0.rc2
+
diff --git a/sys-apps/systemd/systemd-234-r4.ebuild b/sys-apps/systemd/systemd-233-r5.ebuild
index a4c94bd3a96c..74c4b9e56fee 100644
--- a/sys-apps/systemd/systemd-234-r4.ebuild
+++ b/sys-apps/systemd/systemd-233-r5.ebuild
@@ -7,21 +7,22 @@ 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}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		!doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~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
+inherit autotools bash-completion-r1 linux-info multilib-minimal 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 policykit
+IUSE="acl apparmor audit build cryptsetup curl doc elfutils +gcrypt gnuefi http
+	idn importd +kmod +lz4 lzma nat pam policykit
 	qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
@@ -42,10 +43,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
 		>=net-libs/libmicrohttpd-0.9.33:0=
 		ssl? ( >=net-libs/gnutls-3.1.4:0= )
 	)
-	idn? (
-		libidn2? ( net-dns/libidn2 )
-		!libidn2? ( net-dns/libidn )
-	)
+	idn? ( net-dns/libidn:0= )
 	importd? (
 		app-arch/bzip2:0=
 		sys-libs/zlib:0=
@@ -100,9 +98,13 @@ DEPEND="${COMMON_DEPEND}
 	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}]')
+	doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') )
 "
 
+python_check_deps() {
+	has_version --host-root "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
@@ -147,10 +149,16 @@ src_unpack() {
 }
 
 src_prepare() {
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
 	local PATCHES=(
-		"${FILESDIR}"/234-0002-cryptsetup-fix-infinite-timeout-6486.patch
-		"${FILESDIR}"/234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch
-		"${FILESDIR}"/234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch
+		"${FILESDIR}/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch"
+		"${FILESDIR}/233-CVE-2017-9445.patch"
+		"${FILESDIR}/233-format-warnings.patch"
+		"${FILESDIR}/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch"
+		"${FILESDIR}/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch"
+		"${FILESDIR}/CVE-2017-15908.patch"
 	)
 
 	if ! use vanilla; then
@@ -158,159 +166,189 @@ src_prepare() {
 			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
 			"${FILESDIR}/228-noclean-tmp.patch"
 			"${FILESDIR}/233-systemd-user-pam.patch"
-			"${FILESDIR}/234-uucp-group.patch"
-			"${FILESDIR}/generator-path.patch"
 		)
 	fi
 
 	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
 
 	default
+
+	eautoreconf
 }
 
 src_configure() {
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+	# Fix systems broken by bug #509454.
+	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+
 	# Prevent conflicts with i686 cross toolchain, bug 559726
 	tc-export AR CC NM OBJCOPY RANLIB
 
-	python_setup
+	use doc && 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)"
+	local myeconfargs=(
+		# disable -flto since it is an optimization flag
+		# and makes distcc less effective
+		cc_cv_CFLAGS__flto=no
+		# disable -fuse-ld=gold since Gentoo supports explicit linker
+		# choice and forcing gold is undesired, #539998
+		# ld.gold may collide with user's LDFLAGS, #545168
+		# ld.gold breaks sparc, #573874
+		cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
+
+		# Workaround for gcc-4.7, bug 554454.
+		cc_cv_CFLAGS__Werror_shadow=no
+
+		# Workaround for bug 516346
+		--enable-dependency-tracking
+
+		--disable-maintainer-mode
+		--localstatedir=/var
+		--with-pamlibdir=$(getpam_mod_dir)
 		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
+		--with-bashcompletiondir="$(get_bashcompdir)"
 		# make sure we get /bin:/sbin in $PATH
-		-Dsplit-usr=true
-		-Drootprefix="${EPREFIX}${ROOTPREFIX}"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
+		--enable-split-usr
+		# For testing.
+		--with-rootprefix="${ROOTPREFIX-/usr}"
+		--with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
 		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
+		--enable-efi
+		--enable-ima
+
 		# 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="/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)
-		-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)
+		$(multilib_native_use_enable acl)
+		$(multilib_native_use_enable apparmor)
+		$(multilib_native_use_enable audit)
+		$(multilib_native_use_enable cryptsetup libcryptsetup)
+		$(multilib_native_use_enable curl libcurl)
+		$(multilib_native_use_enable elfutils)
+		$(use_enable gcrypt)
+		$(multilib_native_use_enable gnuefi)
+		--with-efi-libdir="/usr/$(get_libdir)"
+		$(multilib_native_use_enable http microhttpd)
+		$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
+		$(multilib_native_use_enable idn libidn)
+		$(multilib_native_use_enable importd)
+		$(multilib_native_use_enable importd bzip2)
+		$(multilib_native_use_enable importd zlib)
+		$(multilib_native_use_enable kmod)
+		$(use_enable lz4)
+		$(use_enable lzma xz)
+		$(multilib_native_use_enable nat libiptc)
+		$(use_enable pam)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_enable qrcode qrencode)
+		$(multilib_native_use_enable seccomp)
+		$(multilib_native_use_enable selinux)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test dbus)
+		$(multilib_native_use_enable xkb xkbcommon)
+		$(multilib_native_use_with doc python)
+
 		# hardcode a few paths to spare some deps
-		-Dpath-kill=/bin/kill
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		KILL=/bin/kill
+		QUOTAON=/usr/sbin/quotaon
+		QUOTACHECK=/usr/sbin/quotacheck
+
+		# TODO: we may need to restrict this to gcc
+		EFI_CC="$(tc-getCC)"
+
+		# dbus paths
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
+		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
+
+		--with-ntp-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)
+		--without-kill-user-processes
 	)
 
-	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
+	# Work around bug 463846.
+	tc-export CC
 
-	meson_src_configure "${myconf[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
-	eninja
+	local mymakeopts=(
+		udevlibexecdir="${MY_UDEVDIR}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}"
+	else
+		emake built-sources
+		local targets=(
+			'$(rootlib_LTLIBRARIES)'
+			'$(lib_LTLIBRARIES)'
+			'$(pamlib_LTLIBRARIES)'
+			'$(pkgconfiglib_DATA)'
+		)
+		echo "gentoo: ${targets[*]}" | emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+	fi
 }
 
 multilib_src_test() {
-	eninja test
+	multilib_is_native_abi || return 0
+	default
 }
 
 multilib_src_install() {
-	DESTDIR="${D}" eninja install
+	local mymakeopts=(
+		# automake fails with parallel libtool relinking
+		# https://bugs.gentoo.org/show_bug.cgi?id=491398
+		-j1
+
+		udevlibexecdir="${MY_UDEVDIR}"
+		dist_udevhwdb_DATA=
+		DESTDIR="${D}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}" install
+	else
+		mymakeopts+=(
+			install-rootlibLTLIBRARIES
+			install-libLTLIBRARIES
+			install-pamlibLTLIBRARIES
+			install-pkgconfiglibDATA
+			install-includeHEADERS
+			install-pkgincludeHEADERS
+		)
+
+		emake "${mymakeopts[@]}"
+	fi
 }
 
 multilib_src_install_all() {
-	# meson doesn't know about docdir
-	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
-
+	prune_libtool_files --modules
 	einstalldocs
 	dodoc "${FILESDIR}"/nsswitch.conf
 
+	if [[ ${PV} != 9999 ]]; then
+		use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7
+	fi
+
 	if use sysv-utils; then
 		for app in halt poweroff reboot runlevel shutdown telinit; do
-			dosym "${EPREFIX}${ROOTPREFIX%/}/bin/systemctl" /sbin/${app}
+			dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
 		done
-		dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd" /sbin/init
+		dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
 	else
 		# we just keep sysvinit tools, so no need for the mans
-		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+		rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
 			|| die
-		rm "${ED%/}"/usr/share/man/man1/init.1 || die
+		rm "${D}"/usr/share/man/man1/init.1 || die
 	fi
 
 	# Preserve empty dirs in /etc & /var, bug #437008
@@ -323,19 +361,11 @@ multilib_src_install_all() {
 
 	# If we install these symlinks, there is no way for the sysadmin to remove them
 	# permanently.
-	rm "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -r "${ED%/}"/etc/systemd/system/network-online.target.wants || die
-	rm -r "${ED%/}"/etc/systemd/system/sockets.target.wants || die
-	rm -r "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
-
-	rm -r "${ED%/}${ROOTPREFIX%/}/lib/udev/hwdb.d" || die
-
-	if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then
-		# Avoid breaking boot/reboot
-		dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd
-		dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown
-	fi
+	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
+	rm -r "${D}"/etc/systemd/system/sockets.target.wants || die
+	rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
 }
 
 migrate_locale() {
@@ -382,19 +412,6 @@ migrate_locale() {
 	fi
 }
 
-pkg_preinst() {
-	# If /lib/systemd and /usr/lib/systemd are the same directory, remove the
-	# symlinks we created in src_install.
-	if [[ $(realpath "${EROOT%/}${ROOTPREFIX}/lib/systemd") == $(realpath "${EROOT%/}/usr/lib/systemd") ]]; then
-		if [[ -L ${ED%/}/usr/lib/systemd/systemd ]]; then
-			rm "${ED%/}/usr/lib/systemd/systemd" || die
-		fi
-		if [[ -L ${ED%/}/usr/lib/systemd/systemd-shutdown ]]; then
-			rm "${ED%/}/usr/lib/systemd/systemd-shutdown" || die
-		fi
-	fi
-}
-
 pkg_postinst() {
 	newusergroup() {
 		enewgroup "$1"
@@ -402,7 +419,6 @@ pkg_postinst() {
 	}
 
 	enewgroup input
-	enewgroup kvm 78
 	enewgroup systemd-journal
 	newusergroup systemd-bus-proxy
 	newusergroup systemd-coredump
@@ -418,7 +434,7 @@ pkg_postinst() {
 	# 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%/}"
+		udevadm hwdb --update --root="${ROOT%/}"
 	fi
 
 	udev_reload || FAIL=1
@@ -435,11 +451,6 @@ pkg_postinst() {
 		eerror "systemd again."
 		eerror
 	fi
-
-	if [[ -e "${EROOT%/}"/usr/lib/systemd/system-generators ]]; then
-		ewarn "Please rebuild any packages which install system generators."
-		ewarn "  emerge --oneshot --usepkg=n /usr/lib/systemd/system-generators"
-	fi
 }
 
 pkg_prerm() {
diff --git a/sys-apps/systemd/systemd-233-r6.ebuild b/sys-apps/systemd/systemd-233-r6.ebuild
new file mode 100644
index 000000000000..be302349a160
--- /dev/null
+++ b/sys-apps/systemd/systemd-233-r6.ebuild
@@ -0,0 +1,462 @@
+# Copyright 1999-2017 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}.tar.gz -> ${P}.tar.gz
+		!doc? ( https://dev.gentoo.org/~floppym/dist/${P}-man.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ppc ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit autotools bash-completion-r1 linux-info multilib-minimal 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 doc elfutils +gcrypt gnuefi http
+	idn importd +kmod +lz4 lzma nat pam policykit
+	qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.27.1: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? ( net-dns/libidn:0= )
+	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}] )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	sysv-utils? (
+		!sys-apps/systemd-sysv-utils
+		!sys-apps/sysvinit )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	!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
+	doc? ( $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') )
+"
+
+python_check_deps() {
+	has_version --host-root "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 ~!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"
+
+		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() {
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	local PATCHES=(
+		"${FILESDIR}/233-0001-Avoid-strict-DM-interface-version-dependencies-5519.patch"
+		"${FILESDIR}/233-CVE-2017-9445.patch"
+		"${FILESDIR}/233-format-warnings.patch"
+		"${FILESDIR}/233-0002-core-load-fragment-refuse-units-with-errors-in-RootD.patch"
+		"${FILESDIR}/233-0003-core-load-fragment-refuse-units-with-errors-in-certa.patch"
+		"${FILESDIR}/CVE-2017-15908.patch"
+		"${FILESDIR}/CVE-2017-9217.patch"
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/228-noclean-tmp.patch"
+			"${FILESDIR}/233-systemd-user-pam.patch"
+		)
+	fi
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+	# Fix systems broken by bug #509454.
+	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	use doc && python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		# disable -flto since it is an optimization flag
+		# and makes distcc less effective
+		cc_cv_CFLAGS__flto=no
+		# disable -fuse-ld=gold since Gentoo supports explicit linker
+		# choice and forcing gold is undesired, #539998
+		# ld.gold may collide with user's LDFLAGS, #545168
+		# ld.gold breaks sparc, #573874
+		cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
+
+		# Workaround for gcc-4.7, bug 554454.
+		cc_cv_CFLAGS__Werror_shadow=no
+
+		# Workaround for bug 516346
+		--enable-dependency-tracking
+
+		--disable-maintainer-mode
+		--localstatedir=/var
+		--with-pamlibdir=$(getpam_mod_dir)
+		# avoid bash-completion dep
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in $PATH
+		--enable-split-usr
+		# For testing.
+		--with-rootprefix="${ROOTPREFIX-/usr}"
+		--with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
+		# no deps
+		--enable-efi
+		--enable-ima
+
+		# Optional components/dependencies
+		$(multilib_native_use_enable acl)
+		$(multilib_native_use_enable apparmor)
+		$(multilib_native_use_enable audit)
+		$(multilib_native_use_enable cryptsetup libcryptsetup)
+		$(multilib_native_use_enable curl libcurl)
+		$(multilib_native_use_enable elfutils)
+		$(use_enable gcrypt)
+		$(multilib_native_use_enable gnuefi)
+		--with-efi-libdir="/usr/$(get_libdir)"
+		$(multilib_native_use_enable http microhttpd)
+		$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
+		$(multilib_native_use_enable idn libidn)
+		$(multilib_native_use_enable importd)
+		$(multilib_native_use_enable importd bzip2)
+		$(multilib_native_use_enable importd zlib)
+		$(multilib_native_use_enable kmod)
+		$(use_enable lz4)
+		$(use_enable lzma xz)
+		$(multilib_native_use_enable nat libiptc)
+		$(use_enable pam)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_enable qrcode qrencode)
+		$(multilib_native_use_enable seccomp)
+		$(multilib_native_use_enable selinux)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test dbus)
+		$(multilib_native_use_enable xkb xkbcommon)
+		$(multilib_native_use_with doc python)
+
+		# hardcode a few paths to spare some deps
+		KILL=/bin/kill
+		QUOTAON=/usr/sbin/quotaon
+		QUOTACHECK=/usr/sbin/quotacheck
+
+		# TODO: we may need to restrict this to gcc
+		EFI_CC="$(tc-getCC)"
+
+		# dbus paths
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
+		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
+
+		--with-ntp-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.
+		--without-kill-user-processes
+	)
+
+	# Work around bug 463846.
+	tc-export CC
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	local mymakeopts=(
+		udevlibexecdir="${MY_UDEVDIR}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}"
+	else
+		emake built-sources
+		local targets=(
+			'$(rootlib_LTLIBRARIES)'
+			'$(lib_LTLIBRARIES)'
+			'$(pamlib_LTLIBRARIES)'
+			'$(pkgconfiglib_DATA)'
+		)
+		echo "gentoo: ${targets[*]}" | emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || return 0
+	default
+}
+
+multilib_src_install() {
+	local mymakeopts=(
+		# automake fails with parallel libtool relinking
+		# https://bugs.gentoo.org/show_bug.cgi?id=491398
+		-j1
+
+		udevlibexecdir="${MY_UDEVDIR}"
+		dist_udevhwdb_DATA=
+		DESTDIR="${D}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}" install
+	else
+		mymakeopts+=(
+			install-rootlibLTLIBRARIES
+			install-libLTLIBRARIES
+			install-pamlibLTLIBRARIES
+			install-pkgconfiglibDATA
+			install-includeHEADERS
+			install-pkgincludeHEADERS
+		)
+
+		emake "${mymakeopts[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if [[ ${PV} != 9999 ]]; then
+		use doc || doman "${WORKDIR}"/man/systemd.{directives,index}.7
+	fi
+
+	if use sysv-utils; then
+		for app in halt poweroff reboot runlevel shutdown telinit; do
+			dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
+		done
+		dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
+	else
+		# we just keep sysvinit tools, so no need for the mans
+		rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+			|| die
+		rm "${D}"/usr/share/man/man1/init.1 || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
+		/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 "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
+	rm -r "${D}"/etc/systemd/system/sockets.target.wants || die
+	rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
+}
+
+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 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="${ROOT%/}"
+	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-235.ebuild b/sys-apps/systemd/systemd-235-r1.ebuild
index 6fe34a0809b9..2bb192a49e2d 100644
--- a/sys-apps/systemd/systemd-235.ebuild
+++ b/sys-apps/systemd/systemd-235-r1.ebuild
@@ -150,6 +150,7 @@ src_prepare() {
 	local PATCHES=(
 		"${FILESDIR}"/235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch
 		"${FILESDIR}"/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
+		"${FILESDIR}/CVE-2017-15908.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index a2a389418096..67b8e161ffed 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,16 +4,13 @@ DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e
 DIST util-linux-2.29.2.tar.xz 4277668 SHA256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 SHA512 0a87e6758531f74276f3de7607ef545f324b9b36b444aa5d163140c5fb0f4f7602655d7ec9939f92550dcb320d922cd69521a2183199d463795e67d3c27fce79 WHIRLPOOL 1f45711e593c76c6e208a28892ed2bf2622adb5fa1334867e13c6bf775a8903c2f1ebf18c3238d96fe139c5b60d61abf496251cf594a339209ce044f2bb8c17a
 DIST util-linux-2.30.1.tar.xz 4459284 SHA256 1be4363a91ac428c9e43fc04dc6d2c66a19ec1e36f1105bd4b481540be13b841 SHA512 bcf1807198660c133c380e13d6ba5dcdb7470c47bcaeea03ccc5a78a0d834e3df3d13ae5ffc35fd7f8fff7ba062629d4b1f5cde78452b846c9315c51c9e108f5 WHIRLPOOL 19e78768cf2fd2d73bb7b45cb826101b4653bf49c9838bda10f05e508f06b117bb846ce517726465384bfe94ba24981f261d7b5091458242fb0c14d593d4b29e
 DIST util-linux-2.30.2.tar.xz 4442624 SHA256 7b5be5489e9b5b7177832836467aba1c87bf0e9bcbcb5a6f35d76cd4782589dc SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d WHIRLPOOL 771d2af788241db337be1e11be499d42b67ec86fa43da2eb161914194d1f002e95d9080793117a4b58a57691df8677ac59e9356ae2da7076ca48188c185a1843
-DIST util-linux-2.31-rc1.tar.xz 4459892 SHA256 25771b2feb19bed4bf50597c597b2fed4f7580db135fb63a9421ceeeee123436 SHA512 027815da2ee4d342ff1578d5bba71ea63dc1cd6816ad753c644b5422b693e9dfe35ab158101ac9d7f8b7dbee1d2cf97e4930b24ed247eba7be1312e5292c3f9f WHIRLPOOL 6309c11499ee310b754780a31229385ee1fe87f31a84969b490d93d32d294f3a9c096c909abb363f06378e87bea3015bc7150620493989838ae47a4140912b18
-DIST util-linux-2.31-rc2.tar.xz 4472160 SHA256 adf02ca514d20fc31e608f158bf11de27875fb22db9a6702ed60c36dd052b275 SHA512 d5b882dbe566e5ad4cbf3ea328bc777ae643c271c4db4a119f270222ef50d89bdb2244524093df794caf0ec9a6b5f559c618f0e36f2c1e2ce30e24c60e876a97 WHIRLPOOL f790512822ca30c4b1086ed735e234506375eef57721cf9692b460440fb09fc38a9088379a3d74be34d0d46231bd6ef9155aa05ea6338e54f22585418871c36a
-DIST util-linux-2.31_rc2-losetup_types.patch 1472 SHA256 00f04271f725b7d373ffe3db1b591bd8fbaf740fd5641673c47c0e2678720b5f SHA512 353b90e87948fda6aa357470260d6945f0993e89589a1380293b481a839bfe8a4618a55ec92e4c1962e25fe5f74de400cbf2c12371cc0a9298711182d953b51a WHIRLPOOL ff5afe50e51427ab181451c4a823101ceed0d237bcd4c8cc5e30ef365456d3aa1f102d0845e5d84e06f59206edd5ed21f3dabb61d50455f2ca32d8d2d7294342
+DIST util-linux-2.31.tar.xz 4503892 SHA256 f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5 WHIRLPOOL 1667045919e29feafdea35f1c66b47f546b7b111347ad7cfcab94519bfba9119a492fa3475e2fef5d5c3383ff19daf9d4bbad1cca24ca1ea4be138e40e161611
 EBUILD util-linux-2.28.2.ebuild 5508 SHA256 dcbe429af2023147f49d14efc6079f77b640fd5098a50131bf4773404ac43c53 SHA512 7ce97d8d0325171d047508c3081fa3adadc79837f0821a4c5d63683e52353186328501d09bb0b884f3715ac443757a557c1c205f79c451a93f20c65035fe9516 WHIRLPOOL ce00e83c6e4a432f195d1997823bfb26b995cdf2b6c9b77f5b55b25ab5b1a3c9294e3985274c65b77b44bf1ded47ff7e7ec7b38d8f0dbf8e8811b0bdad741c96
 EBUILD util-linux-2.29.2-r1.ebuild 6022 SHA256 6579bc49e505806dc5eb5511c204cbebcf1a72837544afd10ee0b2d187eb5cd0 SHA512 ede52a77a6cba1f06f6ae18ae64d2f836e6f5babc2d407409878867e7ef46614ffbd6f8267ceffb51d374d1ab87955d5ebfb3e92863078845aea06488dee6fe5 WHIRLPOOL f658c636808f16da62d95eb8805ad32a9b1c891256a9ec15a75ee81e1ed2db0a1a97e354a33571dbd8edcfb044eb828106a955f883015a173aa9d2ea3ebc8c63
 EBUILD util-linux-2.30.1.ebuild 6073 SHA256 1c3a5ed5a02034c10b341cc69d20727399f13db6fde950487d57133b79cc0acc SHA512 f6f247c6119337f79e3ab559de54b35ff8c892633323606e687c957c8b2db540487c9b8b5b37554ae59e29946ad0cdac563cbc2ca7a99cb723c69398aac52366 WHIRLPOOL 86feef252078e51fb3cf1961c513998ae67c709355b19069f86255ec9d27155bc9b93334b5bbca28dfcbf596ba6e3d8e66a161134234ef14a30febc4ff90391b
 EBUILD util-linux-2.30.2.ebuild 6073 SHA256 1c3a5ed5a02034c10b341cc69d20727399f13db6fde950487d57133b79cc0acc SHA512 f6f247c6119337f79e3ab559de54b35ff8c892633323606e687c957c8b2db540487c9b8b5b37554ae59e29946ad0cdac563cbc2ca7a99cb723c69398aac52366 WHIRLPOOL 86feef252078e51fb3cf1961c513998ae67c709355b19069f86255ec9d27155bc9b93334b5bbca28dfcbf596ba6e3d8e66a161134234ef14a30febc4ff90391b
-EBUILD util-linux-2.31_rc1.ebuild 6113 SHA256 75fd7e729162fb71616429f72762f9987e010c52369f676ae66912b8e7f70c25 SHA512 1dc5b46a29f3784843d9731de2723e8c0c6cf1d80bc80ee58c814384c44f8af7fc41e44d18cb6c902cf675170433a578218a071ccad89223160f5c76506cd885 WHIRLPOOL 6a17f9ae8531cc8ff3342113bc553896131d3c925399720e8f61320d2d8b57505d35c1a81003104024407387b10480758c9df5b541beb56c26306965ed310501
-EBUILD util-linux-2.31_rc2.ebuild 6310 SHA256 6d2803635c2f3fb5c7ab44f6b2e938d2b4208ac8cb2402c5c42c62e3a74de7ad SHA512 85b96206e7b76bce5fd83a591697867e8dfdcc44dc61c751ea5151fce74521db3bf865ce52f56e085afa93b3a5f1429d82d7fb2caf257e1c84b3d19f522de9ec WHIRLPOOL 10fb9991cac2aaa7f2d9d56c51b115c62c53016728c8190583bc3794611e915136b94491ef0cc6df1707952cdc677b5b3b9f7e40bbeb724856c89cf6f5748a7a
-EBUILD util-linux-9999.ebuild 6113 SHA256 75fd7e729162fb71616429f72762f9987e010c52369f676ae66912b8e7f70c25 SHA512 1dc5b46a29f3784843d9731de2723e8c0c6cf1d80bc80ee58c814384c44f8af7fc41e44d18cb6c902cf675170433a578218a071ccad89223160f5c76506cd885 WHIRLPOOL 6a17f9ae8531cc8ff3342113bc553896131d3c925399720e8f61320d2d8b57505d35c1a81003104024407387b10480758c9df5b541beb56c26306965ed310501
+EBUILD util-linux-2.31.ebuild 6095 SHA256 edcafd9c1c11ee19d546d0710f965009a48291f76f6f88e35eee8e2f27f995e0 SHA512 92133a47e65461d7fbe99479061ca1f49de6c647937ae2b08c35f504992a96d9e011976a13fda03c004d0834e80caa36f8e3d5c50438fc6dc35b53fbd3443f9b WHIRLPOOL cb4cbfa45498aad32228e904f436eadaf3a46ec29a45c183a5692c18a0ab8348dd00cfdebce5aa466d9c45a0bf229ec2f2bdf263f08e5b64f67a26712f3a6a9b
+EBUILD util-linux-9999.ebuild 6095 SHA256 edcafd9c1c11ee19d546d0710f965009a48291f76f6f88e35eee8e2f27f995e0 SHA512 92133a47e65461d7fbe99479061ca1f49de6c647937ae2b08c35f504992a96d9e011976a13fda03c004d0834e80caa36f8e3d5c50438fc6dc35b53fbd3443f9b WHIRLPOOL cb4cbfa45498aad32228e904f436eadaf3a46ec29a45c183a5692c18a0ab8348dd00cfdebce5aa466d9c45a0bf229ec2f2bdf263f08e5b64f67a26712f3a6a9b
 MISC ChangeLog 12932 SHA256 d8b36c6a1492c24f0ff0c47ed2ba5a83168ff61b7e608da5d6d2f7b1ded9dca5 SHA512 3af940e4798129722304739796183a7f185e2bb46653e68722ec99caced6b8bc4a985e54511fba0feae333036928fc8daf4a74c081f589acf9ff23f5efd4afa6 WHIRLPOOL 51a5399b50e743a84499d5c0363103beaa140effc16d37eeaaa3f86172037533a737d0124c5c2bdb95177fabdfc79ae110dc42e88e886cd2d103559b0964a2d9
 MISC ChangeLog-2015 79222 SHA256 8f46bfb6fa3cf29ae15a63d9d482a64044196af6ccd6605972d93da5f9c78b37 SHA512 794cfd5f96e6da3247693c3adef7df1ce451c51e790d0b8f43ba221918053130bf39d4a8a3a8ef642ace608d979b604ba2c55ff348490b0dace4e6d9e53119b5 WHIRLPOOL af58c38f736bfe76bf98a72982165d72fb8523a4d5082d601179a1f93fa405e58c15854b899eb8614618bda566d2f682c7221a5c45984fadb4b555dbe7deb30b
 MISC metadata.xml 947 SHA256 07970446e1e05479e7a582190e17aaab8190197b6771c779d89d177a8036b619 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c WHIRLPOOL d0d33c91a68b44b8d4207b7acaeb0d180591944cacd5fe8fc918b161f24c107d5c69a17831e620eeab7504364f725a427272ac242041ed9da289f3ed3196ac6f
diff --git a/sys-apps/util-linux/util-linux-2.31_rc1.ebuild b/sys-apps/util-linux/util-linux-2.31.ebuild
index b23afd5b6532..81b95f587ee9 100644
--- a/sys-apps/util-linux/util-linux-2.31_rc1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.31.ebuild
@@ -56,7 +56,7 @@ RDEPEND+="
 	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.3-r2"
+	!<app-shells/bash-completion-2.7-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -107,7 +107,6 @@ multilib_src_configure() {
 		--disable-chfn-chsh
 		--disable-login
 		--disable-nologin
-		--disable-reset
 		--disable-su
 		--docdir='${datarootdir}'/doc/${PF}
 		--enable-agetty
diff --git a/sys-apps/util-linux/util-linux-2.31_rc2.ebuild b/sys-apps/util-linux/util-linux-2.31_rc2.ebuild
deleted file mode 100644
index 493ecb1a0edf..000000000000
--- a/sys-apps/util-linux/util-linux-2.31_rc2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit ltprune toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-single-r1 multilib-minimal systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-
-	SRC_URI+=" https://github.com/karelzak/util-linux/commit/c4e60bc0807b04ab104594abc83301481d5d5995.patch -> ${PN}-2.31_rc2-losetup_types.patch"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-	virtual/os-headers"
-RDEPEND+="
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	!net-wireless/rfkill
-	!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!sys-block/eject
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.3-r2"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${DISTDIR}/${P}-losetup_types.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-	# Undo bad ncurses handling by upstream. #601530
-	sed -i -E \
-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
-		configure || die
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
-	local myeconfargs=(
-		--disable-chfn-chsh
-		--disable-login
-		--disable-nologin
-		--disable-reset
-		--disable-su
-		--docdir='${datarootdir}'/doc/${PF}
-		--enable-agetty
-		--enable-bash-completion
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-		--enable-line
-		--enable-partx
-		--enable-raw
-		--enable-rename
-		--enable-rfkill
-		--enable-schedutils
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
-		$(multilib_native_use_enable caps setpriv)
-		$(multilib_native_use_enable cramfs)
-		$(multilib_native_use_enable fdformat)
-		$(multilib_native_use_enable nls)
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_enable tty-helpers mesg)
-		$(multilib_native_use_enable tty-helpers wall)
-		$(multilib_native_use_enable tty-helpers write)
-		$(multilib_native_use_with python)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable unicode widechar)
-		$(use_enable kill)
-		$(use_enable static-libs static)
-		$(use_with selinux)
-		$(usex ncurses '' '--without-tinfo')
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		# build libraries only
-		emake -f Makefile -f - mylibs \
-			<<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
-			install-pkgconfigDATA install-uuidincHEADERS \
-			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
-			install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
-	fi
-
-	if multilib_is_native_abi; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid mount smartcols uuid
-
-		use python && python_optimize
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	prune_libtool_files
-
-	if use pam; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index b23afd5b6532..81b95f587ee9 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -56,7 +56,7 @@ RDEPEND+="
 	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.3-r2"
+	!<app-shells/bash-completion-2.7-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -107,7 +107,6 @@ multilib_src_configure() {
 		--disable-chfn-chsh
 		--disable-login
 		--disable-nologin
-		--disable-reset
 		--disable-su
 		--docdir='${datarootdir}'/doc/${PF}
 		--enable-agetty