gentoo resync : 07.10.2018

57 files changed, 280 insertions, 429 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a90eb27d9559..58aa4696fb65 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index e519e5ffe2ae..bf53dbbcf680 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -4,6 +4,6 @@ AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740
 DIST accountsservice-0.6.45.tar.xz 382740 BLAKE2B ce88e53c7d0187f53ed0a2758f81c8e2d1083ab1c95ec6cddebb2167b36706b1537ecf74b7904a9002c6179cfdf811a3268451af9443727ba9793a9af06cf8aa SHA512 09975f9fa03a3177d923de6d6f6e6acfffeb2ff4924c45eaac78c994c16974427c8e936a87034747ba494d2bb3df6e8a92ff44db387761b06e06e311d7cf105a
 DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
 EBUILD accountsservice-0.6.45.ebuild 1543 BLAKE2B 187f75fa6dc5883ba6f27ce72cfe47cf32a841651b7df7c3375d0e88ee087036e375f7475379bce6d3db9daa186320d110b0f9e1f84e8018cf0e6eadebe484bc SHA512 cafc7f6cff3c5e569d7093a8a5a43fbd83794c3e4b15e507ea7486265ca95bc63f5f6cfb98bc543d19600e9bf69ef6d6efe88a1d8085737f7cde99fad20080f5
-EBUILD accountsservice-0.6.50-r1.ebuild 1613 BLAKE2B fc8a9793424fcb8b6fd35072b6d415042b52c71a7a712ae1d1dcfd4ae8de309b011aecca6cb2f4326939958cc5f1baa1922b7389634da998d26d01aa7733e3d6 SHA512 1fc972a74ea8fa04931775e386037496dac6f4915669e5084f3b886f7868f44ac7b0fc3af6da165204e71f9ba04a685cb02a59ba7389a6f676178f7213d6e9e0
+EBUILD accountsservice-0.6.50-r1.ebuild 1608 BLAKE2B ff6a6740463ac1cc16a18de721b0fdac4573ba95ca575c540aee719c39928f51d904b002926f2b01da5f560e180e806a674e8b6edc3518956b641537a270cf56 SHA512 e06f0d20b0d9883753d33ba66c45507d25665a55b8b54e0f1275f08a8bf595ed50dd75d47aa3e009a1a4a1a4a70c44d6263e4ae90a50cf324239ffaae1a4cbb1
 EBUILD accountsservice-0.6.50.ebuild 1499 BLAKE2B 49968684a8a34c6b5af66417106526a41cb624b74eb5f5d7b01b23698c05507a8d8e14722668179cd2f3d77ed6504117e5c6be362d3fc96b28d6153af5769a92 SHA512 46f2173a4d67eec92950bf7181f662796ba0039cde4280a63cae9a2007db870424d2bb31c4c907acd7edcb5dfc466b937cd3868baf6cd7dd21de9a7307f884c9
 MISC metadata.xml 524 BLAKE2B a48a629a81d6502b8c54c466c6d901fe02e0fbe14ddbfd3294501560a19e33c3915c1305ea981fe41c572689def2d0a8f00de4b3131a19297f4ef3db9d6b5b06 SHA512 a0c662b3c0c45df43780f160b6db6db67561a1b2c84ce60929707d94cd9f1bf76588420189b91e0eafe58001a61d8a313f2a4b421b980a7c7f988c95e782ee07
diff --git a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
index 3036d2bed673..ac040961862d 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="doc elogind +introspection selinux systemd"
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 1a1695a7f684..479ff204448b 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,3 +1,5 @@
 DIST bolt-0.4.tar.gz 113525 BLAKE2B 4d6b25b60a35bbeee724e4549a49709ff19d99457c8a35c02c66026cdca999359220d09812f8e9f44586b5e3cf3dda2e3ff30f35a4f37ed6d815535e62af39f3 SHA512 3ea6b748768b5d9df60425274ecdb4ccd5ce6599e01f0648a24704643fbbadd7a114d4a1946ee3b7bd8866935758cbfe4494734c26c12ccc508c205a036d5317
+DIST bolt-0.5.tar.gz 149665 BLAKE2B ca7f937d4b7f4911cba93f8619e52af37f18a6542bc76aaee388a9122ea38d11ba0a21f4afb45bd6109e12ada4662783cb8f7aebec0d58751ace6c18c49ace88 SHA512 d36f2e39ac53b131fb9607055231a5a205c368547c0db2c3a7537b6e60b156c8b0663d1e5b09c825e1e1a63fbe21087746d0bafde1bd474eb90f1d0cff991246
 EBUILD bolt-0.4.ebuild 811 BLAKE2B e28db1546f449f68019161dd5b85ad5a48355df464c9faf29d4197570538d030d9af840c46fcdc8c56291d4be83942fe3bc9f61486ab9571b4ea61164748489f SHA512 8951b1d10ddd4c7102c1047630d9b3cacd5563d1c1d494e306abcde839b85ea31c762e1d16b0caa5e103e66a3faf1b251526c0ef6ee4d340318e44873b19155e
+EBUILD bolt-0.5.ebuild 908 BLAKE2B bba91781931c9be0cfd2f21ebe5fb8fa12eb5d7079deca835856bbdf77d4a5e0941326fab01ae38e817d6503a46dd3cd4a6b2a304c0a6c0fbe04ec2f8ced7d9d SHA512 72ef83615267edac04824a4a7059c5203236d9f43eebb27c51f07da75b1ebcae8f6c03a551ce0b5f7fdf1d4e8263a4ff954279349262a5b2220a73e1a800c8eb
 MISC metadata.xml 387 BLAKE2B 9c5d99308a9bf4340ad48310dc9cc5f67ad7db1683f54794f025b90667dfb2f178b25c1d9a3d0fa0a7fde249ea8bf40cb608265e96aca30e547f3e2e536b91f0 SHA512 16060e68e59d82a6a556bc0149f5e365a4092b14edadeb09dfad8278b19e28e0d1835fcb24a2f335809d1ec910c788cc69d579d7aaaba9ff32b4090a904c7706
diff --git a/sys-apps/bolt/bolt-0.5.ebuild b/sys-apps/bolt/bolt-0.5.ebuild
new file mode 100644
index 000000000000..1156dc761c54
--- /dev/null
+++ b/sys-apps/bolt/bolt-0.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson systemd
+
+DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3."
+HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc systemd"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0:2
+	dev-util/glib-utils
+	virtual/libudev
+	virtual/udev
+	dev-util/umockdev
+	sys-auth/polkit[introspection]
+	systemd? ( sys-apps/systemd:0= )
+	doc? ( app-text/asciidoc )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local emesonargs=(
+		-Dman=$(usex doc true false)
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--sharedstatedir=/var/lib
+		-Dsystemd=$(usex systemd true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/boltd
+}
diff --git a/sys-apps/daemonize/Manifest b/sys-apps/daemonize/Manifest
index 6b3040e78b97..15aa749c5b55 100644
--- a/sys-apps/daemonize/Manifest
+++ b/sys-apps/daemonize/Manifest
@@ -1,7 +1,5 @@
 DIST daemonize-1.7.4.tar.gz 66005 BLAKE2B 6bcd1fb514d4ffaaa07f9c296b9ae4795aa4f2a2ab3a3232897e733d7c09f2727764b7c79ae4a254dc53ac3a7c77ed2ee16a537829827ae475ad6bce34315355 SHA512 aa5dd1d89650fc4a7e783163852de176877b0e999c4d16950a03a81c0db1477e2994fe8d97d8e2bd61baafb7810522754eade96f3ff0301c1e6ce74f9252d34e
-DIST daemonize-1.7.5.tar.gz 65817 BLAKE2B 4f523031a4bd2396a57965ed217784bef9d8825305eeda73c0fb8090a9f3eb1c15cbd99b079016e14b179fc293341afe0150ec646ef5cba66272c325d51a4b2d SHA512 8e1c7cf47a2026d13505c83c5987ea7237226e104dd5fdd4d57d006000846b387216b2506604f60c6178a7445493591254696dddbb334d89ee611954a65659ea
-DIST daemonize-1.7.6.tar.gz 65927 BLAKE2B 5a91928edbef2487db15de8d72c018dbc209b54985e680a8164f1fcc79b739f57940b84171a719753f7f0ea4ce06bdb0711ba1125651cef50b37952564cada2a SHA512 e0276c504727004edf02f97d3295daca6c9990ae7130c536d388a967ee8711625308eb8ffdd989b6e3e25915038095f4a53b4cf051a6f2a2a397369ea99ab14c
+DIST daemonize-1.7.8.tar.gz 66009 BLAKE2B 323b98357c1750ae051378d8d432a4997fb3d162f65f102a3f7d5e1c0271eec77aad7f5253c4712209c9c2cba1c725b3daeaf1c240dca31be13990d3a833fbc0 SHA512 77cb7f6d41fd3484222831540aa8dedcd1f3cbb2f4be2a9b5e0bc1c848fb1392b616ff30b9ff3bb46f3decd1ff2829dbf7130887f81ed66a7cd2c710755a0836
 EBUILD daemonize-1.7.4.ebuild 593 BLAKE2B f8e7a3b6b40618121f7a990f6d953b8f60e1d78cff4c316d53601401cd514aa952fa312c5cab9218048ec6487dc1f40926e5620b1b73c4b111d47fc6c9c22360 SHA512 5df8000970f909dfb73200b254780a7598a1b08e262b6991ea2e1629a47f168c9307c4b09cac5bb8ed801b7a55057479e390bf36fb9d0e96a12a99576f053fa5
-EBUILD daemonize-1.7.5.ebuild 595 BLAKE2B c7b52aa3c60803287e4ba6d8177ded570caf572f5dab13f4dd0809b23bef0e62ab5fc5b4f4ada34981be8d6d502cb43be271a39f5d37801e28e4c1a6657360dd SHA512 6d347f37c42da231a73872a03b38ce1b51ed34097313d238e51b938a49b509efd568ec4c7c1aa258bd2224550adb4b100c51beacec179cd27fb135b4b15921ca
-EBUILD daemonize-1.7.6.ebuild 595 BLAKE2B 2947f4d468f040c640668eb6595acc2b5730196f20f09ee3218d2dbebe06836326c62b15298583ca6bb7a3e5ea9ea67c18ff467a7084593a3d8f4fde848be006 SHA512 27a028624ad1b66c7ea110126801932a587b2ade1a42b6f2a45a95ee4ef5ffb43792c7f4db8e2648c085da0c2e7a3302fbbf2d0855be86917399028541af04d3
+EBUILD daemonize-1.7.8.ebuild 529 BLAKE2B 792525122f902ddd62fb0a41390586b173fcffb9533b70b1e10a33c1407fd0250ede85686401cd101df34d696c301381f1726202ffad332f19efd2d1357bc057 SHA512 61c046196f9a53a308e5414e1cde3b1d4aac9e4e5c9ff95ecb01dd178b10f19ff51c5c7a9737ee46d82af3f8fb2b05bef9becf063b102ead5458858784f9ffcc
 MISC metadata.xml 323 BLAKE2B 489ae3e56f15b64d9842744ff57160a94b16211ffed2abf3d0cf2fde5e53a65be5fb5e42cddee855838c76cd85b7dd6c62716b99d2451aadc74858c20b99c660 SHA512 fdddf9c23f5f171bd9c1c5f8ca98c61e8a1187b57b77a8a12de8e1d339f44d405e19b42330ef8e53f146798950eaef9e9a8e44849d8cba6aeb828db14d97113c
diff --git a/sys-apps/daemonize/daemonize-1.7.6.ebuild b/sys-apps/daemonize/daemonize-1.7.6.ebuild
deleted file mode 100644
index 72704fcc0425..000000000000
--- a/sys-apps/daemonize/daemonize-1.7.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Runs a command as a Unix daemon"
-HOMEPAGE="https://bmc.github.com/daemonize/"
-SRC_URI="https://github.com/bmc/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS=( README.md CHANGELOG.md )
-
-src_unpack() {
-	unpack ${A}
-	# Workaround commit suffix from github.
-	mv "${WORKDIR}"/bmc-${PN}-* "${S}" || die
-}
-
-src_prepare() {
-	sed -i \
-		-e 's:\($(CC)\) $(CFLAGS) \(.*\.o\):\1 $(LDFLAGS) \2:' \
-		Makefile.in || die
-}
diff --git a/sys-apps/daemonize/daemonize-1.7.5.ebuild b/sys-apps/daemonize/daemonize-1.7.8.ebuild
index 65bf5f18250e..16382e7c34eb 100644
--- a/sys-apps/daemonize/daemonize-1.7.5.ebuild
+++ b/sys-apps/daemonize/daemonize-1.7.8.ebuild
@@ -1,26 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Runs a command as a Unix daemon"
 HOMEPAGE="https://bmc.github.com/daemonize/"
-SRC_URI="https://github.com/bmc/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
+SRC_URI="https://github.com/bmc/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DOCS=( README.md CHANGELOG.md )
+DOCS=( CHANGELOG.md README.md )
 
-src_unpack() {
-	unpack ${A}
-	# Workaround commit suffix from github.
-	mv "${WORKDIR}"/bmc-${PN}-* "${S}" || die
-}
+S="${WORKDIR}/${PN}-release-${PV}"
 
 src_prepare() {
+	default
 	sed -i \
 		-e 's:\($(CC)\) $(CFLAGS) \(.*\.o\):\1 $(LDFLAGS) \2:' \
 		Makefile.in || die
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 142f91a1d328..5ff32ae66e59 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -3,7 +3,7 @@ AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb
 AUX etckeeper-1.18.6-gentoo.patch 2812 BLAKE2B 4df25391aad119d6c01cb4e35cf83a1105c7f125079b3bb3418f8b7c6cff52400eeceff8cfe5785eb968b6c4a3e9fd1112fe1fd7b654982141d9a0b7596d0ce1 SHA512 2f399e12c7bbeef539fd846532068c18fd0becdab505cbe56759c6eb7f9c4463eff49526858ffa745d4bc50619685dab81811db257506f9b537bbd7af9986958
 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
 DIST etckeeper-1.18.7.tar.gz 77568 BLAKE2B 168b5b683c25a60c6626a678aed2f650106d4db554acbc239a2cd3c937f4b399ccca4f28fded30175c5787d8bd0907a25d62e6566e7902a2e914cd01513a8c2e SHA512 44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a
-EBUILD etckeeper-1.18.6-r1.ebuild 1768 BLAKE2B 31e5a00dab3080b8e2241848a8d2c510b732d0330fc9b732d72e48789b403e65b52fbeeb0f73c8b1b9b7f5afbdeb9cfa7c30932dcf1ba1159c58a773a9945932 SHA512 ac0fac599f4b7917486c671ac949eab706103d0304e2a157267224a07fd6af449565de66ec13988b383380f8624ed443cc1d7b0872a18abea11a2cad93d79781
-EBUILD etckeeper-1.18.6.ebuild 1711 BLAKE2B 9f338ff11900fb652bb9f942dc993caed137ac5fc7af58e8b8741252f1ecac3f328c771f137533b5dfd7afab30acb186f67ac52c476023ffd0379ece8a202ec1 SHA512 870d331516eda64ee50228751d1d6552359e8b7fc8afe57293d2415d3380653185729e22018b17773b5573f1b151d3c46846fa5e226b6a6a66f9203b775913e7
-EBUILD etckeeper-1.18.7.ebuild 1852 BLAKE2B 986fc04533c6d045578aeff774c1d7984a116bff863ca56b58f95f8a7852aa787b7befec61ff40dc957a28d25925a856cfdb87a9917e6a8b88d2c2ad5f3f5225 SHA512 841c2593f2f4d251607cbcf4345232fcf8bec6f940590126d9681f2d680e8b60a9cb87c1e76b17565b87325663f7b0cc4c11349f492ac5b8ee06c6d7602a6deb
+EBUILD etckeeper-1.18.6-r1.ebuild 1775 BLAKE2B 6b957febafaa09290c02a9946f9745ce28fbbd4652df0297ba10e3f10b6fc838ea819e672a72eb0870dce44293c184a294e5d0c6d4624b3ced129a5a9a7156b6 SHA512 e4fa61e5c49e2149adbc511466d995c03afc350df8ba5d767c493733e8a2ab4c24161a549e3628b33d2d808b1937678c6968e541362fac3ea3e23a4c9d0fc5b8
+EBUILD etckeeper-1.18.6.ebuild 1718 BLAKE2B 79005365182bb210feefd82d5b5230097433922fed15cc5efdb3fb81109d2f3493aaf0283e4eaf0a0cce4fc3cd059cdd411a7f649fd699cd2dba7b72fb598954 SHA512 91f3da5f0d1022e47038d45820b6e3daba1739fc9dd650a576023b8da487270b2f4babbaac30be91e99cbddd8b68595e2c8998fdaded81bf520154b6d0c91795
+EBUILD etckeeper-1.18.7.ebuild 1866 BLAKE2B f04bba588be503ba8d6acd96aeee63a39c60fe9463477cee3f1d45fc6a70fb43c067996d22172521f1ec25118ec1fdbf8b53d06443c45b4e450fdfab000d63f7 SHA512 e2e44061b211a5278e0bcabcc42a88ba5c46f09fa02d40d10b84369430e4d27977237c900b26f615e297bc70f7c58061d7dd03d05a3b6fadfa2ff6d90d5ec045
 MISC metadata.xml 980 BLAKE2B c3c6a13f0b45eddef29c767f55c739298f6554e94f444723e19d6b93dd9af2bfda7aabcf8c6d0e56fba482b4067a2130c4474373708652eb9d8216119177fd7d SHA512 41d4b97b4073278af7543cd459c1c5bcfc951bdb6a6c2a201cba6cdc0e0fedc640fca5d9e59041951315a961f5eea284eb3c12260148bfbe97c11ee15b11ad9f
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
index 3f0dd55eb8f8..60ffce7651d5 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 SLOT="0"
 IUSE="bazaar cron"
 REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
index 036e3fa29f9a..59f27252629f 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 SLOT="0"
 IUSE="bazaar cron"
 REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-apps/etckeeper/etckeeper-1.18.7.ebuild b/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
index f18078fe62db..32667889cf27 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 SLOT="0"
 IUSE="bazaar cron test"
 REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
@@ -32,6 +32,11 @@ RESTRICT="!test? ( test )"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.18.6-gentoo.patch )
 
+src_prepare() {
+	default
+	hprefixify *.d/* etckeeper
+}
+
 src_compile() {
 	:
 }
@@ -45,10 +50,7 @@ src_install(){
 	}
 	use bazaar && python_foreach_impl bzr_install
 
-	if use prefix; then
-		doenvd "${FILESDIR}"/99${PN}
-		eprefixify "${ED%/}"/etc/env.d/99${PN}
-	fi
+	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
 
 	newbashcomp bash_completion ${PN}
 	dodoc doc/README.mdwn
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 6c4bc20738ff..2764c577beae 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -2,6 +2,6 @@ DIST gptfdisk-1.0.1.tar.gz 195378 BLAKE2B 50cbfe1143c1e26595757bb40a94952ee9d26c
 DIST gptfdisk-1.0.3.tar.gz 199924 BLAKE2B f664398cb58d081ad19e267a370a4a7363e1060358aac394d87cd5874efe558fbd7bea4a33da871287c144b664c60e283d3338ca88d7d494503afe9a0b652e7a SHA512 80d437bfa2365abfffbd4812ea928fcebd52c5421de321cf190d395549e32c5ebdbb2d060cc4b95f77fe13cdd719f4d2bb3d0ed5d97792b100325f92d7c852d7
 DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
 EBUILD gptfdisk-1.0.1.ebuild 1187 BLAKE2B bff741cf8c43f0f3b060e4febd75f9a41d76328ded6415f7d022e306e07836af7051fa5d6a755d59d88b97dee403eba2f260871435736863b6024e35e8ee4515 SHA512 f8d8c14f2a549aca37e9eb13e0365b6e3029568c44902fac2881374804b772abd8d7cf6d5d34f74c43d757dffbf1026014ad6ea11e6343b670c72c58c166d63e
-EBUILD gptfdisk-1.0.3.ebuild 1245 BLAKE2B fe0861c438e837708fa8052f7ad0d9cc7926403fc6530cf638bd3326ef8b51ca2deabd7d2fd89002431454fea4b480b1f0648847e0d2cf0c9cf5553a9807f344 SHA512 9e4a5ee7a5ffc79e29396c01427ba9503c3623746e431809e30efac4563fe20e14a73cf5c0797bedde745517fb4008ce7b1013aec0a057c7ab3414d98c1cbb0a
-EBUILD gptfdisk-1.0.4.ebuild 1248 BLAKE2B ddc6d9cb111fbf70b5f2bc668f2b16402405007ea338f9597c39c5d900fb92dcc67a0b5802db00d6ab5f0e7df5cf16afe34e84b4e929d1c0d5e8ed593adebdf2 SHA512 c528801dd6b4d0d3495e0b70e0dcdec485682440f721ab07b8d186be365f3a3ad4cd698797e611623cdac6614c9323481339f1a45b99e748af69ff255a4903c0
+EBUILD gptfdisk-1.0.3.ebuild 1244 BLAKE2B 30db017ad95d995589200cdc2026ff32ec414262b4f178970f73f8a88bd2653b5690bdcde4e47cc8bb459e35933d7ed2692d196f8eaa54ef8e1a76c8f5071934 SHA512 72529d598e3c94a2886b3b54093bcaa0015ada90dd729818d0a2fc6b7befabbece64821c7a342c9ea44e3c4c2d8cddb17877afb33edfcc343fd6ee1f6fd1e690
+EBUILD gptfdisk-1.0.4.ebuild 1254 BLAKE2B 254054a09a965918a1f9c08d07f671a02b47cb6d7688158bb985c0072bd1bf3e357cb7a8b0502eb11eeacd6b227ece6629371425e5140eabb4d67a7e769f92be SHA512 315f7b2547974cf27a33b30e860cb7291f57ba60006207c1bb6779b119c3d8e8feddebf613abc316913b354cde7fd99108c326aa905cf120d67b6ed9c1d92a2a
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
index 70a5f059ee87..1b20d951d671 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
index a1046c70120d..5f5ea9aeddda 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index b6259c4a0342..d03878eb7f3e 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,5 @@
 DIST grep-3.0.tar.xz 1375156 BLAKE2B 19f5441ed3fe5bb16d9d8327e76f0beb7eb837b727f6da99844dc9c74eb4def9eab857059c527e651758fa224a6f4079ec5939806645806f2db341ed0cb727e4 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58
 DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
 EBUILD grep-3.0.ebuild 1358 BLAKE2B d3dd5e78bf8763f54b30e1447b61248673d0da1151458c6bcd0bfd4dcd4784e45aac6adb71b2cb26cab95762e0c7ec5d54c0ea85ea01df174bc2e0367ba3499e SHA512 3778bc0473f795069196d67b7b806f368994396454d0255c9d37a68b33e35e1b8415c8760373819aa59c12ab2533faf30fb27dad032da40007781ac05fe8cb09
-EBUILD grep-3.1.ebuild 1410 BLAKE2B c0c968993b0ddb07195b90ffa8a64e1a03b291ba2aa9b369209706868bf3583796e3e54223f95d7b1fb2170e824c9ec59ef9e0ae7eeaea7f4715ee9cede07411 SHA512 d143f8353bc8f7789098d4240736d764a337d77565455306390924c8c6b6a25b92c27f1fdbbdc60740e177b9cccd4f173796430e30a7e06d5abc6c653ff9c5d4
+EBUILD grep-3.1.ebuild 1402 BLAKE2B dd1e60f885b919e2c9baa0b5ab6119011553171b503f0986172fdcf03920a74c1d587cc0058715666ebb94a26b5fd05ec032e957e95d6db956997a10ce4d3ed1 SHA512 0d4f22aaf6ef1e60bfbab6a3b11e9096fa9e0e3d984f109a55138c69b63a28336c19d85bbef237ace38157ee9ce082917014d6cb85bb4ac22d8857bb3eb3e7e9
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.1.ebuild b/sys-apps/grep/grep-3.1.ebuild
index 74350ee63c18..24f509c2bfa5 100644
--- a/sys-apps/grep/grep-3.1.ebuild
+++ b/sys-apps/grep/grep-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index bf65f471fdd5..caf0fbb9bd37 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -1,7 +1,5 @@
 DIST gsmartcontrol-1.0.2.tar.bz2 695445 BLAKE2B cccfe2d96eab050fbcc2b99107e6a962a75c6cce492d64e40cab371f7d23cec6eaf6df7682cc0a43a8678152be3425ccd6eeb6f8743bd1a8e2edb7f4624d4238 SHA512 a9dd037fc4223afa762408bc34325fb31947822250efe32ae97b88e836c5bb68d8354d7605925b2ab7c834764ea473a14f2cd1f234577ef76730b02ad9a8b701
-DIST gsmartcontrol-1.1.1.tar.bz2 667372 BLAKE2B 3a1f0ba8b3083c34e32c2cca571f427f0d123e5183c593cddf150b61e855da941e9fae855a6d7cf7be5931555d67f3587db17d6f52fc77b35d27af9403425cba SHA512 fc180b85a9db232add4260856e078a578801e11b87df417a5572fab284e992c85009ab9e7d9d6213b2842097067fc119fa0183d5b0dedf8dde71fe4e9e0b38cc
 DIST gsmartcontrol-1.1.3.tar.bz2 677998 BLAKE2B f444dd29602f6934b440650e57d5d981a3b9823a905ce3c178109b230e6536edd4f38ed0762872b38186774127a164feb7363bb45cbd80e9c0b34398c1a06092 SHA512 7a8bb79875a53d742923fc8ff8336d7fbbdaf2e1b1f64296840557997125d4dcfea9a93a5e8a834003d592083a180ee85ca0e29d3aecf0eb475a3d4fed460456
 EBUILD gsmartcontrol-1.0.2.ebuild 985 BLAKE2B 6ba808f9716a9b89bb394f98c289a38c8c0108893139a5ea41b43200a404d831fe73102f1ff808c8aee1310e77f6a63aa39192c0d880cc920788de0de7996938 SHA512 d94227eae7f6e3b7ddc5c728efdbf4ef1994de75dcd7596dda6a80591e8e55769aa9dbdca98003031efaab58ed7d4e4cccefa17bf1585ab2938deca86be7532b
-EBUILD gsmartcontrol-1.1.1.ebuild 987 BLAKE2B 5a0721c0f4e9b9e8bc880ebbd742c05a8ee595a31313782c4e72a923ae27a2c4e5fa8626a4ad87441eaf04f872aff47157c907e9eafb2b95a322a531d944095e SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6
-EBUILD gsmartcontrol-1.1.3.ebuild 987 BLAKE2B 5a0721c0f4e9b9e8bc880ebbd742c05a8ee595a31313782c4e72a923ae27a2c4e5fa8626a4ad87441eaf04f872aff47157c907e9eafb2b95a322a531d944095e SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6
+EBUILD gsmartcontrol-1.1.3.ebuild 982 BLAKE2B 28b241d2dab6972d8203e1a4622f35f5f9c74d6fd83479e2571ccb277da25f9c28701bc0b9a505ab03ab7c06a87dc3cfafb58d6c45f668a2762be03e3c96a91f SHA512 99143012593566e3b7bec9fd7a94f4a8ee3a81e29ac274280a0f72a6a897a89cc6f45677d9800a06eaf74dfe08c07871a7318bc5b49ccf648730395d443d1294
 MISC metadata.xml 340 BLAKE2B f4f46445999e4db825f8d50018a9c6a8c8ee431340653e1c78519e60eaf4316b2e8387fa67aebdea0fa814f92433f65872b78028f746d9367666a158411ee8ad SHA512 f769fe192e485692a86f1ac75f8de07be0a8f5c2ddd7d3ea0a526d271881746417e01e09e765e3160f7d8b516d9240b5bb09030dc18ea9551192fbd8df5b4cc3
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.1.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.1.ebuild
deleted file mode 100644
index 4757ae7e2385..000000000000
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hard disk drive health inspection tool"
-HOMEPAGE="https://gsmartcontrol.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-libs/libpcre:3
-	sys-apps/smartmontools
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xmessage
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/gtk-builder-convert )
-"
-
-DOCS="TODO" # See 'dist_doc_DATA' value in Makefile.am
-
-src_prepare() {
-	default
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	econf $(use test tests)
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/share/doc/${PF}/LICENSE_* || die
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
index 4757ae7e2385..b5b1c6d82126 100644
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 0c1a4224d6cb..84281e83d5f2 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -3,6 +3,6 @@ DIST help2man-1.47.4.tar.xz 189456 BLAKE2B 58bccbaa5f126b369683b6e051446242750e0
 DIST help2man-1.47.6.tar.xz 192980 BLAKE2B ddf2b899e4479a45505aefaf3dabfceb1595128da35c000b81be79046aabceff58e1d605b2797880c5c652947d0fe59673eaf087de911152e79768c571037a73 SHA512 d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
 DIST help2man-1.47.7.tar.xz 200128 BLAKE2B bdac9d1db29b03bbb8e41caecfdf3a7273b69d9b9fa2e206b2e6c28d1144c3104b8d4b7d4a43aab1b405bffd6e097db63a2f4e97a76dfcd980ee5d8a9ffc2114 SHA512 e6ec25d973df68edde87d3314b1bef2e679d57d4c9e024bca17362b9da058c80314050e1ae61d73179b8c2662c8692caa1f223fc48b8d02f2d4f040d16e51d14
 EBUILD help2man-1.47.4.ebuild 1069 BLAKE2B 389e39c59f7fc01a5f38f52768e952ecfc5a773cf9ba99219415f1ee48632b8aebc83d641a8b7db8918a74032f45828f1c04b27363532ac0c76449e6c8af9670 SHA512 6d3bcd6558285498dbc900e5b500327c341c5314b08bfe2205567a8e529dffb86f1d5e335fc0b3f00665c0008e08a008d59a51175fad95cdc26db7297f37d96a
-EBUILD help2man-1.47.6.ebuild 1051 BLAKE2B dc5d5389293e3cddb11938a2962593db4be26edda0288b8c08d7edec9e2845e636ef134badcce1a3f5b5d57a6fb7dae9518b0d76b90ffae681537296ae57d9c2 SHA512 4b907cdc2ef4673140931eb9a5a698a9a62f135aeac148106352a46928dc1a3888a98c0f20b28161b1bc91b5d247bceb1630207137521dedaaa879fd35c9ea74
+EBUILD help2man-1.47.6.ebuild 1043 BLAKE2B 2fe0d25baacac4a7179380f4787d1b6b339c8551923b1f619cc81c3111ea8a289b8730742431aa3180b77dcad4257871116e436b0edf65702cf468550ead6bac SHA512 bc782810b7953cabcabc34ba7ec63dfa648e8756a586973e29f2510f58e395c034703735884a211d6cb3438d923fbf539a0470fca5ee603673b5fc83298898da
 EBUILD help2man-1.47.7.ebuild 1051 BLAKE2B 6bde9567cb042fb11341f6d6081b7efefaf3f0c1231523040d42267d9abd1d774e276c497d767a0ca475e64524e92f71d30c811532296cc166861ed95a0e68f4 SHA512 a1dafde12c1bd8a58714601bc36e28589940d3e709060722b8996fcce0087d7604f6342d1fe006b297e29100d4d216f12d75377103c31642a43ed93b3170fc6b
 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
index d17ef937b47f..ac10192b4498 100644
--- a/sys-apps/help2man/help2man-1.47.6.ebuild
+++ b/sys-apps/help2man/help2man-1.47.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 5867cf421e12..1dd7d4f570ec 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -11,7 +11,7 @@ DIST iproute2-4.18.0.tar.xz 692868 BLAKE2B ad40a5fa0aecb7c5eb98c3ee2b3a8da212c4b
 DIST iproute2-4.4.0.tar.xz 528552 BLAKE2B cad90d2734647a5a5e90b0a8b1337656c6480471caa06beee54fb3abd9c3bc64fc21da349d9b8aa0decf6208de325dd37a9e02fd9e994b024f9142dcd229b87c SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
 EBUILD iproute2-4.14.1-r2.ebuild 4092 BLAKE2B b3e3ae2b24182aa2d99f16120231bd4ac2029b73b9af53f0098046ecce73049e3dac510ee405f4dd12aa8c0e45b0504b7f82425c8063d05b5a958475ac2ce9d6 SHA512 c4f5cb98704d5a78d74a17a057bebb89f059c0a622d5e7ed28c6b36a73ed6be6d2a9205ed6b1ac4401f23ae46372e25d85a1038631d6ed215b2fd68c2e6a4c73
 EBUILD iproute2-4.14.1-r4.ebuild 4275 BLAKE2B d8d6a43be5eb593ab7107bff4126cda9f41fff88ccb72fd4d3aee7464457739732b2e3a161114302f7e1d9ff18a5b3c7d73a92ed523254ff4857584bc2baa109 SHA512 ae5db8ad15d20df0ec18e2703d43be081189366f535ff700d83da449eed8c120df869a6d2873e817e07bd2920eea46387bda0866ccce0b48d0e7a71e8faa8752
-EBUILD iproute2-4.17.0.ebuild 4203 BLAKE2B 648438d095571d6900cb8724ce3d93d87b9e24fa143d32929e0beae98ce13d47f432ab6c52e4ebb1e7920d66b470b566ada902e6bd8456cd79f458d0b6c345a7 SHA512 ae8bde274a67fe22beeec1fbd18725ea61351cd0beb81c0c764891321270c7dda97bb76b0fc2e89c0778df669551ca110a6994923e3e45260a8ef49c727ee06d
+EBUILD iproute2-4.17.0.ebuild 4198 BLAKE2B 5f9c2cb3e058550c4412e400d6ecae7cac784a66641e8c11417f98aaec35a82451ac3f185f896631dcd752296fc6d7a41b3105d9ea682e13a353268ea46c089a SHA512 4bd00acc93f0012114aa74de44756dbc2dc88a1246a988479a0c0537a990c74f37ab3d4e3ae8bf3fc3cf2c1aea097e96b6f37bf0b57835c7b835dab9e305af5f
 EBUILD iproute2-4.18.0.ebuild 4214 BLAKE2B 4c6a9d68cb27d3b41e8da00e1fc25c083c5277706186414d407c9000b4343dfaad8913ee640e9060b1e9acda5ed43fa642631ab3b2bf8c3a956ed1ae68cebd0f SHA512 30839985403cbda2401bccfb822d394590508836e0e780bf321f64235f372819225afbbd4dcf4ec3d05992435408ebcaba401bb7c7f2872f5e474bb2b3566f5b
 EBUILD iproute2-4.4.0.ebuild 3883 BLAKE2B 40d441c04e746f197263fa22f5b7bdd3302daa94896103311773feae8c68b193ee9d8c46659aaced6525f1af1bde444f1c6963e4807c7123f795fee530dccd1b SHA512 a751a4d91b63dea7cf43ec0532bffb795291d7ec9c04f762691e4e6cad9e47ce24895f315cc3ccfc11c30cfee94e66f855c477c3f95850f7c546dfd6675ad9eb
 EBUILD iproute2-9999.ebuild 4246 BLAKE2B 256792b60179fb5d92d0b66871edaf53e41f31fd664593e757638c771004e875e01370cd13ed78b623d165d5be152ce7f174f02573b184177d623e73b0cb7099 SHA512 06dc3174d116d4f191beebf14df1b62765eb3ce34cf41d3cb0b78de8d4216f38875ac539740aa0c7c79f8b0cbe1ea1bcca8fda30d4471682dc103c6423272ba5
diff --git a/sys-apps/iproute2/iproute2-4.17.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0.ebuild
index 70299ede914f..03a8a55c50ad 100644
--- a/sys-apps/iproute2/iproute2-4.17.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index f3dba4ffafba..e0cbdad2c1d4 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -2,6 +2,6 @@ AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca
 DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde
 EBUILD lsb-release-1.4-r1.ebuild 732 BLAKE2B 86e83fb65af3f76b58fda76f2005738c4ae724a9fce7b13c85664262bba7e817ddb42697000394cec90830a5e280f62ff0b61a00781fcba8937e55e7deb09a75 SHA512 ec24e3ade879837b901ac4beee6bd354d0070965386683c40ce27d3b239ad8a5522f77ffc07f96a91c685c4ccbeeae006257e1420d60d58e6a59ba33cd7550a9
 EBUILD lsb-release-1.4-r2.ebuild 854 BLAKE2B ca559ce9afc79b56a947e6dc4d91e445f26ffcde324ad75d5fad418499a226dc25b7473f541d258dba3bc853e08cedfb4d05613e64650a13d60071b3daeb2193 SHA512 ab5356625e24fc97349be711516cf346d21bb3a414c72ae5d6c95cf18b307df74ff8a1ded89d700ef65307b3c79205644e815d2281725c265e3ff61c4cef4dc8
-EBUILD lsb-release-1.4-r3.ebuild 919 BLAKE2B 39cdf3b809b2e1644ae06cd9e7f11b36615b3ac4ed31f67b26a84a23079446e192b4bcf57dc62ad207b57448f5b8cbce1046da815eed66f5cb901d5e445afdfc SHA512 78f6f7dfe8e1275ee07e12ce6e920a055e1cda207d60594f63484278f35a6fcfdd6dd10c75e153c2b2f1b1971ac1a9a7b15bc69c9ae6c8b3faf724f267e52733
+EBUILD lsb-release-1.4-r3.ebuild 908 BLAKE2B 2a0960731df44a0c16c4504bd4a8d400f2b68921e027ea8be548092ff1d9186c9eba02b493f053eee03d6100ac3293337a37bb238c52ea6e80fbe9f8155feae8 SHA512 f7c1c31bae996497ae0c73df1b707c4a69b05439a7a9e0db2bb102e276699a878b092484492cd094920a5ff3940b3f50b9db7a0362a11b6a9c3a62a621ee884a
 EBUILD lsb-release-1.4.ebuild 690 BLAKE2B 6c0f11ac818e4c90150aa66f1497a565119e9733df7fb471f275cc8b0348958e0097dd27cd83c478d84b8e5f52ea8650a24ccb29c9048c23907f61e710ea26de SHA512 e1a2159c9549ad1596eeea49734f85c0b46497c36778df27c6477c570e26170d0a4875d656b7f825497c0573d06c574695b7bcfc15cfcb458892905a48b3ec26
 MISC metadata.xml 795 BLAKE2B 3af7256256701726c04244c09e8cb8aa9e560cea0b16502412f3565235cae17ab172daf4cc26cf7356ef021d2989752c733a8d4250d241e32e1c79f2149622b8 SHA512 e0951bbb925a0729e886a608c2b177fa9a68aea5571316d0d89f8cae3fa6f48c97aeb37c1393ae429f02ec40f640fe237836f018ba31c2a3d0b9a81ef2661dcf
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
index 4629e5f4c285..ab2624601ee8 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 # Perl isn't needed at runtime, it is just used to generate the man page.
 DEPEND="dev-lang/perl"
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 70b90dbb537e..35231d975d8c 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -5,8 +5,8 @@ AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a928
 AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990 SHA512 605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
-DIST nix-2.1.2.tar.xz 816492 BLAKE2B 21365f2f7a88456aa566882780a65cabc190789e8e0f0aa62838bd7c9e2326c59776d78c6eaa4a2836039d02d6899114d5bc236bfadff5a2ef329531873e9e85 SHA512 6d54612f911438d5094c9d41fbf43ba4d8cada1da2b3eddbf7a3309262f9a9e94a2a826bb45247d5766bd6a419456ecdca5a8bebccff12607ebe004328bbc76a
+DIST nix-2.1.3.tar.xz 816396 BLAKE2B 9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760 SHA512 d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b
 EBUILD nix-2.0.2.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
 EBUILD nix-2.0.4.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
-EBUILD nix-2.1.2.ebuild 3182 BLAKE2B 9b6a0aac5c73bc3f9dc688eddc6d2b327c80f40c9431f76e285640dfc44dccc603e1d18302ab0f2c5a04a8f679737cb8a702c4682fae4e1bdb58468c22b195bb SHA512 89ed502fdb9472df48ee061541449e087e2630595c3b97053d828ff90d0ab13610c260bc458c94a11857f9d7f7a696f7a702ef36a5ebb931f89996095b549d85
+EBUILD nix-2.1.3.ebuild 3179 BLAKE2B 619405197f3593f020bfb08df60ba2834882eaf6458f9913724a80634ad1cb53ed7ff971eaf700f7721e67a7408a4ad5fe328153d11cdc71d22a45dca7ea0f88 SHA512 f976aa9d2f78f7be65355201b14588ae36be2e326f8f2b259230165cde378afe85facd32cbaef024fdbb522392d3b6349cd38e85bb80db72cf302cb396c0edf0
 MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c
diff --git a/sys-apps/nix/nix-2.1.2.ebuild b/sys-apps/nix/nix-2.1.3.ebuild
index 66d217abf098..a104f3b883a0 100644
--- a/sys-apps/nix/nix-2.1.2.ebuild
+++ b/sys-apps/nix/nix-2.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools flag-o-matic readme.gentoo-r1 user
 
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 6e8d27dc596d..9997619cb1c0 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -9,5 +9,6 @@ EBUILD nvme-cli-1.2.ebuild 595 BLAKE2B 63bbaa12561818fae5ec1bdc49e1589b8b403c21f
 EBUILD nvme-cli-1.3.ebuild 568 BLAKE2B ecf0ba7fadc2aaaf14da03c66ced763dce19e20eacacb9f68617528740a58d2d6862fdd4efe057fd5a9d0ef04b3d14cc1cdec35de7242958aa3e5e4e60f41179 SHA512 db12e2ecfcccab7cadaa134695e5235c98baffe34d76b889e12119a73b49c630fa5a82d6894caacb17dbaadaac4f4536031ef3b4dfeedc01a067999e897c999f
 EBUILD nvme-cli-1.4.ebuild 566 BLAKE2B cb2dd807e6c5328816a527a5ebae478cb323506fde758fd2f47c23e620a195373163b030ef6f57bd4863e90c5099efff0ac76a8486d12e2ae8e01ce70efb7403 SHA512 1bd5660ea24b05ad923106b860c11b1934f78da54c87c9ae5dd2cdfaa4f7a44bb0af9c5170da3a231ea915e6697c5f8e47e67c01d02403885007f726bc64fec3
 EBUILD nvme-cli-1.5.ebuild 566 BLAKE2B e723786af2108253b54742b752ea755b84964e2155e68a3500c90a8900a2cf80de952c3a212c3e0809009518b274158aace3afa9c7f2bf16d2e2b31321581c2f SHA512 3fb2c2818a77fe647dc8216004bc817ebcdefff99e18abffc62883d98d0448972975651eae704b945324bd809aaa6215d9803145955a971a15ae19357ca647ee
+EBUILD nvme-cli-1.6-r1.ebuild 631 BLAKE2B f35a3e4808f96a80425b1cf272ed5c7cfb08f9dbe67d9cd529627e545d5c4f1dbc514eba16c2d2effe7e68851194cd8ce72097c86748f92abcf3dcd9013380d8 SHA512 8ae659abb70ae9d84e04a776b3c4fd563dd318dd0f9b0a5e8cfe2639fa3a97ca25a25f06b3cdfa829877d09a2f77825e44de721fd257a4adb171deb5d4dfc4e2
 EBUILD nvme-cli-1.6.ebuild 563 BLAKE2B 4494d38c8091d084bffc00ee18e1752cfc78f37f8b78684c738849aaadc93e9edc4cf8c1a3b13879dcc5bd86c9ed5053a72c6e7da367606605eadd7ea5c734fc SHA512 25a4590cc15ef4aff600cd0c18ec52e9bc7f043723ad569d7b1957b808e0d995abc5838f28b5af27350c38098c198274797b9eb6a059412ce86142b0ea18b75b
-MISC metadata.xml 310 BLAKE2B 08c09b5876534bafc616d925be9898f2679ce3727a430ebcebd265b1a330118f3f14aab98189112e718bd7d6762878d2445b514d85bcf792b92144ba8ce36bd5 SHA512 f32474bd2f6daa3306a5bcea0ad742c51142823dd6a14a6bd18c8201016c0182d2e87762c66b95882a42d5ff9083813ff995b0774d615745c2a6666c444bf616
+MISC metadata.xml 369 BLAKE2B 67a0c73fe0e2de97927a7c827bf4d216c7460c2ec4383c07e028c0b2d10e71a45559482bab635a6b9374fbec557ab83327baf041eb47bbc06c5e624bb29f6925 SHA512 d9439fc99f1bc5051b670e7d287185af8e7db4ba9045fd9a9aeb4c0f04a33716650d3a01f0ad8640e8b62db048a0f536fbd6145d5a7d79bb7aa524d63112db61
diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml
index b267c4856951..f9ed9d1035db 100644
--- a/sys-apps/nvme-cli/metadata.xml
+++ b/sys-apps/nvme-cli/metadata.xml
@@ -7,4 +7,7 @@
   <upstream>
     <remote-id type="github">linux-nvme/nvme-cli</remote-id>
   </upstream>
+  <use>
+    <flag name="uuid">UUID support</flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild
new file mode 100644
index 000000000000..f54d27afc76d
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-1.6-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+uuid"
+
+RDEPEND="uuid? ( sys-apps/util-linux:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i 's:^LIBUUID =:LIBUUID ?=:' -i Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
+	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 9a47ba980769..139732269328 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -10,6 +10,6 @@ EBUILD openrc-0.34.11.ebuild 10093 BLAKE2B 4f1e8fd970cc608d56df44eefe714390bf68e
 EBUILD openrc-0.35.5.ebuild 9976 BLAKE2B e3c47e0f95115e34d7b9084ba2985b854de17030c11301a8ea1b8f6d89a28a2222665737ed2eb8c5f84a282b9d1587bd98ece6965700ca9d85c89815e7a862e6 SHA512 a78575665626eb2c56870429f84eddfae6ceee4ff26fcdaf525584989a538a40266b3dd741d444301b021b615fd401713fca8a24735a126c0a5ca98932bc57f0
 EBUILD openrc-0.36.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
 EBUILD openrc-0.37.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
-EBUILD openrc-0.38.2.ebuild 9845 BLAKE2B 658fa666907c6be846af33bb224e921325543676b3a5b496103526dc5ea64a423933f911385117d727e49bdb6f3a855123523d0a21aeac10f07b64c5eba39539 SHA512 bec6c4afcd99e21b816d75d083f4f0e49d41e75b6f1b622760d0a7a8956a35323fb333c96451e80181959abc739f13004e263359e3c898b05dfac969f80045a7
+EBUILD openrc-0.38.2.ebuild 9837 BLAKE2B f089ebcc4c20bd528cffaa50aa4db2ac99b82efa2c449ec7ba9f88ca09bbc515d5df5637d639cd4650497e277057d6cb9078a6c7a417c9b2d9eb7ec59aa48e7d SHA512 9658b8f880105ce6cff9c11d40ba2526bdec9089dbfafcf5214e6660855f28b344da042d4411b9c1b2940b2fa00197d1a173fd75280ebf17d10201cbd01a0417
 EBUILD openrc-9999.ebuild 9848 BLAKE2B 8add10cb57cdee0f2b7a18f99279203ab996286eb335a1c162bd675d21962003faf143b65933bf6620c836345b536b4840d0e4088ef633fb78f5ae54e7d55526 SHA512 2cce39876ef342b136d9a85cbb8dfb10b3619c70175e18dc60c1bc8614d866669bd6cfb5e9ecb43643612d0bb8ae225c32b25318d528c82716137ec6965eeacd
 MISC metadata.xml 497 BLAKE2B a65de1314b8d3c0a01bde15654be667a5a59d4e569e2516fa17496143cf232e3f05ca43e48c7f0c4cdff5c610edaded48039888a6e67ccb7b0cb0a811b253541 SHA512 c93291d7caeb45ad2aaebc778795d65fe20666ef125c2382dd07c0d71aace5380f5cc5dd5eb1e3a80b883084f1c91d3635540d5d0451a030ae5649ba74de10fb
diff --git a/sys-apps/openrc/openrc-0.38.2.ebuild b/sys-apps/openrc/openrc-0.38.2.ebuild
index 5897de98e54b..86ce817e9122 100644
--- a/sys-apps/openrc/openrc-0.38.2.ebuild
+++ b/sys-apps/openrc/openrc-0.38.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index da16c960ff31..37d6cd853cb2 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -1,6 +1,4 @@
-DIST portage-mgorny-2.3.43.3.tar.gz 1254313 BLAKE2B afb5101537bfff9b05622f4357757215bbe9641f2ca058baa59316b72ad3280ca7905f75e10b3270627c0b703434691bbfbbd88c6e375ba3f405d69d983b1944 SHA512 4fe3d1a8809a91fb52a9ccccac7d66cd25e8b6ff23b0ab2b4fae5f26a2036296a1c4eba78fee819003a8a8c44a5c6fcb0f04b9eded220d124bf08019a4f2fb02
 DIST portage-mgorny-2.3.49.1.tar.gz 1255740 BLAKE2B a64b3d1a96d7ec808168830fee03e40dd4070745f8670ec50e3d286173178bd3af8e6f823e2f732f374b59f3b88b4f44033eb6dcc21633edd25a9c8d563d04d7 SHA512 bfdf4aad186635770b05178e3c552fdca42a20790d4db17c7a204af27117b540545ba19f253924ac6ce18dd5036fe9a0503630a522303739f536b6e3b5178319
-EBUILD portage-mgorny-2.3.43.3.ebuild 7168 BLAKE2B 4ef17f24f9d2cdc07b0951ffbbd6ecc1ed14cbe6948457103583d691c0fe2d8e2394e73157759ccbe886ad3b90033742f1c0c6d3908796fc96a0fc46c1ec9f3c SHA512 7ce5aa4b699a9b5938e13c0f6d6a5592bbe1edeb1d01e8ee9869a5e9bad7f6b6270cf7b79e47e98677bc7868aad0751fb011da22ad0fa89dce53646186f2dd15
 EBUILD portage-mgorny-2.3.49.1.ebuild 7168 BLAKE2B 4ef17f24f9d2cdc07b0951ffbbd6ecc1ed14cbe6948457103583d691c0fe2d8e2394e73157759ccbe886ad3b90033742f1c0c6d3908796fc96a0fc46c1ec9f3c SHA512 7ce5aa4b699a9b5938e13c0f6d6a5592bbe1edeb1d01e8ee9869a5e9bad7f6b6270cf7b79e47e98677bc7868aad0751fb011da22ad0fa89dce53646186f2dd15
 EBUILD portage-mgorny-9999.ebuild 7080 BLAKE2B 703c046e27a79356ed4a0c88690e83677ef0493ea63e4a19be21778513ce9a3f8f14ff03e8116aedbfe9c8baed2f31fbe613d88586eae647386b2625527a6c2c SHA512 d7fa51354786bb879c6f2954b633a07d863126becaeede41e11f8f3d1c52ad80f8ffde671ccd4ffafc5552b2074e5cd6c30270f525f828244d5a7b339147b445
 MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.43.3.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.43.3.ebuild
deleted file mode 100644
index 36bbee3032b0..000000000000
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.43.3.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# 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,5,6,7}} pypy )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1
-
-DESCRIPTION="Fork of Portage focused on cleaning up and useful features"
-HOMEPAGE="https://github.com/mgorny/portage-mgorny"
-SRC_URI="https://github.com/mgorny/portage-mgorny/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-SLOT="0"
-IUSE="build +ipc +native-extensions selinux xattr kernel_linux"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	>=sys-apps/sed-4.0.5
-	sys-devel/patch"
-RDEPEND="
-	>=app-arch/tar-1.27
-	!build? (
-		>=app-admin/eselect-1.2
-		app-crypt/openpgp-keys-gentoo-release
-		>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		>=app-portage/gemato-10[${PYTHON_USEDEP}]
-		app-shells/bash:0[readline]
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
-		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
-		>=sys-apps/sed-4.0.5
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!app-portage/repoman
-	!sys-apps/portage"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-	)"
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-pkg_pretend() {
-	if [[ -f ${EROOT%/}/etc/make.conf ]]; then
-		eerror "You seem to be using /etc/make.conf. Please migrate to the new"
-		eerror "/etc/portage/make.conf location before upgrading."
-		if [[ ! -f ${EROOT%/}/etc/portage/make.conf ]]; then
-			eerror
-			eerror "  mv ${EROOT%/}/etc/make.conf ${EROOT%/}/etc/portage/make.conf"
-		else
-			ewarn
-			ewarn "WARNING: You seem to have make.conf in both locations. Please take"
-			ewarn "care not to accientally overwrite one with the other."
-		fi
-		die "${EROOT%/}/etc/make.conf present"
-	fi
-
-	if [[ -f ${EROOT%/}/etc/portage/package.keywords ]]; then
-		eerror "You seem to be using /etc/portage/package.keywords. Please migrate"
-		eerror "to the new /etc/portage/package.accept_keywords location before"
-		eerror "upgrading."
-		eerror
-		if [[ -d ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords/99old"
-		else
-			if [[ -f ${EROOT%/}/etc/portage/package.accept_keywords ]]; then
-				eerror "  cat ${EROOT%/}/etc/portage/package.accept_keywords >> ${EROOT%/}/etc/portage/package.keywords"
-			fi
-			eerror "  mv ${EROOT%/}/etc/portage/package.keywords ${EROOT%/}/etc/portage/package.accept_keywords"
-		fi
-		die "${EROOT%/}/etc/portage/package.keywords present"
-	fi
-
-	if has_version sys-apps/portage; then
-		ewarn "If you are migrating from sys-apps/portage to sys-apps/portage-mgorny,"
-		ewarn "please note that Portage will abort upon having to unmerge itself."
-		ewarn "However, sys-apps/portage-mgorny will already be installed at this"
-		ewarn "point, so you simply have to restart emerge and it will successfully"
-		ewarn "clean the old package afterwards."
-		ewarn
-		ewarn "If you did not use '--dynamic-deps n' in Portage, your VDB dependency"
-		ewarn "graph is probably broken. You may need to use '--changed-deps y'"
-		ewarn "for your first @world upgrade to resolve the conflicts. Afterwards,"
-		ewarn "--changed-deps should no longer be necessary and any conflicts"
-		ewarn "introduced afterwards should be reported to bugs.gentoo.org."
-	fi
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py ||
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i lib/portage/const.py ||
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "${REPLY}")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "${REPLY}" ||
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-
-		einfo "Adjusting make.globals ..."
-		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
-			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
-		if prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [[ -f make.conf.example.${ARCH}.diff ]]; then
-		patch make.conf.example "make.conf.example.${ARCH}.diff" ||
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_configure_all() {
-	cat >> setup.cfg <<-EOF || die
-		[build_ext]
-		portage-ext-modules=$(usex native-extensions true false)
-	EOF
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-
-	keepdir /var/log/portage/elog
-}
-
-pkg_preinst() {
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED%/}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED%/}"/var/log/portage{,/elog}
-	fi
-}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4f1171e7b5ad..ceb8b1e5cc22 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,7 +7,7 @@ DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e1
 DIST portage-2.3.50.tar.bz2 1012905 BLAKE2B 8eebb6ea412db4d07be64047c8e9995c7d61906ff3c387495f144acd5b7d31e9d8ede3f9e606dc7a28df5b5726a0a6d55e2e0d79c78848213f4835fb1a588f30 SHA512 120514e4e176de9ad27892d547825d4fd51d250266f9de8f2f96d689ff1373adab77b838e9801043f0053111063857e957e83b495d520db8cc7733af28b03b64
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.40-r1.ebuild 9684 BLAKE2B 25337738dd51a60f4b8348796348572bc92e95af3178ae4c4097225697923aa14bbc5e206160ed569bf9f84cbe354823c2326eb54173bc455c4d46566050d002 SHA512 20184f3260d3d8c413ea2a87eaec2eda08e94a27290f658c12ae3490712e6773c95e52818b8224882380a55c4eca77b42d9233d23ea64aae6cbdfb43e90bdbe1
-EBUILD portage-2.3.49.ebuild 8679 BLAKE2B 1da913abd7eb3e3008d5413e9e62e4568182086c7fea7a54475cdeefde33ef745bd3a8920732aef767a46f1a3b2cec4997b1c4701c2e44301d356333b909c204 SHA512 7b291a6db82c3e1f7d00e35b611508de8132692112122b7c3d60f4b8db49a9bac0d862a240054d6b2fe0395d9102918d3326e09875dd58db50e003adda35143a
+EBUILD portage-2.3.49.ebuild 8683 BLAKE2B c0a2a77fe3c82a1dfbf190773b88fdc4d8f4bc92eb72c7f2806dd4854f3f1a14532ff46c8d10c8a795ecb0adb1320656b537ae5207a000bc57d24f76967d55b4 SHA512 b89cf6c8e80646955869c0ea3fedab46bb37cb9e5edb8f5363d989ce47a5a953118d214f2bbe6bd33eb28a8b239933879f85ba91452acc69fad995399dc7dfab
 EBUILD portage-2.3.50-r4.ebuild 9772 BLAKE2B 5a8d97b843b85a65e1dc5814018d88cded1d6b6a9122172eb1bc23eec223b131d21649ecd2d8097a8f902dba2037562acc6bd584e0e42c02d95abe8e8c469d09 SHA512 656d58ea557bb3664291730c50cca18648770bf23ab5a6cc78e85ba0318ee57bdeb380247d48ab7b02dce7e06917946a8d38f526fd14faf6694aa33dad866535
 EBUILD portage-2.3.8.ebuild 7912 BLAKE2B 1ce75b28134fdd89a42bf12973dc87d609f3dc115f125e66159d8fda21f31f7e7629ff0832db995e11b711addb4ecab1500985700527758eaabbaa020fd75b18 SHA512 3b96e079c2c9be6213a40216a6eb0f7ffba6629263cd9f3bb1ad6d48ac66d45cddbf6df724e54252320e964de87a1c0d5cf0e7a8e22f287c3d3401652b745e3c
 EBUILD portage-9999.ebuild 8553 BLAKE2B 3341e4fe3dd6601a1a5c94a166910f61bdb9bf860fdcd7bdf725bb0e424b016800a58cae1c547cabd70604d7b4b1a3ef11535afa875a75203e1911c42f8f920d SHA512 de3bee0495126b35c22947a238c57fa6b92eb9b553f540f6617f12cb4861f1f5e9ab611548a4660e87612bc2dee8f1f5c1e38de207fa67ea9617d89858d9ff54
diff --git a/sys-apps/portage/portage-2.3.49.ebuild b/sys-apps/portage/portage-2.3.49.ebuild
index 83bc4fb447ea..8ca04fb2dee1 100644
--- a/sys-apps/portage/portage-2.3.49.ebuild
+++ b/sys-apps/portage/portage-2.3.49.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest
index 1471abd98ec3..742ca263e4b8 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -2,5 +2,5 @@ AUX rename-1.3-build.patch 172 BLAKE2B 47ae1d23ce99ad6ef2099bd6484cfad23a7aa46cd
 AUX rename-1.3-gcc44.patch 330 BLAKE2B c574203c3df6d984de18dda43512ac3f91165789ee6a7525824d2ac0a11403a53e33a31dc843eb295b31c8119ced7bc3f0393482e60003673c9cf83d43d78b80 SHA512 5a40ab4c81b4c197af051e01682f4fbb580b3fea9287539f601b4c07c6155c3aba802e38752566f9d2a41239cf2d20d748bfd64d2f7007eff578344cd12852c9
 AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49e2a028567fcee0ae2acf65af4e50f63ffb1a3b6b9740544970e2b648e3c5795e5d60224103a776b6f8bd1b08a SHA512 6d0d757c3991448a1937480bb5c1cd219b681e7cbb9b1fbdb27097715cac04b2d2c0bb0b9c77ab2b131f6bbb8e0774f4da5845e815918d4de6faf96f218adb47
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
-EBUILD rename-1.3-r2.ebuild 904 BLAKE2B c622dd555b9ca55842551f472d8f58e889ea075e2bed2ed8ec98e05efaa4ff787c62e5a3eeb76d96dde06b00280d1edf0a54eb866fbaed2679686d53aa8033d6 SHA512 a219a73bae81d3edbb11aa389f621c7d371c8395124eab360ead04bae52a1e3e8cbfd19f7286cb503ea23b2d1957bd6e62cc2aebe07399c4c19cbe81c8b70bd1
+EBUILD rename-1.3-r2.ebuild 894 BLAKE2B 49510c145acd276f067258e6dfd6193caa8f4e6143e6d377d3590d837c68be82c63b6449bad246db1e86b9d47dba980ffb9b378b75b262568e72e9b2a63f316d SHA512 9a6856d85c2d33f27a4ec93c527d26db05714c22a825f208638629ec9ee956a6b9db3ce45e75c97c8fd4f90b133c57561dcff641aa2ff6261ef5936272b8bcf0
 MISC metadata.xml 326 BLAKE2B 0952c4b08788858859a0b53a418f4e2504d8a05ad4623495992fed7983c3f70d7eb40a7e042a6adf2b6785bf1228af302704988dbd715acf2347b67b97701d3c SHA512 5d7e26ff9fa47efcf1728be310c91822d85ef3e521a5903d66c9ae8e6449e72465f5f87a2fecc0a51086edc34a325545a0d40210ed320f56bd34af9db9fa45c0
diff --git a/sys-apps/rename/rename-1.3-r2.ebuild b/sys-apps/rename/rename-1.3-r2.ebuild
index fc964811bd6b..d82f8e908445 100644
--- a/sys-apps/rename/rename-1.3-r2.ebuild
+++ b/sys-apps/rename/rename-1.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Easily rename files"
 HOMEPAGE="http://rename.sourceforge.net/"
@@ -27,7 +27,7 @@ src_prepare() {
 		-e '/^CFLAGS/s:-O3:@CFLAGS@:' \
 		-e '/strip /s:.*::' \
 		Makefile.in || die
-	epatch "${MY_PATCHES[@]}"
+	eapply "${MY_PATCHES[@]}"
 	tc-export CC
 }
 
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index ecd7825391c2..e2b518ae759b 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -2,4 +2,4 @@ DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca
 DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44
 EBUILD s6-linux-init-0.3.1.1.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d6203cf489786e0129e4076336a5a5ef6e44de370749313e06e008984ea78b0f07014d68288fb33912902bee21f2bfb59c887 SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89
 EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0fcde3d8523d74c77867811231e1126e26a042bffc3aa7b6a98e1d39fbf3d37f4a39f604e02e397d085a43e85a795ad58f SHA512 2cdfdb084ab008bd5ae29b63eaca26be3e8d6e40520e2d6c266f4072cf98709872ef0d79bf39d22a62a144c50c413e95eea6016ec3999286b7db75ea1d50a0a9
-MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
+MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 96c083c9b378..34f39bd4b285 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -13,4 +13,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 0bc212e46790..c59edb44eb9c 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,3 +1,3 @@
 DIST s6-linux-utils-2.4.0.2.tar.gz 40832 BLAKE2B 24ce6d51aacfcaeeb8531931a0deac4e2430f627907157022ed6378e7058afcc946f1c620bb3758e43a1911db517dd46e65a43f338c446e61711b000d6751523 SHA512 4b0c8f1b65b8eb47f3aa7aa365d20dcd46fc144e166f78825ee53aeb789e009b2716a826efa1e92e86e8fe86421efc6ae07970ce421c6913f0b1db679eb6117e
 EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 BLAKE2B 9bde0a49a4d14c1be0642e590f568a0ab15c7a29f51480779f96ff25799494f73e268d6ca9e8ccbd82c3259b6df1dba770d29f94459b9c4d2fe97b1eba27eab1 SHA512 bfd9bba07e7071baa00df31f5980952f6312b370d4f9762650afb1dfce909f8d6d50029bd7d7d78f2cafafc8ac7e3162bdc31c68b13d610394730be35ebc429a
-MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
+MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-linux-utils/metadata.xml b/sys-apps/s6-linux-utils/metadata.xml
index 96c083c9b378..34f39bd4b285 100644
--- a/sys-apps/s6-linux-utils/metadata.xml
+++ b/sys-apps/s6-linux-utils/metadata.xml
@@ -13,4 +13,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index 550cd77895a5..fb0ea461b1a7 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,3 +1,3 @@
 DIST s6-portable-utils-2.2.1.1.tar.gz 47138 BLAKE2B f5519fbedc2599c0b9366bbff38a9438cb4cdf3b770dfec6e519f8857bd77a3bea172284318df224104fe7003af4a68cadc8089d77c98ba4da85eb59d59819f4 SHA512 fba7a4d1f5e0c969dc254775f28c02f1b8673ead28022962175bd605125dc56012cfdeb177037c322780be93a5191a5292a47cb26cf5d466bb5eb081fa5a9657
 EBUILD s6-portable-utils-2.2.1.1.ebuild 1165 BLAKE2B 2606b82a595387a09d74f1295ca6bf89428f339f55827290cdbaa185adb62982247fc61346adc75025c0d0312d0292c7364105cc787b550e52bac09dc4e9db1d SHA512 e29fc657d3088c4d160a0526ed09d6377d777ee3b9c4c5ff23db7eeb174e0ed52f14f08d7a02e3a72249391d0c91f038e1d348763071ed100a200b4611ccc5f3
-MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
+MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-portable-utils/metadata.xml b/sys-apps/s6-portable-utils/metadata.xml
index 96c083c9b378..34f39bd4b285 100644
--- a/sys-apps/s6-portable-utils/metadata.xml
+++ b/sys-apps/s6-portable-utils/metadata.xml
@@ -13,4 +13,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 5bc803dfd6cd..344be908619d 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -4,4 +4,4 @@ DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B fe6aa6e2ed868cca6d76928571d561784012ded4
 EBUILD s6-rc-0.3.0.0.ebuild 1619 BLAKE2B 3746812cc4b8c852ae97dad2b9e28e7b84713f98a08df1fd11660507f4810357d8cd1e4798ea246440206fbf4ad1ac452f773f0ac1442e27a4897b4d084d4db3 SHA512 30767d3accaed63968c91dba9d4d4eef80eef838cb2505a84cbc75ce8e966a0f5fa60a24942921a3bdec524f49e22148fd012c1212f206010dd8ef7061956f3c
 EBUILD s6-rc-0.4.0.0.ebuild 1866 BLAKE2B bdb83058265bfbeca41faf995b796c042f7b4f2f27816cfe6b6039e88ecc6b1f81db18337925673cd82106ce950c4d2ca533614009fb4e18d35072a562764bc0 SHA512 c0c00a6a58ea33ba062a41e26911875c944d77ff20875f8569542d17fa0e075fbe05e0018f92eab6671cd20d2ecfdcb9de0a64f1fe27f785b97ff8b0c75f6027
 EBUILD s6-rc-0.4.0.1.ebuild 1866 BLAKE2B 85c17232f071f38901f70e762f74ef89dda79d75f506b99321467f408978d23bc1bd568911357c2e5a76da03681e62ab62e58f5df95df961caac4b4d10a448f3 SHA512 30168528ecf7f8ab574c981f57fddc37d8b10b0f7985e789ecf3baa1f6f63575018aa7bf468f1439804db32f1b608b727c8d1bc7a79ef105c1abb5a3beb13035
-MISC metadata.xml 461 BLAKE2B a9b075ac9aacaa5fba1cc8d768dd188eea6fc1b44d36dc785698db2c8658db6af198a7c534621e41c85a3fac8d4a8bb724470afe90335e2d1afff2ca5d03a454 SHA512 6d7640d82400f43a58eaf536a0275dbffd45dc33fdde49e1d41da959ba0fb0ea68ad9fee8b7e2991d0d4a78b69a224880ed91e4a922f067bf6e1a741748bb4b9
+MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-rc/metadata.xml b/sys-apps/s6-rc/metadata.xml
index 96c083c9b378..34f39bd4b285 100644
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@@ -13,4 +13,8 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index e04d907cbe2c..c43ea2011072 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -6,4 +6,4 @@ EBUILD s6-2.1.3.0.ebuild 1284 BLAKE2B 805f6f16a33b6a150ef75c2c3775c715598694b13d
 EBUILD s6-2.6.1.1.ebuild 1508 BLAKE2B fbfa323712511650c38cfce93faf3c4408791ca887ba7a77e4c9b4022b36cd42ee719b8691bfe8976db608ff4a7822753fabd78d51f107b77ee84d117fc55d10 SHA512 194af6e8227a1f63e5285af765dcb43ae3c06e07daa33c83718e73077d3a3848e1edddef3acd49e48618e2ac10c240bb60313338248a1fc6395b326064cf6a6b
 EBUILD s6-2.7.0.0.ebuild 1508 BLAKE2B e04f58311a19ea1ed6088b46f7919296a234efd09d07bd77207f1d9432183c57081072974b4c720a40f57af0dfb8ebbd447f47ca862c89e8f612b825a43bfe25 SHA512 ad05a4ed4e5c0f98c52cf9a3b37c33de5025cfa04b3d240f7a8487b86637f4317ae6cd10d835f18734326bd3e47d1777d91c860dc2020f16e5d9f888172323b3
 EBUILD s6-2.7.1.1.ebuild 1508 BLAKE2B bd4df2ccff6fbe2e72e4643c33a1a37e6d008ada08f5f0806faa8c14905cda8e0e7e00b3d52da57dab5ba58428ded71d4b188b2b714a37ef015b424433ab8cea SHA512 fa2e5517bc36bbd43a56e35a960aacf13ca0d39bfeec82feb17dc0479c8bdc24b636f38a54d302149a816dc18e8f3fa1250e526bd8b8c890db01bf473fa3e5e2
-MISC metadata.xml 413 BLAKE2B ad4e5f70c72eb8fcbc679c329e16d9eadcec41aeb07b391098676a9c52739b4e3a27fe86e742d1322a50261e62060f7a93eafd6534ccc7514f2402295e2b01b5 SHA512 000e085535127bf6a340451b6cbd51549dd2f1f9cba1bcf76dde590f628f780fc756f344844982f1d3a6ef69299b6db4fb71ddd92f72650e38f7a24aa541257c
+MISC metadata.xml 743 BLAKE2B 51cce1b0cbf5b0a026853d24c760d20cd8a82baae31bd4c7dc67af31933beaec632d8937dc8236ae2fec3807ffdc748f82cdd50a025179659ac3e3854f209006 SHA512 7391141506e39054d73b3ef9a336feaef887896603db105d493cfa50fa7dad721c8b0aaee16efb10be5aaa0561f2db19987de1431ee79e312cdb04e7edf77b6f
diff --git a/sys-apps/s6/metadata.xml b/sys-apps/s6/metadata.xml
index 48d60bf54d56..b8be92c8b77b 100644
--- a/sys-apps/s6/metadata.xml
+++ b/sys-apps/s6/metadata.xml
@@ -5,6 +5,18 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>aranea@aixah.de</email>
+		<name>Luis Ressel</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		S6 is a small suite of programs for UNIX designed to allow
 		service supervision similar to daemontools or runit.
diff --git a/sys-apps/superdiag/Manifest b/sys-apps/superdiag/Manifest
new file mode 100644
index 000000000000..98252f7892f6
--- /dev/null
+++ b/sys-apps/superdiag/Manifest
@@ -0,0 +1,3 @@
+DIST SuperDiag_1.1.0_20180731_package.zip 2564515 BLAKE2B 9ae34682daf5aa8996989c434906dd59f64e569a1cd1ae107d1e7861430ae028829efd1a1aa1ba2b5269d13e0ac2bef33b106a945fbd800fba6766b10f7486a5 SHA512 b79eae3063fc1425ee2a7a71304ae8993da52e9a2a8b2565e5f4fe0f3f3cdf8a7016cf765dab9e440c71cb8ff6b311fa2e4067459d76268bcf2697e8344c4e9a
+EBUILD superdiag-1.1.0.20180731.ebuild 2053 BLAKE2B 71e957a37cc5360703ced5eb60a1aa91d790ff5ab6853eede1018d223c878c4d20dd3e78b0f38d1f13d800aa60be3b3ae3801526b11f4da81c85a66dbfb9dc8d SHA512 e1ac41f6d2dc61c7517c5a491f389274f97551d5821ce58c70b692536464ba3269ab0d2c4e3dc4b02e48ab97e5db837c65d3c5e303c7f08edb290cb85de72598
+MISC metadata.xml 1029 BLAKE2B 13723c78dd32c1f8c2109f857e6c4920416847a759dd2676060468cfba802cadd87d5ebf90deae548f04b71e1bab00e8f4f6668ef8bb5487c504ce3823bfc708 SHA512 48410f21f790cc13623ac9f0812b205b017b57a47d82b8af11a9b9fd6a3d83b8d761205d6fe919c3d1fe637ff8554c17fee5af9754c4d978e0d3f52e749eff0e
diff --git a/sys-apps/superdiag/metadata.xml b/sys-apps/superdiag/metadata.xml
new file mode 100644
index 000000000000..c8ab6cc03ab4
--- /dev/null
+++ b/sys-apps/superdiag/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		The Super Diagnostics provides offline the capability to determine
+		the health of Supermicro server's components, including CPU, memory and I/O.
+		Features: Designed for Supermicro Sytems, offline diagnostics,
+		command line interface (CLI), local and remote diagnostics,
+		automatically collects information on detected devices,
+		test results reported in output files and flexible test coverage.
+	</longdescription>
+	<use>
+		<flag name="iso">Install an iso image, which can be used with <pkg>sys-apps/smc-sum</pkg>.</flag>
+		<flag name="usb">Install all files, which are needed for an installation on an usb thumb drive.</flag>
+	</use>
+</pkgmetadata>
diff --git a/sys-apps/superdiag/superdiag-1.1.0.20180731.ebuild b/sys-apps/superdiag/superdiag-1.1.0.20180731.ebuild
new file mode 100644
index 000000000000..99c892c14414
--- /dev/null
+++ b/sys-apps/superdiag/superdiag-1.1.0.20180731.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_BUILD="0724"
+MY_DATE="$(ver_cut 4)"
+MY_DATE_ISO="20180724"
+MY_PN="SuperDiag"
+MY_PV="$(ver_cut 1-3)"
+MY_P="${MY_PN}_${MY_PV}_${MY_DATE}"
+
+DESCRIPTION="Provides the capability to determine the health of Supermicro servers components"
+HOMEPAGE="https://www.supermicro.com"
+SRC_URI="${MY_PN}_${MY_PV}_${MY_DATE}_package.zip"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="supermicro"
+SLOT="0"
+IUSE="iso usb"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist fetch mirror"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	unpack "${S}"/${MY_P}.zip
+
+	if use iso; then
+		unzip ${MY_P}/Diagnose_Remotely/ISOFor${MY_PN}_v${MY_PV}_${MY_BUILD}.zip -d iso || die
+	fi
+
+	if use usb; then
+		unzip ${MY_P}/Diagnose_Remotely/USBFor${MY_PN}_v${MY_PV}_${MY_BUILD}.zip -d usb || die
+	fi
+}
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=SDO"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_install() {
+	insinto /usr/share/superdiag
+	doins ${MY_P}/startup.nsh ${MY_P}/${MY_PN}_v${MY_PV}.efi ${MY_P}/EFI/Boot/BootX64.efi
+
+	insinto /usr/share/superdiag/Picture
+	doins ${MY_P}/Picture/*.bmp
+
+	insinto /usr/share/superdiag/SelData
+	doins ${MY_P}/SelData/*.dat
+
+	local DOCS=(
+		"Superdiag_${MY_PV}_addendum_release_notes.docx"
+		"${MY_P}/Supermicro Super Diagnostics Offline readme.txt"
+		"${MY_P}/Supermicro Super Diagnostics Offline User Guide V${MY_PV}.pdf"
+	)
+	dodoc "${DOCS[@]}"
+
+	if use iso; then
+		insinto /usr/share/superdiag/ISO
+		doins iso/${MY_PN}_v${MY_PV}_${MY_DATE_ISO}.iso
+
+		newdoc iso/Readme.txt Readme.ISO.txt
+	fi
+
+	if use usb; then
+		insinto /usr/share/superdiag/USB
+		doins usb/STARTUP.nsh
+
+		dosym ../BootX64.efi /usr/share/superdiag/USB/BootX64.efi
+		dosym ../${MY_PN}_v${MY_PV}.efi /usr/share/superdiag/USB/${MY_PN}_v${MY_PV}.efi
+		dosym ../Picture /usr/share/superdiag/USB/Picture
+		dosym ../SelData /usr/share/superdiag/USB/SelData
+
+		newdoc usb/Readme.txt Readme.USB.txt
+	fi
+}
diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest
index 8bc60c28b1af..9b17da4db0eb 100644
--- a/sys-apps/usb_modeswitch/Manifest
+++ b/sys-apps/usb_modeswitch/Manifest
@@ -10,5 +10,5 @@ DIST usb-modeswitch-data-20170806.tar.bz2 32700 BLAKE2B 954aa513a74774cdabb2e382
 EBUILD usb_modeswitch-2.2.6.ebuild 1617 BLAKE2B 216b3c94b7f204ee41fc36f95e5a3b6329ef5e2b225f78ea0d037cdd9f5530d12cb3cae88330ea300c2d37170612482525189f26792b872872f7ba65d66637e8 SHA512 905090c51fe23cc47d3f36cbed21cd590eb1132857fbd49c3fa821f824e39e535917c96f48b4716a524cb9fa3d68b13a5221ce57109d59e7782cb17624112664
 EBUILD usb_modeswitch-2.3.0.ebuild 1620 BLAKE2B ea03a8ba28fd05a2c09c1584ac97ca306fb4a085d20d9c1299f1b4878095f0b7e14ab5bc5cb47c5aa938e2a7823f7421f95564f82c62cf02fa1040f028ea2399 SHA512 1bffa0315fe2dac3b7748b3f227a8942b9f0e26e91f581e9c6b24927f564bf85d73c08ce061224fc0aad9ac6429b1e4d160f60bdbe6ca0d3bc916827f29c761b
 EBUILD usb_modeswitch-2.4.0-r1.ebuild 1673 BLAKE2B 4e9bcf904dc03abdb4ea4a4115826b1efc6760e10cc162ffd4996ce550eff77d30c9675e9b8f4a6487ff96cc0e764f6e64bdb81b22472f7ec2472599571c939b SHA512 a3e049d75118661a57bf590234f399a43c2774c5908e2b7b804287f2173e65178b171197019e672d6101308d3e477a788ef8de650a95a194f0523573510ebb5b
-EBUILD usb_modeswitch-2.5.2.ebuild 1673 BLAKE2B 56bcccb342017c86c98abe3df44c91c5f927c571cf77cfd5c6446258fd3e4eaad0e618c7a669be8e803a0a2eea118104d1232b5deff78f0d0455591399609219 SHA512 bbe4a4a31bdfcd769dd8287cacc15d4fcf23b4634534bc72b2f1e7a3aedb28d88c20ea71664fcf95952c5170c6c0d646af849641fa76afbbec2109c533980706
+EBUILD usb_modeswitch-2.5.2.ebuild 1669 BLAKE2B a755ff2453b15e72245fa837a7f9abd83abd0da932e955abb04caacaba8c6dc0584ae48562667725598b0f8472dbaf04a336623551afcf91c098eb5075748158 SHA512 f3b5eb0c6fb9d96ea280db886c093c524da0fd637e5ac7b47e135a6791ae9ee8be3964d2b20182fb8b1235baa4a12b39cf6ce61c3472950cdabbc14f3487fc3e
 MISC metadata.xml 541 BLAKE2B edede0ecefedff47ad5641a9661eb7d192f339ae48f7c562309412a545f4e3897a4dfd521e56c8f906326578fefe1e489905be98df240a240944c4c2520ea4c2 SHA512 a7d85ab85e65702c21bb6235e55482a678fa3e990c0b75f147b91970286784e26f7aff11b6538278ac51ce7003f7e55cc8a0bc51ede9f219354c7e5693dad80b
diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
index cf78e7d75d8c..2192dbd4d067 100644
--- a/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
+++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE="jimtcl"
 
 COMMON_DEPEND="
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 8e2236440bf1..ecd250df1c63 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,9 +1,6 @@
-AUX usbutils-006-stdint.patch 701 BLAKE2B 511a0466d35f452c48bf6490415f1fdc3925fc2b613cd9f0f1d29258afae1e8fb03a5c6ea0ec9a1606b227af1e3e8160f07959b281a1e62d7115779a80779ab8 SHA512 8854846ec60652490401932a751e1e7ea61f59afa83447dd976ac351f898418777780b5e240c76771580aa8a879dbb63928adc053a3a95649dde5d9fab52798a
 AUX usbutils-010-fix-py3-support.patch 4251 BLAKE2B 46cb941e30da1b3b9f1a346bba5815485b6423578175b999a57475e6e2d917da9ce4a80943c74b84ce8488d6cbf1461010d4866d5e4813945e04d8b5aa0b5e8c SHA512 652824dcea10591ba74769703f60f49a3fb592e7cd5435756804c200cee45e9c9a818c6d6a4d3b315ba3b9e2dfa7314f94f870b2da768f6e887348b1aa5597f6
-DIST usbutils-008.tar.xz 287052 BLAKE2B eb9b998adb69938d004828585f782840e34f453327de54a32c563268db22a870fd7298cf839692e58ae42148e63037260e09bc2f1d5700ff96bcc451aff626ba SHA512 ab1ad36467ff79ff5ab0b924620001612cae44def58c05ade01a4e58d8a4d48df61c09faba49a20497b7d6314045bbaf137b51a9f4e6b65ed0ea3bb339bf1c45
 DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
 DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf80a1e1ae888fa498429a7a9e28eaced49047f8f793bad3c59f3b515557054860286b17d9f89f915d0db5943cc SHA512 8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3
-EBUILD usbutils-008-r1.ebuild 1233 BLAKE2B bd4a135641d42af965c9419b9d2cefd4f0b0f9a66de24bad5ed127a05fffa4c6aa2328a9cb331223691189b3ad7d42b10338f82f5da3d8b62f484108fff4db00 SHA512 6bf060d7773c9abc7935df695783ee523a160cda99e8b405a495e424034b209b039bc551cd1f711ffa07f503313348cb2f3f34fb9169387785469ba3fa99b31c
 EBUILD usbutils-009.ebuild 1133 BLAKE2B 93d5326da2d8a76846292a395eb8a96cd5fce8bfb24812ddd2657ca0a37d782611533cafbc5a60fe0da4aca2032a52a5bc1bdea0c0a7c1b73bf6ba63644a2d69 SHA512 c5ee7dc9644cfa0d709af886e1ad89a1272a156bceb3580d05ebc667a570b2dfb4fdedfd8c4c973186e62d6171c9595d7922cab8ca3d5c5ea70dc52cd1464845
 EBUILD usbutils-010-r1.ebuild 1249 BLAKE2B d81e58baa5928f383358b9b2adfb274c6cef0e5a547bf062e521b989e9e50a1a91c6ee0e4e1eb65815055044220496659ba3379fcb5d9ca86773e2d6ddfd9e72 SHA512 53b65fa4bf4bd01142527e51e2d6644dbf22a8f81f679d07f95ecb2a0d541936349d10c6d2c5aee493b1bcd2265e758dbde8292b6404bf238d9b119984608bd5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/files/usbutils-006-stdint.patch b/sys-apps/usbutils/files/usbutils-006-stdint.patch
deleted file mode 100644
index 3aecbdfec04c..000000000000
--- a/sys-apps/usbutils/files/usbutils-006-stdint.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://sourceforge.net/p/digimend/bugs/41/
-
---- a/usbhid-dump/lib/iface.c
-+++ b/usbhid-dump/lib/iface.c
-@@ -30,6 +30,7 @@
- #include <assert.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <stdint.h>
- #include <string.h>
- 
- bool
---- a/usbhid-dump/lib/iface_list.c
-+++ b/usbhid-dump/lib/iface_list.c
-@@ -30,6 +30,7 @@
- #include <assert.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <stdint.h>
- 
- bool
- uhd_iface_list_valid(const uhd_iface *list)
---- a/usbhid-dump/src/usbhid-dump.c
-+++ b/usbhid-dump/src/usbhid-dump.c
-@@ -40,6 +40,7 @@
- #include <unistd.h>
- #include <getopt.h>
- #include <stdio.h>
-+#include <stdint.h>
- 
- /* Define LIBUSB_CALL for libusb <= 1.0.8 */
- #ifndef LIBUSB_CALL
diff --git a/sys-apps/usbutils/usbutils-008-r1.ebuild b/sys-apps/usbutils/usbutils-008-r1.ebuild
deleted file mode 100644
index b4a75cd8ce37..000000000000
--- a/sys-apps/usbutils/usbutils-008-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
-	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
-SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="virtual/libusb:1=
-	virtual/libudev:="
-DEPEND="${CDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-apps/hwids
-	python? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-006-stdint.patch
-	sed -i -e '/^usbids/s:/usr/share:/usr/share/misc:' lsusb.py || die
-	use python && python_fix_shebang lsusb.py
-}
-
-src_configure() {
-	econf \
-		--datarootdir="${EPREFIX}/usr/share" \
-		--datadir="${EPREFIX}/usr/share/misc"
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-}