gentoo resync : 02.03.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-03-02 15:59:12 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-03-02 15:59:12 +0000
commit: 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (patch)
tree: 8d58c1f4b049da677b33209b072f2b3057268fe0 /sys-apps
parent: 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (diff)
63 files changed, 912 insertions, 1228 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 939361b753d7..17540893ce30 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 8d857c4a4551..c272fdbe0ece 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -22,6 +22,6 @@ DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e345
 EBUILD busybox-1.25.1.ebuild 8772 BLAKE2B 09a9f7fcf016901ae5d79fcca962ff13dec578bd2815f0196a9458d066b6ff1ecdaaa21a457ad0dc3fce6d8b4a5d8bc3cb66e79824067d7dc973e8163bc99c39 SHA512 0c1bfc1298ec19e03d3c1efcd974332f3f960937c69124d2f9399640f468b4b823b8196dfdc2eb955af8257c3bca538dc92ca6d71b1cf1e5838fa5f12fd87cd0
 EBUILD busybox-1.26.2-r1.ebuild 9109 BLAKE2B 310e0233de69bb18a6789f127dbcc97ef648f420e8119fe97eb99ddfa8efd124d7ec71536a0282ab63975241e5f8618969b38dc98c6736dac44e63027c96bed9 SHA512 c8acdb039cca5528efcb5c2861b4eaed3f7611909be5b368a72f35c86ed4d0bf386b5f88f8b1ee083663aa73da1812854e613d43b303150c9d2013bb151566e4
 EBUILD busybox-1.27.2.ebuild 9109 BLAKE2B 76fa055773bedb7511974c2e695bb23ddc48ec3233e169ef90d4ab789ddbd086fd7ebc9ffab8ed7b255382d1291618d554a56891bd76ec4c8b7a47dd1275812e SHA512 e2ea36c7a4f48c3766363f7f447e4ab5f31b88541db7c64207e0c3fc0d5410ba309d112d9ca6734adf631bd4bbf815049c79713de77a6aa9ad558f53a688fbb1
-EBUILD busybox-1.28.0.ebuild 9296 BLAKE2B a3573a05fee71b2ca7d0b3bec2a23bfee7fcc43b04a8e7b564636c199a7e959119443584f906e946369946eeba5d740ca86e1818630b32bb72cbc061ac8b0d58 SHA512 21af9ef16e28d7f102f0618a7ffbb92d6ddc0e3fe190d2ebd8daf78f619cff854706a3e2dbacefd2532a941a7ac14be444920dc7cefd42ca905b40ca2e067382
+EBUILD busybox-1.28.0.ebuild 9295 BLAKE2B d36d276411281f3c1d82ce4269b087e171b22cd368456eaa4ec61f2a1fd33b731d51ff2eab47447aef0b522b2e8192c735b14357aa643726f914a8a65c4e7135 SHA512 c6798ba93e3b68ce21659cbf2fc0df91dc8bdf8c69a52416844d431bedaa5cb2b50b8f1b76da3e28d4cd18b1e25dc6fe08cae5e1434fde18c97a42b7c1dc08bc
 EBUILD busybox-9999.ebuild 9303 BLAKE2B 3f794930b716599ab002d5f5bc08021ac316024385fc5386ced878229572d0d2c39afa497308a90943d56a1896656be57fa79e00d0a3a3a9bdd54f747f0ccc8b SHA512 b252fa2fa58a345d89cf63f706072c58a5fdcc4377b0d2a5e3c07de21d00751928649100cf8309fa66c9bf07423d129236d69882173c85beef4c90603a8226a2
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild
index a47a7dc9661f..278f9ae18567 100644
--- a/sys-apps/busybox/busybox-1.28.0.ebuild
+++ b/sys-apps/busybox/busybox-1.28.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 3a777265087d..2a64930eaee1 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,10 +3,10 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7b1728e6a7658d606550923d2bd60a6a6916c0fcd88205ecdc4a25ab58309bdcabaeb32c2f6c5e4ef8686af02c SHA512 726f97d0a2016f4f0625ba332e93e2d33bb16857cd35cb6c79da0f44fff297df948c3df62c31ffbec34713a7b85b3ff5b65f31517fe3511ddbd3bf18bd4748ed
 DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7 SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
-DIST dbus-1.12.2.tar.gz 2063143 BLAKE2B 0618381befb7af7d4e0c2f1d9e32ee7ee70f17905783e414ab47acd7dcf5993329e430869a6cd9de33cc5919c880fed73eb1246d3ac2929c3d50d331efc92ca7 SHA512 523698ae543a4f1d9142898351ed38827882a3ca583ca7934676af48d09219ea562ae77d734cd142e5ca0d5e74f9e8d0fdeb1019592ca3524e2b690c6283f7cd
 DIST dbus-1.12.4.tar.gz 2067402 BLAKE2B 621a9223c9d20a76415935d421a506100bbdf4852dc3c2a4f221750f739757a4945d60cb4a1f9032602f2993b868b502e7eb1835c8d2764666902c01daa01ba5 SHA512 ca9f7c76f705aca0f71366627fadf8b5c68992d5bcb6fae1746a8c14e9dc93c4492e80c63b6fd522b8753ec264df046e33482a5ce20be82adf181a6dd69b36a5
+DIST dbus-1.12.6.tar.gz 2068612 BLAKE2B 3dbb05e899e511a636816393ebc28548cc2ecaabaa0c04737189a0812791da195708ee455d7b0439fc81eea113f4bd8fc64b1b9b93e9dac84664b9c51049e75c SHA512 a0599329190e90d5982215138a19031028ed825f54c76c1ae13b54c2e4ddf14c949eacaac05c667db11bca13fb4bbdf8855fc9e15641cece55be1efde00c41ab
 EBUILD dbus-1.10.18.ebuild 7511 BLAKE2B 723c6e71e73b4ed5c3b2a664da5b00fd37efca9103e96e19ca0e0a58482e3e60ddc3325c1ad50b2cf58862ea2f1f1ea9944c3a7093a729f3a712b3e4e42255a3 SHA512 1623a683105edaf9f495b18ca770ff788e528302a50235fe584b9eab2b91cd655a5ed0eb3b3e60ca810382a7637a7bdfa736b8b1129a86e56e4040bb16a4d81b
 EBUILD dbus-1.10.24.ebuild 7393 BLAKE2B 35ef55bb33062bebbd00fb69a2399e5a170708b66aca3d99a6977d217f2c35afa80bad1afe31f9d2482ca496ed2ce14c9a5a291e3f32fa63a7acbec718e3e6bc SHA512 09b0a0f9bc3729c6833b068211ca76332a65bf47a28a50d3bfdaa386adfab41004c4cff81cf8cc677a7a72521cffca03092d858819d9fc7acb633b5cedcc463c
-EBUILD dbus-1.12.2.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 EBUILD dbus-1.12.4.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
+EBUILD dbus-1.12.6.ebuild 7441 BLAKE2B 6bb7f000fa2ba4431b092867838e96da1f336a66552e702c2482dd9bc9881af13260353a2e681a956a9621e7c2e278f2a0ad6b548b0fd22bab5e303eab6e2cea SHA512 c7492f3c4826709bf5459d396a9d940c47e05163b469a65899aa69cbee036970c0563598cc46c246a4b1ca63e59b58f8f66bf277ab3ff46067ab6646efb6b888
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.2.ebuild b/sys-apps/dbus/dbus-1.12.6.ebuild
index d53c2a80ec6f..d53c2a80ec6f 100644
--- a/sys-apps/dbus/dbus-1.12.2.ebuild
+++ b/sys-apps/dbus/dbus-1.12.6.ebuild
diff --git a/sys-apps/duc/Manifest b/sys-apps/duc/Manifest
index 0a3ca3dbfccd..3fef843eea77 100644
--- a/sys-apps/duc/Manifest
+++ b/sys-apps/duc/Manifest
@@ -1,4 +1,7 @@
+AUX duc-1.4.1-tinfo.patch 751 BLAKE2B 2928f2a12dc8755c5b43ce8255958ceac4b85dadd716d989bf1472b31ef9ee32e799fb83f4c69b617ef80d7479c070fcf784fc9b6efcdf234547167cca4d2119 SHA512 d0bfa984cad2691106038392297ae3e9ccb0dbf83a45456f50918c88d93bbddd33f9c5359367e6348d161b639e03f6e5339a44842d7fd5edb0306e21df846b4f
 DIST duc-1.4.1.tar.gz 325689 BLAKE2B 1e23204b60d1dd67eb094c1152c5056d0abc1fc6037a3811df5be18cbc4d61ccd2077b175f8f75559f368e2633476990e0c453cf88cff03c8aa3fc1796a42440 SHA512 88aa8f51651adf019c3a91c83eca308b822ff7569d6f6d30cf91338740ec9b0bd21c4f5dd783cf46c8d67aad6b03ad908cd7ed472e5db6feaf66ee02582d9f88
+DIST duc-1.4.3.tar.gz 363507 BLAKE2B 8d4364d48c247d7a83c8c5dd900b1c36ec78c68fa7d090e178a0e3209583e433c2e459d192f65ac350038c7e0d5a57df2c5c0d649cc9f554d7af74ad960c8db5 SHA512 5eb3e862e7003838e012dd1faab507a9b58607b77bd2af70a662005b6e4008ac44d1fb2e17b99da8e42ddfadb1cede2a468144ace7a72c12d0825fc7df4d18cd
 EBUILD duc-1.4.1-r1.ebuild 1749 BLAKE2B 17bba3460f3e11451315cde56b1428e53c1a43f405f47037edff35bdf8fa6af3018112aae6318fdbd78a07ec99c0a250cee01b936459bd60e42183413e0a9a35 SHA512 341c0fc7bdc58c3326e96ed1f924aedeba77d67ddbc7c6d7ff227bfb01bc8eb0594c2ee169a674e4ffb64eba17d422949d8e70a5b37a1053b89e9d32dd424808
-EBUILD duc-9999.ebuild 1749 BLAKE2B 17bba3460f3e11451315cde56b1428e53c1a43f405f47037edff35bdf8fa6af3018112aae6318fdbd78a07ec99c0a250cee01b936459bd60e42183413e0a9a35 SHA512 341c0fc7bdc58c3326e96ed1f924aedeba77d67ddbc7c6d7ff227bfb01bc8eb0594c2ee169a674e4ffb64eba17d422949d8e70a5b37a1053b89e9d32dd424808
+EBUILD duc-1.4.3.ebuild 1800 BLAKE2B 9a4d39aa899f8e604de6d317e3a194c0a5eecd95044589168d6ce972625689b520c2d64bfda9e29bf030090daf51395b30ee753c06a0d61e5d08c5c3906adf25 SHA512 44a8972a14c6efed140ff0e5d72191f1ce76dd80c649946abe8ef8007df0f1a9119de7ed45041bd26509c9d3a0ee57842990c07ae966be579c32f3dfeea8732b
+EBUILD duc-9999.ebuild 1800 BLAKE2B 9a4d39aa899f8e604de6d317e3a194c0a5eecd95044589168d6ce972625689b520c2d64bfda9e29bf030090daf51395b30ee753c06a0d61e5d08c5c3906adf25 SHA512 44a8972a14c6efed140ff0e5d72191f1ce76dd80c649946abe8ef8007df0f1a9119de7ed45041bd26509c9d3a0ee57842990c07ae966be579c32f3dfeea8732b
 MISC metadata.xml 899 BLAKE2B 390fd22c6c48feb24433dee58f2f7b96ea75ea41fd77e35222e68f8cb7cb5bafb694af00074a98c0a18a50359ce635fb814de4d12798c5349a1ad8cc99880eea SHA512 44329c606478e5335f5566e9a2b8660e4135c77e25c769916fa0a10129a097eec1820e154bcf6edc785c579fbb8273e21d8b36d114d077f642f9cffd4df56c6f
diff --git a/sys-apps/duc/duc-1.4.3.ebuild b/sys-apps/duc/duc-1.4.3.ebuild
new file mode 100644
index 000000000000..55fa313bfe3d
--- /dev/null
+++ b/sys-apps/duc/duc-1.4.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/zevv/duc.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/zevv/${PN}/releases/download/${PV}/${P}.tar.gz"
+fi
+
+DESCRIPTION="A library and suite of tools for inspecting disk usage"
+HOMEPAGE="https://github.com/zevv/duc"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="cairo gui -leveldb ncurses -sqlite +tokyocabinet X"
+
+REQUIRED_USE="
+	^^ ( tokyocabinet leveldb sqlite )
+	X? ( cairo gui )
+"
+
+DEPEND="
+	cairo? ( x11-libs/cairo x11-libs/pango )
+	gui? (
+		X? (
+			x11-libs/cairo[X]
+			x11-libs/libX11
+			x11-libs/pango[X]
+		)
+		!X? ( >=media-libs/glfw-3.0 )
+	)
+	leveldb? ( dev-libs/leveldb )
+	ncurses? ( sys-libs/ncurses:= )
+	sqlite? ( dev-db/sqlite:3 )
+	tokyocabinet? ( dev-db/tokyocabinet )
+"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1-tinfo.patch
+)
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	sed -i -e "/ldconfig/d" -e "/install-exec-hook/d" Makefile.am || die
+
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=( $(use_enable ncurses ui) )
+
+	if use tokyocabinet; then
+		myconf+=( --with-db-backend=tokyocabinet )
+	elif	use leveldb; then
+		myconf+=( --with-db-backend=leveldb )
+	else
+		myconf+=( --with-db-backend=sqlite3 )
+	fi
+
+	# Necessary logic for cairo
+	if use gui && use X; then
+		# X backend GUI
+		myconf+=( --enable-x11 --disable-opengl --enable-cairo )
+	elif use gui; then
+		# OpenGL backend GUI
+		myconf+=( --disable-x11 --enable-opengl $(use_enable cairo) )
+	else
+		# No GUI
+		myconf+=( $(use_enable cairo) --disable-x11 --disable-opengl )
+	fi
+
+	econf ${myconf[@]}
+}
diff --git a/sys-apps/duc/duc-9999.ebuild b/sys-apps/duc/duc-9999.ebuild
index b063305e8b89..55fa313bfe3d 100644
--- a/sys-apps/duc/duc-9999.ebuild
+++ b/sys-apps/duc/duc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit autotools
 
@@ -42,6 +42,9 @@ DEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 "
 RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1-tinfo.patch
+)
 
 src_unpack() {
 	if [[ "${PV}" == "9999" ]]; then
diff --git a/sys-apps/duc/files/duc-1.4.1-tinfo.patch b/sys-apps/duc/files/duc-1.4.1-tinfo.patch
new file mode 100644
index 000000000000..74f0529d6741
--- /dev/null
+++ b/sys-apps/duc/files/duc-1.4.1-tinfo.patch
@@ -0,0 +1,23 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,8 +138,8 @@
+ if test "${enable_ui}" = "yes"; then
+         AC_DEFINE([ENABLE_UI], [1], [Enable ui])
+ 
+-	AC_CHECK_LIB([ncursesw], [tputs],, [
+-		AC_CHECK_LIB([ncurses], [tputs],, [
++	AC_CHECK_LIB([ncursesw], [touchwin],, [
++		AC_CHECK_LIB([ncurses], [touchwin],, [
+ 			AC_MSG_ERROR([
+ The ncurses library was not found, which is needed for ui support. Either install
+ the ncurses development libraries, or compile without ui support (--disable-ui)
+@@ -148,6 +148,9 @@
+ 	])
+ fi
+ 
++AC_SEARCH_LIBS([tputs], [tinfo],, [
++	AC_MSG_ERROR([No library was found providing tputs])
++])
+ 
+ if test "${enable_x11}" = "yes"; then
+         test "${enable_cairo}" != "yes" && AC_MSG_ERROR([cairo must be enabled for x11])
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index d15b4f58aa80..6ec19c027551 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,3 +1,5 @@
 DIST fakechroot_2.17.2.orig.tar.gz 463307 BLAKE2B c13e0bb649dc4ecafed1d1f7aa487659631bfae94b2fdc91aee8b23910954e46a74ba6f3d50107a9a282b9e7cb21bf4edb372257adaf157f43c4055738ddce49 SHA512 bcdcf8e77aae46b567acddb80e6817a118c7ef250ba7b6962982e60a6a5e3b8c1eeef950dc33335f31466c3f53ab6b7260bc64a1da9c4b156a44d811ef8cccd0
+DIST fakechroot_2.19.orig.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
 EBUILD fakechroot-2.17.2.ebuild 588 BLAKE2B 1aec510a554865e5db274a48268fa533ff59e9ad0a5f09832472cf744bb5acea273fe4fa034a2bc8848f63913c2fee9c00873dcbf289d05b04a817ad9f12ec2e SHA512 c0ce568bcc8c33cc217f39caa1f23a0d0ffca332da3bf8f453a01ac2ba649b2ad772b96b1dfa2f164a880781585905be51a71f95f1027525cda5ba8be5c01902
+EBUILD fakechroot-2.19.ebuild 583 BLAKE2B 1da49d7a61540dc4460f7b6b1c449870648c09eb78f3921e6c30bd0113c7ce1fe0505ae4b2c307f9b56b319d578ba25672a7d46f13d4d533aa25e6bd61fb0f60 SHA512 a7ece4464ec8f3f3584bcd172f078647c7b614d174bf0e81dcb9cbd3bba0ba1caa8eb1354267e12655cf8cda265a79909e43d00481074ac03c4523e42e422c4a
 MISC metadata.xml 345 BLAKE2B 3471b0985dec02f4065149b788a8edb64d5a90741719c02bb4c87dffc27ee6f61f4d231df83e716382f36d2220e7cb7a4797cd3960db955761ee4852c76b80e6 SHA512 940ab52cf3ad5ef13f24f093fcc41e4c39dc9cd484eaf0dc0bb0d29306cbab474044cc72898ddaf49604a63032d7a089e2f308c9ea94e79c6a16c27970aba08c
diff --git a/sys-apps/fakechroot/fakechroot-2.19.ebuild b/sys-apps/fakechroot/fakechroot-2.19.ebuild
new file mode 100644
index 000000000000..4a89ac3de3c6
--- /dev/null
+++ b/sys-apps/fakechroot/fakechroot-2.19.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Provide a faked chroot environment without requiring root privileges"
+HOMEPAGE="http://fakechroot.alioth.debian.org/"
+SRC_URI="mirror://debian/pool/main/f/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc NEWS.md README.md
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index d0f6533b7a00..5dfd68e2d3bc 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -6,9 +6,11 @@ DIST gawk-4.0.2.tar.xz 1626808 BLAKE2B f66ebc3650c7288d46ed4548f07c83cbd591873a5
 DIST gawk-4.1.3.tar.xz 2311268 BLAKE2B 956872ef3c8bdf27ccf9c3f7f158f161f42bb8607af7f966e843e24cb4e4e89380cd05a3169157cc822ea5ce8d849993b952795ecd0ecf14213f0bdd689d1b16 SHA512 8b9470a1bba397353f10e4e652e8589a637a49e8235fb39ca7681ae662fd27cd140c193d0634179c800f99e19b0e49aef55dfa6612f9695ba80760a36936a1c3
 DIST gawk-4.1.4.tar.xz 2367832 BLAKE2B 67004e2867e4c4f43aac7142a52c83642d8bb3b0a5451293418bc15e575a8ed1d97c0a975e084bf46ffd1c27dc70e48de492cd2e007773622ef14886b9269ee1 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097
 DIST gawk-4.2.0.tar.xz 2948108 BLAKE2B 6e46b70480184edd3a70bcea2b4e4448b4dfbac317be6e1a6d9225bc6c0b42abe49fe9380231cb3fc87efd449d2c5232ac7099b4c4472c3815a52200ef0013a3 SHA512 3076b2f42e43fff0ce63dcaa3fb749ce421473d0abc3e1e2d9dd375207d3e35c98d5bf91c3179f49156e8a4977424c16bb2d3d662846ad487153729dd4cfeb4c
+DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
 EBUILD gawk-3.1.8.ebuild 1782 BLAKE2B a960ff46bb378cadf1b7125fff29ac6045e403d1052025621fe565145f792a43a79cc4ac540faf217670f69ffc8a0b9b5af4b7a231de624c3c0d6832737c68ac SHA512 747c9f7f32af7469b7359bbaa7e329a84c78aaf0c8c122a0003bb3e32dad47d1470edd30f215504e0305027b40a3e72e8000ee3889e7cbc4c427ebd12bae884c
 EBUILD gawk-4.0.2.ebuild 2076 BLAKE2B 73d9ce392a42ee14556b70be84ed284108212c471d7e31faaaf07305c525ed73d16df7d3bdc12539ca50352c861a4ed7ca291a376e7516c0f4facf1bc1e813c7 SHA512 69f941d2eb134277c70b4e7ea4364a8902d7522903064192c7f306219128fb45f0a2d42ed79c852da918acb0c740e49052d36a5e27d331d239c6e6d811b7cc41
 EBUILD gawk-4.1.3.ebuild 2189 BLAKE2B cbd7a2fdd568544975ebea18313a3ee53578621f976fc60c38914ef17500b47f7e056b7ce7ff5ebd9d4e663b16f54fff67c4fc17acc2f49645da822a727f32c9 SHA512 674a608dd79b81e65f7fe473583403116f76a309afda68e75d2474125d399e6dc8e1396e67db213d0c68c0297f6940b4672c2f88e071506a213dcc58fdcdd9ef
 EBUILD gawk-4.1.4.ebuild 2280 BLAKE2B cc058a61eb920ada018002678b9525568c1cd6f75a1535d08c43bb3c4318fdbb3234caedac5c361d4cc413a765b1f09682f0b277ca6de5a3d1960a8050688119 SHA512 ca16121ba9c64a7dc335b2e8d343d96f6eee73b57347d8cc22d0780605e345ab8563103166feef03963e62c7aaf20741939fca4a419744c340fe6cf2a0ebe537
 EBUILD gawk-4.2.0.ebuild 2403 BLAKE2B 63eb90fbd3ec95a3cc739c8a6f3936cdb9245fb347cb8b08bc40043ee57c328701b7b1191dae0c1b94545a663ee60803f64bcc4f7285fc34228a9b78214cdaa5 SHA512 bf9c48fdd03eacdbd922e0117e8a360ce92a518e17c0e81413697aa2781156fc0c1b0963ca37f4bf2aa32e0a71bfc68b5496dd67c7d1a115758f7f7cc4033d2f
+EBUILD gawk-4.2.1.ebuild 2390 BLAKE2B 6f7c79b9deb526756b4e94e8dd0b2808876a55f6c3ce749ea8685097cef43fda19f6219aed811aa92104f749d9d9176719ecb7ce4ef32829934164e7836855a7 SHA512 a18f0cb55218a5661c038549364a8d7753a7c7a8d5ae2cf4087cb8bd079d49148ee59d624b3891658dce9695776432f753cf06be760ce7d95c45ffeb2339f672
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-4.2.1.ebuild b/sys-apps/gawk/gawk-4.2.1.ebuild
new file mode 100644
index 000000000000..36326f0271e9
--- /dev/null
+++ b/sys-apps/gawk/gawk-4.2.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="GNU awk pattern-matching language"
+HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
+SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="mpfr nls readline"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	mpfr? ( dev-libs/mpfr:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# use symlinks rather than hardlinks, and disable version links
+	sed -i \
+		-e '/^LN =/s:=.*:= $(LN_S):' \
+		-e '/install-exec-hook:/s|$|\nfoo:|' \
+		Makefile.in doc/Makefile.in || die
+	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327
+	# disable pointless build time hack that breaks cross-compiling #493362
+	sed -i \
+		-e '/check-recursive all-recursive: check-for-shared-lib-support/d' \
+		extension/Makefile.in || die
+	# fix standards conflict on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i \
+			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
+			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
+			extension/inplace.c || die
+	fi
+}
+
+src_configure() {
+	export ac_cv_libsigsegv=no
+	local myeconfargs=(
+		--libexec='$(libdir)/misc'
+		$(use_with mpfr)
+		$(use_enable nls)
+		$(use_with readline)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	rm -rf README_d # automatic dodocs barfs
+	default
+
+	# Install headers
+	insinto /usr/include/awk
+	doins *.h
+	rm "${ED%/}"/usr/include/awk/config.h || die
+}
+
+pkg_postinst() {
+	# symlink creation here as the links do not belong to gawk, but to any awk
+	if has_version app-admin/eselect \
+			&& has_version app-eselect/eselect-awk ; then
+		eselect awk update ifunset
+	else
+		local l
+		for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk; do
+			[[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}"
+		done
+		[[ ! -e ${EROOT}/bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT}/bin/awk"
+	fi
+}
+
+pkg_postrm() {
+	if has_version app-admin/eselect \
+			&& has_version app-eselect/eselect-awk ; then
+		eselect awk update ifunset
+	fi
+}
diff --git a/sys-apps/habitat/Manifest b/sys-apps/habitat/Manifest
index f5e13a677760..1f3d571dec7c 100644
--- a/sys-apps/habitat/Manifest
+++ b/sys-apps/habitat/Manifest
@@ -1,4 +1,7 @@
 DIST habitat-0.28.0.tar.gz 25147061 BLAKE2B 0412565e3816e451945b0eae73eff0039dbd881bd86d3ed1e6f0aeef90555100f9baafcf551ed48ef2188b4ddbf768735006129afe5b66fcf53e638701b93fcc SHA512 eccdced6655e46b894aa3ef29cbac7100e18b4c44c7c2c7a25d5bb31ba732f908122630a7dd35c6347fa805180b471ce7dac786113d2f9b6d35a967994913b9f
+DIST habitat-0.54.0.tar.gz 35324897 BLAKE2B 554a2097c019e61cd6f1facdd0195abbca5e94834819283ddc2d742d196b6768e1da03a8a94f462a17d3c5c751fdddc1499f59a698f73fce170387055a07cbc6 SHA512 4b34de34e6d7b20ab641222636720357c903228aeb6833462ecc3367c6844d9f377d101b3187996e3cf3c179aa7b0c71a83921b4d18d1002fe30e3b25e31a35d
 DIST habitat-cargo-0.28.0.tar.xz 84559904 BLAKE2B ed4e62e5aee3a6b336c617d7d912db8e6b58ed28f5cc747765075926659841a84d8380ef6273c0a83017f08cf8c5dcd57928de033b71e17213f7dd5f7b0ad381 SHA512 d6f798e21bfa8124820f505231423b0ef72d068a38e8a88f0d196cfcf9e5d7a2142499f809a8525ec2f5ce664e7598d5c0979efcd2511e860b8f884ac4f6fd4b
+DIST habitat-cargo-0.54.0.tar.xz 247811208 BLAKE2B 28d79018ff9f1209881908b335a1c77f60c39799fbd02e37ffde6bccc37c46aafe1cb05914c9b373150a0a917fa5b1538a94a8a75127172cf9d15cca5ba90520 SHA512 603e45b6e61b24b5420e57ef1d06bf15a67681525ae7a4210f07d14a072cf116947d28cc754e415f1e35fc6e03ede70cd47706ddf4857b76ac17aa420bf95d07
 EBUILD habitat-0.28.0.ebuild 755 BLAKE2B 7956cc74a72016dfe839cd53af4588ed17d7ed43b114bffd6c123d90dae1c337a4b82f01d6bdfe4e32262b12e966759eb4536be124edbd33baf5d9731677db51 SHA512 d63dd5b0f3576df45f9714c364123694133211ba4770fafe0c27faebd23b7c1a8f944bbee3aaa023c0c5e45f4bfaf994d31c9497bb82d6589369b038b96d00be
+EBUILD habitat-0.54.0.ebuild 754 BLAKE2B d9bcfd151b0a52503d55d158fcef886c9854c234b98c0d5b95bc068d8b3b64c4153f304a2961a61ac0ccdfe6bfd81c5010a1f161f8148d57c1b7b17a913dd791 SHA512 16cbb9a4ab24c6daae3eedfb2c2666cc93b2cbb19f1ab9c485db38e82cdafda74f74b662a26720d37beae474e7ae8500baedf2e128200cb8face4c4d8c390c85
 MISC metadata.xml 328 BLAKE2B a1f7888eef25b795b359fefb3e7d51f2909a80257b1749f1665973bb34ad655885d5a4fb67cd821c5f6420f828902556c27833f48988b62c72b195a7e25cedc5 SHA512 cdafdd1846825f625feef5635f331f12ff4490383c54e760af5dd4ece4fcbe381ae325c8c732474de7124b55dffd32e129a9647e2e2aa5e0dcaff8ccbe4b1e8f
diff --git a/sys-apps/habitat/habitat-0.54.0.ebuild b/sys-apps/habitat/habitat-0.54.0.ebuild
new file mode 100644
index 000000000000..407816389d25
--- /dev/null
+++ b/sys-apps/habitat/habitat-0.54.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Application automation framework"
+HOMEPAGE="https://github.com/habitat-sh/habitat https://habitat.sh"
+SRC_URI="https://github.com/habitat-sh/habitat/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~mrueg/files/${PN}-cargo-${PV}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-util/cargo
+	>=virtual/rust-1.23
+	>=net-libs/zeromq-3.2
+	virtual/pkgconfig"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# move cache dir where cargo expects it
+	mv ../.cargo "${HOME}" || die
+}
+
+src_install() {
+	dodoc README.md CHANGELOG.md
+	dobin target/debug/hab{,-butterfly,-sup}
+}
+
+src_test() {
+	emake unit-all
+}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 57755ee35a36..ef57963609ef 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -2,7 +2,9 @@ AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2a
 DIST help2man-1.46.6.tar.xz 171044 BLAKE2B 41e5edddac3d7e9683b92aef2c5b1fc57c3a3684e13e17a58707bb2f332b4290841a80bd47913f9466e9d2cb02fcacaa515b4f4bb7053993988d599baff6256d SHA512 55bea01b80baf318e4350ee505bf67da9a7e76b7a5cbd861d0fd6e3afe47b82d1de8f1079d0df2f4ea8ec176d6ca95d5c847d8b1c118cf96ab59b06567c1204c
 DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e07274cbfbd6a4aeec2e8a9b57f2d845a2ddede36cc49eb2ed141690830b90f9a86ddd7c913586ea0f573e8cc3cf8 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd
 DIST help2man-1.47.5.tar.xz 186044 BLAKE2B 288eeaab3781293209f4a6aeab570317e5ed9e2e76acf9a1669c767b627e3896936fba775e32f6016b7881b5747a51b5020c0ab4fc77030d1e27c15acab032f1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7
+DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
 EBUILD help2man-1.46.6.ebuild 949 BLAKE2B c1bc74c78bfb78764a17b747e1f16a0d2abb8f78a1e35737f829212f127b0739f97f14dbdfc1dbe465034dd0f603868e35cd02b2fceb15c699946cc93fcbe5b4 SHA512 578767b49b696227dabe944055ceb1afc410382230de113a6a6b898f23a33fab50dc433b670329bd550b61ffd12955e44ea1a8729077d521bac43156f3cc31c9
 EBUILD help2man-1.47.4.ebuild 1085 BLAKE2B abe7a2655e5b9766d0d694251ba95b101c893028f425e55ea1c7ffd4272c81f465d3772d407bd22af62633925df1b6ef5f84d066ea091ed55431d8a27dac19bc SHA512 9f3da9258602e507c9ccc89ea45b5e26a4ec948fc9bffb43ddf084f91fd871364a64c5a3eae48ec603f2f838fae8051b9ba5ed819e69cadd101be1b2cc816da6
 EBUILD help2man-1.47.5.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
+EBUILD help2man-1.47.6.ebuild 1065 BLAKE2B e8a2b3deb5706a5dbdf42bf9ca43c432d51aa65f9607f1f29f6b846da8927a27e826c65d558bca593a26434cd89bd6be4f90387288cb354600bac8ab3ecdc915 SHA512 f4d4cb55e2019a4295d5f100466b5e47b3fe228beb78872b2dcf6e85e77ee61ecc1bd5e674daaac233d10a574ba8718f0d21520626e5983be852c16a29e64f74
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.6.ebuild b/sys-apps/help2man/help2man-1.47.6.ebuild
new file mode 100644
index 000000000000..dfceeba86d7d
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.47.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/"
+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 ~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
+	nls? ( dev-perl/Locale-gettext )"
+DEPEND=${RDEPEND}
+
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e 's/-shared/-bundle/' \
+			Makefile.in || die
+	fi
+	default
+}
+
+src_configure() {
+	# Disable gettext requirement as the release includes the gmo files #555018
+	econf \
+		ac_cv_path_MSGFMT=$(type -P false) \
+		$(use_enable nls)
+}
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 31fa6eab7c13..f746e7925ad4 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -3,6 +3,6 @@ DIST hwids-20170715.tar.gz 2091853 BLAKE2B 66e930346176d3501ba0e5f802b7e44fe327a
 DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b4975a02e5735c1b8483214193bcd45a606145a7709f0b9021dd69e0757361bd568f4ba2d66a52641f691aa7f50a SHA512 6a05963f1883cfeb774671931a32eb9322ead145d4d8aa2fa791e90fc3c823a0b3baeaaa4ce84de0e6a10dcd7f1b5943f6d2cab8790d21e8f34ca1d403598a8a
 EBUILD hwids-20170328.ebuild 1442 BLAKE2B de4a2b9d8395ce3c5c0a09f3f735519b0fea7166faf60439d67da84952027fb47fc2aebcb9c0ba5960d0b6c42874bc4833371596ceb99fe394a49c4af8df54af SHA512 3dbde4bd8f65b1822da919b5cea69e20d9173e2e14f26054dfaf08ee0a24839d867a699a3950de2249a88cb17848747983c3bd38e86f2deed14615c844ea6c29
 EBUILD hwids-20170715.ebuild 1455 BLAKE2B 48b2ba621d627158d3cee3c1e96cdae5327620431e894314677ea3c0341282d41d87cabf045c1dca24a1c1c7055dd3365d700b5fea973eaab5f18ee0dc7c13c0 SHA512 3460a0646dcb649b10d7c02b98f50719d298a00f224df3aa06dd79235ea1107c914b20f07a53d675ee9bed3f76fdf30befcb5b33fc61c1d10b952122a2e9430c
-EBUILD hwids-20171003.ebuild 1716 BLAKE2B f55af1c06f53680865037e2bf5cf202a925ed21c53abb9e228651261dae8c88e8c4045f3f99a6381d2a36048375f6b273de8c49e23d4c0201582f28bab378949 SHA512 8cd7e7f1ad3ec621f549d40a2a152cafc57381628e0e0ea80e8617554012a09f7f8b827bc23de178a8483e9bece403c392cf072f9c5a811ee78b0b4c0092ddb3
+EBUILD hwids-20171003.ebuild 1715 BLAKE2B 3c3eee89c5187c16e3c0988be9f978560be54160163d36b523d9d60d21cf75974dcf222c426fb2e7ce0d49be00202aa63d47d26ece9aa5fdffa8f47c757c43a4 SHA512 69fed4c80017d23740fa142de19a8893d49022cfc15921128342b1349e105a3ccbf95163670ff10dc7fe96624065d13e0e60f1c7081733b13836ff22bcb0a949
 EBUILD hwids-99999999.ebuild 1750 BLAKE2B 37d13e56d50016ec2ec0d02c6c9aa5975036ab904f3e5e8b74cc13d888d73164e92b85b1e68dd82140b1fb662c1c0b5a68429c90cf4a2be2e6b48204772d3a16 SHA512 84fcacd98a96fd5c1f6ef2f13dec9ce46a6e3a0bb942eeb3c041d6bbb8ce0d4c63bf392f747f0e6473fe15420143170aee147b52941fac40b903c375b43bdda8
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20171003.ebuild b/sys-apps/hwids/hwids-20171003.ebuild
index 376d93cc4354..80c0211ae370 100644
--- a/sys-apps/hwids/hwids-20171003.ebuild
+++ b/sys-apps/hwids/hwids-20171003.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="${HOMEPAGE}.git"
 else
 	SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index b98955f9b286..6bb91435b180 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,10 +1,9 @@
-AUX man-db-2.8.0-libseccomp_automagic.patch 3579 BLAKE2B eaa3a3f5519acc762d34db8dfa43eac737f0fcf952efc90cb3197be68f65539ff84bc1ec8ee8b75e82ac293d9f5eb233c8da006da96f118f141ec309673fd1c7 SHA512 9fd8837514eb11c8a702c540ec40595e431632654de76234115ebef4d72d3ad680a977c83578fdbbaad316544a27a6283ddbde31942be20ab68ed186ba7a7827
 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
-DIST man-db-2.8.0.tar.xz 1620344 BLAKE2B abb2879848f4db187d28bb3d8359ecfab0033ea3a5333ebd1a837733de563972d97153f11c08e8669553dc5cddea12ca774117985b32d218a30db407437717f3 SHA512 06f52ecd6e7ced858a32117ea4be3ed5fc3d4428cb810d31b85dd75556e999f5badc6eb81f642b56afe2a697462ccca9fd8cc5ecfbd40f132d5a74f84f316d39
 DIST man-db-2.8.1.tar.xz 1621664 BLAKE2B 94496c1ca912e7cea2c98be8443d5b13dd685c5af86e9996b625fae44384f4cacf24a4196d77a080da10baa385b5e63d8b090c2bfcc492f2a41757d7a3840468 SHA512 82e75df32eb8575f47c3f36b5f2bbc827776747abfa39af589802e6566636c0771df0ee3197cb2bec3318c3055ff4e9d04c7da13b3bc6ea8a1ea1b1340554ef0
+DIST man-db-2.8.2.tar.xz 1622504 BLAKE2B fc551838488323914319cde2b4d0d724be63741a1e0ed816a67a26da89dfa84a7faf99a9aba20e0e254129aa0f26505b76f4ba6be6786281c4d105e96829e9ee SHA512 ffd6c3ba605da419c819dcad10edf713242074a035ce405f4c97dbbd2a7e9b253f82efae1022d08d9f04591014e752ff38a3f8727e5a5cf60d33a9167cc2d8fc
 EBUILD man-db-2.7.6.1-r2.ebuild 3173 BLAKE2B 7fc7db98ce8e00ddd57564cfd72129b3b42e1505e3d0cf0ebe875b8793febd33024245e61f4db184955cdd4d60ed7862af9639874859e317a17996483627240b SHA512 0a51e238d3b399eb8fffbb01f229c614aad6c84691ca9b309c982a2e832a332f01d963f6d3e1da850dc667d6248acd04f564418838692bce98af70cc9d6aabf9
-EBUILD man-db-2.8.0-r2.ebuild 3278 BLAKE2B 71b8fe018cdad873b4939189f4fe229f04ad7c626f40dfc727d8a1e72339a7895ee7def5b53e7897b2f811303835e26ca112d6bcc308e9fb6859e432bb8d3758 SHA512 390b9c7265525aea65837ef9116ee41da92c54f2e9d1122d8313b22861f516cc22a0f10397f1521bc86a5fd10475db41b70dd9e7fd2ee992ae9657faff6b09e4
 EBUILD man-db-2.8.1.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
+EBUILD man-db-2.8.2.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
 EBUILD man-db-9999.ebuild 3389 BLAKE2B 32d6a4d0df1b7f1bcae76b6c91a88b736f781b71c8fbdbb31fdc035e0c95dbb84aeb922051cd7149d53b1201ebb5966fc7ec3ea3ca25a6b6ff7e561ef09664d4 SHA512 f5513746a0c73d3aa969c7e821d22119f41e81f3726a9702ce57b6c4a85f9321a512050af163f589295a5377f5430835fd6195c784a42ea692cd44b0c3222ab6
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/files/man-db-2.8.0-libseccomp_automagic.patch b/sys-apps/man-db/files/man-db-2.8.0-libseccomp_automagic.patch
deleted file mode 100644
index cf9c12573178..000000000000
--- a/sys-apps/man-db/files/man-db-2.8.0-libseccomp_automagic.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 3d4ab15670079aa8e898f80a650b3be941230486 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 6 Feb 2018 15:30:21 +0100
-Subject: [PATCH] Change libseccomp logic to not be automagic only
-
-Introduce --without-libseccomp configure option so that users can
-disable seccomp even if libseccomp is available on the system.
-
-The default is unchanged from before this patch.  If no
---with(out)-libseccomp has been given on the command line, the macro
-looks for presence of libseccomp and uses that if found.
-
-* m4/man-libseccomp.m4: Guard pkg-config test with a command-line
-option.
----
-
-diff --git a/configure b/configure
-index 3f949306..8eaca64e 100755
---- a/configure
-+++ b/configure
-@@ -1718,6 +1718,7 @@ with_included_regex
- enable_nls
- with_libiconv_prefix
- with_libintl_prefix
-+with_libseccomp
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -2459,6 +2460,7 @@ Optional Packages:
-   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
-   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
-   --without-libintl-prefix     don't search for libintl in includedir and libdir
-+  --without-libseccomp    do not confine subprocesses using seccomp
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -47295,6 +47297,15 @@ fi
- 
- # Check for libseccomp library.
- 
-+# Check whether --with-libseccomp was given.
-+if test "${with_libseccomp+set}" = set; then :
-+  withval=$with_libseccomp;
-+else
-+  with_libseccomp=check
-+fi
-+
-+	if test "x$with_libseccomp" != "xno"; then
-+
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libseccomp" >&5
- $as_echo_n "checking for libseccomp... " >&6; }
-@@ -47353,11 +47364,15 @@ fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$libseccomp_PKG_ERRORS" >&5
- 
--	:
-+	if test "x$with_libseccomp" = "xyes"; then
-+				as_fn_error $? "--with-libseccomp given but cannot find libseccomp" "$LINENO" 5
-+			 fi
- elif test $pkg_failed = untried; then
-      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--	:
-+	if test "x$with_libseccomp" = "xyes"; then
-+				as_fn_error $? "--with-libseccomp given but cannot find libseccomp" "$LINENO" 5
-+			 fi
- else
- 	libseccomp_CFLAGS=$pkg_cv_libseccomp_CFLAGS
- 	libseccomp_LIBS=$pkg_cv_libseccomp_LIBS
-@@ -47367,6 +47382,7 @@ $as_echo "yes" >&6; }
- $as_echo "#define HAVE_LIBSECCOMP 1" >>confdefs.h
- 
- fi
-+	fi
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: default CC = \"$CC\"" >&5
-diff --git a/m4/man-libseccomp.m4 b/m4/man-libseccomp.m4
-index a9377317..c90e3aa4 100644
---- a/m4/man-libseccomp.m4
-+++ b/m4/man-libseccomp.m4
-@@ -1,9 +1,18 @@
--# man-libseccomp.m4 serial 1
-+# man-libseccomp.m4 serial 2
- dnl MAN_LIBSECCOMP
--dnl Check for the libseccomp library.
-+dnl Add a --without-libseccomp option; check for the libseccomp library.
- AC_DEFUN([MAN_LIBSECCOMP],
--[PKG_CHECK_MODULES([libseccomp], [libseccomp],
--	[AC_DEFINE([HAVE_LIBSECCOMP], [1],
--		[Define to 1 if you have the `libseccomp' library.])],
--	[:])
-+	[AC_ARG_WITH([libseccomp],
-+		[AS_HELP_STRING([--without-libseccomp],
-+				[do not confine subprocesses using seccomp])],
-+		[],
-+		[with_libseccomp=check])
-+	if test "x$with_libseccomp" != "xno"; then
-+		PKG_CHECK_MODULES([libseccomp], [libseccomp],
-+			[AC_DEFINE([HAVE_LIBSECCOMP], [1],
-+				[Define to 1 if you have the `libseccomp' library.])],
-+			[if test "x$with_libseccomp" = "xyes"; then
-+				AC_MSG_ERROR([--with-libseccomp given but cannot find libseccomp])
-+			 fi])
-+	fi
- ]) # MAN_LIBSECCOMP
--- 
-2.16.1
-
diff --git a/sys-apps/man-db/man-db-2.8.0-r2.ebuild b/sys-apps/man-db/man-db-2.8.2.ebuild
index cb7cf8d1c4e8..627b8941479e 100644
--- a/sys-apps/man-db/man-db-2.8.0-r2.ebuild
+++ b/sys-apps/man-db/man-db-2.8.2.ebuild
@@ -7,12 +7,17 @@ inherit ltprune user versionator
 
 DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
 HOMEPAGE="http://www.nongnu.org/man-db/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+if [[ "${PV}" = 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
+IUSE="berkdb +gdbm +manpager nls seccomp selinux static-libs zlib"
 
 CDEPEND="
 	!sys-apps/man
@@ -21,6 +26,7 @@ CDEPEND="
 	berkdb? ( sys-libs/db:= )
 	gdbm? ( sys-libs/gdbm:= )
 	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
+	seccomp? ( sys-libs/libseccomp )
 	zlib? ( sys-libs/zlib )
 "
 DEPEND="
@@ -38,10 +44,6 @@ RDEPEND="
 "
 PDEPEND="manpager? ( app-text/manpager )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-libseccomp_automagic.patch"
-)
-
 pkg_setup() {
 	# Create user now as Makefile in src_install does setuid/chown
 	enewgroup man 15
@@ -62,7 +64,7 @@ src_configure() {
 		--with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
 		$(use_enable nls)
 		$(use_enable static-libs static)
-		--without-libseccomp
+		$(use_with seccomp libseccomp)
 		--with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
 	)
 	econf "${myeconfargs[@]}"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index e3caec6fe5e6..22e19b6cb4c5 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,10 +1,12 @@
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
-DIST openrc-0.28.tar.gz 224228 BLAKE2B 6f4693003aba77148bb5ed3516c1372e3ca67364a25d866fce418ba6a287a8cc0c33534cbe1edcdab32a869f8f8dc72819fb2dffc46375bca1e053fb3acf415b SHA512 a10c293bf4287bcc4ffb9c996cbc1294f979483ea9fb2efb0dd1becee193f49ff114530c078850e8c11cf2c0a812be2e74801352fdbfe313b90cd9af5b8ccf93
-DIST openrc-0.32.1.tar.gz 223808 BLAKE2B 4aadd36e371de56d5c2b59597ab04c1b004be73e370fa00560b77ab0587ba49fb4a49608aba4ad85ed7279eadf54e023961e25784e3078edeed4891956995f38 SHA512 9cd48978fcd69a6d80b474a06b56550cc8c538d6d7a1cb6f88b90087593eebb8185ee5192ec05be2f87f61de53dbe6ded9058aee7ae8f806bb0d7d7da70f62d8
 DIST openrc-0.34.11.tar.gz 228054 BLAKE2B 8d4fdd7de4b3c44df0ccec728b91bd2624582dc2bbdb1fa7892aa61ce0a953a7cf66964f38da888636d895e3c6b776747a4a7fbbdbbbd26029313695f35837fe SHA512 76245d31c6fe9e90e5e2f35ce918b915fc88c231674e0c99dc98b8f3fa120e794900eec9919a0ab029a081b206393246eccb9119a79c90ad6e39325d022928be
-EBUILD openrc-0.28.ebuild 10111 BLAKE2B a089c38ecc6b602a7a9c94fafbab8d5afae7784578fc9be238fa47039bc218edfeb0935c96531a3b7c350ab11a9c43c60b26e818ee8fd85b5d367222d7118c8d SHA512 0327bd3daab7411065e80c3eef8dad7b14b963ddab254fbafa9e4d62953aa3c05fba8eb3b1b46dbe089add1e6fac95ad6722593982f56a7053dc8c10bc41dd94
-EBUILD openrc-0.32.1.ebuild 10150 BLAKE2B 18205fb38a46193f0134b00570ebc2b11cb873eedbe8a3aa638ebdaefddb3742f49e6e21b3dce100795174ed3cafb347566e7878a0cf1443fc20ddd739d1bb82 SHA512 7d4948ff6de5c2b9027e0f00cd43a9b578d3e5c924683ac8af8d4f817132370297cf1b9fd673bd1a5c473682d0030a2cf3e67ed1f5f89b120c9baee3d31bea58
+DIST openrc-0.35.1.tar.gz 241480 BLAKE2B 336c2398bbfecc59dc068481b50d7470fd9ec4435f0b06b1a6787e2a95ab1aea74a8fb97de41989ea6419bac078553e88bfb456d119ca644e0f75b82338de465 SHA512 53013e40021ad8de93db64aec54753f9fc8eb6d4fb61c4d8683450375191ff29c03a9a7607175e201b3f712a84ca7334ad1cc34302822bb8b75097bc95922988
+DIST openrc-0.35.2.tar.gz 241600 BLAKE2B 09517a33ea7faf2e59d3a194876a3bb55a2477dde5f7f30915f77c24104531a27e752a59a049929878a115710ecbe1ed116e4283357f88c65cbe130787b88220 SHA512 61282509bae087a6c94a1947a30eddfa633cd2dbc91392511daa7240318d9f0c0a231005e329b6e46eece194fe497071f40387bea46d27ef09db9eb6e92f07d6
+DIST openrc-0.35.tar.gz 241364 BLAKE2B b7655f3e7ba21d4af96c7f72e02cc44c557cb6465fcb0d7912a08fdde5af603dcc3551694b89641d58c749453f032ef4224d18fd36bc1b5e27dd97e8cd9bd664 SHA512 a95f11eb8c7b154044fa720f803dc158bcd993a3ce28cd465fab44d9f40555e45a160ea2e923a89161ab43673a95920970ea00cdc34c652efd68ec22a2577cbc
 EBUILD openrc-0.34.11.ebuild 10145 BLAKE2B 44747f052ca54517722e08a8877b36bb12985ef703ccd7608faecc7b9f6727e6f9157aad51f563ccd1b9346945f56cb553e47fc77dd369c5e635a80da5f2a4dc SHA512 6f71094d74e5ea02e87427619a6b55883ef5de3e8d581447c9662a46f0c1b0a6f49cdb00737a7a0ed8ca9d3ce23418f1d0068832ab58a268398781d4aabccd15
-EBUILD openrc-9999.ebuild 10264 BLAKE2B 98b1cb59f635ef3d07d6faaa536964fb5408f613a7418d56425810a9adc579373ab4de9fba31a5239fedc83688aca7dc623d47b1e5ab163ec32152fa52e9fdae SHA512 7198628422361a508f83f3d5af9820296c75636725f39b708ce0f7af53153dc2fee75d781117869f3c5d9d3cba3ab20311d4cd89e0f50b869468cb88ee27e669
+EBUILD openrc-0.35.1.ebuild 9953 BLAKE2B cbcdcf1ccfd81c1e060a64b686f8aed344cb99723a4e04326438c5e23c11b980b6700be60dc7e34fc7efbc9ad26513a28df3bbfd06e7018b4b0e27a8bba282e8 SHA512 6d25ad312e4526bb82efa5754914a57e8cd8b222455aa7b8ec434106eb04746b4aa3a90afc760fd1b1a1c3b5858bb7dc052acf2d48843c0789bd4bd208b65560
+EBUILD openrc-0.35.2.ebuild 9966 BLAKE2B b931796a166d874bcb7a74b1a05cc8480b43657458e9b60377e133d440f9b0089a97cf7525265c6e420840abc614a57b4c3bc029a4d32423b1091deaca568c7e SHA512 959cc20911fbf11799ef85923fb74275969131680a3fe6a570b53fd0e965647a209af4765f5f13ab50c82b3b87907affce999fc4bcdf99f936ca08b83a6c2a22
+EBUILD openrc-0.35.ebuild 9878 BLAKE2B 70ffec2e75a61159206469eebb22c6bb4d0eedc214a5d8b5e2445233a1300bec3a0e2f127ce72bbade3f79771ddae89a3e4576931e9af60e9c0edd92994ba461 SHA512 ad585e39529af121b001726bd8f0d59c7ff89f35de2d2963ca50b73466e069d60430bbbb978291986bbf3657fefefe2b6c367430e8886fb6e720d4964b1a7af5
+EBUILD openrc-9999.ebuild 9953 BLAKE2B cbcdcf1ccfd81c1e060a64b686f8aed344cb99723a4e04326438c5e23c11b980b6700be60dc7e34fc7efbc9ad26513a28df3bbfd06e7018b4b0e27a8bba282e8 SHA512 6d25ad312e4526bb82efa5754914a57e8cd8b222455aa7b8ec434106eb04746b4aa3a90afc760fd1b1a1c3b5858bb7dc052acf2d48843c0789bd4bd208b65560
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.32.1.ebuild b/sys-apps/openrc/openrc-0.35.1.ebuild
index 87ce1832378a..eda95f741414 100644
--- a/sys-apps/openrc/openrc-0.32.1.ebuild
+++ b/sys-apps/openrc/openrc-0.35.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 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
@@ -53,6 +53,8 @@ RDEPEND="${COMMON_DEPEND}
 		>=sec-policy/selinux-base-policy-2.20170204-r4
 		>=sec-policy/selinux-openrc-2.20170204-r4
 	)
+	!app-shells/gentoo-bashcomp
+	!<app-shells/gentoo-zsh-completions-20180228
 "
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
@@ -73,12 +75,14 @@ src_compile() {
 
 	MAKE_ARGS="${MAKE_ARGS}
 		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
 		MKNET=$(usex newnet)
 		MKSELINUX=$(usex selinux)
 		MKAUDIT=$(usex audit)
 		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)"
+		MKSTATICLIBS=$(usex static-libs)
+		MKZSHCOMP=yes"
 
 	local brand="Unknown"
 	if use kernel_linux ; then
@@ -122,9 +126,9 @@ src_install() {
 	gen_usr_ldscript librc.so
 
 	if ! use kernel_linux; then
-		keepdir /$(get_libdir)/rc/init.d
+		keepdir /lib/rc/init.d
 	fi
-	keepdir /$(get_libdir)/rc/tmp
+	keepdir /lib/rc/tmp
 
 	# Backup our default runlevels
 	dodir /usr/share/"${PN}"
@@ -248,6 +252,9 @@ EOF
 			ewarn "if you do not want this to happen."
 		fi
 	fi
+
+	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
+
 }
 
 # >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
@@ -290,24 +297,19 @@ pkg_postinst() {
 		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."
+	# Added for 0.35.
+	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	elif ! use kernel_linux; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
 		fi
 	fi
 
 	# update the dependency tree after touching all files #224171
-	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
 
 	if ! use newnet && ! use netifrc; then
 		ewarn "You have emerged OpenRc without network support. This"
diff --git a/sys-apps/openrc/openrc-0.28.ebuild b/sys-apps/openrc/openrc-0.35.2.ebuild
index 23e168975f36..8c7c2151f6b3 100644
--- a/sys-apps/openrc/openrc-0.28.ebuild
+++ b/sys-apps/openrc/openrc-0.35.2.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 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
@@ -34,7 +34,7 @@ COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-proc
 	)
 	selinux? (
 		sys-apps/policycoreutils
-		sys-libs/libselinux
+		>=sys-libs/libselinux-2.6
 	)
 	!<sys-apps/baselayout-2.1-r1
 	!<sys-fs/udev-init-scripts-27"
@@ -50,9 +50,11 @@ RDEPEND="${COMMON_DEPEND}
 		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
 	)
 	selinux? (
-		sec-policy/selinux-base-policy
-		sec-policy/selinux-openrc
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
 	)
+	!<app-shells/gentoo-bashcomp-20140911-r1
+	!<app-shells/gentoo-zsh-completions-20180228
 "
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
@@ -73,12 +75,14 @@ src_compile() {
 
 	MAKE_ARGS="${MAKE_ARGS}
 		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
 		MKNET=$(usex newnet)
 		MKSELINUX=$(usex selinux)
 		MKAUDIT=$(usex audit)
 		MKPAM=$(usev pam)
-		MKSTATICLIBS=$(usex static-libs)"
+		MKSTATICLIBS=$(usex static-libs)
+		MKZSHCOMP=yes"
 
 	local brand="Unknown"
 	if use kernel_linux ; then
@@ -122,9 +126,9 @@ src_install() {
 	gen_usr_ldscript librc.so
 
 	if ! use kernel_linux; then
-		keepdir /$(get_libdir)/rc/init.d
+		keepdir /lib/rc/init.d
 	fi
-	keepdir /$(get_libdir)/rc/tmp
+	keepdir /lib/rc/tmp
 
 	# Backup our default runlevels
 	dodir /usr/share/"${PN}"
@@ -248,6 +252,9 @@ EOF
 			ewarn "if you do not want this to happen."
 		fi
 	fi
+
+	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
+
 }
 
 # >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
@@ -290,24 +297,19 @@ pkg_postinst() {
 		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."
+	# Added for 0.35.
+	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	elif ! use kernel_linux; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
 		fi
 	fi
 
 	# update the dependency tree after touching all files #224171
-	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
 
 	if ! use newnet && ! use netifrc; then
 		ewarn "You have emerged OpenRc without network support. This"
diff --git a/sys-apps/openrc/openrc-0.35.ebuild b/sys-apps/openrc/openrc-0.35.ebuild
new file mode 100644
index 000000000000..e261b2d39bdf
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.35.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/lib/rc
+		MKBASHCOMP=yes
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)
+		MKZSHCOMP=yes"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /lib/rc/init.d
+	fi
+	keepdir /lib/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+
+	has_version ">=sys-apps/openrc-0.35" || add_boot_init cgroups sysinit
+
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Added for 0.35.
+	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	elif ! use kernel_linux; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index dc6f3b58eabc..eda95f741414 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -53,6 +53,8 @@ RDEPEND="${COMMON_DEPEND}
 		>=sec-policy/selinux-base-policy-2.20170204-r4
 		>=sec-policy/selinux-openrc-2.20170204-r4
 	)
+	!app-shells/gentoo-bashcomp
+	!<app-shells/gentoo-zsh-completions-20180228
 "
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
@@ -73,7 +75,7 @@ src_compile() {
 
 	MAKE_ARGS="${MAKE_ARGS}
 		LIBNAME=$(get_libdir)
-		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		LIBEXECDIR=${EPREFIX}/lib/rc
 		MKBASHCOMP=yes
 		MKNET=$(usex newnet)
 		MKSELINUX=$(usex selinux)
@@ -124,9 +126,9 @@ src_install() {
 	gen_usr_ldscript librc.so
 
 	if ! use kernel_linux; then
-		keepdir /$(get_libdir)/rc/init.d
+		keepdir /lib/rc/init.d
 	fi
-	keepdir /$(get_libdir)/rc/tmp
+	keepdir /lib/rc/tmp
 
 	# Backup our default runlevels
 	dodir /usr/share/"${PN}"
@@ -295,24 +297,19 @@ pkg_postinst() {
 		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."
+	# Added for 0.35.
+	if use kernel_linux && [[ ! -h "${EROOT}"/lib ]]; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
+		fi
+	elif ! use kernel_linux; then
+		if [[ -d "${EROOT}$(get_libdir)"/rc ]]; then
+			cp -RPp "${EROOT}$(get_libdir)/rc" "${EROOT}"lib
 		fi
 	fi
 
 	# update the dependency tree after touching all files #224171
-	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+	[[ "${EROOT}" = "/" ]] && "${EROOT}"/lib/rc/bin/rc-depend -u
 
 	if ! use newnet && ! use netifrc; then
 		ewarn "You have emerged OpenRc without network support. This"
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index d5cb9d66b17c..ad9b47668e4b 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,6 +1,4 @@
-DIST paludis-2.6.0.tar.bz2 1885055 BLAKE2B 55c979b0cf357be62093e7f7f774786843dc441cee8011663218550b43636b614b348f1979cd89c9e571e8439b0493e8e2399a0990c370eac765c48a61126dc1 SHA512 78a9c0a19703dbbc07934de389b749ab83365454e29b19c323d6c03304162e35ff4d92f7ac1f28067ad853057f2422be43418b3c6a57a193c4b8dd5a4e81eba4
 DIST paludis-f8e58ee1d02d2476ae92ebc3737e42b8b6a36891.tar.xz 1004024 BLAKE2B 1c34c93815efa41298cc2916c4428971d1f54242cfd759c771972bdcde94986c6af03546372c7eda277a343851b38ee93c0a103e519457b42e48cc7bed87b755 SHA512 813592b6f164d7994000ff1740e003049e040e7d58832bb1393a1f4facf428806b57bbf97855b830f75acf4b20e963093e9993b110f76f44e25afb9a8a1eaa1e
-EBUILD paludis-2.6.0.ebuild 3765 BLAKE2B ab27f927363ee869ff416fc0596f2493562afd122e7765661ec03bbb7e3e42c68e1751e04205ad2a8c481d5fc0c5e880abb2bae9a3fb8fe30fecd2ee5c4039b9 SHA512 585d750b8e8d6c48f8260acaeee567771adfa12cea0f8bfc7b7b069c280d29fd2d28784856c002f8ba51c3eb4e40835fe86b775cb3a6c35361aec37006ed300c
 EBUILD paludis-3.0.0_pre20170808.ebuild 3784 BLAKE2B c7e95761d787f258f7ad92a2471db03c731649d7287f2ed9a26d69e933ef87236713d04240a85ab43df41c7128236e3135fbed1aaa8c4cb8444ebf6bab245946 SHA512 ce2783f67cfccdeb3c8bde767890f9fdbf8af3c68228ce333d5bb9b92d73bf0bb69d7947b8e678817b58e3420ceecf7d99ea6a4ff2fd3eae79644fce175d02f0
 EBUILD paludis-9999.ebuild 3633 BLAKE2B b27ba87915d6a019d6503c97eb23fb5ea87dc85df20e0ce3d29973117a961c7f477bad0b21c660f6689f9c1eebba178b4f2797e5c8e40d8c5fe23f3d46a12e1d SHA512 5ecdff9a67ac467dbc7c925f2ad77eb98344f01d0b6ccfda938a3ee3a6681d4af7f108713d2764154cd5d7b251078fce2c70c6aba0629ab40efbd090e265962d
 MISC metadata.xml 706 BLAKE2B ec2963b467d0fbab598fdf44b021cc10569e9a25305ad22c08d129c17f36db1a0759edb6e89119cd687fc36b2b26c4844086ab1cb8e249b6883df8fb9858b830 SHA512 ab32599364fb289dc43d8dc1574ee472585f014c663d2c80209700596b455e074346ab35e69bd05fee86a451902852790f1bb9dcd37f2118e8e8bc24b90a01ec
diff --git a/sys-apps/paludis/paludis-2.6.0.ebuild b/sys-apps/paludis/paludis-2.6.0.ebuild
deleted file mode 100644
index 3b42a102df75..000000000000
--- a/sys-apps/paludis/paludis-2.6.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-# matching profile defaults for now
-RUBY_VER=2.2
-
-inherit bash-completion-r1 eutils python-single-r1 user
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.exherbo.org/"
-SRC_URI="http://paludis.exherbo.org/download/${P}.tar.bz2"
-
-IUSE="doc pbins pink python ruby ruby_targets_ruby${RUBY_VER/./} search-index test +xml"
-LICENSE="GPL-2 vim"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
-
-COMMON_DEPEND="
-	>=app-admin/eselect-1.2.13
-	>=app-shells/bash-3.2:0
-	dev-libs/libpcre[cxx]
-	sys-apps/file
-	pbins? ( >=app-arch/libarchive-3.1.2 )
-	python? (
-		${PYTHON_DEPS}
-		<dev-libs/boost-1.63[python,${PYTHON_USEDEP}] )
-	ruby? ( dev-lang/ruby:${RUBY_VER} )
-	search-index? ( >=dev-db/sqlite-3 )
-	xml? ( >=dev-libs/libxml2-2.6 )"
-
-DEPEND="${COMMON_DEPEND}
-	>=app-text/asciidoc-8.6.3
-	app-text/htmltidy
-	app-text/xmlto
-	>=sys-devel/gcc-4.7
-	doc? (
-		app-doc/doxygen
-		python? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-		ruby? ( dev-ruby/syntax[ruby_targets_ruby${RUBY_VER/./}] )
-	)
-	virtual/pkgconfig
-	test? ( >=dev-cpp/gtest-1.6.0-r1 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/sandbox"
-
-PDEPEND="app-eselect/eselect-package-manager"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( ruby_targets_ruby${RUBY_VER/./} )"
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if id paludisbuild >/dev/null 2>/dev/null ; then
-			if ! groups paludisbuild | grep --quiet '\<tty\>' ; then
-				eerror "The 'paludisbuild' user is now expected to be a member of the"
-				eerror "'tty' group. You should add the user to this group before"
-				eerror "upgrading Paludis."
-				die "Please add paludisbuild to tty group"
-			fi
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup "paludisbuild"
-	enewuser "paludisbuild" -1 -1 "/var/tmp/paludis" "paludisbuild,tty"
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix the script shebang on Ruby scripts.
-	# https://bugs.gentoo.org/show_bug.cgi?id=439372#c2
-	sed -i -e "1s/ruby/&${RUBY_VER/./}/" ruby/demos/*.rb || die
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=(
-		--htmldir=/usr/share/doc/${PF}/html
-
-		$(use_enable doc doxygen)
-		$(use_enable test gtest)
-		$(use_enable pbins)
-		$(use_enable pink)
-		$(use_enable python)
-		$(use python && use_enable doc python-doc)
-		$(use_enable ruby)
-		$(use ruby && use_enable doc ruby-doc)
-		--with-ruby-version="${RUBY_VER}"
-		$(use_enable search-index)
-		$(use_enable xml)
-
-		--enable-vim
-		--with-config-framework=eselect
-		--with-environments=default,portage
-		--with-vim-install-dir=/usr/share/vim/vimfiles
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	dobashcomp bash-completion/cave
-
-	insinto /usr/share/zsh/site-functions
-	doins zsh-completion/_cave
-}
-
-src_test() {
-	# Work around Portage bugs
-	local -x PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
-	local -x BASH_ENV=/dev/null
-
-	if [[ ${EUID} == 0 ]] ; then
-		# hate
-		local -x PALUDIS_REDUCED_UID=0
-		local -x PALUDIS_REDUCED_GID=0
-	fi
-
-	if ! nonfatal emake -k check ; then
-		eerror "Tests failed. Looking for files for you to add to your bug report..."
-		find "${S}" -type f -name '*.epicfail' -or -name '*.log' | while read a ; do
-			eerror "    $a"
-		done
-		die "Make check failed"
-	fi
-}
-
-pkg_postinst() {
-	local pm
-	if [[ -f ${ROOT}/etc/env.d/50package-manager ]] ; then
-		pm=$( source "${ROOT}"/etc/env.d/50package-manager ; echo "${PACKAGE_MANAGER}" )
-	fi
-
-	if [[ ${pm} != paludis ]] ; then
-		elog "If you are using paludis or cave as your primary package manager,"
-		elog "you should consider running:"
-		elog "    eselect package-manager set paludis"
-	fi
-}
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 3205eec7b601..a0dd63c95e41 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,15 +1,6 @@
-AUX 0010-remove-sesandbox-support.patch 747 BLAKE2B 00a7f2ea6a23ac5f19795a5ae01644a157de7993ded5649cb4bd35fcf30fb106a2e9fa71b6388b06ed43fc785e372b892f3e9ebe036a44eefe39747010faa643 SHA512 b7b54191d2b8703393dd23a7fcccbdc3e2b7234acd962e994c8549eebae6cae3b6f62055b47a2d5db94510739abfb2fa365090c452422b6fbc02ad625ebe4859
-AUX 0020-disable-autodetection-of-pam-and-audit.patch 3924 BLAKE2B 8ed6d1cf96dd458d42cc1453c27d2b322962d19f283da130294426d2b257d77892cc8518a42b169a886732e16f254b18eb05693e4f1139e4fe6215199fc13122 SHA512 0efcbe36fdaa369cb1837767e872189f9f18b58d738b38c304ef31c568e60d602cfb5f87328a3b1f209840e2ab102f2d0ee8c4e918b2866c0ca978f33252ad33
-AUX 0030-make-inotify-check-use-flag-triggered.patch 650 BLAKE2B 8aec58f6d26d180694cda47530273b5e925dcd53c9b0dd592e442180b84c348f52e48d7709dfde6b814441d2560045b6fb1c87bd06cb15988e670c037d1b8f27 SHA512 9ae10652ae14abd8930690363d41d9cacf0d0003ff21cf75dfc52a4ab7a4ab3d1fa9f1dc6994de9ae874483297478d79ee071dae766dfabf07ba70092bd11ba4
-AUX 0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch 519 BLAKE2B b801bebdbabeede3ed3844b67b8aa16b41fc949da13648d04ef097c4bd0ee29507a06955ffa47d453973f9aae587affbef0424068b1d672b8c8ad3142be45c84 SHA512 c49b440ca07003688e115ea792188f37e5456d8afde0ee3be7a49af8c51ca7089e85e64ad237fbdc3c34685a58022f695f00fe443face1052f8181829678a256
-AUX 0110-build-mcstrans-bug-472912.patch 2509 BLAKE2B 550c8252733eca65a11365f3b9588e73c4989de0a11bac02c5710c9f6240f2bec477f1bc4c2662b20ee42cc18e71d06ce28b48bdc550dd4d852a55fe924a382b SHA512 97a6c17e8232dc62dd5beaf101efa1e0462eedfb9fb4eff93d96171bbd866bd12b19ada1c512eef20ba732813e6f009276debbe5385ece373dd3bad1b7e61765
-AUX 0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch 483 BLAKE2B b92fdc3e1a6ecc370fd678cd210ab4e6c6ff29022b33a42810f9c4e1d8bb1b57e9c1d48b23b084d880e8ee7b4501bc697b7c9c60f17b51637258aece16e5f8d1 SHA512 a8a81158924aa527038696a98503144e50ed941ba1afbf52d26fc5bb9373c7ac6fd3f864070ff717c5b45ddba0470bc43b142f02da134559af8896c15084234f
 AUX policycoreutils-2.7-0001-newrole-not-suid.patch 351 BLAKE2B 84a67799662e6df3aeefafeda3a70e011856313beb4ac28e37312e7a53219b0a2d224a4be650200b537a39a58858c443e2b3253c1ebab617aaa6acf95b7e68fc SHA512 41c37a0711011ebdaafee01b357438ac3219b34b6c9e6ebe182c863d61c899e4819ae71bd9adf4b52bee37750c99b5b1cd40c6a92f119899bd227251d37ccd99
-DIST policycoreutils-2.6.tar.gz 4660087 BLAKE2B 26ea03db8552b5ad3967acb6912dde0f332315f93682e65e3f6461f19efdc4ec1444c219a946e3172283078012961c0a39bb77203e20544e6c4de48c7a6fa0f9 SHA512 ba289060bc348f9315bce84a5e5daf145600274289fdd2206edc10bb0ee03f9b02a9e40e9c118809961ddfe7844dee7d8952d8c9a239af7282f4fc1614c21e9d
 DIST policycoreutils-2.7.tar.gz 2796707 BLAKE2B 4b1c03f2d12252b453950c3d6bcde75780926a1b91263d3881f741399c5630c707f0429b9b144c657b017b7b0c1500b63b6463610dea3caaef8c2f7c3f69fd8f SHA512 ce97d659f72058fd23d8dab8db98fc7c0003806a636c521fa15da465d7358d40ccc8e3eaa9675f00a9b0b8aaa1465d3fb650bc0ebbbf00164e121230673256fb
-DIST policycoreutils-extra-1.35.tar.bz2 12124 BLAKE2B 78e9651a1d8aa1747ef6a4dfd657e27a1b22e13d6ae36cabbfe8bd80986770a6f3638232db6b56f730cf379e85239e4a945cea4946553d07f18e1e9d1467996f SHA512 8cc3c74afee7ec38d7d085744fdd60849d3ae97a75599d2181b12b5b472a6a4445868e8a6aff707e439c10d9c378fb55e329b4db21c0a771f41180bf3b9eabc1
 DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346 SHA512 c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
-EBUILD policycoreutils-2.6-r1.ebuild 5556 BLAKE2B 0e656ac59ad6d2f5dea6d6d68ecbe79114816d972cc31168699546dc4b5697949203984c9089197dc08baebd678898660f4148eddd63f473c6ca87b90100393d SHA512 657e73bbe5e5540f49ab1b1cceaae293c57a2c5abab67b24624d51549745e674b91ca35619da0ff71c51f31af91500d37784bae280b1d52e715b9eda6d9f9690
 EBUILD policycoreutils-2.7.ebuild 4962 BLAKE2B 894abdd726bf885289dea565ab831ceb952856eed4cdc762e78a8656cf169ca04a2345d72f990f071dcdcd57e6f3de4404dd3a7f548f59cb790567ccf2fd76db SHA512 e3ec9164a11c29bbd225887784b35bc54f306ee94d9fa80963158f218d2261c8d60a63583cbb96f4186863000294fa552a434bb438d0d1fb2754e8d074bb0c12
 EBUILD policycoreutils-9999.ebuild 4969 BLAKE2B 1b9aaf5ec568301dba3b11bb3fb46ba4db3a0f1137c1edec2de01507faa8d41065c4538c8deb7d4ab5a1b89b82c6431bbae3f5bcc040e621ad49adc1534b55b9 SHA512 6cc7dd5c825bd0c9cc63f14dc3000bbb9f7692f1fef6f9ce0f0e6fa09094846e9994f5fa8f39dea42bc52e38f0118239698e6971643ea5d539ca3a8436d763ad
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/files/0010-remove-sesandbox-support.patch b/sys-apps/policycoreutils/files/0010-remove-sesandbox-support.patch
deleted file mode 100644
index 52a34bd1f47b..000000000000
--- a/sys-apps/policycoreutils/files/0010-remove-sesandbox-support.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -uNr policycoreutils-2.4-rc2.orig/Makefile policycoreutils-2.4-rc2/Makefile
---- policycoreutils-2.4-rc2.orig/Makefile	2014-08-28 20:13:23.212622408 +0200
-+++ policycoreutils-2.4-rc2/Makefile	2014-08-28 20:14:24.136624808 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
-+SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
- 
- INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
- 
diff --git a/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch b/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
deleted file mode 100644
index a3eeaed901d5..000000000000
--- a/sys-apps/policycoreutils/files/0020-disable-autodetection-of-pam-and-audit.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -uNr policycoreutils-2.2.1.orig/newrole/Makefile policycoreutils-2.2.1/newrole/Makefile
---- policycoreutils-2.2.1.orig/newrole/Makefile	2013-11-04 21:37:27.197018032 +0100
-+++ policycoreutils-2.2.1/newrole/Makefile	2013-11-04 21:37:47.602018075 +0100
-@@ -4,8 +4,8 @@
- MANDIR ?= $(PREFIX)/share/man
- ETCDIR ?= $(DESTDIR)/etc
- LOCALEDIR = /usr/share/locale
--PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
--AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+PAMH ?= no
-+AUDITH ?= no
- # Enable capabilities to permit newrole to generate audit records.
- # This will make newrole a setuid root program.
- # The capabilities used are: CAP_AUDIT_WRITE.
-@@ -24,7 +24,7 @@
- EXTRA_OBJS =
- override CFLAGS += -DVERSION=\"$(VERSION)\" $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
- LDLIBS += -lselinux -L$(PREFIX)/lib
--ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), yes)
- 	override CFLAGS += -DUSE_PAM
- 	EXTRA_OBJS += hashtab.o
- 	LDLIBS += -lpam -lpam_misc
-@@ -32,7 +32,7 @@
- 	override CFLAGS += -D_XOPEN_SOURCE=500
- 	LDLIBS += -lcrypt
- endif
--ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), yes)
- 	override CFLAGS += -DUSE_AUDIT
- 	LDLIBS += -laudit
- endif
-@@ -49,7 +49,7 @@
- 	IS_SUID=y
- endif
- ifeq ($(IS_SUID),y)
--	MODE := 4555
-+	MODE := 0555
- 	LDLIBS += -lcap-ng
- else
- 	MODE := 0555
-@@ -66,7 +66,7 @@
- 	test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1
- 	install -m $(MODE) newrole $(BINDIR)
- 	install -m 644 newrole.1 $(MANDIR)/man1/
--ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), yes)
- 	test -d $(ETCDIR)/pam.d || install -m 755 -d $(ETCDIR)/pam.d
- ifeq ($(LSPP_PRIV),y)
- 	install -m 644 newrole-lspp.pamd $(ETCDIR)/pam.d/newrole
-diff -uNr policycoreutils-2.2.1.orig/run_init/Makefile policycoreutils-2.2.1/run_init/Makefile
---- policycoreutils-2.2.1.orig/run_init/Makefile	2013-11-04 21:37:27.115018032 +0100
-+++ policycoreutils-2.2.1/run_init/Makefile	2013-11-04 21:37:47.603018075 +0100
-@@ -5,20 +5,20 @@
- MANDIR ?= $(PREFIX)/share/man
- ETCDIR ?= $(DESTDIR)/etc
- LOCALEDIR ?= /usr/share/locale
--PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
--AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+PAMH ?= no
-+AUDITH ?= no
- 
- CFLAGS ?= -Werror -Wall -W
- override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
- LDLIBS += -lselinux -L$(PREFIX)/lib
--ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), yes)
- 	override CFLAGS += -DUSE_PAM
- 	LDLIBS += -lpam -lpam_misc
- else
- 	override CFLAGS += -D_XOPEN_SOURCE=500
- 	LDLIBS += -lcrypt
- endif
--ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), yes)
- 	override CFLAGS += -DUSE_AUDIT
- 	LDLIBS += -laudit
- endif
-@@ -38,7 +38,7 @@
- 	install -m 755 open_init_pty $(SBINDIR)
- 	install -m 644 run_init.8 $(MANDIR)/man8/
- 	install -m 644 open_init_pty.8 $(MANDIR)/man8/
--ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), yes)
- 	install -m 644 run_init.pamd $(ETCDIR)/pam.d/run_init
- endif
- 
-diff -uNr policycoreutils-2.2.1.orig/setfiles/Makefile policycoreutils-2.2.1/setfiles/Makefile
---- policycoreutils-2.2.1.orig/setfiles/Makefile	2013-11-04 21:37:27.198018032 +0100
-+++ policycoreutils-2.2.1/setfiles/Makefile	2013-11-04 21:37:47.603018075 +0100
-@@ -3,7 +3,7 @@
- SBINDIR ?= $(DESTDIR)/sbin
- MANDIR = $(PREFIX)/share/man
- LIBDIR ?= $(PREFIX)/lib
--AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+AUDITH ?= no
- 
- PROGRESS_STEP=$(shell grep "^\#define STAR_COUNT" restore.h | awk -S '{ print $$3 }')
- ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }')
-@@ -12,7 +12,7 @@
- override CFLAGS += -I$(PREFIX)/include
- LDLIBS = -lselinux -lsepol -L$(LIBDIR)
- 
--ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), yes)
- 	override CFLAGS += -DUSE_AUDIT
- 	LDLIBS += -laudit
- endif
diff --git a/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch b/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch
deleted file mode 100644
index 6a31e255a952..000000000000
--- a/sys-apps/policycoreutils/files/0030-make-inotify-check-use-flag-triggered.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -uNr policycoreutils-2.4-rc2.orig/Makefile policycoreutils-2.4-rc2/Makefile
---- policycoreutils-2.4-rc2.orig/Makefile	2014-08-28 20:22:45.230644554 +0200
-+++ policycoreutils-2.4-rc2/Makefile	2014-08-28 20:27:08.642654934 +0200
-@@ -1,8 +1,8 @@
- SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
- 
--INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
-+INOTIFYH ?= no
- 
--ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
-+ifeq (${INOTIFYH}, yes)
- 	SUBDIRS += restorecond
- endif
- 
diff --git a/sys-apps/policycoreutils/files/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch b/sys-apps/policycoreutils/files/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch
deleted file mode 100644
index 7d438983bb7e..000000000000
--- a/sys-apps/policycoreutils/files/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr policycoreutils-2.2.1.orig/load_policy/Makefile policycoreutils-2.2.1/load_policy/Makefile
---- policycoreutils-2.2.1.orig/load_policy/Makefile	2013-11-04 21:41:28.289018546 +0100
-+++ policycoreutils-2.2.1/load_policy/Makefile	2013-11-04 21:43:31.118018808 +0100
-@@ -19,7 +19,6 @@
- 	test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8
- 	install -m 644 load_policy.8 $(MANDIR)/man8/
- 	-mkdir -p $(USRSBINDIR)
--	-ln -sf $(SBINDIR)/load_policy $(USRSBINDIR)/load_policy 
- 
- clean:
- 	-rm -f $(TARGETS) *.o 
diff --git a/sys-apps/policycoreutils/files/0110-build-mcstrans-bug-472912.patch b/sys-apps/policycoreutils/files/0110-build-mcstrans-bug-472912.patch
deleted file mode 100644
index 68033c705cd5..000000000000
--- a/sys-apps/policycoreutils/files/0110-build-mcstrans-bug-472912.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -uNr policycoreutils-2.4-rc2.orig/Makefile policycoreutils-2.4-rc2/Makefile
---- policycoreutils-2.4-rc2.orig/Makefile	2014-08-28 20:31:19.563664821 +0200
-+++ policycoreutils-2.4-rc2/Makefile	2014-08-28 20:32:25.900667435 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
-+SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll mcstrans
- 
- INOTIFYH ?= n
- 
-diff -uNr policycoreutils-2.4-rc2.orig/mcstrans/src/Makefile policycoreutils-2.4-rc2/mcstrans/src/Makefile
---- policycoreutils-2.4-rc2.orig/mcstrans/src/Makefile	2014-08-28 20:31:19.562664821 +0200
-+++ policycoreutils-2.4-rc2/mcstrans/src/Makefile	2014-08-28 20:33:39.345670329 +0200
-@@ -1,23 +1,10 @@
- ARCH = $(shell uname -i)
--ifeq "$(ARCH)" "x86_64"
--	# In case of 64 bit system, use these lines
--	LIBDIR=/usr/lib64
--else 
--ifeq "$(ARCH)" "i686"
--	# In case of 32 bit system, use these lines
--	LIBDIR=/usr/lib
--else
--ifeq "$(ARCH)" "i386"
--	# In case of 32 bit system, use these lines
--	LIBDIR=/usr/lib
--endif
--endif
--endif
- # Installation directories.
- PREFIX  ?= $(DESTDIR)/usr
- SBINDIR ?= $(DESTDIR)/sbin
- INITDIR ?= $(DESTDIR)/etc/rc.d/init.d
- SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd
-+LIBDIR ?= $(PREFIX)/lib
- 
- PROG_SRC=mcstrans.c  mcscolor.c  mcstransd.c  mls_level.c
- PROG_OBJS= $(patsubst %.c,%.o,$(PROG_SRC))
-diff -uNr policycoreutils-2.4-rc2.orig/mcstrans/utils/Makefile policycoreutils-2.4-rc2/mcstrans/utils/Makefile
---- policycoreutils-2.4-rc2.orig/mcstrans/utils/Makefile	2014-08-28 20:31:19.556664821 +0200
-+++ policycoreutils-2.4-rc2/mcstrans/utils/Makefile	2014-08-28 20:34:14.145671701 +0200
-@@ -3,22 +3,7 @@
- BINDIR ?= $(PREFIX)/sbin
- 
- ARCH = $(shell uname -i)
--ifeq "$(ARCH)" "x86_64"
--        # In case of 64 bit system, use these lines
--        LIBDIR=/usr/lib64
--else
--ifeq "$(ARCH)" "i686"
--        # In case of 32 bit system, use these lines
--        LIBDIR=/usr/lib
--else
--ifeq "$(ARCH)" "i386"
--        # In case of 32 bit system, use these lines
--        LIBDIR=/usr/lib
--endif
--endif
--endif
--
--
-+LIBDIR ?= $(PREFIX)/lib
- CFLAGS ?= -Wall
- override CFLAGS += -I../src -D_GNU_SOURCE
- LDLIBS += -L../src ../src/mcstrans.o ../src/mls_level.o -lselinux -lpcre $(LIBDIR)/libsepol.a
diff --git a/sys-apps/policycoreutils/files/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch b/sys-apps/policycoreutils/files/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch
deleted file mode 100644
index cf50664264e1..000000000000
--- a/sys-apps/policycoreutils/files/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr policycoreutils-2.4-rc2.orig/mcstrans/src/mcscolor.c policycoreutils-2.4-rc2/mcstrans/src/mcscolor.c
---- policycoreutils-2.4-rc2.orig/mcstrans/src/mcscolor.c	2014-08-28 21:26:25.125795076 +0200
-+++ policycoreutils-2.4-rc2/mcstrans/src/mcscolor.c	2014-08-28 21:27:03.509796589 +0200
-@@ -11,6 +11,7 @@
- #include <syslog.h>
- #include <selinux/selinux.h>
- #include <selinux/context.h>
-+#include <selinux/av_permissions.h>
- #include "mcstrans.h"
- 
- /* Define data structures */
diff --git a/sys-apps/policycoreutils/policycoreutils-2.6-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.6-r1.ebuild
deleted file mode 100644
index 6a544ae2b9dd..000000000000
--- a/sys-apps/policycoreutils/policycoreutils-2.6-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# 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} )
-PYTHON_REQ_USE="xml"
-
-inherit multilib python-r1 toolchain-funcs bash-completion-r1
-
-MY_P="${P//_/-}"
-
-MY_RELEASEDATE="20161014"
-EXTRAS_VER="1.35"
-SEMNG_VER="${PV}"
-SELNX_VER="${PV}"
-SEPOL_VER="${PV}"
-
-IUSE="audit pam dbus"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DESCRIPTION="SELinux core utilities"
-HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/selinux.git"
-	SRC_URI="https://dev.gentoo.org/~swift/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	S1="${WORKDIR}/${MY_P}/${PN}"
-	S2="${WORKDIR}/policycoreutils-extra"
-	S="${S1}"
-else
-	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
-		https://dev.gentoo.org/~swift/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~mips x86"
-	S1="${WORKDIR}/${MY_P}"
-	S2="${WORKDIR}/policycoreutils-extra"
-	S="${S1}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python,${PYTHON_USEDEP}]
-	>=sys-libs/glibc-2.4
-	>=sys-libs/libcap-1.10-r10:=
-	>=sys-libs/libsemanage-${SEMNG_VER}:=[python,${PYTHON_USEDEP}]
-	sys-libs/libcap-ng:=
-	>=sys-libs/libsepol-${SEPOL_VER}:=
-	>=app-admin/setools-4.0[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	dev-python/ipy[${PYTHON_USEDEP}]
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib:=
-	)
-	audit? ( >=sys-process/audit-1.5.1[python,${PYTHON_USEDEP}] )
-	pam? ( sys-libs/pam:= )
-	${PYTHON_DEPS}
-	!<sec-policy/selinux-base-policy-2.20151208-r6"
-# 2.20151208-r6 and higher has support for new setfiles
-
-### libcgroup -> seunshare
-### dbus -> restorecond
-
-# pax-utils for scanelf used by rlpkg
-RDEPEND="${DEPEND}
-	dev-python/sepolgen[${PYTHON_USEDEP}]
-	app-misc/pax-utils
-	!<sys-apps/openrc-0.14"
-
-src_unpack() {
-	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	S="${S1}"
-	cd "${S}" || die "Failed to switch to ${S}"
-	if [[ ${PV} != 9999 ]] ; then
-		# If needed for live ebuilds please use /etc/portage/patches
-		eapply "${FILESDIR}/0010-remove-sesandbox-support.patch"
-		eapply "${FILESDIR}/0020-disable-autodetection-of-pam-and-audit.patch"
-		eapply "${FILESDIR}/0030-make-inotify-check-use-flag-triggered.patch"
-		eapply "${FILESDIR}/0070-remove-symlink-attempt-fails-with-gentoo-sandbox-approach.patch"
-		eapply "${FILESDIR}/0110-build-mcstrans-bug-472912.patch"
-		eapply "${FILESDIR}/0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch"
-	fi
-
-	# rlpkg is more useful than fixfiles
-	sed -i -e '/^all/s/fixfiles//' "${S}/scripts/Makefile" \
-		|| die "fixfiles sed 1 failed"
-	sed -i -e '/fixfiles/d' "${S}/scripts/Makefile" \
-		|| die "fixfiles sed 2 failed"
-
-	eapply_user
-
-	sed -i 's/-Werror//g' "${S1}"/*/Makefile || die "Failed to remove Werror"
-
-	python_copy_sources
-	# Our extra code is outside the regular directory, so set it to the extra
-	# directory. We really should optimize this as it is ugly, but the extra
-	# code is needed for Gentoo at the same time that policycoreutils is present
-	# (so we cannot use an additional package for now).
-	S="${S2}"
-	python_copy_sources
-}
-
-src_compile() {
-	building() {
-		emake -C "${BUILD_DIR}" \
-			AUDIT_LOG_PRIVS="y" \
-			AUDITH="$(usex audit)" \
-			PAMH="$(usex pam)" \
-			INOTIFYH="$(usex dbus)" \
-			SESANDBOX="n" \
-			CC="$(tc-getCC)" \
-			PYLIBVER="${EPYTHON}" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)"
-	}
-	S="${S1}" # Regular policycoreutils
-	python_foreach_impl building
-	S="${S2}" # Extra set
-	python_foreach_impl building
-}
-
-src_install() {
-	# Python scripts are present in many places. There are no extension modules.
-	installation-policycoreutils() {
-		einfo "Installing policycoreutils"
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-			AUDITH="$(usex audit)" \
-			PAMH="$(usex pam)" \
-			INOTIFYH="$(usex dbus)" \
-			SESANDBOX="n" \
-			AUDIT_LOG_PRIV="y" \
-			PYLIBVER="${EPYTHON}" \
-			LIBDIR="\$(PREFIX)/$(get_libdir)" \
-			install
-		python_optimize
-	}
-
-	installation-extras() {
-		einfo "Installing policycoreutils-extra"
-		emake -C "${BUILD_DIR}" DESTDIR="${D}" INOTIFYH="$(usex dbus)" SHLIBDIR="${D}$(get_libdir)/rc" install
-		python_optimize
-	}
-
-	S="${S1}" # policycoreutils
-	python_foreach_impl installation-policycoreutils
-	S="${S2}" # extras
-	python_foreach_impl installation-extras
-	S="${S1}" # back for later
-
-	# remove redhat-style init script
-	rm -fR "${D}/etc/rc.d" || die
-
-	# compatibility symlinks
-	dosym /sbin/setfiles /usr/sbin/setfiles
-	bashcomp_alias setsebool getsebool
-
-	# location for policy definitions
-	dodir /var/lib/selinux
-	keepdir /var/lib/selinux
-
-	# Set version-specific scripts
-	for pyscript in audit2allow sepolgen-ifgen sepolicy chcat; do
-	  python_replicate_script "${ED}/usr/bin/${pyscript}"
-	done
-	for pyscript in semanage rlpkg; do
-	  python_replicate_script "${ED}/usr/sbin/${pyscript}"
-	done
-
-	dodir /usr/share/doc/${PF}/mcstrans/examples
-	cp -dR "${S1}"/mcstrans/share/examples/* "${D}/usr/share/doc/${PF}/mcstrans/examples" || die
-}
-
-pkg_postinst() {
-	for POLICY_TYPE in ${POLICY_TYPES} ; do
-		# There have been some changes to the policy store, rebuilding now.
-		# https://marc.info/?l=selinux&m=143757277819717&w=2
-		einfo "Rebuilding store ${POLICY_TYPE} (without re-loading)."
-		semodule -s "${POLICY_TYPE}" -n -B || die "Failed to rebuild policy store ${POLICY_TYPE}"
-	done
-}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1f161788535f..6f6cf8df03b4 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,7 +8,7 @@ DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b
 EBUILD portage-2.3.13-r1.ebuild 8511 BLAKE2B 1b64d5a8f21d7631bb785e26929dcf2ede2896e0262f09c0d3243e8ef538582353e0386819b5c35ca192c2a3e28040296451157a5bb757c78bdb28885f101b22 SHA512 99cfbd35d7666eef17ea804a14788f4d1612d70743d8d37e4cd94e9eacace3486f7e78e4032215e52abf43fd416bdfbe5dd59178d494fa39b85d25ce569777db
 EBUILD portage-2.3.13.ebuild 8197 BLAKE2B 0d4dc660b6169ea2c69c35ff9d44ce8ae3d25d18f15f529bca80140e20fae2905598cc2668c5b9fdc9bac042144bdbf7c8ccffb0e2680cff28ceef13123ac228 SHA512 1dea3d8545bdb72b4b0acbaf7377404be97630335ec1d22430e2a872c550a45abde63b03cc2105cac70627e0c5b5481448bcedfa0b7702e11ed79f29c2f4b3a2
 EBUILD portage-2.3.16.ebuild 8360 BLAKE2B e86eb44b2dd331f52d308a63d3db0f94dd2873ba1fba84d9f3a2d0420a18ee656765238c4da0025ebc329a1b42025ab2f665b9374f757e3b7a40b67af2391564 SHA512 993dca2cc7a1b1d102507f11945922cc403771055dc273c10e92b62c55b9f47e9b32136a8d958f66de32476b2c60ce4d211e69cbb1fa7de7003ca0c658944025
-EBUILD portage-2.3.19-r1.ebuild 8410 BLAKE2B 1a3753ecea5555ac11a60b3ded94a75cdffb931a828927fd5d01cc0d544bccbaa35a5ac559001d02c4a8df7cdd61939bb60785cc7c0e518a30470b3a611c1829 SHA512 c91fd81e456c454614c23609776aa10de0a3e1f1114ef6bc03b15db6715109aab31e357e7ce7bb2b5f4873c1e64585ed060d52533874b745c430e1050e929bab
+EBUILD portage-2.3.19-r1.ebuild 8416 BLAKE2B 59795b2a944ef1c0c53e1700e39c1e2ed8077863176e8f42f504b3cf54b565b6664558d8414bf98df73bda261234749a568fe360444b418ae944b84ee46ea556 SHA512 39bb40d10dc26ca4026d11e4eee21828e9d95a0c4109dab9c82499fb4950f0a6970fd6836dad0174a2ecf08ac960a71588402180c85675db0539ead6f3173106
 EBUILD portage-2.3.24-r1.ebuild 9266 BLAKE2B 28dfdb68f2128309d1f5917c0f19ff0f41d42a15ee916d51570dd03a75890e0286e6f262e78dfeeeb95ea989b4521b8c7406b15e5208f803cfbe2a01df1a0552 SHA512 5cd897ff5a79ef08ded6f36e61efcf9b82fc0de87b5f2ba51a1cc0faca83ead8b8b3b6fe62d04601c8bacde8fd4cbd10bbfb93c40f5a40cf59aa203a732460ab
 EBUILD portage-2.3.8.ebuild 8184 BLAKE2B 82741887eae10f0618155d62129b43e52d4295847411ee3128a594e7679e0270eb924e34e9a5da5814092d2a02cb901592981a7c2bbf8e45498f2e28ff68bf28 SHA512 089f05718ee3fe0c8738af8653f76b2c9f7b65782fb29ae2a3d055af3dc3fff1f27c9a38620606f45416c6cd6d4b84a86db68ed43ddc41da5312487168383dfb
 EBUILD portage-9999.ebuild 8795 BLAKE2B 82b5c300a67ef35dc2e57e2680efec39cfe4247e5ae8b6e469bfb022275076056b0ec05f280d4925a4537588d94b471397d8a065c2a80e6e64b5e9c51cff2ec7 SHA512 fadc6f2da2fc363438aee4a04b0c36bad372d724c14591fba943b6f9f7602d820300192dd1ca9d78f32bf2279a27aca0c74364a2563a58a135f684adfbaf1910
diff --git a/sys-apps/portage/portage-2.3.19-r1.ebuild b/sys-apps/portage/portage-2.3.19-r1.ebuild
index 9dd63fc62c97..dc03695e781e 100644
--- a/sys-apps/portage/portage-2.3.19-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.19-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="build doc epydoc +ipc +native-extensions selinux xattr"
 
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index d25544f4dffc..85066407cb28 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,56 +1,78 @@
+AUX ripgrep-0.8.1-bundled-deps.patch 767 BLAKE2B 957959ddc7c1b81519de1ab522c8dda6828acf39f9f8cb0e33db3f8762c15190bf536d74c36e4564059a54ad79323c28077260990cd026aa03b24093ec338caa SHA512 7640f6441c09759b727efd1fc25c10c09d929af4c7a28ccf61f9cc141611a274b52af5763a77598f718ea542a2a00f9d8b73d371412fb3e176577f21b6299ecd
 DIST aho-corasick-0.6.3.crate 24963 BLAKE2B 7d22a3501664a4324e43a20874fe4d2afcb1576d66f76bcfd894c0ea03b0daefd85e03e20196370dcb86d8c81067c3bc2202889349389c23b876d4b2bf8f2bbd SHA512 4d0d55d8a6657fe13009d66728b7417926325dd9ca4f7ad7cd5d40e59cf0a55b906cd109d724a0b385ee988526535fc64a467ded171419e452c5a8c90196ae45
+DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
+DIST ansi_term-0.10.2.crate 16642 BLAKE2B 69c001a07e02f48eeea8d63b1a242fc1eeb2ab9cb874e6c0e6cf40efbb6a1d585572330f9b69abb4d8df3012edc6e861854f816571b35aa55ee759fce79f1203 SHA512 ad4572845913cb21fdd9d8c0bffc5fce1571ef62c32fe83fd41262f7955e918400a446077494038299c4c0dfb0bd030d089336b3f169e726a5e15ee5c78ea3b5
 DIST ansi_term-0.9.0.crate 11718 BLAKE2B c3a29c8efe994822aa37854cc804ce2ea7f03ea622cfe05dd063f2e07f3d666ab7a8fc21f0f5a7f7f6c2a520b5cf6409ceb8b2438b3a416a44e70de4c094fa20 SHA512 4b5297d80f2a7fa840aeb1c31e7b893b33abcc7ce7f6f54371f6d7fc8e2915b43b5e3be3baab32b0821e174d8f7b58961029569a4f9e59b8a46c05f24ecaf04b
-DIST atty-0.2.2.crate 5124 BLAKE2B c49d6ad5d47be2910fd9cb96bb68ddc38489e800894679df7acd15c88d834035d9918afceb219eb6ce127e68ef2c7eb25a04f022218189283cd8d228861772f6 SHA512 6e6e2cede7f280a53a61c78126783ec0338c13a8e9bbabb91d4b6fc43aacc56a4f7e86556210029595acf18e444121998101992b40e35a64cce884ec08247d0a
 DIST atty-0.2.3.crate 5486 BLAKE2B 5c1b3bc8cd680ae639302d51fd54a10ad2595ed112d7e179d200d81a0c3bce326cde22458c9c757beb6601f00fcb61000f6f1785b7ca6832ca28b9f58472d604 SHA512 9c944334333ca59d28588e164d2a68750eaf889dcc6b28bc49fe9a7990e0b1694d302a685142866362b7b97ef3f36daa410b59d6222e99cf6f096836850794cb
+DIST atty-0.2.6.crate 5617 BLAKE2B 52274b58d4ae19cdd57a85a46449be32ac4662da6ce746382eff30c75729dbb5e50a9e9ad59f11b11f6d40b7ec2bc261e290f33127de62636c7f249c174bc4d3 SHA512 ae0aa91616571391eb4a2cc46b4765784dcd96b514fc7c3b64f756d1a180f95c83b9d14086f872fb7466be0e623f44a1a3170e786d7fbff5bdd949ef0cd88997
 DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
+DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
 DIST bytecount-0.1.7.crate 10121 BLAKE2B 2960616fed29dc32393190759027d718836eacf334c29142a31ba4970842ac0b1d8859cb936f5a0a1635d9b5faec5841aa40b18c9acc1a47f8b86302e9b1c013 SHA512 2482f06b62699251c70f45a67c29efa3cfce74568d261105ab14134853396dd6ee9a35ba29dd28e3b8dab4f1398f55708c4f648590330c8aea753ab27cb59c3c
+DIST bytecount-0.3.1.crate 12347 BLAKE2B 31d4d72e7edd37b78232db9b7a0ad2ea2fd18596891e43cff7f00438f5e033d5b3f901e6750fa179dc4d313424afb4dd853d3f5714a0d14c4faaf83958eb961a SHA512 09f2fda4bcddffc94f9e1f60afe478ba988c74276196e003f652229d7979491b1dc29686d3d11e2a9015b628638288b6dac23b27b157ae1025f64b05c35a5e19
 DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa
-DIST clap-2.26.0.crate 180834 BLAKE2B 4c99fde23a20a4c8ba235f10d252f837c7d65c6d593acaa39b452c09809e19d2946b1a991ce7ad65998e05a20683194c4c928e1eb2f102732727f8e6798f3d8d SHA512 b1a610e889b21f8f23aa5f7d40ee50cc5721201d661feca05952b792274aa6dc3a35c54e8aa29cba1f6502596864303fdee881b6794dedb59cc9fd90355498b8
 DIST clap-2.26.2.crate 182509 BLAKE2B 2bf91bd56d44edc6864a59576625cb2a04476e1f4246d0032ca413b6a43492d4de8bfec1ad05396fe5da9182a2c021331ad0efda76961af8f36c163a0fec5325 SHA512 15745452263c8b39fed61f12c5f36413a4064f726262bd4cd432baa873d2c820b702d2bbff645e65a0c2fb8e054b6f0a51b0047a21c40749c9c0f631003959ea
+DIST clap-2.30.0.crate 190562 BLAKE2B f97f4eb85f5a6775a42f112bd26c48561bf8ae41016b638b4f0fe0c18987896a1a3918f41211330f617b44a40c7ae0a2ccdd107e6f3bbdf53bb6c035439f4139 SHA512 2a4af4035dd92adf00e183d15528ed658ce7dec6d9df592565fbcc86e94b1b41ce9f11996da64a655a85909fc89c9b9404ec9b717bbca78c14d96e85916480bb
 DIST crossbeam-0.2.10.crate 32993 BLAKE2B 10bc4519c091251798a838a9ed3404f84b6af950e88209b6ce7607f5ee1105fdd1ea4c81f788321455b3bf5c6169e7296757a73619ee837ee4ac799fa1c64b7d SHA512 cdefcda7626c08ca59bdf5581e0e8d3e6367081089cc32dad6e84b5f643c7cbc5b08ce47034dd925fe2f5e2dfcfd18afb51fba511265ee3598fc1844838948f2
-DIST encoding_rs-0.6.11.crate 1220572 BLAKE2B 2960e2af568a911b78b9a6f8e2c185c7ab5c449ff29a2e0278987183f5cfa09052d49ee26870ff24e243e8412202d6ff247f76d6eee7c3fbd81e7224b429f3a8 SHA512 5409fc1d6b9af953ffb246a8c119e9aa0e03ce6c3f0d6ce3606340f789e9195f376b76e724f08fc5b9975c370abafe8cfd591d55ff5fa05375654d5ff2fa6954
+DIST crossbeam-0.3.2.crate 33440 BLAKE2B a5fe9d77b3fcb4ac890b3ccf4e2548cf82c99571961d3960326210ce63dbe8b04e4a5917b57dbb657777288942dec1689387b73e41175b86e013307e057e7257 SHA512 e467a84c3a3655ed1108e2af2ee75dc1fd7bd435dc28fa29e43c055edd26d24d8a5d95edac86fb428e52ba70fcca68ac960952442d0a451568877c371057f0e9
 DIST encoding_rs-0.7.1.crate 1220716 BLAKE2B 2984bb16d93e323086076ef08f0290cf036e3cb3d57fc5c4f5575d6302236bd0f1d914c8016b4c192a1eb91622319f1d5a3498b05ba2c038ba843a441ad4f33c SHA512 272e4b5a5d2dd091bf33f53baca2e2afe2b9b3d77325aa6fcf27bbef5bd8f7ef5a47a443c6633fa6fb4793f990d1fb75f0c02f2be6f2e3d385bdf546b2c28a44
+DIST encoding_rs-0.7.2.crate 1241345 BLAKE2B f3aea266a3cd48027405d537e8bdf45b5b1084ab2d9d30a17dfdc23806607fc4eae4ecbd20d6faf667084d401f58fbe0fb53babc2aadbbfcdb30b81bd91a325e SHA512 92633620eb915ec3a4b1cc3d9d3ac38134827fa5f750eb7415e31e97c99e65e8532393090202a6a5a86979ac64127a7e8531b7c736f1109f47ea303bcb4f81ee
 DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
 DIST fnv-1.0.5.crate 6295 BLAKE2B f8c6cb514301864a6c61b2831195bbe97c849aff8b867b837b5af91a9bb49e2499625a636d2b4148b294f7061b783713780d393ae3c0d17e8ba55e00a74bf112 SHA512 a851ed060bf49224436acb1b5cc3125d30a3b527be9d7abd09f4170eee6243de8067b0bae5b136e62fdb8ee026e42a150109e90fcdf4cc4258f4de045d6069a8
+DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fs2-0.4.2.crate 12815 BLAKE2B c84f4eae016ae1424e63f6c2b5a6c1deb2aa1343b0bdbf732041e737da7701fdb1228a5750cb1994375e78fbb324fbb425de26e11f0aacdf7e10e0cb10cf4084 SHA512 626c5edadaf356ef9d13ac042ef517f317a376fefc76163e3dc7573eff024323a2ea0f9c1582db5d797eb2ea64f2d27e7877e774154f5d5dadc506c926a5dfef
+DIST globset-0.3.0.crate 21315 BLAKE2B ff971a15dd85f7ab420c60f1ffcd1f2b772ee35e7743b8312fd4b45ee6e2160c783458173dffca540f5f7a4c7feeafaf31932ec775e8a99a6c6aaeebc87e98f1 SHA512 53cce0854058e70c869c4d7803dc040866028bb91ef2a5be59f3d93de18452898ec958b035961d536821fe967ad52c074114dcf23d62e0d0a5317b32d264e8bf
+DIST grep-0.1.8.crate 236744 BLAKE2B f119476878826f0b410770db4b95fa65fdc89b461f6ecdc43d15013d9fc82d91117b76fba6150c193633667243b3e49f88499cc532a3cac21565bd3e68217abc SHA512 d0a4e9dd51402ed8036aa5d2cfcdb184538d2bf0c81baac75c73e80d05945a63cb08a931d87fa526695af93271cecaed6650a045904ceaa05ed6e06fd23e537b
+DIST ignore-0.4.1.crate 41806 BLAKE2B 0c311a0c552d0a4fedd6a410d6482815469caf6ba318714e247d1056426eea803ad8fd15c5cc364b779b162467d482d7eadf1cd0fdefbe266983ba5326b51022 SHA512 3ea888576957cde216c07e003e3a2401d7bb27edf8cdf045e8f37f51488c0d9aeafca71281991109a0d291741a948f0577c4d24e189f448e474fa79829f6f79a
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lazy_static-0.2.8.crate 9950 BLAKE2B fff432af8299c8ae39f055a0c6bf0b8bdb7c3317b77ffc8a3c9b248e79434f8bb3f737596822fc5cf0dda7a2ce39616f699ca13a95d2f56cb619b3263beaf415 SHA512 21c6ea68cb40d187a19e6d960fe0d7e4671101f26b304e4cbe6124f1a3d983fc41c44c4ce9e0d9b984783b7ba94ea873236e48178bdf56cfb8c0a8cfb9ebe368
 DIST lazy_static-0.2.9.crate 11024 BLAKE2B 1ce03ae2143f64f01606435e5989331b4257b9fea8d878fb2b078bf4cb58132a51d252abef5c776169d8828871aa9e9be629a96d907c52407f2d59384861d1cb SHA512 10a75fc071f58fd9cf4d87619ff32e94b2d53da0f414e48319c4f15c1120c018ece698a396f538f60504c85f2faa5da3e48fd17c0fcfb8f575352c70f79c9ba2
-DIST libc-0.2.29.crate 182632 BLAKE2B f35394c5072eebbe3253ee3a252e9551d62964ec6e161b37ee3e6451ff3c292c1bc94fd839ad03ebbf149254ea86f29c893353d036840b38b483d18c8ab095d9 SHA512 3ebb02800c2376ee4b56bc56e3e26f478e6974e826fa7c54aa105416736d5bdd1dbc46dacdb2a0ceba7c536fdee136d21122c5c6288cf10c72033241473369d5
+DIST lazy_static-1.0.0.crate 12611 BLAKE2B c7ffeb553b82cacfeacf214ab069cd0abbc6b83d670ad84704ecd30919c390055b3679ddc85e9a7d0add530df588f6cba4cfd7c5e44e9158b609edef2fe85e4e SHA512 73044fce4d00002d35931d4b28810feb5c28c3debfb7bd570d9a8434cf15c29c17f0daf29ac04d748a32f52a205d5f52ecf69aa395f49d46b825e3fc0cbcd41b
 DIST libc-0.2.32.crate 228762 BLAKE2B b143575c02182abdf765805d879bad92b1b5901eb828774eb0803b08e0bc8af5682ce6aedd3d6d7d68443cf875ffbb0bee026023b957b198b04464559363e167 SHA512 73115eb14e2c90757c5075c86582bb463860f4016e5c3e9a0187b63ec93ee279da8f6146f2eef7914c72c1e6fbab3362dc9b789e2706d15d9b8a486e8311b088
+DIST libc-0.2.36.crate 310575 BLAKE2B cd61236a99ce86b18329e0bfc34b738b6133a38e90d4a1a257b2739ec0e91e6ff24243f6b2b7e1c5ad3b4aa1301da42adc81e67769698f11928ee712ec31e70b SHA512 97995c49322f5a3c93df2db08b7372ba3a6da0edc9247cbd3bfb58f9b01315953596154c97c5bca1517b56b8e35e8d03bbf89f9b980aff724977b98bc0d938ed
 DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
-DIST memchr-1.0.1.crate 8221 BLAKE2B 2b3553c5da6bd6eef0cd716fa9e6856aac0a03a566d038e7b0d2c469e16b682ea985d293fa4d8f85cf34e120bce51732e9987061db396f0aaedafc900c13fd86 SHA512 70ee14fcba41cf896f563da48c8acc683f8cdf77c54cf9786d6a938bd14eca7bcc22c86d0d70a3cae56b2c2f9eeecad2950be759abf02fc98ef96a643af91be6
+DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
 DIST memchr-1.0.2.crate 8639 BLAKE2B 3177eb1792892c0a74c5a7696ba6a4543fd5fabbea60d77e9b55e9d7eed365f3ed1b6dce44911246b52b8ad9a05e51679f42f9ffd4e6bbdbb5d01b5155eef280 SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24
 DIST memchr-2.0.0.crate 9824 BLAKE2B 7e8c47b8ec9465d9c91879a1ac28d8a31b0f8a6e40e4553329d84de8817b2333dda4e234f02ad3fd61e6c68031842a79fca971826b39afbe2fae66f682735fa7 SHA512 de1ba67ccd342cd0b5cc493b5eb67e0e4ef90d0da0c1ec035ae5daaf778fc8d16eaa620d2cdf2100f45a3861640ea174eaeb9012571c90d47e2e925300665b46
+DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
 DIST memmap-0.5.2.crate 14465 BLAKE2B b9b4c5e0aff4867d1988f51aab57fad96b1430f5d0f8515d69214dfcbab6dd4ddb89042bf345ee2de9a84a7146f82c86f7c832cfe4d7b7a3af53948381f8f95e SHA512 c2ccb0afa6795831f1a032c4995d74daeb3bd739059146007b2524ec066517f39f7a2fcf56e69d17a5d091511011b9c0794a8e3ada7322dfc5f20a3d9f6c1b05
-DIST num_cpus-1.6.2.crate 8442 BLAKE2B 2abdaf71357a958cc3f968184cd1e74a9b1b4a8f4b3548a54dc65b10f560a580263479e99cd9cea37179a9cb9fce4db248c8c117802d4ac508884f589e9e156e SHA512 6136c6cd3e4a9c0f165f037e3e6af6502a3ffcdd0cc2d38635902f243124e5c6ccbd4db8e0bcb624e2ef824284145c0dd31c1cd5f708478334bc91f842c6050e
+DIST memmap-0.6.2.crate 15015 BLAKE2B 0bcadeff2c355ca77c7828e71f87b1c05ed6eb27d1a244d4bac8c05463903c7c237b1b5aeabaae421af2046a83aea1c4d184a3622d59358e71e083fe2bdd618c SHA512 67e05abb90f5c771f719492b3ac00fb2059e6eb94106be597dd3204cc9f23d91b90476ec1d36b7fcda1fe3d011df596052ac666c239bbd2e1df16bdafed46b4f
 DIST num_cpus-1.7.0.crate 9626 BLAKE2B e099f897fc49d9123507f78cec7c52074629eeb6ba953be5af92f7a83942d69817c55792ce7fc4564b278d79867f145e42ceb7bf559f6790241d7949f3815657 SHA512 467500989a9b1fab4922c4db049a735a6fb7ac07cb92be2ce2bbf6e0c2ad4e3be5e1af33bdf2b9d160cab5ee5a4f292addea1180d5c2a940abd85f8e624d37e0
+DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
 DIST redox_syscall-0.1.31.crate 13420 BLAKE2B 5e533c5db7dd026c490c4250761d105592a2958aba4643d50642d7e543f2850d09b8debadaebf1a7a5f4bcf4c9584bed3f7f6776d075681a4038d3bc53ba9499 SHA512 162655d5ba07857183a75bd7aaa3e190e8d1c2e80002319e5006a67c09a105fb3f3726fed1a116b7284712bf6a2bfde1607cb8b576251233c12b69582969a9f1
+DIST redox_syscall-0.1.37.crate 13980 BLAKE2B 9896615b819ccee17b18093c28a778bf6b4e0b4f6986f071e9e956a9bbc9724e151fd497d394c669d0feb8dcb95c3258a4103af9aacfe8381fc930cd5a1acd8a SHA512 147e48d44227cfe8ea190d543f9f8ab1e49fe2336c80f7e2b83546e617d0eeb8a1e94ce6e4d6f633b92ca72241cbfe0aec082425bc5f7b63d5efd164b51d5e48
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-0.2.2.crate 193403 BLAKE2B d8b439c1544b7faf15fa073f9e759a1a4bdc905290da12d22526e00d22462e5b4d29fa928a88cd6a60902958b828539d04c65f9d8f2d00b3b75805dff9763afe SHA512 208b671d06b260e4a130718a86ced88ee7f183bd056461bc6d44a15a22260a9ee05a014682bdb8bb7ff674fd33ac4748687c7ebd847578c7fecc8efbbb1993b3
+DIST regex-0.2.6.crate 197800 BLAKE2B d135424d756eee989ad9a9180882c773fa4f399cb7f99b454c1b7ce3f2d66ce8daaa19f989878e5676b70f8d5dc2cac30773654156d8cd4b410bef44bc1276d5 SHA512 69c84096834b794227e4937db7598f35e8c489ef8445d3b5f3c0b2a73fe54be029f6db609b046441fda6374485c16943197f7416ed9545c784d14fb61c9e804d
 DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
-DIST ripgrep-0.6.0.tar.gz 470996 BLAKE2B e2ce86defbc8b28d5065ce2f8731b97d15bea0bbad243a1df5bfa20e9d4bfd628fdabd0dbf57b36dc847f26ca7028558392d4c7c9bec72657b45d2b1b34a8264 SHA512 219ec95598c080ddeee65233d1abf58320662ef28681a25cdf9fb63fd38bdb149c75471625545188dcd1deedf05fd58fc32e25cf39fd63943f765c57394ede23
+DIST regex-syntax-0.4.2.crate 126234 BLAKE2B 874339260fc870fcbb8bb982629cfe1b5789877eb3db13181a73a4295b567a2466b3fc17433b890c0a7986ac3640382bd28c155abfec126b650d2a1c99003b3d SHA512 9b37814ab8bf8ba9d0ad125ea4038f505a0d232084faacbc4fa4126afefb3b8bdee03bfb55ee6f29c518a28f25021a31a8eb35d69999c48c739b1c30c2dba98d
 DIST ripgrep-0.7.1.tar.gz 474458 BLAKE2B f75d74f7340b07acf7df2ed13b2a1fd2409a7e126c975d0f73e1fadf386d5a69fcb1947e244ece8827938dca0d6eef0d790337b0ef41fe3e19f2b0f0d1b29323 SHA512 1d2c5b1085ebc6b2b0d1cd330583f8d09bae0789590ff3a8bbb7f79c36b106b9f4fb3c880a225fa4f8565cee55e38514db0e7751f1d14a76005ebfa7c7127e5f
-DIST same-file-0.1.3.crate 7078 BLAKE2B 175390d4c7cbe5b98b27b6d23adcef78beda50277f0035eb58d630591023fff92756e928d2089e915e166c5da6a8b1d5b3184e82576eab5145c1681d46b4e953 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c
+DIST ripgrep-0.8.1.tar.gz 521088 BLAKE2B 4133448f49a9f50cd1da749e3a4c93f64fb9a0cc5522b924197c70178dc4f5ae4b903dece61ca127bfe31eb5038d3587fc1a6807fe519a7abf78fb9b5ed0d518 SHA512 4554f1744c6f8dec9ca8efa80320b69cacc03c52dfa36014994dc7217ed109863798e6c89e80e05926fc3288e4afc44b94e7cb810b1046bb24507f39827a5f95
 DIST same-file-1.0.0.crate 8746 BLAKE2B cc117106dc71ef7129866bff11246e7403919879db288e17ca500cf57160ff04e931fb69aa571532ae6b307364cb9d5055a57e8821b0c52e1cbd14dee0d4cb2d SHA512 75dac7dfec4f3732410b1264d8394d20860c993ac5960888f9ed1acc5f730c16215311a5e13ddc5d4f126e8cbfd8e1c5510bdf6c0be8bedfed19cdf3394d6ffa
+DIST same-file-1.0.2.crate 8870 BLAKE2B 0c723d2f7377e7837babe62ee55807943bb12f013d8608c895701e78f873785b0beb4a2ea84e83e3b44848dcf032b36b573a31be7e4ce9932578fb6ea6a51b7f SHA512 56c923ebd529308c5c1efdeae0314c150ec6fc3d68fe3057ae1a9ec78520f96a78e151985bcea2568775d0d59e4e04e262837d2f3965b175b71569fa703b0951
 DIST simd-0.1.1.crate 39577 BLAKE2B 99f41c79ad02f4de5dace61aa1024dbaa4350060858b031ee415cd135bba76a2a037e499ebb512a61caac40fc4091f406030b45ed85742181ba76f7aacc0b677 SHA512 ed58383bbee3d0a5bc537629cdb242d5ae8ff46d4e8911df16e34a9fe9da693f1347b89f77614d1835391f57c27176824c46feb9733de89915ed4709217466f2
 DIST simd-0.2.0.crate 35102 BLAKE2B f80a1fb4597474a8145f69efabd0c9fa39fc60a4cafb0fac247f2b7ee94c1be2d9173dde78fc51dfe4dd040a7360ef2fe784d2c845e5d689e61ce6d444b337ee SHA512 97538d8811d6627d5c8c32bb59783aaa906887fb320679144d50330e520e85bac7060d7d4e4e7074097ae8928aab66085500344bcd5c4dc8e195e339c7b4f2fb
+DIST simd-0.2.1.crate 35716 BLAKE2B e34e1e937ed92e921603f7aa4b78283a01ee9246c9033c7e16cb95e2585c9145a591ac4f9786f0c51d0b303637203fdf9a0354a0ebc3d658c47edcd055a98546 SHA512 2bf1c2f830d10f60e62def7c5525598e121124e8a4fe1125419c0da3ed97bceec9909550eee171a335ec9c6944958ce5581ae53baad47cccddd234d2b7801535
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST term_size-0.3.0.crate 9932 BLAKE2B 226f2cdf0cbda83803ab1fa8666c8f7be91f5e57b04367203417baa288793b4779a4d5f1cc5d95e40181d9acf8575632c735b13a1805ed9a23bc438ba221f003 SHA512 a466470372c09a6152f1fdaa3d631395410f4db938d0ba1db1695d66bf1620177f4dab4a9aade47de1d48019712072bfc91630cf4c088c56a5775f4d27dded8c
+DIST termcolor-0.3.5.crate 13539 BLAKE2B d5b9edfa562321ed1efd0d26d634c327d0256f09a0d8d1eb5b35b6095561756a4a374f5b43b5384faa8ca321882b8f2598692734b02909884911dff9825bda8c SHA512 3057a20b5aee2a745180c51605469f7b27c0c15b3073b2ce901558cab19893b4cf2afccf95128596a709464c281e08a66b7ae7bf1d28e64da4fb221865733277
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
-DIST textwrap-0.7.0.crate 13341 BLAKE2B 23013cb7c9a7949171b4b738c8c7693180fcef83cd01c19ece2d9bd5a63bfe784499a36692c99f3085f4d26eaaa5d4de4c5b3e803cce1b1852a9ad7e6a08e03f SHA512 4829ecb3a0829f202c53a58ae063ff39f8f5a0a7c031ad30435b73751d5c1d3ef607e4b469e15479f980862e5cd2c947fcdb2e676963f8556a156cf4215f06d1
 DIST textwrap-0.8.0.crate 14903 BLAKE2B 9eacdf4437c2ddccfe256e116d3c4c038aaa28ebd1e67e16d2f40158153115192d4f6a6ff43dda98adb4e49c5e2a7ec096e7f903d2ed591b7f1ff58fc67220b7 SHA512 1648a496cfebedbc6f81b150a2315a9ba588e5b10eab652c27e2d33ce265115aff9036bf3c263a656065c037e66e5a899462a6ff12b1b3a10ccea2fa0e3ba018
+DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
 DIST thread_local-0.3.4.crate 11760 BLAKE2B 7d1c7bc70d6f35a04074ae6d25d14b07f4f48742a8090a1465d2b6cfc9a80e50a737cc75d65f4bd1de226c341d10d630092fee3be74daaada88f567767217403 SHA512 51fc5e1f5046fafe794128e6655c3ed5fa54446d9db151abb5da6e2599b6fb03200746ff4e6adffb6b8a04d015966fd4860ea3eac50bc169ec04ba33978f849d
-DIST unicode-segmentation-1.2.0.crate 67562 BLAKE2B e294566ff0f0bbf8873c73c8f1103bce8d4d0fc8a03f41b299f88aeacecbcb44a3cf2ce95aab9682177a9e3f2e3db9cbd53403830c761724ee3654b9c328f862 SHA512 724fb05d4c02926a535a3380f0a718e5ca0b61c71173efccee6780e878b3e890f11e7941cd970c6c1763ac756f31fe338b0dba2ff31db2aad29670bd6e8b9bab
+DIST thread_local-0.3.5.crate 11794 BLAKE2B 775c55a2165b942eec4cfaa78653e3ff06a6b951635e95dd176f8bde9c58f789a4e3698cc7fa5eb7a9d173fb6c1eb8da682c65a36aa29beded1facae01817336 SHA512 c17bb6bb58e8ef5f27cd6b0a4290752ec00c9856753c9800664e1debc347a26930970b073ba87d6f95936b1be540f87559a8410151b18d01ecc3fe77c45d6cb6
 DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
 DIST vec_map-0.8.0.crate 13742 BLAKE2B 5e1fd880c56f01d69d1680d77b361c89f94e77d75b0c8d1d49c780e6b729e3bc5e8d9a72e3a298bb350b1c27fac02dd7b31eb2f2018208f242b02d8d6d64af21 SHA512 7ce0c05c0b410577b489adb4d35376bc2a55c6041ce50e011b78415e952b5fb7fcff89fdd00b95e086de742f26ff057e99e55585824bbc0482e0ac2134406520
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST walkdir-1.0.7.crate 17883 BLAKE2B 23366528bc49b213e0926e24186b2a1240a5ff7e5cbc5be3c271a416c1417bcc5260b976746f8e0bd3265f4adea45699af661cd998dc15f3aacb878044587c37 SHA512 d5752c39c055dcd163bd74db3495a16e1865fd32e3f0cd779455fb818e78106ee4bdf0cbbcd36331f860c5ca8de658f848988a47194c5b9e130f28a77c4576d3
 DIST walkdir-2.0.1.crate 21483 BLAKE2B 012487a663fbe0ac53dce67d6777c8968c9f32756d1fdc8832083784fd067ce1b55862811d8953f7510d61e5d0dca7969ccbfa5079744860c474ea3e1ba6ce5d SHA512 54ca4b7dd89569de8710af7ad06a631e5693ca7ddb368f1d893d544547de5e073f862324796b66849e46af9c8b0ad3fa98f81a381db8e2e394502a79be1aec7f
+DIST walkdir-2.1.4.crate 22695 BLAKE2B 87d989088a5f4a28c6e7a96c534092ed9574525e711a3d5f7e1abb9a7aa3d347da155f5f0d98cfe6653803b1eabae78dad01594beacd7e5281d6187d7c2db5e4 SHA512 db8a52b2708fc344833a0cf67ef96eea77dd0471337d49c806e7418e18b6c09dafd0034bc3c2ac62dcc360f4292c3634f5a20da3f10a071bb734ec8a121a4387
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-EBUILD ripgrep-0.6.0-r1.ebuild 1244 BLAKE2B b66c397dfb43aaa06a9896d1b2fe7c3a60a27d858795c131d5b5dd35f82946b8ddb2e67bc36ce3b418e430954d2febb03891884737a32fe9cd917eeaac8b86fd SHA512 1cf77e3b841efa4e00b522e4bb8daa02d490393d17c4d34b4a64ea3ae58804d9020d8cd7e5f272501ee2296d17d483dc8cf45fc4b9ffbc10cc6fa598b77064ba
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
 EBUILD ripgrep-0.7.1.ebuild 1284 BLAKE2B 8a5f52fe898761f38cda43fe315c16683f796b55d79d61105f908dd12d64ad40b04bd6787c40a6440f97165380415c45b4eed5e9588b7795b6b48eae6e38a405 SHA512 d0484855abfbaeab6f1167d2ec284847944702356200d11daef215a2a5f7791c2d74918f56eec541772f42fc7d1315c2c71afd9e9bdcd2e3e2b011bb5487cdc9
+EBUILD ripgrep-0.8.1.ebuild 1621 BLAKE2B 58aed7712ab6486af6f136d18e49a06f33f7b0f742f277be9eb20d7499b90af585d091d3787f8456a9974c28964c9bc2225bf337b4eaf5c3036658e5ae037c6c SHA512 c35a40baab29898bb378329fe245c5ac204fdcbf740659376ef31593a6a1be4fe9223ba75144dde9859366937ac20c864e2b77f602106e757ca65d2fd2079184
 MISC metadata.xml 339 BLAKE2B 814975935c3042512ae2d83d3964bc94bef9b6b19181adc8c07f538e095983d503af6f6683c61109f4c3515175f02879f07d352845966c04bc774ee47d65db97 SHA512 4501066b64cc47d58915b452027ea603d319b0eae3d9bcd45642f16bcca3e5bbba3fc998fe8501ce63c4717ccf5f404392b98b54d53b93c648e8c8de116141ef
diff --git a/sys-apps/ripgrep/files/ripgrep-0.8.1-bundled-deps.patch b/sys-apps/ripgrep/files/ripgrep-0.8.1-bundled-deps.patch
new file mode 100644
index 000000000000..ed83151fd6b5
--- /dev/null
+++ b/sys-apps/ripgrep/files/ripgrep-0.8.1-bundled-deps.patch
@@ -0,0 +1,33 @@
+Use deps from crates instead of bundled in the repo.
+
+--- ripgrep-0.8.1/Cargo.toml
++++ ripgrep-0.8.1/Cargo.toml
+@@ -29,16 +29,13 @@
+ name = "integration"
+ path = "tests/tests.rs"
+ 
+-[workspace]
+-members = ["grep", "globset", "ignore", "termcolor", "wincolor"]
+-
+ [dependencies]
+ atty = "0.2.2"
+ bytecount = "0.3.1"
+ encoding_rs = "0.7"
+-globset = { version = "0.3.0", path = "globset" }
+-grep = { version = "0.1.8", path = "grep" }
+-ignore = { version = "0.4.0", path = "ignore" }
++globset = "0.3.0"
++grep = "0.1.8"
++ignore = "0.4.0"
+ lazy_static = "1"
+ libc = "0.2"
+ log = "0.4"
+@@ -47,7 +44,7 @@
+ num_cpus = "1"
+ regex = "0.2.4"
+ same-file = "1"
+-termcolor = { version = "0.3.4", path = "termcolor" }
++termcolor = "0.3.4"
+ 
+ [dependencies.clap]
+ version = "2.29.4"
diff --git a/sys-apps/ripgrep/ripgrep-0.6.0-r1.ebuild b/sys-apps/ripgrep/ripgrep-0.6.0-r1.ebuild
deleted file mode 100644
index 5c82b23a1594..000000000000
--- a/sys-apps/ripgrep/ripgrep-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.2
-bitflags-0.9.1
-bytecount-0.1.7
-cfg-if-0.1.2
-clap-2.26.0
-crossbeam-0.2.10
-encoding_rs-0.6.11
-env_logger-0.4.3
-fnv-1.0.5
-fs2-0.4.2
-kernel32-sys-0.2.2
-lazy_static-0.2.8
-libc-0.2.29
-log-0.3.8
-memchr-1.0.1
-memmap-0.5.2
-num_cpus-1.6.2
-regex-0.2.2
-regex-syntax-0.4.1
-same-file-0.1.3
-simd-0.1.1
-simd-0.2.0
-strsim-0.6.0
-term_size-0.3.0
-textwrap-0.7.0
-thread_local-0.3.4
-unicode-segmentation-1.2.0
-unicode-width-0.1.4
-unreachable-1.0.0
-utf8-ranges-1.0.0
-vec_map-0.8.0
-void-1.0.2
-walkdir-1.0.7
-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/ripgrep/ripgrep-0.8.1.ebuild b/sys-apps/ripgrep/ripgrep-0.8.1.ebuild
new file mode 100644
index 000000000000..47ffb4aa1d01
--- /dev/null
+++ b/sys-apps/ripgrep/ripgrep-0.8.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.6.4
+ansi_term-0.10.2
+atty-0.2.6
+bitflags-1.0.1
+bytecount-0.3.1
+cfg-if-0.1.2
+clap-2.30.0
+crossbeam-0.3.2
+encoding_rs-0.7.2
+fnv-1.0.6
+globset-0.3.0
+grep-0.1.8
+ignore-0.4.1
+lazy_static-1.0.0
+libc-0.2.36
+log-0.4.1
+memchr-2.0.1
+memmap-0.6.2
+num_cpus-1.8.0
+redox_syscall-0.1.37
+redox_termios-0.1.1
+regex-0.2.6
+regex-syntax-0.4.2
+same-file-1.0.2
+simd-0.2.1
+strsim-0.7.0
+termcolor-0.3.5
+termion-1.5.1
+textwrap-0.9.0
+thread_local-0.3.5
+unicode-width-0.1.4
+unreachable-1.0.0
+utf8-ranges-1.0.0
+void-1.0.2
+walkdir-2.1.4
+winapi-0.3.4
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-0.1.6
+"
+
+inherit cargo bash-completion-r1
+
+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"
+IUSE=""
+
+DEPEND=">=virtual/rust-1.20"
+
+PATCHES=( "${FILESDIR}"/${P}-bundled-deps.patch )
+
+src_prepare() {
+	# remove bundled libs
+	rm -r globset grep ignore termcolor wincolor || die
+
+	default
+}
+
+src_test() {
+	cargo test || die "tests failed"
+}
+
+src_install() {
+	cargo_src_install
+
+	# hacks to find/install generated files
+	BUILD_DIR=$(dirname $(find target -name rg.1))
+	doman "${BUILD_DIR}"/rg.1
+	dobashcomp "${BUILD_DIR}"/rg.bash
+
+	dodoc CHANGELOG.md README.md
+
+	insinto /usr/share/zsh/site-functions
+	doins complete/_rg
+}
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index db59a075f627..21cc00fb155d 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -8,6 +8,6 @@ DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6
 DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
 EBUILD sandbox-2.10-r3.ebuild 2156 BLAKE2B fecdef4a769d481e6479c82c341626de5d935f031b33df13eaae51b2041e0793a9854f3726ae90586586dc7d0008230f7ba6ae948c48d145d5c05bd4fd0aa027 SHA512 a08a00c80dcd282c929078c7c3afed16a7c30d710294e1621cf2ca1841f01f95872dd92a0bea1f3d7bb8850c05cffcefb68c58a36c9b1eac1960d1d4b04e3224
 EBUILD sandbox-2.10-r4.ebuild 2222 BLAKE2B 5f0e178bafb0f28dcf320452c64317d9883afee0a68c09190e3293bd857b5ee816e4656b01b5e1dbb7664802d0e13a05540ab4ba61a04c93788dc1d21cee7c95 SHA512 dca8808e22888f5542a1233604a84b0a5e9952bf6e8792b24a716e477b254fc90ac1efc0cff0eccf832f10026cf56341011e227001c70f0d5eaab36c89b5a23c
-EBUILD sandbox-2.12.ebuild 1931 BLAKE2B cd545ca0c7b3b1ca9672e7a0562da03b9eae5dbef36cec7d1eb59d452785ee8f11c03b9a25a9cfe0862a923d5b0f9349c15c6076f9735062cb43505607520b73 SHA512 2a5ec9b1aacfb63d3c4d8f64d067091ab28c7f54ca295a857d14d11d1f4e410c5475cf32d0801cfa1362ce57045da0ef5e1f413a1b56dc541c5efe56d4410d7c
+EBUILD sandbox-2.12.ebuild 1930 BLAKE2B 7bef86110c807a42e928684bf0360972b179876cb798aa022ee59d145f3cf179eae75993414b363c3ed09193d6ebf4390c32f03584264edb535eec81e3c253f3 SHA512 c3647c9b704ebf55929feeafafba28a16f324e06eb7150a0d404490ce3076a21a45473db6a7afb7d6e0c694b2e2e715b2418543835343087cffa548bfdf3186c
 EBUILD sandbox-2.13.ebuild 1938 BLAKE2B 26db9bc8c8334a4a20bcb09765861f6ed6b6a3da6edd02cc9438943fc18271a9ffa90a26d37e2f648cdd5073a22de71decc21417db1ea331833f11d146f5ce4d SHA512 11cd256384d562de308cd579a04c3742dc436a8e3f4e30cc66d837373c2352b99b23bd4fbfee6fa61b74b7e1eaae95b7ffec1f0fb9785979b783c17f420cdbe7
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.12.ebuild b/sys-apps/sandbox/sandbox-2.12.ebuild
index 2a7f3ce6beb3..616b419f0fee 100644
--- a/sys-apps/sandbox/sandbox-2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 21364fcea6bf..4d4f11462c08 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,4 +1,4 @@
 DIST selinux-python-2.7.tar.gz 2068004 BLAKE2B 57c7f324a8faddf57a576f9ec5c46c8dbbd085a3aff4355df645b0f391a0c2db718e8adb2719515cc4a9c386e11c3df053b5303d3f91ff4958fb91e80d440b51 SHA512 df8645e7ac9ca568f0c9d81c42b93d0abadc43c22f14d38451ab262b52132cfb7abd7742e3a00ab9c153f95dd5b23b3a496d84875debcd9787f75d940eb45c28
-EBUILD selinux-python-2.7.ebuild 2669 BLAKE2B c1a04f9df954ede292be8a5d7d5175240e3385ecdaa3c93c3d64d6a06d9210af2ca451ed06efa923b7fd269d296d14d03e3b6f9b082c0ac7a38b9d56bcc51afb SHA512 7319def94fe6e2fca46f9a4cfa361cbda66f389c2874873a8efadec8aa5083644d9f888d82733a98aa44142b0fc888419139898ffcf3f3431fd2e2a9223576cd
-EBUILD selinux-python-9999.ebuild 2676 BLAKE2B 94788d94d5dadcaf4488ce542f2489278f37d464c1f7b614c2caf6ef908fac45c4611eaae40e0ec8573894ddb2a833bb067fce13e5ed978506a6223169f795f6 SHA512 c646ba210a01e9ccddd639681aab38ce98abf7bb1fc07627f6a56ad5bbfe25a3b2f4664da5b414efe8b03b469a40fbf5d8cd2100a45a6b71d2d0188834b2cee7
+EBUILD selinux-python-2.7.ebuild 2673 BLAKE2B 14692ea38d55be1eb9b17dde7b4f1c7195139543347314896527c442931812bdac4524cd75c66b654d9b778ed4d6d213d21f2b8b1f3dc424b4bf8101da08bb07 SHA512 ad6d6047b551c82464d58de569cbe7c4137d0e5c87125164690bab4aac5bb48fa01059e31e1cb6de99a0abfd942c7294fefecced7e4b19d8dc4715b398c788c6
+EBUILD selinux-python-9999.ebuild 2680 BLAKE2B fe6418d3802857143c9ab2b7ba5b6c2b69caad5686740c81cb600ea2c9d1e45bc8388957a46d791afad73b8317711a6b6f78a77bb40465e9d5515f4f6038b77d SHA512 6931842e2036e3644c7c93c7c4908aef9403f68c5190b349865742dee41bcada1ddaeb3472bfbe0ae979000ed6592fb22dc49f427b60ba73a1eee256c9e98046
 MISC metadata.xml 718 BLAKE2B ca11527a8722aa1c1f74f1731409e950f866094492f15e9345c117622da63f06bb5681e806545083200a494d3b65f0c4f31e1454aea5fed923f438ef01aa91af SHA512 a45a1c3e516dd956e60be67ddce632d055a98ff0fb45b920adfb5d1253da77822286f9742865027a47e94386dad2a1478a5b51f2bf9a97e2c2571470fdb34e04
diff --git a/sys-apps/selinux-python/selinux-python-2.7.ebuild b/sys-apps/selinux-python/selinux-python-2.7.ebuild
index 832b4b2d809c..eb6630aa1643 100644
--- a/sys-apps/selinux-python/selinux-python-2.7.ebuild
+++ b/sys-apps/selinux-python/selinux-python-2.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index 510a3b731c47..c1e6a49cf4c2 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 0ce05c17dd24..ff11bff211ab 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -13,7 +13,7 @@ DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
 DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
 EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 82e15d7171054d46049bc9a50a8482bc1ebbe7bb53af2ad1b6ee594582f30cb561c6d2e18226f4401c605cf9bcd53290128c7be441cfa6cd60470e313144009d SHA512 53b2e092bc48bc8d2899d9869e77049e9ce0cc6178ac63bb830544ec0a69a3ba5ba29a82a5ba76ab19dd4ce8997b9ae5ffeb3698780fe086ed5a632ff386c1d3
-EBUILD systemd-236-r5.ebuild 13010 BLAKE2B 8619b8ed7a03823b3150036c67185d2fada5ea19bac4cf8b24baa15f7411c8988bb885df6946c6ae5fd20f1defb4dd2562e3dc73af9cc865c5dc42c76c16b2aa SHA512 2ba1fc26dc8db03da3f1f315643b081a998675125e7e7fa2a44071f0cc7dab4c2087a4e8fc83edde25481f6feea955ccb34c2f2c59182a27987061ead617018b
-EBUILD systemd-237-r2.ebuild 13075 BLAKE2B 0d3fd9b59f27ef8e228f7f7f0bf6086f5f04aeadc61b5f4a2ad0b954a0476b7347757817492e3f7365ef7a4602529e30481b3d9a87587f9ed2aabcc43601148c SHA512 f19050b05beefa5581ec53aba7d7965ee6d2daa938ee0a35f6804e881685733766b12cc6f34000831c7903d47e0e6f6a184708ce3d3bc4fff07f7d528ea72824
-EBUILD systemd-9999.ebuild 13020 BLAKE2B 9b514d8b1e871d19a2588c268390258516fee6458821c18fe86cd3397a03b532c3c3c3fb3eb63f1287ab1a372f0b57062c0462d4037329c4df9ca976e73b914c SHA512 7f011b2a72812d167303f8e9ab4fd24a32acaf1ec5a1175abf46fe9b4b4bb1311dc87ecb408c93414e8904e8428851de801e4511134994be6c1df3e47c5e4207
+EBUILD systemd-236-r5.ebuild 13010 BLAKE2B b2a01986b7554e9c55c7f223e9d0c7fdb3ef8107fba40d5db3f1e6f2b8608b53b33d7a04049d0fe4a507d8c65dbdedc1f89cc4625f4e9c4f84ec1f80bca6dc2e SHA512 93a249780754ca1d13e1cf5d8c9c2fe91e602ab411c44a8890c90aac48e5c86293f2fb4fd7078bde490d77538fd2c081acf553af8ef45166982eb510dc53e18d
+EBUILD systemd-237-r2.ebuild 13075 BLAKE2B ff45dd6aa7ff3c27ad18495eb44a8ff04c67d8dddc80546fafa52e3845f1f3ded10f47f9b4e6c46b46786651d3c387f0e86e87ebf09f52045d62054fd9c5f403 SHA512 8bd6fb56e66284ef26f5ad525a38ce67e74d2b48d57dd15a1c67dfd60805da57745b837342d45c96406bef4c7a26aabf0de0db6f60fafb026268a6a154f457b1
+EBUILD systemd-9999.ebuild 13020 BLAKE2B dcba36f9056f996c5aba1be98786e050be0ea128a03b4deb73d9e3d8f5ec6bfe9f2e0b1d9b6be105269dc7a93f34d967e55d5b9ec30c8abb22a6443c06f8f3ec SHA512 0bb205a1421d6bc733794c6db488d58d5855ba972c7f9715253a4d584f02c103ce445171d4fedd5651fc81aa492d696a49c05aea6130840ea0b6f7f931b78259
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild
index 013dfccd14c0..0fb903b6c8f6 100644
--- a/sys-apps/systemd/systemd-236-r5.ebuild
+++ b/sys-apps/systemd/systemd-236-r5.ebuild
@@ -237,7 +237,7 @@ multilib_src_configure() {
 		-Ddbus=$(meson_multilib_native_use test)
 		-Dxkbcommon=$(meson_multilib_native_use xkb)
 		# hardcode a few paths to spare some deps
-		-Dpath-kill=/bin/kill
+		-Dkill-path=/bin/kill
 		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
 		# Breaks screen, tmux, etc.
 		-Ddefault-kill-user-processes=false
diff --git a/sys-apps/systemd/systemd-237-r2.ebuild b/sys-apps/systemd/systemd-237-r2.ebuild
index 71abd1c33595..06b717f4da45 100644
--- a/sys-apps/systemd/systemd-237-r2.ebuild
+++ b/sys-apps/systemd/systemd-237-r2.ebuild
@@ -239,7 +239,7 @@ multilib_src_configure() {
 		-Ddbus=$(meson_multilib_native_use test)
 		-Dxkbcommon=$(meson_multilib_native_use xkb)
 		# hardcode a few paths to spare some deps
-		-Dpath-kill=/bin/kill
+		-Dkill-path=/bin/kill
 		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
 		# Breaks screen, tmux, etc.
 		-Ddefault-kill-user-processes=false
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 97ed32eebe70..60dd1f8efd11 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -56,7 +56,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
 	pcre? ( dev-libs/libpcre2 )
 	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
 	selinux? ( sys-libs/libselinux:0= )
 	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
@@ -238,7 +238,7 @@ multilib_src_configure() {
 		-Ddbus=$(meson_multilib_native_use test)
 		-Dxkbcommon=$(meson_multilib_native_use xkb)
 		# hardcode a few paths to spare some deps
-		-Dpath-kill=/bin/kill
+		-Dkill-path=/bin/kill
 		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
 		# Breaks screen, tmux, etc.
 		-Ddefault-kill-user-processes=false
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index b53b10a6b8ef..26fc883af557 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,21 +1,9 @@
 AUX toybox-0.7.0-includes.patch 556 BLAKE2B 651e566be279aed75013763a0fa7c2c330d6c6ccccaad3e9d01c85bbedfbac7d2ab612acd223763fa1f625d863aebccf324708f41939715f0d453b1214cd3f77 SHA512 83b243f10be79855ca007214055043bdb2da6fba8734a87355faf357a84796a647f6b1d312ee8223ad60122b9fab5f44cf6372b116fb43c408fc320221a39174
 AUX toybox-0.7.0-parallel-build.patch 1148 BLAKE2B af79f6c228b17f72a15535ab5ad8e15870fc8a7f40b816a33a6d8b28ee9107543507d570a1abc3ceaa141bd0a993d37e9e5a58764fd33af4e379023b3b28498e SHA512 b60ce1e8cb33203bea57d9cc757a872f87c55b378a8315d90c125ab9dadbf60d6b7a4bb444f9ae7b08c82ed29e211014aeadb767d5c0954816df66d823c3ba02
 AUX toybox-0.7.0-sysmacros.patch 768 BLAKE2B 80bbad5bd28d41e8aaaf4271bdb4842461291dbd00375ad481f0d1bc2f9c1beb26edafab07f0085b6944b15075763065798d5a4cc157309096e6ce331e7caf3f SHA512 8c43465012b93f7ec175d6d166a8f73475dd37fc1a09df5be25b12de57248ab155b1056ac488cd091433c9de9a602443ed57238818eddd02e41355412d27d19b
-DIST toybox-0.6.0.tar.gz 710572 BLAKE2B 7538191d87987972a41589ba5af0f7dd9b531a2fc87579bb5f30c87a5b7ff2a173a0ba5b1149f69d3d49f51e48009c10d6026ad6699aa1f4e5ed208a897cf2a5 SHA512 ddbd2252cd64a3508b9cd9d8a0a574805583b5b9c3861c153d25e8a394115c28b5a58d02a5aa7d7f58b9b9f3effcd33ac3f55788e0f3c4ad4265233f49c6f3ff
-DIST toybox-0.6.1.tar.gz 736371 BLAKE2B 47e881c39c1d26d467a62074f17a07d83aa6fba443ffaa995a8552087bef515a760ea3a7d12c964646da3c93e3f8b22a96478f78fbcd91f083e34e476f74d16c SHA512 256afdcb0303b8f7a0bfa411cd0300d45460229dac3bf86fa147bb9d7806dc1224d0b1e28e58472932d8468407491559c6369cb29e78f67691560825dc25a68a
-DIST toybox-0.7.0.tar.gz 759570 BLAKE2B 9100208e794c0eb61724ada03d7789ac857a76e43ca31e91f5f1303d3859cba2b4c9ab92b3fd0901762ac97ffc6b7820702af879b0817df3cd5e69ccb6f5bb88 SHA512 805d576712897f32b1f4e75b000a19a284622c040c0410ffc53e11c8ab7e3234e48cf5079a36622f03e6386acc9cbfc9ab94ba9e3e25e524ac0fa430a7d7947b
-DIST toybox-0.7.1.tar.gz 779835 BLAKE2B bd753c652e60150d7cc8623828528c98eef0dcd93a2c776fbf399d4b8d40e760bd40c4c6ae361b646f2cecd9ad8dda1565b6b376eacd6cc10123ae36161135da SHA512 6347ce8a917e7e7f2046ae2aaefbfffe1c8aca42a4770c57dc23739de93647dc476356a4c3875a75d423bd7fd027c01a1b45627dc16f69801ef0369dbae6799b
-DIST toybox-0.7.2.tar.gz 798101 BLAKE2B 0d134fdfe10f77cf4083c5609a9e4ba94bdbfa17461f270e8656f08ef0dcf101dfb64ee517f17cacf170b773fb7e907c95fb1816c9b052e3acc0e44f14f0f58f SHA512 ce579be77b628a8466718c13b28390dd2988bbdd5d51b8fac5cc18125cd13968105bd991dc8bf1e6a9618e8a9c07eded361f6371e2f02f4cd7181b42c135f1ef
-DIST toybox-0.7.3.tar.gz 806773 BLAKE2B 25b9cc7b5edcb342fb4aa51917d66bb6ff8f683399647655754759f55854569e264d68adeb3b180008fa7f0665a708b3935898b7c032947430261510df5377a8 SHA512 8f6fcf156fbfedb706f3048b535369e235c47a40087405e54f0b0de877691c41b700b2ddd8c0d5abd6e09367f313c2eef1bc659331b2391738f6f0eefc9115fd
-DIST toybox-0.7.4.tar.gz 817027 BLAKE2B 46997663edea326eb04c630217cca09a61c5add9f01813357831ad1a33ea99870c094abf15aa16c5ad4a5a21ada9a7d7de7660ad2a4831824a7170d472c58f3b SHA512 380e8c22f1bcea34ee345b9bcfd9459c7bcde8518d0f5c74227ced2e59b063f619e1b6314c1af4e0371d7300fe916d55510272469a061c4232005b7533b09022
 DIST toybox-0.7.5.tar.gz 818815 BLAKE2B 0d91eb07b9c2e64c611be24eb09aac7ffc26d65f3dd39ee7663419e4eff1e9d559b7b6e8df0dc8e13986124aefa706b343c4a3521466f2bdf657d4c9a82a9fc2 SHA512 f0cc54da2394ed14b41dbc80bf674f86989f0312b645b9e1e5403fb0a3282cafce9608b2d738ab2dbb6fe3779eed70d51133a867c6ea76683dd7e6de245df127
-EBUILD toybox-0.6.0.ebuild 1157 BLAKE2B 109fd536f9bfbbf0c8a18b481638924a15bd7dfca7ad750198bb77816c9fc75a38a7b5ba7ebc9aacdb96af631add124741d403efa277e9763a7bbae268966902 SHA512 126a62f29b61547b936693fe20581385340373bfcea6ecda899612e6d506de063a7cdf2567573224d0f8face5792a18ca1ac60baab121c7d636742e749046918
-EBUILD toybox-0.6.1.ebuild 1143 BLAKE2B 027d0728fc89461a354eef0c7ff53ff0d29212fcfe4fcf7b170c2cc78ad86098fd029fb568d8e4cb626dc9a03c4a32750164253ed471d2db48de128e85dfb162 SHA512 0cf11ea87fa8332074ee3df684e4431168d78d199daaaa52ec9559ccf266acdf8eab8b77c0a5a6710284dbe0327fed6bb4789503629b1c7135ad5677a5cbf96e
-EBUILD toybox-0.7.0.ebuild 1276 BLAKE2B 1845788c71348317933b757051e8aa746578c42994608b9baa73efed7e05badd7c9e3ab64fb3a3a311c3dec5ca0f1f8899d6c4ae4010c9bb8ce2644a316e2ab4 SHA512 3ee5aa13536fde7b6171c3e6b515d964c2abe307dc0c71a9aab2c487320ca943a6629f0aa9870a0bd23dfa2084437aeb394f0d52cd58d8d084ccb78f3c0a0e10
-EBUILD toybox-0.7.1.ebuild 1153 BLAKE2B cc94ffda140e82af21c1dcbf7db4f5d35c154d3ab07ac0fd5df367fe90e7c3261d3a886418d0590060ea0dfa15f80fec37a9a6cf130ae71b48cbdfa40f35f9bb SHA512 10b39e903fae908242b95be60cbd7d08808952eadb4e2ca75008d18d9980d83ba632142ebd720bddb81f5c64fd8770d547d164092ff89863daedf644e6790658
-EBUILD toybox-0.7.2.ebuild 1153 BLAKE2B cc94ffda140e82af21c1dcbf7db4f5d35c154d3ab07ac0fd5df367fe90e7c3261d3a886418d0590060ea0dfa15f80fec37a9a6cf130ae71b48cbdfa40f35f9bb SHA512 10b39e903fae908242b95be60cbd7d08808952eadb4e2ca75008d18d9980d83ba632142ebd720bddb81f5c64fd8770d547d164092ff89863daedf644e6790658
-EBUILD toybox-0.7.3.ebuild 1153 BLAKE2B 7045659da4001b0791fcaffffcdc2d3d362ffd5ca6b4f7b9faef6c4d7a6afd25a0649953017faa10ce10d5c8724da274518a1fe9e37718bf8f832bae308c6677 SHA512 5e70c6665773d9bbf334ffb8f0d90005e76b3e47c3eb8d1796738a619c5d5743a7eec476e1d4bbbe721b561916b7f15759c3ae2dd3f1e6952b9050b913ebdea5
-EBUILD toybox-0.7.4.ebuild 1153 BLAKE2B 7045659da4001b0791fcaffffcdc2d3d362ffd5ca6b4f7b9faef6c4d7a6afd25a0649953017faa10ce10d5c8724da274518a1fe9e37718bf8f832bae308c6677 SHA512 5e70c6665773d9bbf334ffb8f0d90005e76b3e47c3eb8d1796738a619c5d5743a7eec476e1d4bbbe721b561916b7f15759c3ae2dd3f1e6952b9050b913ebdea5
+DIST toybox-0.7.6.tar.gz 834351 BLAKE2B 7c6737a8b16f77fd7a5e389be17ef8eb41d28718e46231ec1aa48af0a0ec1cbdc1c0b74670c3f79f58a5b0547f47aa6e5ccbaccc5451b12a80e1c566ee49a30d SHA512 1ed06114f5feb46e642bfeee517366a16c0a5d76562841a3cdf6b003bb330be10d4ac5009c7cf845eb5ea99bb8ae8b4291c413bbd45fd89c2ae3e4a69c1455bb
 EBUILD toybox-0.7.5.ebuild 1153 BLAKE2B 7045659da4001b0791fcaffffcdc2d3d362ffd5ca6b4f7b9faef6c4d7a6afd25a0649953017faa10ce10d5c8724da274518a1fe9e37718bf8f832bae308c6677 SHA512 5e70c6665773d9bbf334ffb8f0d90005e76b3e47c3eb8d1796738a619c5d5743a7eec476e1d4bbbe721b561916b7f15759c3ae2dd3f1e6952b9050b913ebdea5
+EBUILD toybox-0.7.6.ebuild 1153 BLAKE2B 401a475bac0b34e93117ec3b1b4494a95d50c4abf1d6271eda8d26d76b5738351ed9d5f35b10043b095e99418b054c6144ffc66dfdf839a4f6caa713c2bb0dce SHA512 be2886c58e3b75be69096f3858a72df21d1f6ca76ffda7e425242055a67e86d4ac1cab7f0622911e587695e4437a292a3460be7ac66632718d28b8a6f06763f7
 EBUILD toybox-9999.ebuild 1147 BLAKE2B bae964f1ef1e6ac5b432e6bdab775c2969f7c877c69b3bbbf61b931e74c8ea110ce4cf661a5c8a4519acee77aab986ace8e08fc75bdb6e1b1dea2520a1047d0b SHA512 cbe42d685c6837e010349b4c46d5527e85bc9a7c68a70ec882e6e56d79a71d39fa0fc763e5efd404d37138c8fa5c39708d314f6ba9c81e279de79929d353f4a9
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/sys-apps/toybox/toybox-0.6.0.ebuild b/sys-apps/toybox/toybox-0.6.0.ebuild
deleted file mode 100644
index a0eb514ef84d..000000000000
--- a/sys-apps/toybox/toybox-0.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
-else
-	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch_user
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin toybox_unstripped toybox
-}
diff --git a/sys-apps/toybox/toybox-0.6.1.ebuild b/sys-apps/toybox/toybox-0.6.1.ebuild
deleted file mode 100644
index e154894f4704..000000000000
--- a/sys-apps/toybox/toybox-0.6.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
-else
-	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch_user
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin toybox_unstripped toybox
-}
diff --git a/sys-apps/toybox/toybox-0.7.0.ebuild b/sys-apps/toybox/toybox-0.7.0.ebuild
deleted file mode 100644
index 693e1fc02af0..000000000000
--- a/sys-apps/toybox/toybox-0.7.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
-else
-	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-parallel-build.patch
-	epatch "${FILESDIR}"/${P}-includes.patch
-	epatch "${FILESDIR}"/${P}-sysmacros.patch
-	epatch_user
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin toybox_unstripped toybox
-}
diff --git a/sys-apps/toybox/toybox-0.7.2.ebuild b/sys-apps/toybox/toybox-0.7.2.ebuild
deleted file mode 100644
index bd845a49cb54..000000000000
--- a/sys-apps/toybox/toybox-0.7.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
-else
-	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch_user
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}
diff --git a/sys-apps/toybox/toybox-0.7.3.ebuild b/sys-apps/toybox/toybox-0.7.3.ebuild
deleted file mode 100644
index 855407636080..000000000000
--- a/sys-apps/toybox/toybox-0.7.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
-else
-	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch_user
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}
diff --git a/sys-apps/toybox/toybox-0.7.4.ebuild b/sys-apps/toybox/toybox-0.7.4.ebuild
deleted file mode 100644
index 855407636080..000000000000
--- a/sys-apps/toybox/toybox-0.7.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
-else
-	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="http://landley.net/code/toybox/"
-
-# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch_user
-	restore_config .config
-}
-
-src_configure() {
-	if [ -f .config ]; then
-		yes "" | emake -j1 oldconfig > /dev/null
-		return 0
-	else
-		einfo "Could not locate user configfile, so we will save a default one"
-		emake defconfig > /dev/null
-	fi
-}
-
-src_compile() {
-	tc-export CC STRIP
-	export HOSTCC=$(tc-getBUILD_CC)
-	unset CROSS_COMPILE
-	export CPUS=$(makeopts_jobs)
-	emake V=1
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	save_config .config
-	newbin generated/unstripped/toybox toybox
-}
diff --git a/sys-apps/toybox/toybox-0.7.1.ebuild b/sys-apps/toybox/toybox-0.7.6.ebuild
index bd845a49cb54..876ef47e3464 100644
--- a/sys-apps/toybox/toybox-0.7.1.ebuild
+++ b/sys-apps/toybox/toybox-0.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index e883da4d28f2..c0e6422ef400 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,10 +6,10 @@ AUX util-linux-2.31-too_generic_symbols_pt3.patch 1118 BLAKE2B e2f098346f7359945
 DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
 DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37deed57eb48a028ddfb578ecc057c1c928b2082d13014f0dfdaf5a8274ee3a13993fdbc19b7e05e5a992505ac90de79a SHA512 d45c1e62e39f5d5c7a642071e7ccce44fe4ecaafec54d8c9a4e9d526280a6e25723bfa0eb068401e291579c0d067661775bbe085190d13ff16493f47360b7760
 DIST util-linux-2.31.tar.xz 4503892 BLAKE2B 8a9e2fc674cacbfabfc76cc0ab671f3fdb35d49de9f4ae8660b49df9e196878c2459d8fc57f6c9b6d2ad73cc56d970656ffcbc22deed97bb7a0cc28490a1fbb0 SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5
-DIST util-linux-2.32-rc1.tar.xz 4540628 BLAKE2B 2ece393a3ba334cd1e39e38b47330ea588b67034be2fcdd88ff38ac06c8c20099d177119e4e186d207df02d2aefed03470ec2f3538497df3b2cb6fef9c63dbb7 SHA512 46ccffb1b10b9b386ac04d1d627ae291a2e710f723546d527c6ffdf30e276694f8c19d4cbb563a0a5f1e5a30f1b4be7a5009f7de5a26b11d761138861c711fc1
+DIST util-linux-2.32-rc2.tar.xz 4552488 BLAKE2B 31b17eff5e500f27e80f8354ebd71fa04c6c3faa8c17a36399362de5f6f8de7ae0344844325053dd680ba5b1ac48ed1b28ab20f76a1ea89d065dd01d1ae1215a SHA512 a7c3b5b84fa78aded1fc7b4e3111c140512f5e2e5851162659423a3905eadd746d65beedd3faf813b77e823d63f3c9b33db1f44f7b85e9006ff64f82fb3cadb7
 EBUILD util-linux-2.30.2.ebuild 6088 BLAKE2B 90967f2b8c4cf9e5125226fe2bd34a4bf0786e4380316c13ead390daa81165bf39b106a344c0f1de27db1623f65bb0ca17ff285090358d57d68415c66de1c0c2 SHA512 92e96b92c6e6e05b2d828f0f7f41ef99963a9b6fe82dfea85945c7986a67fdb7ba3f8291e5abcd1124fd3973ef415d09f337fdf1828eaf7bba87fb2a2de574aa
 EBUILD util-linux-2.31-r1.ebuild 6200 BLAKE2B ac7a9047da0ba8ca5c3b0d74ffad0279959579573ae921db0e2484ad605b61357cd544762464fddec4a13c30ca71d836ad6c45114b524ef576e15595e6e56464 SHA512 6ac9ff512e5090bce89279e9c91ced5a6d5b654e67827b80041b3998b5ef3641e91cb855fe9a43640b1327c511128c3557a0c5d027add52bdd89720baa04aec0
 EBUILD util-linux-2.31.1.ebuild 6123 BLAKE2B baabda73487d0759010a991a1b5cd062bd154ae2e2fc38783656d78a8042180adeba3bddc764e53ff51c7364c16c4e9ce94ccb25f5d8ae348d6f86a2b7a21b31 SHA512 08357d6965531f0377756ba41bdeb5cf1b9e53d30983f438898329905c21e6d8bde2beab600074690565dccc8e282d8457094489e374eba27d42639e44e84de7
-EBUILD util-linux-2.32_rc1.ebuild 6123 BLAKE2B baabda73487d0759010a991a1b5cd062bd154ae2e2fc38783656d78a8042180adeba3bddc764e53ff51c7364c16c4e9ce94ccb25f5d8ae348d6f86a2b7a21b31 SHA512 08357d6965531f0377756ba41bdeb5cf1b9e53d30983f438898329905c21e6d8bde2beab600074690565dccc8e282d8457094489e374eba27d42639e44e84de7
-EBUILD util-linux-9999.ebuild 6090 BLAKE2B 912da0452d851eef8b8d9dfdf014117a4d62e3e4ef3bd6cc27c5fe7251cf8b08fae6aa9fe8ba4caa1de00f2c226c7550dfcf02f9943d63e8b643ac6fe5dda3c1 SHA512 21f6cfe59cce0a8bb08e462011296fe5f2a21ba1a62fb57de74659dde40f432f9b81bacdd7a6bc8422609bbed73b601204d80147f82bf270c643f1928efc37c6
+EBUILD util-linux-2.32_rc2.ebuild 6127 BLAKE2B 483ee54c9e877c399d7c97bd4469b00bb4e07bc05499d14ecd839962f6bcef3d7825844544e2d01a6f3abdb173ec84e3a5b83d1a869ef125fb847099a06c291b SHA512 596dd5f71e909c1531780d6ffd6cd4119cd45e21595d33081a970a79c61d573bcbe3651a624fdbf9ea29a7b148a40442ae7c730dd3c98b895e33e2be0e3f5f3d
+EBUILD util-linux-9999.ebuild 6094 BLAKE2B 478e3cc02e85bbdfd2bd8a88ab9b3b1c7e0a4e655ed4ce6aa9c6d7fa0f03f33b8ba9821c2dff452bca5b2adb2ff7f401547b9f9a645ba1682664215717475c16 SHA512 646e0ad34b33a77a329adb470524bb1446637e15bb48ad1688e1ede05a4be2a3f601f639cbdbaa8e4d1714bff6f2f9a37bac57d8220091bfed8dca630e23e41f
 MISC metadata.xml 947 BLAKE2B aeb1eef359b4be20e0df592245a2d432d92adf29336ecb1519bb4a97deed47c75bd14ca6c132f2e2ffe5c2d2ddcd7638ee38d03c7f8bcf8c8accb36a916663b5 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c
diff --git a/sys-apps/util-linux/util-linux-2.32_rc1.ebuild b/sys-apps/util-linux/util-linux-2.32_rc2.ebuild
index ee5b6efcc218..9b414fd08b9a 100644
--- a/sys-apps/util-linux/util-linux-2.32_rc1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.32_rc2.ebuild
@@ -13,7 +13,7 @@ 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"
+	EGIT_REPO_URI="https://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"
@@ -30,7 +30,7 @@ IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux
 # 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 )
+	cramfs? ( sys-libs/zlib:= )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
 	pam? ( sys-libs/pam )
 	python? ( ${PYTHON_DEPS} )
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 998ce9b3d728..fd77cb1a7723 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -13,7 +13,7 @@ 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"
+	EGIT_REPO_URI="https://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"
@@ -30,7 +30,7 @@ IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux
 # 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 )
+	cramfs? ( sys-libs/zlib:= )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
 	pam? ( sys-libs/pam )
 	python? ( ${PYTHON_DEPS} )
author	V3n3RiX <venerix@redcorelinux.org>	2018-03-02 15:59:12 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-03-02 15:59:12 +0000
commit	06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (patch)
tree	8d58c1f4b049da677b33209b072f2b3057268fe0 /sys-apps
parent	99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (diff)