gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /sys-apps
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
182 files changed, 1674 insertions, 1523 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7aa00d0b5ccd..2892526cc901 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 7ff39bc04719..2000c7105142 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -1,5 +1,5 @@
 AUX accountsservice-0.6.35-gentoo-system-users.patch 1122 BLAKE2B f6196cc7136581ede5437aad909a5c2baa6cda36a27d7e4ceebd0aee2b40a66ef83324b3dde92a77ca0dfca96a47ac342f4a580f38ad6e3a042384dd9e742282 SHA512 e8ac404aed1da3ab4bb092b476cbb18f2ae7d209bcbe6a30cb9058f50dce0f70d64a3de593108ef5588132389d522d19975384eb1b8414119cb622bc7d738931
 AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740424844d62e0e559ad458651965e3ae00853ab4e226dfb0f035daeada6adaa568ac9d9eee517413770d73501d8d712a9f51385f653c3 SHA512 303c933389be6c19e01e43eb074a5e5f72f80cf3f4ef88d8ba52d07c3b6500b6d81a0a209d4abf15a46c617f57486654a74e9f17ba8b39aa438495ccbfa19186
 DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
-EBUILD accountsservice-0.6.50-r1.ebuild 1605 BLAKE2B 46b9032241ea325069f8708630b28bd8c82db3e7930e56fbe4122d42bb694044be572b2ce39e474557751788a49a4eebb29a9f5fc0bd15a13194eeff4d0e3276 SHA512 77ec2cd5048352ffb9335d264eef728fa4f3e115fc383253e6727e318d2f92acd366f8e95a5061f5148946d721f634d2aa6595616d4d799a487b70290712f0d7
-MISC metadata.xml 524 BLAKE2B a48a629a81d6502b8c54c466c6d901fe02e0fbe14ddbfd3294501560a19e33c3915c1305ea981fe41c572689def2d0a8f00de4b3131a19297f4ef3db9d6b5b06 SHA512 a0c662b3c0c45df43780f160b6db6db67561a1b2c84ce60929707d94cd9f1bf76588420189b91e0eafe58001a61d8a313f2a4b421b980a7c7f988c95e782ee07
+EBUILD accountsservice-0.6.50-r1.ebuild 1615 BLAKE2B 582df7bf9fe7548cbb74a898b838c1f697c9a347e6005718e7fa370cbb3dfd1e745cc1342d5cf6b4d51b37cb977cca46f20650346c7f3aea6914f3a41cb30e62 SHA512 738f992dc912e4aa3a96cfaba8b681eb4efb336d06d3b33d93df321ef4a6832ad35359253014d2de456fd43ed05b5be3eac59f123c005fc572aad583812b6f59
+MISC metadata.xml 523 BLAKE2B 6117c5e7b8e0120bbae31e46c4d1e3709111638afa43c18d000c975ea0fded590ecb9404e10eca2542b5262cb122be9e34d140b6b3101ad69321cbc2f73a5890 SHA512 41c7b3374cfc02ddd842f13c25039abf016fdc110716cd9f308c4d9050a793c8506d6459c3604eae946184f3d08b2848d63b1bf65eb845f9a551c27debf1794a
diff --git a/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.50-r1.ebuild
index a61545c13622..cd05be8ca8b9 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 Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,16 +14,16 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
-IUSE="doc elogind +introspection selinux systemd"
-REQUIRED_USE="?? ( elogind systemd )"
+IUSE="doc consolekit elogind +introspection selinux systemd"
+REQUIRED_USE="^^ ( consolekit elogind systemd )"
 
 CDEPEND="
 	>=dev-libs/glib-2.44:2
 	sys-auth/polkit
+	consolekit? ( sys-auth/consolekit )
 	elogind? ( >=sys-auth/elogind-229.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
 	systemd? ( >=sys-apps/systemd-186:0= )
-	!systemd? ( !elogind? ( sys-auth/consolekit ) )
 "
 DEPEND="${CDEPEND}
 	dev-libs/libxslt
diff --git a/sys-apps/accountsservice/metadata.xml b/sys-apps/accountsservice/metadata.xml
index 69657d082aea..35e1d4b2c2bd 100644
--- a/sys-apps/accountsservice/metadata.xml
+++ b/sys-apps/accountsservice/metadata.xml
@@ -6,9 +6,8 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
-		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> instead of
-			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
-		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
-			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+		<flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
+		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> for session tracking</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index a20eec23052e..d88a51669b55 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,6 +1,6 @@
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
 DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe SHA512 2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f
-EBUILD apparmor-utils-2.13.1.ebuild 2007 BLAKE2B 3656ea0681e8664dc5829db0b221ca9479890663e8aabf45eecef60d0668023e5587505b5a7ed0383a16939d2bb8793014b6e85704118ac4de7702c23ea94a5e SHA512 af53cfeb38a9288b81254b49449c57ac132888fb9037d1496f8fd87155bce9390b980212818b4a0ee3d19323307f007126da97a3bba6466e4e27629ccfe6adca
-EBUILD apparmor-utils-2.13.2-r1.ebuild 2183 BLAKE2B 0a54046c5abef22f20dd728b440d193a91c336d56cfcf7139025e6cf75e320bdd87edcb300cefcf0fd68fa594d8abcbac40a86397c2a7b4d3613e809b4277c2a SHA512 31cfd15ed8b1fb2ca8a27288451a918869a19f4e3ce598f972b5bb514db79216927d7c5fe1466caa10abf10080299cb0068e1f092684e8eaa4f315ca3ef16b30
-EBUILD apparmor-utils-2.13.2.ebuild 2067 BLAKE2B 9a99ac56d7e18d1f2ebd204a5d4b621228e047f0a69606aaed8c91cb39bfdcbd6bab63252e009c36c1e3a51158d3a546cebb3fbfc6cd725b2eeff4aff928bd55 SHA512 cdc94e238bc888af7c2da2f9a0357137ffb892dec2d0f33af18bb86e897bf84f0a7f3176b3f48bd668be00eb54761e605a9b1740fd7710ad2701701961bab94a
+EBUILD apparmor-utils-2.13.1.ebuild 2005 BLAKE2B 8720ce38ccd2a2cc79e5d44b6c7702ae458e0cac065d4b051a999f15310a8b2348c8a00cf841deaa3005740fb824aaff56e2c7251a7f2839bcaecc8f91858df1 SHA512 41dddd15eb3a096e383c4e581db78c416baa1a8b3fbd3b50eabcd6a1d1e1304676e0c6fffdd6a0187f9fad38c50d06240149a5808c0ecd7d310bcb7c417acc35
+EBUILD apparmor-utils-2.13.2-r1.ebuild 2181 BLAKE2B 4a71db4b196914bc0341ce1b12ac517aeba5231735622e18f4f6b9f2d3e33ee41ec6f81cf65c6f25ddafc5489ee05cb26ac579451124009126203a23dd14a3a6 SHA512 63c68749843ec4fd3ec2a749aef2fd422ede91026b9a5922dd96be0b7899ad76611dee0f45c8134561ec12041f69311cde9e8d0ed3f64f417b419dde85a11aa3
+EBUILD apparmor-utils-2.13.2.ebuild 2065 BLAKE2B 825ae1b508723e7bb43ae74a537676383375240534d05940fff86781a5db01892ae12a4055821b0bde19eb6848edf508543e8baa9bdf0b5f394dd147ab3d020f SHA512 ca3b9532991e691d29ad557d3d966642c070a841655f0bd09b0edb191cd000c7ebc755e225b81e6f0705fae0e55611a32ae8c0f8517e15eb147471ca3ce07872
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild
index 0407708f4d80..1dec23f3e152 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit eapi7-ver perl-module python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
index 96e9c45f4802..4ce56c968e57 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit eapi7-ver perl-module python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
index 48e17afd736f..7cde6f4759f8 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit eapi7-ver perl-module python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
diff --git a/sys-apps/baselayout-java/Manifest b/sys-apps/baselayout-java/Manifest
index 8e3645963ce9..f0f11231b71b 100644
--- a/sys-apps/baselayout-java/Manifest
+++ b/sys-apps/baselayout-java/Manifest
@@ -1,3 +1,3 @@
 DIST baselayout-java-0.1.0.tar.gz 72571 BLAKE2B 3a41752b1bdc3980fe8690e499738e19ba9c390164fba04d16eba8f85a73557c7f9c15e311fcd738c250ed1226cc143bc933eef14edad0546b27eb5b41cf3bd3 SHA512 6f5b6ff1ed07406711e15a768f5abdf9f7edef1b31e094760f265863aa8991bf60ff71c8b10003265d8ec1aa7c94a611bede96980d25c819908b705b4d2d1062
-EBUILD baselayout-java-0.1.0.ebuild 691 BLAKE2B da8baf1bad6d786438108b754dc3c4f4d33ab89c22ad3f904859ba56a329c394a9b6fba9a16bb83d94c63e9782457dbcfc925e95bc74109e19cb161907f5ac4f SHA512 8f68171b8036217b07c85acbe591e7a4773bd57b53186712321e5ad91c71895a37a3d0b6f2936a02797bfd2075ab2ad1e2bac2631079794de452bcad2ea5e871
+EBUILD baselayout-java-0.1.0.ebuild 693 BLAKE2B 1602030e82d6c609815266571ed6e2569e03742485984367ae504db7976254514f5409eb46553ac87d323eb714f994e5010ce7707eae2e12fe67e941949ea292 SHA512 1acf9e4c15f850b7da3c063dd4145d213f6e8abc41fef1052411ddd5c929044a92a7dd99bdf99ef706d545714c2cf84c5668889350bd1930518d2df5cc3cd1f4
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
index cff5afff2378..559804021870 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils
 
 DESCRIPTION="Baselayout for Java"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 3339b9784777..6e4eb41d8ca8 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,5 @@
 DIST bleachbit-2.0.tar.gz 886357 BLAKE2B f63ded34d245df892b2c14683ceaae8b57e786a8ab3111e7f76d484c6d3db404996119ab4114c3ae025848936a784878b3f100cf2ca8737401a6daaaf74a077e SHA512 adf5c2f2382b2eaab0eb2b4a173b392c160af7974f223c74ae51a30423514a15b98f04194b9ccde209b5c067d8481f0f1ee28651896d3002fcfa3927d8db056b
-DIST bleachbit-2.1.tar.gz 1080424 BLAKE2B 684fc7db66b0de1aa0a4673f6b9b7887a3dcd14946e599771e548706d6ecfb54e264e6e953b986bd160e182d28ee4468dac0e637fc010fc4f0d31d5b7448c3ad SHA512 eac62c02bc196760869b6c2d31f13d52220a2e62a7e9a7584ebcbe498e14d5c606937cfef9a1cfd2f585b1b9641572c2a81e28515679f8f6a72e95e97b6a0cd8
+DIST bleachbit-2.2.tar.gz 1100913 BLAKE2B a16e63a2533f9d9c385d384e2fd65dbb32a8f064e769f99e8a8cab9c4069cc7b21e6896c5fa8d02d8204e8c93da8a5f66605601eb44ecc354d41f1a6d9fe2d0a SHA512 c7661cc64358a6420768c3ee1a6ec97d2fd4f0bf67b393be045ef79cef8b3f8cc273a51a5dd7c79d89b8a14cd1357f7714fc860addc9ae74af48bd8d427b3a5a
 EBUILD bleachbit-2.0.ebuild 1207 BLAKE2B 101fac851806c9de4e20ef8290ff65d5d446f1400bd2f4025d65398d186683df19783bc72f8eece15962dc6f2ecc97375686304d8c187614653aa865f75f7b02 SHA512 d52074b5842dc0fb44610b7fff374ec25855a4e19bfa58f1b8dc709b0b514bd497ea39e7713c2e3f42db8efbb1975ac8f7c763eda0b78e2f01ffa51d63700882
-EBUILD bleachbit-2.1.ebuild 1214 BLAKE2B 4cd910f30733d2f84563f54467d1840a44f1ff8947c33af06e600d6057ef1dae2b48d8b6f7ec97ffff70ff9ab6f66542bb26f79aed2559e66c9b9856aade8db1 SHA512 2393f2f3fbe3553e5db4a57a79d7eb28f3bed9f999dc74db74b709d6f541416c4286f22ca352782fb728a80b2786c602d0505b191a4b46a96acf9f046368a592
+EBUILD bleachbit-2.2.ebuild 1194 BLAKE2B a5fd7b73e02177b448ed028ea78b64269f04e0378da4e71278ce40b413b0631c0e54a6b980d00854c6a05fe723ae87b012a592e5c889283b6b4928ad63b74e0a SHA512 3f323798258a92bc63120db00ab9db90a50f5142f52afa186970e6e87419af351f3847277e413e97e2d1ffa87e8a791ce7a9177ba42a3bb538543cd90445cc23
 MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-2.1.ebuild b/sys-apps/bleachbit/bleachbit-2.2.ebuild
index 693390017bc3..cb4c5a71633e 100644
--- a/sys-apps/bleachbit/bleachbit-2.1.ebuild
+++ b/sys-apps/bleachbit/bleachbit-2.2.ebuild
@@ -18,7 +18,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+gtk"
 
 RDEPEND="gtk? ( dev-python/pygtk:2[$PYTHON_USEDEP] )"
-DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/gettext"
 
 python_prepare_all() {
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index 077c7b8f1c8c..9a2118d5a35b 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,3 +1,3 @@
 DIST bubblewrap-0.3.1.tar.xz 209924 BLAKE2B bacc4080106cd9876bf0e1ad866a7397d7d232e61a720b52b5a6b9b0d860e625511ed15ac630aa71003fb9fa145ffa9d08ae2e6ba6d1411fd75e7d9568312717 SHA512 74e36caa56540a956158445f5f38c7ac5f7ff3c733ecaf85893de4607900e1fe4050db86a4435cbe18d722e90c5b39c466c555ea8ea8d4944da6207ef1011d67
-EBUILD bubblewrap-0.3.1-r1.ebuild 1048 BLAKE2B d46fbf29736539a20908b44109922a3b5257cce8d69845e1c54444dd04f50a3e51d709eba90dc4465c8ac5ff48440a0f2df39614555f183af04881c94028e9f4 SHA512 a45244a09005f1f621d82e585be8ea2ddfa63d444825f3c9825b8f9e80e9a54b2ad1e9174fe4c270249a2940f9d518cf926a8177fb429e452dc8df43b6255749
+EBUILD bubblewrap-0.3.1-r1.ebuild 1055 BLAKE2B eb9c2fa9540f631f06a68fa3e399ab7f807256b56edf5d4595af6aacaa97f33db587f6ba4c263e8ddd74d4828a9a63e2f7695571c5567b062e0546b4c2f6f290 SHA512 c478ffad9561126502196e0e6107cd15574605614558af089209586653c8d67db12873c5eca7c4957ba986551d4272f862b55dfa9a02c98f1dfe0afbfbee4e25
 MISC metadata.xml 342 BLAKE2B de8d3ba1c95b39bd6e582b27b186ef0805fd9be1fe6c806fb8bcfa28f7cafb3a2068be0e21baa13ca08895db0d0b666b5c1eab573f38fac251ce9d41c793866e SHA512 25752c1aae465ac49409e35c32863b945c1dc8989ddb4fab2999cf890cf4ec33fc82e9324e3af49c15a8580a566e5f737ec270646b4cc569c3c5dd472eb1b2bb
diff --git a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
index dcba78156b3a..30d908bc60d0 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/projectatomic/${PN}/releases/download/v${PV}/${P}.ta
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index 7965dde90c9c..a5339e78a4eb 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -12,5 +12,5 @@ EBUILD collectl-4.1.0.ebuild 884 BLAKE2B f2c348a68a08a4129dcd52288f6bd46f65228af
 EBUILD collectl-4.1.3.ebuild 884 BLAKE2B 40f696fae933f20b5ec6acb5ab2d5fc465431b343925b01e84978febbdcb62e49e5c4cf7a8cea199757a9d7b3985bcbd4d1092c0a64ba136bfc5bc9f477b3283 SHA512 928f5c5e0df737b8805664a308dc6eeb678e2d44d873a61be1926dfca245dcf4df918b1dc7bb9b45896e55ae0ca47823605a3b3a1ea0b8e5aba2c49926d7ff4b
 EBUILD collectl-4.2.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
 EBUILD collectl-4.3.0.ebuild 843 BLAKE2B e204e449e1b433abdf37101426df1024bdf32d9e68045f5333fc276faff536c613ec66ab5fa629be8fc91cefe253bfd7150382d873e4b2661e9577279963b717 SHA512 67a79823835126f35f006a5f95909d2dd5f721546743524589244a8dbb94121f86ae091a3fb68026423cc4efe8dc260ab654c1056eb2ec69f21a55e896745252
-EBUILD collectl-4.3.1.ebuild 840 BLAKE2B aa95cdcaacd67a4db5d59ea173d628941ac43bd7148c086d27e6ed2b47e28b8f57b5ea84184f9aae8e5a81463a2de6263ad2ebe5d4cccd2f710715b0909270c1 SHA512 ac858b33e0c72e5ff77e0b132f953d4d1e662bf9d87aa36c1a85e53ff1ab1dbd425b7353e328a741206461f576c3b801c36e3f176e6cb23e0bdf9fbc0779a538
+EBUILD collectl-4.3.1.ebuild 838 BLAKE2B e9804dbf8dacbae43b58d9ab139d042b34c05695572ed2aeb5ad087ea1de6bd10570588f1918ea8aaccd791ba85e28f1bf8b5a1dc41cc6da4fa6b30aef6a24a6 SHA512 a5368280da8c6db9df470081c56aa48c9b595934d11ec4f1d9b8472fb6379db6f6c55d81b49f772b6c59aed74e499e3f82a9b06c78ea4bdcaf5bf28a75c8f71b
 MISC metadata.xml 328 BLAKE2B 88e0f5bbcfc780806551d88a862ff5c86b82f874f77f5c2f7e90fca7dc2c1b177f9c1c11174cb67b48ccf4cf3a3467ac61e56dc4e462cde9bca217ab071da363 SHA512 2eb88e764d55e93183e030d0e4e2e99a53d4e26855e234f47077e812e1108aaca4b44bb7af18f04cebf9b366a2a991e844234c0af9c719399f1c836b091b8622
diff --git a/sys-apps/collectl/collectl-4.3.1.ebuild b/sys-apps/collectl/collectl-4.3.1.ebuild
index ba9800dc9fba..753b8fcb3eff 100644
--- a/sys-apps/collectl/collectl-4.3.1.ebuild
+++ b/sys-apps/collectl/collectl-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 
 LICENSE="GPL-2 Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
+KEYWORDS="~alpha amd64 ~ia64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8.8
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 759d91615917..1d8d2551c33a 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,6 +1,6 @@
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
 DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
-EBUILD coreutils-8.30.ebuild 6144 BLAKE2B ef59fb59210689c84b3869c5c80e0d9555beb1ba92e8042d917e6389fadde7d78188c3171a06d5a5f7d52b16572e2cde8ae8a123a93e5058582a7ecbcc1694c2 SHA512 6393fd4cf44dc072d57576af3cee0f13c5ca4afd2878a0a15f1553dc1d4429d940eef6da6f72fce4d59fdda34cc437ad988d473605779f8c9bb23b2efe253b17
-EBUILD coreutils-8.31.ebuild 6151 BLAKE2B 8f39aaadf5d6df7f4699512aa1d79a02d03c6da3e7f3c53614ece5bdd338cf350519e9c322143bd256684bdb2f74213f57a9991541a10cf75c641618233f60c7 SHA512 2dc80cbe70a34173e7916c9a26d8bc934870676de13041de89827d4a21a048e03691e3b8f77e7dec79d06069676d6ed13d9fdd7e59dbfd6642a8eb52bb930d5b
+EBUILD coreutils-8.30.ebuild 6140 BLAKE2B df4b9ef9f15d0e9a1b4129ec69ec6e3bb7f94e3f1d558bdde741d3fe2f989e1b1b96be4b68b070929ccb0fbbe514ef2e4f561de60d9701b9776cb0cf2764014c SHA512 2a5922014839d073dea81dcee72f8aac98c60cc6c1349649b58d9368b6f5a84b412bd3f410c9d9b6d1e7e9645cf9791cfb52d8794c643b67c0d04c61c7f43492
+EBUILD coreutils-8.31.ebuild 6149 BLAKE2B f25140aa11a1312d17da9e340c2c991e3fc33aee1456fc337e8e5fd5444854f7d974d216e4ed8ea4ee2798a750e07a0f206cd166335b028c722551e78d01f9f2 SHA512 424360943245136eb9b8fb2992c6362f983c5b795666a8de9f62fef779a133fe10cc06fe35e5edc4863bc07f6bc8450324357c8c526a938ae6e7ac6e8be23f70
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
index c0de31055988..cffb6d4a9a00 100644
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
diff --git a/sys-apps/coreutils/coreutils-8.31.ebuild b/sys-apps/coreutils/coreutils-8.31.ebuild
index 0f3a9d0bd45a..3e1db26321fa 100644
--- a/sys-apps/coreutils/coreutils-8.31.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit eutils flag-o-matic python-any-r1 toolchain-funcs
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 2678f5c43689..5c4610f8d2f7 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -7,7 +7,7 @@ DIST dbus-1.10.18.tar.gz 1986589 BLAKE2B 95b8a04362e78001e723301e5f170e923bca8b7
 DIST dbus-1.10.24.tar.gz 1991358 BLAKE2B ffa82a26f156d5d5b5864cc675f2a24b103dcf5c73ac8a570e1e13f37f9d6b8c2aea2545b1a3979d3a94ce7a2ddda7280afde4ecd9b682d3d31355f82af217f7 SHA512 fc0b88b756affdb4fc7a62e84a6f7757121293afeadc38acf8aac48b6c2b82531e136a575be2ab503a39d7669cb7b609a021e20c1064e28c965c091e94c4f68c
 DIST dbus-1.12.12.tar.gz 2077301 BLAKE2B 6245559fc3419bfdca1bdb2da7f6f5a34e5377dc67e0c8ecb7a87914ea65d044a95be59b749d9cfef7008ad09854b549b86863ca987b8a3949cf0d58cc5a2cb6 SHA512 51af4e86ab7d36e1c9a861164e7cd7aa1605fdd82f90aed8728b34c45a87864a00671de9db00d88ea6f96be97459c7eb53d2517ea9d9687ae9ebf81c58c3a80f
 EBUILD dbus-1.10.18.ebuild 7366 BLAKE2B ec30593cceffe5a927529a64a895e4ab3913aacce6d9a6aeea54e613c38f4b557c81b7b3a7c968ce2f08e9d019f17d15c56dd4ab51b3014ed3f2d382328e14ce SHA512 1a8ee80dd263512afa76aeea6e0442b6c8fc58c69c6c3c04b760772d15964bbdc5ca4172af6bb5d5d1669514e56a4dedb73dc534f91e33609e2a85d3ec1167f5
-EBUILD dbus-1.10.24.ebuild 7373 BLAKE2B 21ad1bff164e2e67786c1e9b7f74c5c9772316429763bf2dc597c2c85fe6b3706d6f87c20cbfe55c0f297dc99342bc58c6b2ab7e443dfefe1d1b4652c9de3bff SHA512 b820553d81073c0bfd754c56014a40639d26ccf6a42c967f97c74c7c4d71be96b5b534f616caded46774d5d29693985fffdecde10d401f30803b39da4400aca1
-EBUILD dbus-1.12.12-r1.ebuild 7775 BLAKE2B 7c806ba0936bdb0934d59ce5e4e9c0e761d03feff04b12775ecacd7dc23cad93f03913ffe17cbd5ed79e04cd62d4c6f01e8dda1cb6534803e0c03c1b128bd064 SHA512 3d6bd9a0b1e6d95a6ab1b6ec751d2c092a702c916723e161a051a27ee2317ec192fe25bf3ffeeb27d90103f4ca461972e9fc8021466cdc38034244a3b1aba5bf
-EBUILD dbus-1.12.12-r2.ebuild 8002 BLAKE2B c3af96430acc3caf382f84017c681f5ef1e9c05248fb8e9827230db5dd1f65ea4a2fd02cc6d4cb034cf1031fc0dca64beb60c37140a56f815c012789ea95dc2d SHA512 a4e93064e27e6fcc1f9a80558a146a39dbb7b241b93bff4885866bce305ba1cb6623814de8a75bebfe433ff943d00ffb9d04eea9847d4c55fd95498bd9dafe76
+EBUILD dbus-1.10.24.ebuild 7371 BLAKE2B 86359da505027828bb4c146e7c33e50e569cbf997fede7ef03d37bfc15b1ce96db4852b24561d45efcd7156a420691cde680dded84c5e82d9aab98a1e904fdb7 SHA512 b9365d7d92412b9a0ccd674859e7eada5e5019a848cdc4a3d8a05aaa3b5308660e22af86869a93536619aa62c0fa63632e99230f49bad5de6481ecdcd6e3dd0d
+EBUILD dbus-1.12.12-r1.ebuild 7772 BLAKE2B 81a77839677b283f6de47d63b3050938ea3929bfe92653ae627c07d0afd648c640064f6c9310b99f697b8984a4f9a06be499db3d7ce303fb74055aaa22f429c7 SHA512 d11da21d55d69a77ef83e3b310a0fa7c0875a376f0de80127e93cdde8dfb0bc35aaa37f9fe95bcaa23c81aebd96d0a0f3feca6d69346ade4c8775c775f5fa240
+EBUILD dbus-1.12.12-r2.ebuild 8000 BLAKE2B 8f25876dba09f3d609f32b6dd23d77ac342070acbaf7a86e7f504980bc7f2e24dec38c848bac9ca699f5b5ddbdb82464803196396a2f4d3be8ae90dc1a878c92 SHA512 f55a77c706bcf660ef5eae51e2b4f1f5c4c8f466ea76c5959b6a11b459b6d56d089463f5845cd0876b7781fb0f38fec1b5d2c69066901a1288a4a8400111f6ef
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.10.24.ebuild b/sys-apps/dbus/dbus-1.10.24.ebuild
index e690376746ac..4d7969914d1e 100644
--- a/sys-apps/dbus/dbus-1.10.24.ebuild
+++ b/sys-apps/dbus/dbus-1.10.24.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit autotools ltprune linux-info flag-o-matic python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
 
diff --git a/sys-apps/dbus/dbus-1.12.12-r1.ebuild b/sys-apps/dbus/dbus-1.12.12-r1.ebuild
index 145518c608f7..36184342059d 100644
--- a/sys-apps/dbus/dbus-1.12.12-r1.ebuild
+++ b/sys-apps/dbus/dbus-1.12.12-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc elogind selinux static-libs systemd test user-session X"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-apps/dbus/dbus-1.12.12-r2.ebuild b/sys-apps/dbus/dbus-1.12.12-r2.ebuild
index 44d36d8040b2..102d5152cef0 100644
--- a/sys-apps/dbus/dbus-1.12.12-r2.ebuild
+++ b/sys-apps/dbus/dbus-1.12.12-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx user multilib-minimal
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
diff --git a/sys-apps/edac-utils/Manifest b/sys-apps/edac-utils/Manifest
index b2befac82809..e179fea95345 100644
--- a/sys-apps/edac-utils/Manifest
+++ b/sys-apps/edac-utils/Manifest
@@ -1,3 +1,3 @@
 DIST edac-utils-0.18.tar.gz 285909 BLAKE2B 7d2662daf94c4ff796760b4863837861015397016bb79202baaa194608b61450d6749981cec621571267ac818a09af758167d2d768513e7d5bf7e763aed7ee51 SHA512 5c81b11c28e8fb3198f2d656171493877393024d9e31233c252d358d8029aa83065e7b66ea87d742518f710466c9ba7dfcf57a1641374ce169cf95fd379101fa
-EBUILD edac-utils-0.18.ebuild 1006 BLAKE2B 2ce775f196e83612225f3a6f59940375736a2d345b2f3236124c8033a089be2808f6170574a42d0f2312d4fecf8068d456bd726043d94967083236d0044fe652 SHA512 2e46c3e1ce5b99ce4398d6db18b645f01ccc62f36488c116726fc8c3a760008b1af26b525bc362aef56e5821574e703fec517beddadc443dba50e5eebd35bf2d
+EBUILD edac-utils-0.18.ebuild 1072 BLAKE2B af78cd06b62a759d5ea5355a76b76d9ca98f1589a75200e42d6c36b1dc7119bdc0b16a0d1ced90322b2eef4394734f97b018e7b47d36d1211fea6c21de9b43fa SHA512 e5721db1b985127cf7423d71494b722e157a1d76d3891e217ae29555cea82fddd7ef9ce0b551425f508141dbc2b3d03fb8bc8f662c58ea2c14b0e9d16efc3273
 MISC metadata.xml 342 BLAKE2B 809bc5970bcec8fa54767406dee65a45bb8d1e10efeb5105ed39b5a6b771d0b821d020a68950e54f22985663bf9dc02586300a74f5ce90f31f4885f95c8bc9e1 SHA512 d11d055d89b95dcd5fe62b514053918f3bda64a737cff22935bc74d0dd8506112599ed503275741dff8edbd4ecab9ee81a4d6aa33add6ef63b059d84f59c4e4a
diff --git a/sys-apps/edac-utils/edac-utils-0.18.ebuild b/sys-apps/edac-utils/edac-utils-0.18.ebuild
index 5bf6da23f318..84151a32ea16 100644
--- a/sys-apps/edac-utils/edac-utils-0.18.ebuild
+++ b/sys-apps/edac-utils/edac-utils-0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,6 +17,12 @@ DEPEND="sys-fs/sysfsutils"
 RDEPEND="${DEPEND}
 	sys-apps/dmidecode"
 
+src_prepare() {
+	sed -i \
+		-e 's|-Werror||' \
+		configure || die
+}
+
 src_configure() {
 	econf \
 		--disable-static \
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index 4205b898e36a..d270fe0a90c6 100644
--- a/sys-apps/elfix/Manifest
+++ b/sys-apps/elfix/Manifest
@@ -1,8 +1,10 @@
 DIST elfix-0.9.2.tar.gz 398758 BLAKE2B 22f8d9e85be2ae9bd906dfa6a1d8b7614f017686b4563ef7e97898a112a56cff59a8cb906ec957b7a111a5c9251a3de6b13dfb66ef9f732099ac610928d5321e SHA512 a7be30722abe7249ec42024d33b2bda00524cfb85da66b4511c5056efbdbfae1d3c2b42048bcf4d5cb7c0ae675f763b74a834d93a25b541ebac42fddcd2c6cf9
 DIST elfix-0.9.3.tar.gz 399533 BLAKE2B 7ff2099218de3352079564971cd2e3851a95820552b9057387b78945fb1a23d7b670591b174dc974ca2b0dcf3948546578a210687cbb16625dc5d638abf83169 SHA512 3395ce2e6d5e9fc9bdd93b58751cea33b5fb8e25e0a390e6261de6804cc54d4e1f91b4b5843fc45c9178d86d23e9932bf9d0f133a6d086607bf52ce16c65fd0d
 DIST elfix-0.9.4.tar.gz 399606 BLAKE2B 51b8b2f1c3cce306c7bc0716ad351bbf446a369a353bcd1b5faa41984dec37e08dbeeea87fa2425820af9f76d36209554b8e602338d01d0ad50e6d95e6079529 SHA512 f705f63b0ca57077f56e519a22ccaeb2e07f57c5269a6e498571a1799286f12098ccc9a92d2126b51b498447a098b0ce22d54c0d97c8c98d25426fe1e00c6e07
+DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
 EBUILD elfix-0.9.2.ebuild 1131 BLAKE2B 6b23b4204cee8654d34140967e95d0f6e8d5340ebf12948a168c260fefc0dc8f5f8891564579c52d27b3a7b79cb260ae7bd2f008489e4d83d809874fa49c593b SHA512 0b2eeed50d4478894cf3e3d576fef84d725caca54da95e41e98698c4a1fa226172d9ae8fa2b343f59db2229aa5596a7fdb8266868a63667f548567d262a4d451
 EBUILD elfix-0.9.3.ebuild 1132 BLAKE2B f49fd5cfe798d82dc4f2629ff4b4a89ab009f893aea00f9afedc7b6967ba285108cc39408c9e87a9e3479288cffb0fc07e02fcbf555e5be04b2953531f2a89e7 SHA512 ad0ed8032bf426f47973dfb5e3952645f384b09f1f1cefa496725b80cfdaecd0b6d1c90adbe645580f6464339cd0fe4db314b9318dd8361e63f60b79554a45c0
-EBUILD elfix-0.9.4.ebuild 1128 BLAKE2B 872e6dec2b0dab7f55c176c3ca2663449e26884d7c4ad822561846e5782b479b20315dc0a92fdf644740647378c78129599f31f19b0a47a8c9b0a81facd04ea2 SHA512 ef01fc41426b89644dfccda43bb7fea45389fb44dbd6d287b3e24b5f3402c8aceff7a9914cab05ca4aecdce72b85622f42c77648bd2d0566a152f665a9acd698
+EBUILD elfix-0.9.4.ebuild 1127 BLAKE2B 77304b496841a74540cb10daedef9ed538ee2814d0e781dc23962e1c3aca6e556d79aaac59f54b0a91ac22da553c808b7ccf3d4737dcf7e7dd8e0c984a6b0129 SHA512 ae6de33cb4d494b432e7c3ad424f4a3762b68a3c98f94fdd2a512713feaf71855b61fed3b14547c544fccac95c093e03bbe40c1d139d9a34b8c06b5bf4d70ed6
+EBUILD elfix-0.9.5.ebuild 1133 BLAKE2B e4d1ab3bbef463cb0c1f8594cc96ad8636667214748e909ce7b9363398602b8d1ade33315b33cff44b6610b76aecfcd8a6febde5b6b52b4c168184c3f909ebde SHA512 11beb675b99df491b362843333dc16a9b2a85c5e3a69d024f318fc7a8e134a4d763fabfe78463d749d218a3a83502c586307b0e8ab4511628d5ef544ae832e28
 EBUILD elfix-9999.ebuild 1137 BLAKE2B bdd63adab9dfcbcef879b4eb35b15168533315f85de4098dc4477c6836615261e7c6a508c987a460c16836590ec26212fec6142b6b7f16985408c335314e8847 SHA512 00f937ff54b0e32255a6e59a3979340d70665b818a363d7c953c8b6aa7d79c6d55731ba23ee8b3e0a3ccb2f32f6eee2993df0879c5c51b60bfd77d740b5439f7
 MISC metadata.xml 496 BLAKE2B a26ee20b4388a77bf12e032c2091b534653874b6f0880775298da89286487d07709511d64e52b0240206d661f8874c55d4d87ce3bdc73e60e9a1432a232cf219 SHA512 b934fa247d4d5bb1d188de8bead5980aba83abe50423dd1e56c534b762b535faa242dbab58021e91bea43951542dc4f5885aff3754cc0957f01e86832bdd2c5e
diff --git a/sys-apps/elfix/elfix-0.9.4.ebuild b/sys-apps/elfix/elfix-0.9.4.ebuild
index fcc5f838919d..c5af80158a39 100644
--- a/sys-apps/elfix/elfix-0.9.4.ebuild
+++ b/sys-apps/elfix/elfix-0.9.4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
diff --git a/sys-apps/elfix/elfix-0.9.5.ebuild b/sys-apps/elfix/elfix-0.9.5.ebuild
new file mode 100644
index 000000000000..7e822357e5a1
--- /dev/null
+++ b/sys-apps/elfix/elfix-0.9.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/elfix.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86"
+fi
+
+DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
+HOMEPAGE="https://www.gentoo.org/proj/en/hardened/pax-quickstart.xml
+	https://dev.gentoo.org/~blueness/elfix/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+ptpax +xtpax"
+
+DOCS=( AUTHORS ChangeLog INSTALL README THANKS TODO )
+
+REQUIRED_USE="|| ( ptpax xtpax )"
+
+# These only work with a properly configured PaX kernel
+RESTRICT="test"
+
+DEPEND="~dev-python/pypax-${PV}[ptpax=,xtpax=]
+	ptpax? ( dev-libs/elfutils )
+	xtpax? ( sys-apps/attr )"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	if [[ ${PV} == *9999* ]]; then
+		eautoreconf
+		cd doc && ./make.sh || die
+	fi
+}
+
+src_configure() {
+	rm -f "${S}/scripts/setup.py"
+	econf --disable-tests \
+		$(use_enable ptpax) \
+		$(use_enable xtpax)
+}
diff --git a/sys-apps/elivepatch-client/Manifest b/sys-apps/elivepatch-client/Manifest
index c0c69b715171..90249b4094a4 100644
--- a/sys-apps/elivepatch-client/Manifest
+++ b/sys-apps/elivepatch-client/Manifest
@@ -1,4 +1,4 @@
 DIST elivepatch-client-0.1.tar.gz 88031 BLAKE2B 6d60bc5539e9c2bd174dc77f34f061f0a351c7ae8026659dcdcab463d2b5fc8dafa35c0ca76ed2e591f6d49c1e58b66766898e7ce774297d053bd6def4378edc SHA512 c2e324f2be6d75ffe4b2f329875f6f81ba3e4657aa1c4e6514188d5269fd68f7d50b7d823281b1bb585804f84fda639931fcd349d168c169f736ee8613f9f451
-EBUILD elivepatch-client-0.1.ebuild 620 BLAKE2B 006435304220412733121ad119cf7a1e8b471574dd613a76830f6d91e32a828a3f04249e8b0d534ce2b1b4ca7bdc6345eeec0b11de6c343e891e42eefe540edf SHA512 9b54202d494a65590af00b8b230bc4721ef76645e687bcd904bf09374cdb41c82fda916e22aeb51f547adde5591afaa70df01fa70e385c3338cdebfa0d896339
-EBUILD elivepatch-client-9999.ebuild 742 BLAKE2B 0693275c3ca9d856e8d45d7ab2f379666c6dfea4c14cc9d9ea5a342c757dde5e54cf9a6c5f81a21ef42ad3b21bced8fdd0bf1e09592fb64e26b5eb0ef74a83dc SHA512 751c77df848d7d7588687a1b4e59eea2c2e8336164f20a63b047fa1b1a1d3d2cd34ca3b617987e09f00e587aa1cf36987e8b3c0a2cc71c759711ff0b78ac19a1
+EBUILD elivepatch-client-0.1.ebuild 613 BLAKE2B 61da61ee9f885e71b949692f96dc19a251092efb67d98ec51defb901e5758745fbd96904382e9aaa4135c17dd911cf98b0853313115b19802d70d5b5d0021920 SHA512 8a49b85afc4ac25a31b68b6fbfe9d9de64f9c86ceab4f0f175f483a6d3a6baa0688f6dbc9bd3bf80f3ebff1328ae574ba3e7fb4b35fc68d0a31be779e9a7a3d6
+EBUILD elivepatch-client-9999.ebuild 735 BLAKE2B e2e6ba0e98e0d6b73a67b0c9673ff55d924e7789ff4a651b0982e36762fb03bf2cf8ac020797e552c5018d8bdefc09d1726729dcb84a4bf4f8a822e8ff8734d7 SHA512 8a985d10418518e636154c107fd8c0a66085fc25133da0a5116a9f326e5268e696d0763dd389fd4c43ddd94e32b8f9df2779cf4fcf308bd365d251ca1867ca81
 MISC metadata.xml 311 BLAKE2B e6ea1b04433934bf6df08628f644783f8fd80234e06fc8d1c692dd1ad1ba1c66ce1465c2871291ef7b18dd02e3803fefd31ce1615fc790c22295da47f3b42d88 SHA512 d53e458f4c2a4844c50d65b8c75f18cf637992dbe78b17dcf20a8a0f15113df8b89c197d2f11f6160fcca7db23669db009028deec039cbf32911e966e6210e98
diff --git a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild b/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
index 2645c846f0f1..e91f470e11d9 100644
--- a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
+++ b/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
index efd08c9166a8..80cc215857b1 100644
--- a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
+++ b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/sys-apps/elivepatch-server/Manifest b/sys-apps/elivepatch-server/Manifest
index 930b6ae82520..ab04335538d9 100644
--- a/sys-apps/elivepatch-server/Manifest
+++ b/sys-apps/elivepatch-server/Manifest
@@ -1,4 +1,4 @@
 DIST elivepatch-server-0.1.tar.gz 11564 BLAKE2B 0b1a9c518ba51ffa4fcdf0d5d0202b182464d13123334583e8f647be4c8ff48c9d7471fcab8a18d2ddd27172928942e4645c75a1976b25a521c7f1caecedb0b6 SHA512 d469fbc32df7a586fa899c6e587832bd53c1984c97b973e3aad4f6bf62962846142938a6e6e5729fce39d3f7d486c5ed9fd9f484425d863a40a1199f170830fb
-EBUILD elivepatch-server-0.1.ebuild 784 BLAKE2B 9d780ebb9313d37f8bdacd86dc07ded80634371a9fc56c0307a0404399cb58f8854011eb24cce40da367dc0c72c2c8c3188c00a3ccf01f882f536d4d4c960ec3 SHA512 f766177ba4ff6b57cc6a5e08715440907d8d2066262354029cf16cf0339bd21cf0aa594200731c5302b73d93ad648d356dc2562f0060b1c648f4d14d1c48dabd
-EBUILD elivepatch-server-9999.ebuild 931 BLAKE2B 48c999e74aae861288a5d6077bbbc6bd5a3c3867d73ecc3dcbcbc1deb889cfcc9fd47456765cb272ee1cf88187be61031fc5bd595c9115a8e30a3ddf48abfefb SHA512 2e2f23160931fdb4216b29db2b64b1d48607247662999ab9600ad5fa544de66e48d64dc1bc2b36b43473f7a4ad1cc2d9c3cf3f5d89063c4b50c5fabccb371f25
+EBUILD elivepatch-server-0.1.ebuild 777 BLAKE2B 82ae46283d444cf00d6bf911f466cbc4fade0e6bd968a0c6198ef181868496b42289e1b40355d1c739243ce71b21661e1c2cf9c116a5af6a7d91c6260116a56c SHA512 ba9ba6e33edfb7ab038f8551ff6c9caa9bb5142c991b98f4b689fd6610ebad49c54e342d89e206e6149f18c37035d6b6a6303bd3faefe4be703f4e85a23c61b8
+EBUILD elivepatch-server-9999.ebuild 924 BLAKE2B faecec5d5947925b6cdb21a55fecc7070f3fbd16f63d90b18efd812ba7f15d3c2b7c682c84541b3346bcbb525449bba624f55a538e507311a0b69e5950a15433 SHA512 e45997a907c5a67d411342405f1a3bbd221b1c65bdbbee811605f54faea5615d6c6290ad3ad8b88d59a286933d8027c52e3f717f01710ca209c5a3a3aa2bfbba
 MISC metadata.xml 311 BLAKE2B 0394811b976f9903cfb643f6b556fe834d6b6f9a9b981e710dd64ed0128dcb1a69fe532c750c24103983a24c87bd5eceb81063fc1d3e606b46cce1bdf65930b2 SHA512 5add2dd39169c27b7688232595ceabd5e23a82d03f122d33d56cb19be11b3b98136a17437b0602adaccb7b61ee338f19df25e339a75ac362db072757106ea070
diff --git a/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild b/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild
index 84d6c4fbb2e3..5707a104f427 100644
--- a/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild
+++ b/sys-apps/elivepatch-server/elivepatch-server-0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild b/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
index 572a789c43c0..b559b7589efe 100644
--- a/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
+++ b/sys-apps/elivepatch-server/elivepatch-server-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 010b7656002b..aa14974e3e84 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -2,6 +2,6 @@ DIST ethtool-4.13.tar.xz 217472 BLAKE2B be60c4763a06dba4b246c17b76dd10bf956e69d1
 DIST ethtool-4.19.tar.xz 221932 BLAKE2B 5a44d30b5b426ad89f41545617d9b36133fff8aa6c6bb0d5adacc4f5fef4e81f693ab620403a5d107d6abad177492b7adc406dc4b082c343938c228562f46f67 SHA512 5b0b83e09799a04e401563e34c4c784029803ecf83d5ba4f3a9cc92bfc7c2bc9cb0d86cb76ac9a7ffbfb379f6a0fc4bc3e0cf9b7826971e46504052e40156abd
 DIST ethtool-5.0.tar.xz 224444 BLAKE2B 49f968604485e49403a3370839f413c63a992fe2153eb0be000e68019570a176378b570600c970bf89e4fa1f5702d7708129151ac5833367c996206ad8e853e6 SHA512 9ff6433466585e38dd0dbb99ed06430cd885f26ef4e11f6b95c024ed7511c376f8d86ff53c298cb8e811193500514737ce21eb0cd925bede0373799eb3a990b6
 EBUILD ethtool-4.13.ebuild 453 BLAKE2B 039558a1279ee3cbfb7c11005761705fd30f8248d97cd79d089be6d7e9b27aec8f9cba28ed58bc6f80e2a33877dee10e67ddf09211d27b30371e2e2fffdfb81c SHA512 46b487cd70ed8f5bfb656a9371ef185f46761c4dcc1ad2f9cbbc20abbc5c9e2d32f6f3a52f0ae709b2444ab8514d4ada9cf66b5fdec88c342bf6ca367cd525a4
-EBUILD ethtool-4.19.ebuild 450 BLAKE2B 446d80560cfbe2213f2c43cfdd5467a562522278aa47453301c7a15c2abf067dedbadf5e0f80c2122c8d942b35a712c5911ab3565368bd7e110e99f2187e6a1c SHA512 31e8a2b97f22d747a42435ad5794765971d73d9b11bdc410a3231189cf3ddc0192b43e9ab1c2abe3a94f734dc7028c76fc9b61172af1061ff9e3744ba5c380f5
+EBUILD ethtool-4.19.ebuild 448 BLAKE2B 4c01a965b0f8316cc6b6d81072fe252e630e059ecf231682c3093b79419e3db61da9949f47a6999e3e2ec823c626ba2874f60cc33ee1386c6cf8c3000d5fba9c SHA512 e510b9ddcd60ddcae090a406c008ac75ee613c6ebfa142ef511d9910997fafd6e705fe5b25d4842c3e3dcd724f43a5465bd62be2cfc20fdb62e30d5e9314a8b4
 EBUILD ethtool-5.0.ebuild 458 BLAKE2B 894672b02c5b2be3ec477864f7efb9d1bb48b74cbc7c3b072de4a70977c38d403b5748ca0c7c19cac75efde02e60c86bf4f87bd3cbad7b41aa207946c5768047 SHA512 7d4350486a6c463e0794ae4242e0bcbb3461f4c8916fc22241462840c4ce1f8773fde4c99722462a9a87124b8645a0265a9cb0b0c693d7726521308da75cdfb8
 MISC metadata.xml 814 BLAKE2B cb6f1a2aa029191f22615d83df4f166c7c53c70ac6486deadab63ea5a463b08ae9aa8392f0a2732b83efc2a476c2416cd94b2e47ed9b09097217da5746d110d2 SHA512 7ba75f7aa20f8cc48b91b7576449e416abfc412fe26670142d4ec1513b6a3939858b298ccdbf72c208c2d70b5c00eea88dc3c4201e2187b188ed4a9d33cf0272
diff --git a/sys-apps/ethtool/ethtool-4.19.ebuild b/sys-apps/ethtool/ethtool-4.19.ebuild
index ad0ce1f0b9b7..dde2a48cef0d 100644
--- a/sys-apps/ethtool/ethtool-4.19.ebuild
+++ b/sys-apps/ethtool/ethtool-4.19.ebuild
@@ -9,6 +9,6 @@ SRC_URI="mirror://kernel/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index 7d63d90ac527..73a52ef3b60b 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,3 +1,5 @@
-DIST fakechroot_2.19.orig.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
-EBUILD fakechroot-2.19.ebuild 550 BLAKE2B 56456eab02ef55e59e1d4176bd9a44a1404c879f5b1dd9684f9b2ee9b5df96a56b9d01bd80322346e6fdc30664d7fd92f074410d7ddbed34590fe575d65c4d94 SHA512 7ab9a333757b3266cb82148b69ada6ba2d6c9fc95eb18a15a870993d26cc7978be69d8fd7e54f7032de70ab1735b346d3d05e152206e93ebab564561ff630658
-MISC metadata.xml 217 BLAKE2B 6e1cd12af01db3565487a9412bae9a06912408439877e1a81fc466c0dc0612175846256a14be3b1102bbd43ac663311d34bc441b5d64caf9462c25ada2cfa3a3 SHA512 1cb210be8d67d18e50ea53bedbfe8b2807e4b2e5c9bf82cc037ce5d60f98d60b5a967e8863a2964769eb6a15626db1e001cc1a38a18b2d1809cc73a3578df4e4
+DIST fakechroot-2.19.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
+DIST fakechroot-2.20.1.tar.gz 504343 BLAKE2B 73459895319c1fd6297ab455e0d15f4b9985f433d958598d8581a35268e4df0f631b39d026061fe5c00ec6b805f3bf4f5f261039b93176db460b6f936c0de1b8 SHA512 9ddc715ff5c550b700c2384284c9f0cf6c2a99353a06d8e4c3b8363f4affdf9a11757ed5d1c9b85c83499b3bec054544290508a20f2ee16d46e66dc824a924ed
+EBUILD fakechroot-2.19.ebuild 560 BLAKE2B b7ca8b03cf134d813ccf36ab31e8b183a8f02c2393abdd66081a82ebbefa2f2f3abd48c2d16a56a0f76b311226790cc9b494b535d64c390bb3a41a3f66078493 SHA512 c6159d2ebd987f2b58b392786d8cf438689d1170160ec3062baae1b4adb5228c3b0426cfbdce938846c5b0025eb61130b21d91577208b5dc22bde31b1583396c
+EBUILD fakechroot-2.20.1.ebuild 565 BLAKE2B a9f08da2069e74a5bdaefecacb714a720e4874d3346b3328b1e82bd22389e196f61200e2c0f504f156e92742026469225d9b583ec6d0044a9e83a1245633303b SHA512 e2ac3e708865d29fad990513e4924466c4d62c0e43cda6cda84ee4b8c4cd15c6d99e12a8b944ef52026eba2f7d4c3b12ead02e300d300f3bfb5b710a7cef3cf7
+MISC metadata.xml 299 BLAKE2B e6a00d68ef91b397077e718c8aad3656c28f0d9030f8c6a1b3526b91dfd16ebd4a74de24a77defdba7cd90e45cf30d4133f8f2bb7d3a284e515374e80f095aad SHA512 4577d40d586c7fedc2346dca9bfbc39fa8f65db7316d320beefdc1fbaa2bf7252dbab451ef3e53aa8fa6bc02bac0f1c34bf4bf8c7615948b08cef9c5bc8ca770
diff --git a/sys-apps/fakechroot/fakechroot-2.19.ebuild b/sys-apps/fakechroot/fakechroot-2.19.ebuild
index 04a280336ab5..93702f3f87d1 100644
--- a/sys-apps/fakechroot/fakechroot-2.19.ebuild
+++ b/sys-apps/fakechroot/fakechroot-2.19.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 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"
+HOMEPAGE="https://github.com/dex4er/fakechroot"
+SRC_URI="https://github.com/dex4er/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/sys-apps/fakechroot/fakechroot-2.20.1.ebuild b/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
new file mode 100644
index 000000000000..4657276f544b
--- /dev/null
+++ b/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Provide a faked chroot environment without requiring root privileges"
+HOMEPAGE="https://github.com/dex4er/fakechroot"
+SRC_URI="https://github.com/dex4er/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RESTRICT="test"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}
diff --git a/sys-apps/fakechroot/metadata.xml b/sys-apps/fakechroot/metadata.xml
index 041c1966b76b..e20ccf3259f4 100644
--- a/sys-apps/fakechroot/metadata.xml
+++ b/sys-apps/fakechroot/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>alonbl@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">dex4er/fakechroot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 1a6a1ba82ba6..1af4399245a6 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,4 +1,4 @@
 DIST file-5.36.tar.gz 875792 BLAKE2B ce1d98148e26c243982bb85357d440ab774fc42c526bca4dbff15c05247d2c15b54b030671a5590020fa5383c436204116f7817ec4dd33aa4387b059e4d7fe21 SHA512 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751
-EBUILD file-5.36.ebuild 3157 BLAKE2B 36430c8085c7dbe067db1ac3b413b247aeae17ccb7dafd85b48b81c44d920b657a5f02b3a5e5570ffc40af9645b01bea9a1fbf3ef90c5496ccb65a6a81c45888 SHA512 5ae9daf7e4aa341f1d91616a3f70549fcb171a4368e49f03d119728836b15355ddd9febee55d4983af03b55336a74f7bdc98555784f1650adfa0c797d6a636d4
-EBUILD file-9999.ebuild 3259 BLAKE2B 786b89386f6070703ad7cbe15f93cce4ec2073a59c74db596c728e9fda8f6cb23b8023f8b482f33130f01a06742e7581b02e07ac812c944a586c842952161a36 SHA512 b1cb4176878e92d18ba2e63038d1b6ff271265a02a4e13f3c6319b1c81e0abc40cb595f5318d5b3116f949d24d9053d8ad9d39f4941520ea4ce5d5efccc9fc40
+EBUILD file-5.36.ebuild 3155 BLAKE2B 5b5673568baf251604069c00ae12e1cb3c16238572441b7d13c30c9db89c03cdd7c6bd6488f9f36fd29ca2ffafb225739a5ad67aa729f934918c63de222c1f4b SHA512 b20685c396c8726411d574870d633c5ae26e06bc9c4b226e88c87c9cf926b9eadebc419e741e4256aad46dbb61122e2a129fb5d396db9d2e49bd521566bf4163
+EBUILD file-9999.ebuild 3254 BLAKE2B 00379e6413836ea41552fbf550173a28d6442f7b95613b5e4a3a0318030e4aa9fce92ea33ce0318f7effde48d12364ee8a9a988686c8c76ad55a59e130da2a01 SHA512 dd78b23c0e5ae4b59645dfceac8207f7c189c7370c1d92709d1d01b243dd8e3337523eba8993ffa43a550cc5a2ed4ede12714c63c0955be277cdcbc45882a5e1
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.36.ebuild b/sys-apps/file/file-5.36.ebuild
index 481e1c425d3a..b55208108ad7 100644
--- a/sys-apps/file/file-5.36.ebuild
+++ b/sys-apps/file/file-5.36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 8bdee5d348af..e112905e6984 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index de0db59c8977..1652b43d71d3 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -2,5 +2,5 @@ AUX findutils-4.6.0-glibc228.patch 14434 BLAKE2B b125febb478b1abd7db298b6faaab13
 AUX findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 2098 BLAKE2B fcc3687a42fe8b891718acda183bf153cb42bf05bf48c4cb83b95721c0d7e4e2025d58a957fa07ba6fc1406702528b347eb410f627893eacc9ece40aab0cfeab SHA512 2b8024827bea7e0cd4e9f60c52bcef3147e2ba2236d10b2763e510c9e9e7ace8331034db7599f4792802b9dc1619f5086738dcece63b896c0a9ea73ab0068b27
 AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b53905d727186d2c9c13775b7364da9864e3bde74ee76eb060af5762eac5529754da84a094c4b570cdefce2275462b5a9f35bc SHA512 2bb4f15159e70c8bc9b6a7b36b290bd1c6d6e8b0ab484bd0b0127425efd27fb4a23585b0d43b437a8fb8b311e201c5cae5ef12f0142489b97fe63844145aabd6
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
-EBUILD findutils-4.6.0-r1.ebuild 1954 BLAKE2B a7e0dcd9564f3a2f4c5bd744acd131105898ee3f18e667c427bd2a411da9773fbd198f3ca8eeb14dba735546ddb962fcebc058a1077bb192d3274e0678a81a58 SHA512 319fccfcb878b2db2b9d5845ecaa0e447253c9e5df2ecdadb2d57d089a9b71be7e7497e9872e4d44e232110e0d7ee534ef4dc60414553d14a71cc2395bac5a61
+EBUILD findutils-4.6.0-r1.ebuild 1950 BLAKE2B 5ff87df0f36f19c1d85ac6e8c471339dc68e66423a29bc0c9ce39daf7dc6c6296a6eb984f57fb79aae157cd4ddf41a89cc55ddab7b941b2080dd2b03877eaa2a SHA512 a4b75299a385392d3dbade614d09398395dabebf2f5c41266ff0a54cf3b2400660e313a9351b2c95f4c1163798041469a5767dc09a601e0cd2b4a53c8da59e4e
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
index 0d3700374197..205ec9ad98bd 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit eutils flag-o-matic toolchain-funcs python-any-r1
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index b9759dcc33f4..7ec3d8f7ca60 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,7 +1,6 @@
-AUX fwupd 299 BLAKE2B 65d2229e93e03c38d5db2523bf1ca4f1663c12e3308426501b57b6d5d2dbf4c9756d64ea627ca892671e0e2cb97bda0221bf0313eed596a3ce85b83c0b4ad1d9 SHA512 8d9f94754a2b5d65e71134f9c6e2fca49433dc123441b37518acc7b7e68f397e19e12fad498b586f56fe6df887be6bf8f27c6041238a57afe3b5457026af197c
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
-DIST fwupd-1.2.5.tar.gz 1818559 BLAKE2B 0d30248bf3be093d3764624294fdd6e26b979560d70b47e67b3ca5f213177d807e749f5e30abd4d7d7d15e4be507103583834062b6a3243367169019e24a1bc7 SHA512 dc6a0def49225ce50bc89c3f76137497d4c8b71f94e42546fbf5221dc0af504ce6090f803ea9dca175f6166ff1341f6a3eab04652d744257c9e88dbd6875abc7
-DIST fwupd-1.2.6.tar.gz 1861765 BLAKE2B 160af03c0c08bed730657520a15f96c9881996807d186a26074f10b6b340e27b0e783ae7a6b1fc433e4347cba535d49bca60b4d242101a9097fc2749f3cca0ee SHA512 c1111fd881126bf85424dec004e4321948cbdd603ed79989eee51f48197f8f0f391371834964dd1bff52eb3b353cc4c2e5714f6ff674b23dbd8e8d0e8a87ff27
-EBUILD fwupd-1.2.5.ebuild 3481 BLAKE2B b6584f19d1e7a11870b82464fd68f14d9b1439dc3cf1bec274a41613ed66beba7723359a82dc3c32f46931549a1018b5598d805004f087e363bc5a53fec2a570 SHA512 0fbed24f38a96137a290548313aaf46aaf2436020d4a43072c343ed12dc911351ad967ff49c00df52fcdc34182c591d5339ce634ac5d2bf96a407bc519f4f1b6
-EBUILD fwupd-1.2.6-r1.ebuild 3706 BLAKE2B 24d91f6899f2aa8f045191926f1dbcfa7722dc9421edc169975cfa6b85271e978ea42496c1b9de51bd0156a242fa4ea42c65daa2b1febdb0cafcf91d1bd98f0b SHA512 03aa3ad72407fff3dc8b750df04f8ea92908b16af452f619f92294f320503c259f6dc2b4e53c6e71f33bb6dcc3b8ac190453703254b8e2bdf6a234a71730e8b8
-MISC metadata.xml 1137 BLAKE2B ffb495509527dd57cc2f835dd5bb2f37f0874ecf4e973732a56811c5688022072a4365bc5a1ee085f6df0225cd56e9a73c18a320ee4f5ba840398570f38275e2 SHA512 bb268eb8ccc78684bb0639962b4ce86de6c258c9f09a4b0adf8011dea35280d7b7b3e494d366b80d1fb2686845487100995b97291cbcb795d9623350de2428cc
+DIST fwupd-1.2.7.tar.gz 1899554 BLAKE2B aed0377135354c6391f63eb0802d27b5359efdb0f9d3b5c1a55ba8fe7ef0c84c9201e689d8a1bdde998e8147b25767e4dc7586c57bcf33e9f9e9d807e38e7a04 SHA512 12b5c193ab6e55e14256ea84273d139e7353618b6524197ba1f4477db32071e33a73b3e2e2b34733ca6269c4dbad5a03f2d3546b27d22b2a6db23989c69be6e5
+DIST fwupd-1.2.8.tar.gz 1911999 BLAKE2B 61a24ce24f778b96f7ad23496890f7a1d20c09e6bbd707f29d154992668d5c0a25cfd31b5d0d11519740e086c098cbdfd440fe9f5cab4dde0ac43fe6b438e911 SHA512 d603f9f4e5a4c0fc6abb0b75f7d884eff47fb8a16285aa545f7140fe98ce781d127ff3769f9c206bb3bfd084bbc5bf6abf9424f70e727ff79162416fe7881154
+EBUILD fwupd-1.2.7.ebuild 3635 BLAKE2B ef585e46a8d923c4b9efa7db3f0be37c8b5edb3f39853698eb2cab6fd65f9bbabdd40eec037945a8f29a8ebc03a1550d8b5076ba3293172b32ef6367e69a841d SHA512 b641c3d787e28a5f0724647d193ed3b4a63d1227abedc0db7c2f7a2663d0dbebe68615b6a6d74ae66fd44c4d8a82495ca2e459efe5088dde6fee3752cacef887
+EBUILD fwupd-1.2.8.ebuild 3635 BLAKE2B ef585e46a8d923c4b9efa7db3f0be37c8b5edb3f39853698eb2cab6fd65f9bbabdd40eec037945a8f29a8ebc03a1550d8b5076ba3293172b32ef6367e69a841d SHA512 b641c3d787e28a5f0724647d193ed3b4a63d1227abedc0db7c2f7a2663d0dbebe68615b6a6d74ae66fd44c4d8a82495ca2e459efe5088dde6fee3752cacef887
+MISC metadata.xml 1093 BLAKE2B 0f2e81196b336c6047ae2df81cf2aed692eb452c396d9b65b726e951be859c43a76638ca635fbca96d6d7dfee7e1ebf7d3fc844eb1633569ecfdbea0dcd9228f SHA512 99344e56a5a3641e65bee382a6ada656cd5c63cf114785b4185f4ee1b3a0c9514f83ca3adc77d38f145d9a1f1e64aa21dd72dcc1e4f78cb50d042f901a5c9c8a
diff --git a/sys-apps/fwupd/files/fwupd b/sys-apps/fwupd/files/fwupd
deleted file mode 100644
index 156d1562e367..000000000000
--- a/sys-apps/fwupd/files/fwupd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Firmware update daemon"
-pidfile="/var/run/fwupd.pid"
-command="/usr/libexec/fwupd/fwupd"
-command_background="true"
-
-depend() {
-	need consolekit dbus
-	before xdm
-}
diff --git a/sys-apps/fwupd/fwupd-1.2.6-r1.ebuild b/sys-apps/fwupd/fwupd-1.2.7.ebuild
index 3006840299ec..5951cd35b846 100644
--- a/sys-apps/fwupd/fwupd-1.2.6-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit meson python-single-r1 vala xdg-utils
 
@@ -14,10 +14,10 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent colorhug dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
+IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )
+	^^ ( consolekit elogind systemd )
 	dell? ( uefi )
 "
 
@@ -30,7 +30,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection]
-	>=dev-libs/libxmlb-0.1.5
+	>=dev-libs/libxmlb-0.1.7
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
@@ -38,10 +38,12 @@ RDEPEND="${PYTHON_DEPS}
 	>=sys-auth/polkit-0.103
 	virtual/libelf:0=
 	colorhug? ( >=x11-misc/colord-1.2.12:0= )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
 	dell? (
 		sys-libs/efivar
 		>=sys-libs/libsmbios-2.4.0
 	)
+	elogind? ( sys-auth/elogind )
 	gpg? (
 		app-crypt/gpgme
 		dev-libs/libgpg-error
@@ -49,10 +51,6 @@ RDEPEND="${PYTHON_DEPS}
 	nvme? ( sys-libs/efivar )
 	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
 	redfish? ( sys-libs/efivar )
-	!systemd? (
-		!elogind? ( >=sys-auth/consolekit-1.0.0 )
-		elogind? ( sys-auth/elogind )
-	)
 	systemd? ( >=sys-apps/systemd-211 )
 	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
 	uefi? (
@@ -94,6 +92,7 @@ src_configure() {
 	local emesonargs=(
 		--localstatedir "${EPREFIX}"/var
 		-Dagent="$(usex agent true false)"
+		-Dconsolekit="$(usex consolekit true false)"
 		-Dgtkdoc="$(usex doc true false)"
 		-Delogind="$(usex elogind true false)"
 		-Dgpg="$(usex gpg true false)"
@@ -111,12 +110,6 @@ src_configure() {
 		-Dtests="$(usex test true false)"
 	)
 
-	if use elogind || use systemd ; then
-		emesonargs+=( -Dconsolekit=false )
-	else
-		emesonargs+=( -Dconsolekit=true )
-	fi
-
 	meson_src_configure
 }
 
diff --git a/sys-apps/fwupd/fwupd-1.2.5.ebuild b/sys-apps/fwupd/fwupd-1.2.8.ebuild
index ab622891d222..5951cd35b846 100644
--- a/sys-apps/fwupd/fwupd-1.2.5.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit meson python-single-r1 vala xdg-utils
 
@@ -14,10 +14,10 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="colorhug dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
+IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )
+	^^ ( consolekit elogind systemd )
 	dell? ( uefi )
 "
 
@@ -30,7 +30,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection]
-	>=dev-libs/libxmlb-0.1.5
+	>=dev-libs/libxmlb-0.1.7
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
@@ -38,10 +38,12 @@ RDEPEND="${PYTHON_DEPS}
 	>=sys-auth/polkit-0.103
 	virtual/libelf:0=
 	colorhug? ( >=x11-misc/colord-1.2.12:0= )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
 	dell? (
 		sys-libs/efivar
 		>=sys-libs/libsmbios-2.4.0
 	)
+	elogind? ( sys-auth/elogind )
 	gpg? (
 		app-crypt/gpgme
 		dev-libs/libgpg-error
@@ -49,10 +51,6 @@ RDEPEND="${PYTHON_DEPS}
 	nvme? ( sys-libs/efivar )
 	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
 	redfish? ( sys-libs/efivar )
-	!systemd? (
-		!elogind? ( >=sys-auth/consolekit-1.0.0 )
-		elogind? ( sys-auth/elogind )
-	)
 	systemd? ( >=sys-apps/systemd-211 )
 	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
 	uefi? (
@@ -93,12 +91,16 @@ src_configure() {
 	xdg_environment_reset
 	local emesonargs=(
 		--localstatedir "${EPREFIX}"/var
+		-Dagent="$(usex agent true false)"
+		-Dconsolekit="$(usex consolekit true false)"
 		-Dgtkdoc="$(usex doc true false)"
 		-Delogind="$(usex elogind true false)"
 		-Dgpg="$(usex gpg true false)"
 		-Dman="$(usex man true false)"
 		-Dpkcs7="$(usex pkcs7 true false)"
 		-Dplugin_dell="$(usex dell true false)"
+		# Dependencies are not available (yet?)
+		-Dplugin_modem_manager="false"
 		-Dplugin_nvme="$(usex nvme true false)"
 		-Dplugin_redfish="$(usex redfish true false)"
 		-Dplugin_synaptics="$(usex dell true false)"
@@ -108,18 +110,16 @@ src_configure() {
 		-Dtests="$(usex test true false)"
 	)
 
-	if use elogind || use systemd ; then
-		emesonargs+=( -Dconsolekit=false )
-	else
-		emesonargs+=( -Dconsolekit=true )
-	fi
-
 	meson_src_configure
 }
 
 src_install() {
 	meson_src_install
-	doinitd "${FILESDIR}"/${PN}
+
+	sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
+		"${FILESDIR}"/${PN}-r1 \
+		> "${T}"/${PN} || die
+	doinitd "${T}"/${PN}
 
 	if ! use systemd ; then
 		# Don't timeout when fwupd is running (#673140)
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 64d755cca4f6..d749d5ca31b9 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -7,10 +7,9 @@
   </maintainer>
   <use>
     <flag name="agent">Enable update notification agent</flag>
-    <flag name="colorhug">Enable ColorHug support through
-      <pkg>x11-misc/colord</pkg> package.</flag>
+    <flag name="colorhug">Enable ColorHug support through<pkg>x11-misc/colord</pkg> package</flag>
+    <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
     <flag name="dell">Enable Dell-specific support.</flag>
-    <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> instead of <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
     <flag name="gpg">Enable GPG support.</flag>
     <flag name="man">Build and install man pages</flag>
     <flag name="nvme">Build and install nvme plugin</flag>
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index a525f304a48e..c5523ea87ef4 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,5 +1,7 @@
 DIST gawk-4.1.4.tar.xz 2367832 BLAKE2B 67004e2867e4c4f43aac7142a52c83642d8bb3b0a5451293418bc15e575a8ed1d97c0a975e084bf46ffd1c27dc70e48de492cd2e007773622ef14886b9269ee1 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
+DIST gawk-5.0.0.tar.xz 3000432 BLAKE2B d7885442c615e2b7986d6cb617db3ac376a5e572ab2aca3c6b2bd0f43feca4374f310bbf2e2a875b617df97cfebf98cb983d169468d51db39058b83eb9771afa SHA512 9eb663bbcad53165b7ddb7d72cfb8377252b68004733a9eb8c191b2ddddaff857e48ba811280311384243eb67574fbe7ac9edf4e507f9a82d67b4b2adff8ef6e
 EBUILD gawk-4.1.4.ebuild 2079 BLAKE2B 59f106bb6c8ca35083689bd6ef778b60af7addb0343a4e4c6e8deda9933d4e94da37fd3a4b9c5e3bec08ca9298be0c8e4233fb29b495744c668d7877609fb183 SHA512 a8abad1ee6e213257ab43fcfcc2a17d570aa754bd0bb35c58c307310ea8ac191d0f8618ea0853f962bc72900998191652effbe0c90409c330a05ec6498100eee
-EBUILD gawk-4.2.1-r1.ebuild 2563 BLAKE2B 6920d537899ad9b4c90a077c28bc26012d11893a9dbb42a64c32fd19c67b3c5412fa97bfdd7d71d9945c044c34e058e45935dbd4c955c78287c0e257e4b3aa52 SHA512 2d4c7ca88ec93cdd8c690fc870d68e8546fab250df0f612cda16e9155d6c40cad654f82e7660c59c96853c94f612b18717d93fe8b819a8c04f41452e7e0ad41e
+EBUILD gawk-4.2.1-r1.ebuild 2553 BLAKE2B 44c8fa67f0b9309f8a829b3b7e16d54286952daffd60ab65dcab9272a891a57950c7b797a494cfad71960f21cafddedfa51dc0b27610daeaa014b5aa87d8877b SHA512 1b5756544707c6a7d67c94991e23afbe81e2c13d2c7d93672f64255bdef1b7ba749367823f000b825f0078c6bc1f9b348de4679d61e6d6b14ac433b2e6e7535e
+EBUILD gawk-5.0.0.ebuild 2560 BLAKE2B 29b53c42906baa36a618759bf87e61819401b68ce0c5aa7699bebc3fcf611dcabd644aaa202cc82bb1adc03813e7231a558ab55e0ef8f7f8327e4f84b5823008 SHA512 8df9f7550e80a112558aa112233cfc785cb88f180ffea8096d9dd359579a8fc1e603ff7d47e4810c10ad02a69ede6c1ecaba1aff0e7f57c499fa1cff1baa4f04
 MISC metadata.xml 465 BLAKE2B 4ae9d07b535014b76695db5d04b7a8b984c045dd78e90c8e7b0b3215a3021e5b190bfd89ca3f0dd5d9d8f1b55340ac57e40e02509e0d65288032458a0a247096 SHA512 517baceec7b9ea9311d1a946df59da35e6a5619344426ecdca6ff56e0da876ae1e6f793417e5d563da0f4528c535026deedf451eb6da8c7140db69709342a3cc
diff --git a/sys-apps/gawk/gawk-4.2.1-r1.ebuild b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
index 4cc3bdbff8e0..a70a9da8c4c8 100644
--- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild
+++ b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~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="forced-sandbox mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gawk/gawk-5.0.0.ebuild b/sys-apps/gawk/gawk-5.0.0.ebuild
new file mode 100644
index 000000000000..f1caee35c349
--- /dev/null
+++ b/sys-apps/gawk/gawk-5.0.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="forced-sandbox mpfr nls readline"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	mpfr? ( dev-libs/mpfr:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+
+	# use symlinks rather than hardlinks, and disable version links
+	sed -i \
+		-e '/^LN =/s:=.*:= $(LN_S):' \
+		-e '/install-exec-hook:/s|$|\nfoo:|' \
+		Makefile.in doc/Makefile.in || die
+	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327
+	# fix standards conflict on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i \
+			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
+			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
+			extension/inplace.c || die
+	fi
+
+	if use forced-sandbox ; then
+		# Upstream doesn't want to add a configure flag for this.
+		# https://lists.gnu.org/archive/html/bug-sed/2018-03/msg00001.html
+		sed -i \
+			-e '/^int do_flags = false;/s:false:DO_SANDBOX:' \
+			main.c || die
+		# Make sure the sed took.
+		grep -q '^int do_flags = DO_SANDBOX;' main.c || die "forcing sandbox failed"
+	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/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 5784a16b9ceb..ba66963d41ce 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,5 +1,7 @@
+AUX elogind-support.patch 4363 BLAKE2B 060db5cb921d8b51d7eb3acd76186649b3d3887ebd72aaca79dfcdc44a602591d3d9ee11047af1655678e6a9f5c2fd445e67cb66b65cc1ac0a244db22b8f9c1d SHA512 1f7ec2af9e2764f338d5d903ce506a8416d21cf03be6c2dc927d3fde67420c5a9066244db0e3837468fa2bea0527643bfb55dc6db8524e8122467d13e19db418
 DIST gnome-disk-utility-3.24.1.tar.xz 1947976 BLAKE2B a3b9d02417bed415bf6b9b8d86abcfa857abe316133ce7abfa11db835831e916d879b09d1e1129d12621b0234ffa27c1e246837cb614c51c54ce387a9c73bea4 SHA512 ae6bf83e005733ae985987411a9fe25b0059f64484fc0d613ad54af478130782974607bec53713ee36c2a28de653ceba82b0fb091aee57101773c0eeeaaed2d5
 DIST gnome-disk-utility-3.30.2.tar.xz 1665896 BLAKE2B 9000dc8e95f27cccdb3a13b84c527c740f801a58b0f3f1a384ae1415eeed330f5f81f284f190d110dca0f5dcfb9316262491b715c2b2cd4f67813587046b5b42 SHA512 59228fa923b7b1e89e8ce8d96920b6f452bc6ae62c203261bffbc584a2ef231e1d2006db8ddbd15f1f7b4ee14aeae54b85520b89bfd3e1450d42c423d987f2dc
 EBUILD gnome-disk-utility-3.24.1.ebuild 1048 BLAKE2B 9efcbf2160fc20cf85e6d720966d67f158ebc7575dbcb1f994993a6f3f21328482cf4500e2ab911dd576a2fb81e9c61c934c39c023e206b8d38b963ec6c15daf SHA512 ced1da29f927fd86b9be3472ee52cacfec069119ce308f64a37768933a4c9bdbddc7ce4547d5696918094d3fb21f1b931487eb6992f6fa55f8faa520f22404bf
+EBUILD gnome-disk-utility-3.30.2-r1.ebuild 1631 BLAKE2B 0bae6a9a95ec598a06ec6dda89f30cd16d506ce93968b868635372113ee8966619a96976071659d50232bc8e3eded34d598d923162a2f24df75185457485d847 SHA512 0d4e1db88846f4483b2ff07262739509cc98e8e7b16610b4d5fa03e1bf0599ee2a6e0295b90da18efe6af61bc28cfcd90e716cf88507cfe89b7836ee85d12c5a
 EBUILD gnome-disk-utility-3.30.2.ebuild 1459 BLAKE2B f30180a801f992aa23d6c7dd20ddc6ed11a84814857b8f9bfc86106326a0b3ec89be063a8d9887b4ff1115af9d99f9432892ed0d537a9099f16d97f81ed96908 SHA512 3fa9c3d366538cdd705910b279d2108b37e862572e5decd799e4e605fe205071695affe6d0adbe8beedff18b8a4307452c132d9ebe6239782c7804038acfe06c
 MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c
diff --git a/sys-apps/gnome-disk-utility/files/elogind-support.patch b/sys-apps/gnome-disk-utility/files/elogind-support.patch
new file mode 100644
index 000000000000..10ebcdc9f53d
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/files/elogind-support.patch
@@ -0,0 +1,114 @@
+From 2c09cf164f654a5ed2bc153db30710999842c7a5 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Tue, 9 Apr 2019 13:16:46 +0300
+Subject: [PATCH] build: add elogind support for seat retrieval
+
+---
+ meson.build            | 21 ++++++++++++---------
+ meson_options.txt      |  3 ++-
+ src/libgdu/gduutils.c  |  4 ++--
+ src/libgdu/meson.build |  5 +----
+ 4 files changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a5149c8e..ac641928 100644
+--- a/meson.build
++++ b/meson.build
+@@ -3,7 +3,7 @@ project(
+   version: '3.32.0',
+   license: 'GPL2.0',
+   default_options: 'buildtype=debugoptimized',
+-  meson_version: '>= 0.43.0'
++  meson_version: '>= 0.47.0'
+ )
+ 
+ gdu_name = 'gnome-disk-utility'
+@@ -75,13 +75,16 @@ libnotify_dep = dependency('libnotify', version: '>= 0.7')
+ liblzma_dep = dependency('liblzma', version: '>= 5.0.5')
+ m_dep = cc.find_library('m')
+ 
+-# *** Check for libsystemd ***
+-enable_libsystemd = get_option('libsystemd')
+-if enable_libsystemd
+-  libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
+-  config_h.set('HAVE_LIBSYSTEMD', libsystemd_dep.found(),
+-               description: 'Define to 1 if libsystemd is available')
++# *** Check for logind ***
++assert(not (get_option('libsystemd').enabled() and get_option('libelogind').enabled()), 'Can not support systemd and elogind at once')
++if not get_option('libelogind').enabled()
++  logind_dep = dependency('libsystemd', version: '>= 209', required: get_option('libsystemd'))
+ endif
++if get_option('libelogind').enabled() or not logind_dep.found()
++  logind_dep = dependency('libelogind', version: '>= 209', required: get_option('libelogind'))
++endif
++config_h.set('HAVE_LOGIND', logind_dep.found(),
++             description: 'Define to 1 if logind API is available')
+ 
+ gnome = import('gnome')
+ i18n = import('i18n')
+@@ -123,9 +126,9 @@ output += '        libexecdir:                 ' + gdu_libexecdir + '\n'
+ output += '        localedir:                  ' + gdu_localedir + '\n'
+ output += '        mandir:                     ' + gdu_mandir + '\n'
+ output += '        sysconfdir:                 ' + gdu_sysconfdir + '\n\n'
+-output += '        Use libsystemd:             ' + enable_libsystemd.to_string() + '\n'
++output += '        Use logind:                 ' + logind_dep.found().to_string() + '\n'
+ output += '        Build g-s-d plug-in:        ' + enable_gsd_plugin.to_string() + '\n\n'
+ output += '        compiler:                   ' + cc.get_id() + '\n'
+ output += '        cflags:                     ' + ' '.join(compiler_flags) + '\n\n'
+-output += '        (Change with: meson configure BUILDDIR -D libsystemd=true|false -D gsd_plugin=true|false)\n\n'
++output += '        (Change with: meson configure BUILDDIR -D libelogind=auto|enabled|disabled -D libsystemd=auto|enabled|disabled -D gsd_plugin=true|false)\n\n'
+ message(output)
+diff --git a/meson_options.txt b/meson_options.txt
+index 952f5d24..895fc115 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,2 +1,3 @@
+-option('libsystemd', type: 'boolean', value: true, description: 'build with libsystemd')
++option('libelogind', type: 'feature', value: 'auto', description: 'build with libelogind')
++option('libsystemd', type: 'feature', value: 'auto', description: 'build with libsystemd')
+ option('gsd_plugin', type: 'boolean', value: true, description: 'build gnome-settings-daemon plug-in')
+diff --git a/src/libgdu/gduutils.c b/src/libgdu/gduutils.c
+index 59a26f3a..bff70304 100644
+--- a/src/libgdu/gduutils.c
++++ b/src/libgdu/gduutils.c
+@@ -19,7 +19,7 @@
+ # include <features.h>
+ #endif
+ 
+-#if defined(HAVE_LIBSYSTEMD)
++#if defined(HAVE_LOGIND)
+ #include <systemd/sd-login.h>
+ #endif
+ 
+@@ -405,7 +405,7 @@ gdu_options_update_entry_option (GtkWidget       *options_entry,
+   g_free (opts);
+ }
+ 
+-#if defined(HAVE_LIBSYSTEMD)
++#if defined(HAVE_LOGIND)
+ 
+ const gchar *
+ gdu_utils_get_seat (void)
+diff --git a/src/libgdu/meson.build b/src/libgdu/meson.build
+index 00f7edd7..0693b229 100644
+--- a/src/libgdu/meson.build
++++ b/src/libgdu/meson.build
+@@ -17,14 +17,11 @@ deps = [
+   udisk_dep,
+   gtk_dep,
+   libsecret_dep,
++  logind_dep,
+   pwquality_dep,
+   m_dep
+ ]
+ 
+-if enable_libsystemd
+-  deps += libsystemd_dep
+-endif
+-
+ cflags = [
+   '-DPACKAGE_DATA_DIR="@0@"'.format(gdu_datadir),
+   '-DG_LOG_DOMAIN="libgdu"',
+-- 
+2.17.0
+
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.30.2-r1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.30.2-r1.ebuild
new file mode 100644
index 000000000000..bdc871e209f2
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.30.2-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat elogind gnome systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31:2
+	>=sys-fs/udisks-2.7.6:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=app-crypt/libsecret-0.7
+	>=dev-libs/libpwquality-1.0.0
+	>=media-libs/libcanberra-0.1[gtk3]
+	>=media-libs/libdvdread-4.2.0
+	>=x11-libs/libnotify-0.7:=
+	>=app-arch/xz-utils-5.0.5
+	elogind? ( >=sys-auth/elogind-209 )
+	systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+	fat? ( sys-fs/dosfstools )
+	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+# appstream-glib for developer_name tag in appdata (gettext-0.19.8.1 own appdata.its file doesn't have it yet)
+# libxml2 for xml-stripblanks in gresource
+DEPEND="${COMMON_DEPEND}
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/elogind-support.patch # https://gitlab.gnome.org/GNOME/gnome-disk-utility/merge_requests/15
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature elogind libelogind)
+		$(meson_feature systemd libsystemd)
+		$(meson_use gnome gsd_plugin)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index bf050c6ac111..765efd8d6315 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,7 +1,5 @@
-DIST grep-3.0.tar.xz 1375156 BLAKE2B 19f5441ed3fe5bb16d9d8327e76f0beb7eb837b727f6da99844dc9c74eb4def9eab857059c527e651758fa224a6f4079ec5939806645806f2db341ed0cb727e4 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58
 DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
 DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
-EBUILD grep-3.0-r1.ebuild 1436 BLAKE2B e6d4ff59605768971cc08475ef88cb73aa52cd803ae0c462f2efaa5585b865310f05f949c97e4b2b3792ff25f224ba3197fb9a8ade61329ad499fa8cf6a31645 SHA512 069f2007d0ca2306fcc466b4599d4311e2a50e372c09e42a39a991d98e9a95610d9da3a1c202fdc8a544d45be1ec1c2043eea2ce2c3eaad54107e30199dbaa8e
-EBUILD grep-3.1-r1.ebuild 1476 BLAKE2B f679918789fff486bfd49240a8fda7c825dff751ec116bcebc2f7b26278a17147a73381c20bc9d4da8de1255f78f97b0eacad4412d0c6093fc7afbdae594f940 SHA512 f32990be9465ccc9fc8156e75f6e33ce2b25f39dcc830f99e8d539f191897f2aad73e5cb444e486f57501ee8a60b08ca5b10ea0f60b4f80bffa52c94fde6e7d0
+EBUILD grep-3.1-r1.ebuild 1475 BLAKE2B 40f812a19e0e4117ce528ee3cce24001629c8ea6d1db6d8572d6f0b483ade494d847f4f3e048779d0d7ae4977e84377748b7181ed5b966369ed29f05e81bc2e5 SHA512 5f731005f203d49e71d60f791eeeab67da26d1d39fa09de3b75c8b246faeaafe9ea56355a9c42ce7ae0651fce32c60e0b6d6c7906772ccd81cf6dd5efb9deb87
 EBUILD grep-3.3-r1.ebuild 1491 BLAKE2B 58a119e0f12cfe41ff4dbfbda6a7dbab96e3f58f8a8b25799da3cbf94b3ad97762b2057250c0c07053e64c6e6c031c4fb11b8412240513e1908615eb01cc6b7f SHA512 485d2fc1e863e14ff3d2b22918a508a3a46d6b93f30badfe02b37106ee0d0982937e459725ea131098fcb30f95cef41c23461d046ecfb0ab2e665c88023fed21
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.0-r1.ebuild b/sys-apps/grep/grep-3.0-r1.ebuild
deleted file mode 100644
index 90ba1b045513..000000000000
--- a/sys-apps/grep/grep-3.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="https://www.gnu.org/software/grep/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	mirror://gentoo/${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"
-IUSE="nls pcre static"
-
-LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	nls? ( virtual/libintl )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	static? ( ${LIB_DEPEND} )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-	sed -i \
-		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
-		src/egrep.sh || die #523898
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	# don't link against libsigsegv even when available
-	export ac_cv_libsigsegv=no
-	# Always use pkg-config to get lib info for pcre.
-	export ac_cv_search_pcre_compile=$(
-		usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" ''
-	)
-	econf \
-		--bindir="${EPREFIX}"/bin \
-		$(use_enable nls) \
-		$(use_enable pcre perl-regexp)
-}
diff --git a/sys-apps/grep/grep-3.1-r1.ebuild b/sys-apps/grep/grep-3.1-r1.ebuild
index bc8dc4beb4fb..e68d8818cadc 100644
--- a/sys-apps/grep/grep-3.1-r1.ebuild
+++ b/sys-apps/grep/grep-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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/hwids/Manifest b/sys-apps/hwids/Manifest
index b3c666c9f42b..b7c5e6035830 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -2,7 +2,7 @@ DIST hwids-20171003.tar.gz 3035908 BLAKE2B 8ecce99f6a6233b3dd79e1663053b6718fd8b
 DIST hwids-20180917.tar.gz 3211960 BLAKE2B d1dc00994a63a6cb6f7c41c73267dcc38b59a46b9e627fac9d6df285b8d1abf5d1335c02c047bff2b09c9ed9f8e4a1c79329c1bd7dd932949d3db2bbb5b9b2e6 SHA512 9fdcd5a7b3adca1bed886aa83e9cf3944391a819fc9f09b673bd815d95e6e70cecf40d8e87287207e34bfeb58c888188fc61b1c0ac13c1ecab0efbdb5100f8d9
 DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a6150ec70dc1416dcb507dfa4d8ad9ce325204791a24e5646dee67aea0c1566c15dcddb65a5d9dddbbbb9b896398 SHA512 6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e
 EBUILD hwids-20171003.ebuild 1692 BLAKE2B f5f7f80998064870b8f7a515e19b40412b5085ec46b33d2ffec5f721138be36de0d4dd3687c844d6988619a0276e7a02f1c3195b4b449f3559a9ecfb9f565fd2 SHA512 a6bae7bddd1ffcfc18965da4e568afc1e5246b3746f3b0c1453126475ef33f6f939c76ad5b5291df589e92489c5a0ea038e808ab38350bd52b7642291f50ca01
-EBUILD hwids-20180917.ebuild 1727 BLAKE2B 1bbf331166ed8a4da1f6b371da7b4baba0b4a95a5f1edec4856e6bdcd120728cb6a4fdd0793214f855662aa9bae37e4df40770744f2e9030299257ed52b1395b SHA512 035d60d8b42941f9919fbe03865682073ca936ab992bd80fffee4e1728f063cc378c18eb61ae790131bffe4594083ba6d9da723cc11d12e059deb36fe09e0068
+EBUILD hwids-20180917.ebuild 1723 BLAKE2B bd739975959bea7e22c5f145e7fb00be9955071b63e83fc24f9ddb18adc41d1d6efe0c2690c0028595ffd57430599794be87779d9f66d6e7a418bfb37e01c63b SHA512 62e67422b893839bba28d6c19d7212c081d216d3b16c03bf1706ed2e59bf500e888ccb7c71d2d30d18b6ca864ccc916186f52f797b183520e69cca9c2fb66af6
 EBUILD hwids-20190316.ebuild 1740 BLAKE2B 6c831c3994c80d603c3c3babfe9ba1e07875b486e8b8ad8fcb233cda01f5385f91c89a11191c0935d41ef79bd9a936b780a13b4cf500ba3279fa5d98b1394d0f SHA512 aefb4150e54ce9a408be6614cfd39422e5abf9a60311edf03c62da3fd42730aa1e2d624405b7f8f9ddd75e99f8ad32f3914eccb4b5e2373867938c10e93533ec
 EBUILD hwids-99999999.ebuild 1740 BLAKE2B 6c831c3994c80d603c3c3babfe9ba1e07875b486e8b8ad8fcb233cda01f5385f91c89a11191c0935d41ef79bd9a936b780a13b4cf500ba3279fa5d98b1394d0f SHA512 aefb4150e54ce9a408be6614cfd39422e5abf9a60311edf03c62da3fd42730aa1e2d624405b7f8f9ddd75e99f8ad32f3914eccb4b5e2373867938c10e93533ec
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20180917.ebuild b/sys-apps/hwids/hwids-20180917.ebuild
index b700d909bb0b..66c79334ded0 100644
--- a/sys-apps/hwids/hwids-20180917.ebuild
+++ b/sys-apps/hwids/hwids-20180917.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 ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index a8210efc90a4..4ed888b0b37f 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -8,5 +8,5 @@ EBUILD hwloc-1.11.10.ebuild 2201 BLAKE2B 4980f997dd06d6b5bfd621cccfba878f373900c
 EBUILD hwloc-1.11.11.ebuild 2182 BLAKE2B 469799a5cf4adb7fb5698a07eaf7e8e2eb3106c2247a79d68b4f1f4293279642a6a32b78e9dfc848d58c4bdab7105031e1e7c02a0186c3f0c4663915a70eb8e0 SHA512 bc4a29313f2c771847a09c2a59d2eeff560e0a74947b8d12cbaba6665540ab87e3f7378e0391bacaa9c83bc6d35de61c10ab623b8cd76870ef5962eeb12fce8c
 EBUILD hwloc-1.11.2-r1.ebuild 2169 BLAKE2B 938851b64cc610349a7a204953fbad5914d238afc5f170ef48b56b7905184747c2b5d84261478a3921946743a35e2a9da0d723cc09b97f785b4acb4c32899cfd SHA512 7b5931e6e1d4670a7f8aa6a93b367351da99bce3dfcea04c88865e47a617e93928c24eefec5a6a92d85950e3081cb08d61a4aa1e0842f2d11eea670d27d487a3
 EBUILD hwloc-1.11.7.ebuild 2180 BLAKE2B eccaadf693dbe56efb83112b561af209370bcef87618bd89e96ff05a90c74b08bbebd3fc481d67b45a5aefe1cb0e220233a4e4169bcd6f5cb03730c52df944fc SHA512 7c2209cc58dd22e76cfcde886b2d8bec3bf0732f3f48c8cc47b19adc1626f9034246681e4ca9e11d0c9f97445da581792ea8a31ebacd1c21faae54a248d6e107
-EBUILD hwloc-2.0.2.ebuild 2182 BLAKE2B 469799a5cf4adb7fb5698a07eaf7e8e2eb3106c2247a79d68b4f1f4293279642a6a32b78e9dfc848d58c4bdab7105031e1e7c02a0186c3f0c4663915a70eb8e0 SHA512 bc4a29313f2c771847a09c2a59d2eeff560e0a74947b8d12cbaba6665540ab87e3f7378e0391bacaa9c83bc6d35de61c10ab623b8cd76870ef5962eeb12fce8c
+EBUILD hwloc-2.0.2-r1.ebuild 2052 BLAKE2B c0535eec4938ba73803929bad5f973d3f7fe00ee3baf1162e803ea664679d7147b9a91b1f39cd83421fcbbb86bc9e06fcb8f1b38c5814e4158e724bfef86bcf0 SHA512 3a3c1b95ca08bc51875461baa84f742688b1f2f8418976b5f2cc3cdb942d1dde95608072031e642fc91028f3cc06d7582a89af2e0e750fc7e8d2f45bb0e2cd1f
 MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
diff --git a/sys-apps/hwloc/hwloc-2.0.2.ebuild b/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild
index 971dfae0ef6d..57d0a74d2dde 100644
--- a/sys-apps/hwloc/hwloc-2.0.2.ebuild
+++ b/sys-apps/hwloc/hwloc-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,13 +14,11 @@ SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0/5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
+IUSE="cairo cuda debug gl +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
 # Anyone with hardware is welcome to step up and help test to get it re-added.
 
-# dev-util/nvidia-cuda-toolkit is always multilib
-
 RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
@@ -30,7 +28,6 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
 	)
 	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
@@ -57,6 +54,7 @@ multilib_src_configure() {
 	fi
 
 	ECONF_SOURCE=${S} econf \
+		--disable-opencl \
 		$(use_enable static-libs static) \
 		$(use_enable cairo) \
 		$(multilib_native_use_enable cuda) \
@@ -64,7 +62,6 @@ multilib_src_configure() {
 		$(multilib_native_use_enable gl) \
 		$(use_enable pci) \
 		$(use_enable plugins) \
-		$(use_enable numa libnuma) \
 		$(use_enable xml libxml2) \
 		$(use_with X x)
 }
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 5b49de7dc0d6..16317e6863aa 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,5 @@
 DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
 DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
-EBUILD i2c-tools-4.0.ebuild 1426 BLAKE2B 5ac0667c25aac0bb702b6fb4710a49f5b757900a4fd60380b044c9e106604f021d84c9b12402a12725039793fb5284467b4c14f9308842777b6539a0837a6b01 SHA512 f930853406ca01db15d14e865c0a3b9ccfca306f4ee8d094c31afecbc72cd571b33db9a07b9bb04a23c494ac19fb97dbc34c38bd003831a272dc8274981d8656
-EBUILD i2c-tools-4.1-r1.ebuild 1952 BLAKE2B 0a228eca593741e05df7864f6540a8630d45d52f80507de525b44934f1861ee47ddfa02b721dc809ef8aeccfded3140e3ac7650e560717d35f9261a335ae0966 SHA512 a4c4d9bbcd4b070d8ab048941296d401c18671307e80853930e0c2b46ba145bb8f81e9b691208a62f86a2a30de58014b29c86ad8f900490f35341dd2705c658e
+EBUILD i2c-tools-4.0.ebuild 1422 BLAKE2B 48b119f6aaf5ce82a7eebfaf20c84f778508a5bc6fccc40d2d35cace27671dcf5dfc9ee2c264426949bcac56232bcf601876ccc027abef98aa664bfbc6007291 SHA512 93b3630aa41e800dc7313be97ff905fc3bff6ee2f622ee44fb7b33a0b88fd0507aba4269bd499c1572468c1fd197b526be3d131f49973cfcfdf1c7274c5737b3
+EBUILD i2c-tools-4.1-r1.ebuild 1948 BLAKE2B 23f2fbb7440200e313c7b13dc3e5f1a3753d2d80218e966d62022d46ecec36c1d3fcf18e678c0fb29fdf069ba90cae2e20538fb8b424d317bb9214a533326fae SHA512 6a9bffae072a2135157796b14961d069d42238ceb7e178caae867f6bad07ec3fac5f067e2d3ed5290a6f762ada929dc93bd54a2ae2d85135e20285772fea566e
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
index d9fc31d5b826..1b59636505bc 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 DISTUTILS_OPTIONAL="1"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
diff --git a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
index 2127072c21bb..e27460b29f84 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 DISTUTILS_OPTIONAL="1"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
diff --git a/sys-apps/idle3-tools/Manifest b/sys-apps/idle3-tools/Manifest
index b9c071d92fb5..fb75402ba1fb 100644
--- a/sys-apps/idle3-tools/Manifest
+++ b/sys-apps/idle3-tools/Manifest
@@ -1,4 +1,4 @@
 AUX makefile.patch 951 BLAKE2B 945ce0da10772695815b4ee6620dc27faafe232f696e3a11fa2e3f172b8e51095dfa2e034fa8f870871f9f0bc000b9aa7a1ab22659f6b0641b6223e5f87524e9 SHA512 544dfc040211706ca15272625ac95c876749670a6d7919e37651bb076bf7911682943ea621c6022e7a216c8fbe434f9fc74c44e3c737489297541bf2d8d29d3e
 DIST idle3-tools-0.9.3_pre20120123.tar.bz2 19842 BLAKE2B 09095a1382e116c6171cf38c2d9cbdba32e38b3890f5169ed966b707bcd27f70e78efaef8c3500499fc261347c1cc228a8b39d910d719451cc11cc40fcb71b1a SHA512 309a6e500b71d64d569729f44b597fd218f983b9018373a4871a62137b32bd540524b757648fe9e873d949de772f26428cb82d16b367212e6d1fb592aa7bfbf1
-EBUILD idle3-tools-0.9.3_pre20120123-r1.ebuild 458 BLAKE2B c8c77be846350bf289a5fc024f3edd02871869f534c94ffc472d496214e8ed8a2b0c7be062bfe3ca24dfc9018371554201d0a0f237f019fbaee645a079122332 SHA512 89bdaab873e18de2ad8b18c01dc007c908b5ecae771bd9ef929d877b9a1448e0300dde37b1e20a1d38c336fa08b303f179eba69e041a602ee6d6a70824ac1969
+EBUILD idle3-tools-0.9.3_pre20120123-r1.ebuild 457 BLAKE2B 5b814451cddddc60dba2270ad595380331de52c948cdb75ee80b71d1950d18737f64ba5a24d12a379c206886ec96431a4d339a2a4af43592bcb46b418b04de77 SHA512 327aed77725bff2f43d87be7bf080a950b6de36b45c0a30aeb128140ebd52945c7c616e7105b9e065a7ba8377189ec5651cbe75aedca0dc402e0feddbd199627
 MISC metadata.xml 952 BLAKE2B e4123a25039cf4653b5e0818fde19ad2827923f013b0ca8c345f2ed204b9e0a38e49da2185c42b8507b5c053801f84ebce62ce4efd91d7bfdd302ebbe5c94632 SHA512 a7e419e6421ab02ad87c430ead433738aa3043249deb164e51b81674661fd4b8edaf9da11b679cd098373f5cb627a95979525c0bfb8d60ab8b691fd541e3a061
diff --git a/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild b/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild
index 9946a1bbefa2..0941e99e3fda 100644
--- a/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild
+++ b/sys-apps/idle3-tools/idle3-tools-0.9.3_pre20120123-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 PATCHES=( "${FILESDIR}"/makefile.patch )
 
diff --git a/sys-apps/ifplugd/Manifest b/sys-apps/ifplugd/Manifest
index 3a7096578c09..3cffbc802195 100644
--- a/sys-apps/ifplugd/Manifest
+++ b/sys-apps/ifplugd/Manifest
@@ -5,5 +5,5 @@ AUX ifplugd-0.28-noip.patch 707 BLAKE2B 8c71d65b766ad163c0d32e74d5643a3ece4236df
 AUX ifplugd-0.28-strictalias.patch 1585 BLAKE2B 78d096d5ce1edb60e8f2599d2cc2443486a9f667bdb9c8cd7ea81bbfb8193fb63f546ba5fee8aa7db734f3a784442f6d355d57dd0ffb4ecc5a2c314e91354373 SHA512 c25d397b27b115741eb531ee6a990ced98e48cb9c0ea6d098104a4d1972bf1d9c2ff805c2522ea90a4af7d70d016af05b757750c1a06b010979d76d845707f29
 AUX ifplugd.action 891 BLAKE2B 47f664abda4ba6453178f81adfe4dcc9516e75a88bce02bdc03d6ac509457adb342fad71afe7f71a8c1ea5ca4b623d53248571d6ae5094bc05188611082b28dc SHA512 749f503a8e7acc3114af0b795d23e03108040b8df12bae475aa96127d0b135c30382cec6abd0a03147d1f69b545a2c5d2bd8a18c9a9ebe0613e8888ae305f949
 DIST ifplugd-0.28.tar.gz 142677 BLAKE2B 78a9d69d30c6f46f2ee2dc96298c6409f274d9b8e5d1e754051ead48c87ea88c4f68329ba1101d825f601c1ecc2ba0ce69753dea75cf006b9c26d33af38ffa04 SHA512 c606e456f81f224eba9f8912e11fb76b759c160313d1db3c9035775b8c1ca57ca10c88dfb33318ba02f5c025218a377ca78ee160fc3d9a31ac6e95b92f340d4f
-EBUILD ifplugd-0.28-r10.ebuild 1198 BLAKE2B 9a5e3b287aa3ede56db97deaec69f744e71b1c777d9d96fd7fceb95dede41fe08e81933f15bdf72e25eb369d50c927b76674e34524d460783209167801accdf2 SHA512 8c3230a32ddd9914fe3ac95c3be8f8f204ab2c5017024649ce7ce19ec79e9195904dd5b3bf1891f423ec600232816a193de97bf155f9df90863fc1ae950ab4e1
+EBUILD ifplugd-0.28-r10.ebuild 1202 BLAKE2B 659325913908ce22987cf6f8181e0942a6a98343a4ff6dc25768aa5c46ede200418d236f73f3cdff101505fa012b40156ee3f891cc8e82003d9e77b4034bcc07 SHA512 7bdc40cb58fb8f6b50450a6f036bbebf6c3fadb9cdd205daded66ea96a4134de5e7385f2f5de7c3de0d74b292ee54929596b7189910dd0e895babb1cf074a7f1
 MISC metadata.xml 366 BLAKE2B 0479c465ea03321b635b24e72ca5e6298418a13dfd09ece7550e9baeb3699a80f219596e046d0711d5cecbe482dba3b848f15e2872ee1cf9a9e6ceb181e85d0b SHA512 2c4b526e804b08e6e971e0413b60c0b0684104d2cd2ac810495a6c6b9ec6a2d8ad846beb929b45639f77a707b08edaabb525af8b9ebfab411ad02214ac4bd60f
diff --git a/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild b/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild
index 9f7114191a90..9854033e3258 100644
--- a/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild
+++ b/sys-apps/ifplugd/ifplugd-0.28-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://0pointer.de/lennart/projects/ifplugd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc x86"
 IUSE="doc selinux"
 
 DEPEND="virtual/pkgconfig
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index bc47bc846dfa..4f1dc2bb53c0 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1,4 +1,4 @@
 AUX revert-openrc-management.patch 798 BLAKE2B 1e04e2f9c361eb0c125e5b23d0b18c58198ad968fec5965f43e6a5e8b8201d29c7ad2c05431d7107d99acc75ab397cfd90121f7f0618f9bb440a8d6687039c20 SHA512 8d8cc8886b5d731b7538425e6be10b4fa8d0c8b8eb946a64e885a0f9dc19c02d596a803716a8a6d681fb9e408650993b9c81ef23d2d0ab53485d65b15863ace7
 DIST init-system-helpers_1.49.tar.xz 42660 BLAKE2B 548711283b04e3df13e9287154e2648b99ac80c2cdc71a428b4496220cd7c319f8f7afccb1e611c07b9d801837ef8799a3295a0490aa62812d47b728ba5ddba9 SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16
 EBUILD init-system-helpers-1.49-r1.ebuild 873 BLAKE2B 63f0c2667c7d0b33933441306679e91ef0a73a954bdf5745aba5c2fb595b005200712dbf5ae4f839be4c510dd147a056c7be12e4393238729ccb1a9242ef2c9c SHA512 d871bd419612fadb89af12c02e7a379fcb569f1bc0e219a165090ec8bd1499adb934b6007e3d063da4440371176012aead4220a521a2b05620db479c73c8086e
-MISC metadata.xml 251 BLAKE2B 4460dac0ad38483c59c081f8ac585d0fe55e4085cc41c667ca1a17fee091a7acffb39680b254e60145fc8d78aec9acc80322319dfb24aa9820b468fcece8e27b SHA512 307528de6c03f6a97b95e189cb88eab281d278ad8b09833cf8c6924fc88fc38b17179a47fc463dd809e5f077b3b2bc74640e28816e50ab712b1989364b9d3bf0
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-apps/init-system-helpers/metadata.xml b/sys-apps/init-system-helpers/metadata.xml
index 4f7ad3b3b5af..7a38bb900964 100644
--- a/sys-apps/init-system-helpers/metadata.xml
+++ b/sys-apps/init-system-helpers/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>wizardedit@gentoo.org</email>
-		<name>Austin English</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-apps/input-utils/Manifest b/sys-apps/input-utils/Manifest
index d34d5becd55e..b99b5102992d 100644
--- a/sys-apps/input-utils/Manifest
+++ b/sys-apps/input-utils/Manifest
@@ -1,5 +1,5 @@
 DIST input-1.2.tar.gz 22809 BLAKE2B efef0701ccbdd1bf934049bf687f921194d1a4328882b94e7b2844ec55f25c5c2293eb76ff869d7ed44dbf5e8efe3b2ebd0bb5b657b2b411da5ef83b39520db4 SHA512 75a5e2d5b778ae93fb2d29ed7c8b0ec564233a385d88d0fe3a9e5ecd55259f14014bf269c318b5872ddd1379110565d354a1a043eb0a4693c724d52b6ca12173
 DIST input-1.3.tar.gz 23755 BLAKE2B 45a9d138f55677da596298d86e18af5849a81f5cff7397dab028c4939b6b385cc3116fc48bd23844edc36330d0f25456931fb903af9adcdc60aa21d8267cf725 SHA512 4f864301e6b7d40882327b26780db1d9b7e37215cb558653738f93b74ea2781f64676e41a440fbd2659f14bd30640c7af6c709315cce4dcc6a157d80ac2cb60d
-EBUILD input-utils-1.2.ebuild 796 BLAKE2B 7ea9e0e9b1131746b5800090e16b874ef0918840cfe1330d14e29470d782c6f0331a41a12c8e5f30a8562a4aebe48e9743f53ca93cc87f192039faf64f411252 SHA512 d6190d8702872eb0a83e77b257c0af91206a7bbf8357dbf811cdd14f08697032023e9608148c6f0acadcbc5d1928a088d4e14139debc0cfdf9f60a74dcb18907
-EBUILD input-utils-1.3.ebuild 589 BLAKE2B 92efb6b179c577926b8c09ccb512b43ce675119bae523387b4a6bbb1ffbb4b699d447b2d432675dbdd0ae16e0f514f9ec8aa10b240097b525dba8d7bf54a708b SHA512 1b957893a475a00516e9185e45be5effc258b8a5381ecf0fcd23e8ff6747b585cfb7e57b699d1bc4213c22b7c13166b48258d78650340eef719fe031df620e42
+EBUILD input-utils-1.2.ebuild 803 BLAKE2B fb4ceb520a0799372d893eca5b86f2b0ab1b9fabe1fe42ce1a4bef730de5825de6be74858ac69d49f295f6ef27738242ca57be91da1dde773cc298527749761b SHA512 3a0ccbdda953cc234fa7405c5a4cd5fb590afa95cb084e17f8cec126efb191f9476db4f737fd5e3dc8dcb648836589d43e07c2591ccc7d662525acb64f3901e3
+EBUILD input-utils-1.3.ebuild 596 BLAKE2B b662551c3617d8e082bd3f62f2fab0576cf140b48967afedb494f88902b47719b8cc3a95fff809c0763af86bcb7577ee375922e202bf90af6d3ef8bb430197cc SHA512 6ee69e3c251baf57557add9cd25ad9192c5098036a09893410745a7de777d359dbe8e1a43310132df640ee0ee5b4ee70ef67f0a193af1adf2a1cdc47e16dea00
 MISC metadata.xml 579 BLAKE2B d49e0ab5401b5894ed919e3f1d5ed066328ea3224c4390298eda52305900302b2ecc80cddaaeef5dd97c262e87006cdf4e3e9287e3b21f54275287739cbb0297 SHA512 91c9d5676036617c6fe240ae29c7d5ebd904bf048802b50d1a5e783dc656b85d7927f81d2955ae5638fd7e0c9789583a6feaba66bd6db8fadb64c247a26dc3af
diff --git a/sys-apps/input-utils/input-utils-1.2.ebuild b/sys-apps/input-utils/input-utils-1.2.ebuild
index f2e8b5042ff1..5bd6e7f4694f 100644
--- a/sys-apps/input-utils/input-utils-1.2.ebuild
+++ b/sys-apps/input-utils/input-utils-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://www.kraxel.org/releases/input/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/input-utils/input-utils-1.3.ebuild b/sys-apps/input-utils/input-utils-1.3.ebuild
index 2821ff527621..ff1c3933d560 100644
--- a/sys-apps/input-utils/input-utils-1.3.ebuild
+++ b/sys-apps/input-utils/input-utils-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://www.kraxel.org/releases/input/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/install-xattr/Manifest b/sys-apps/install-xattr/Manifest
index dfa6716a822a..c0c80a0ee309 100644
--- a/sys-apps/install-xattr/Manifest
+++ b/sys-apps/install-xattr/Manifest
@@ -1,6 +1,6 @@
 DIST install-xattr-0.5.tar.bz2 16136 BLAKE2B 8973584d4819b9f500dcfb76ed0eaddce725b78e72dfa73ccff52c745e6f041926f8f930e5c5035fa888402c6b530207546098864266268dee2c897404bf7c74 SHA512 0bbde3a548fc5062041b38f90ac09c402f3cb0aebf4f0c331552fc44d39dd3d5e4d73bca0811de36c53af8afa5d22e543a7c90107d272f2a1b97c819b244eb7c
-DIST install-xattr-0.6.tar.bz2 16207 BLAKE2B 2f771aa3e81d594eda951ae34242ecf658e18d72f2cb4c8540ab8af40af750e50ad881c44476af84bb05c3ced9df052f08ea8f81ce490f250010e74b190bd1d9 SHA512 1af66ac8ea05b4c32b905f5d5e340e0402fd19d9f5c2fa51c32d0842effafded8327fce58adffdd197b47c0d4d90f8b669c309f512b64e90f86adc7afe995bcf
+DIST install-xattr-0.7.tar.bz2 16200 BLAKE2B bdddd4610e5fbb6f6ccfcdfb37abacff00ada5ca5fa18a6a4ad254b623ebe6dc9d0a2c8931f919f8623ed8f64e9c09584d6beabffbf3c72088f80383b198a2d7 SHA512 1cb4a4e72a9c5820081e032bd0d681ef985a228ad9bb025d5eb31c7b57678348d772f270def803376f2d9d4f8e6ebcede9629ce65eef917b3e8a06d6f40eec44
 EBUILD install-xattr-0.5.ebuild 910 BLAKE2B 99504c17e85a6c5fd9a5d17f73ffb929879ac8f55773bb48e844405371ecc1965b1816a077d57c1093e2f20f4bf8edbdd7653037f486be4648f542f58777dd80 SHA512 edcb914a669002180eac241d124805c8017cd446405f3b8c59a4341f655620385c192e60ab8f681c0c336c3b30887c8cc855472a2e5a4e638790354e9eccd5e8
-EBUILD install-xattr-0.6.ebuild 1004 BLAKE2B 4a2eebf28c7547f88c94258789e9d2103898b522c01ed836ad2dd79c9a3cbb9f925d26d43d4aae8b33c24052a76e4d1090709d5dcb5ed01e8b0cc43269294a10 SHA512 205371c6bbbfe9e918a58aa9f808c4754771007206de0b5466a693af747f3e5ccc32c0144fe17288022e9b59350cdd49de97acfb9af4fe2dcb394538e9c12ce0
+EBUILD install-xattr-0.7.ebuild 1004 BLAKE2B 4a2eebf28c7547f88c94258789e9d2103898b522c01ed836ad2dd79c9a3cbb9f925d26d43d4aae8b33c24052a76e4d1090709d5dcb5ed01e8b0cc43269294a10 SHA512 205371c6bbbfe9e918a58aa9f808c4754771007206de0b5466a693af747f3e5ccc32c0144fe17288022e9b59350cdd49de97acfb9af4fe2dcb394538e9c12ce0
 EBUILD install-xattr-9999.ebuild 1004 BLAKE2B 4a2eebf28c7547f88c94258789e9d2103898b522c01ed836ad2dd79c9a3cbb9f925d26d43d4aae8b33c24052a76e4d1090709d5dcb5ed01e8b0cc43269294a10 SHA512 205371c6bbbfe9e918a58aa9f808c4754771007206de0b5466a693af747f3e5ccc32c0144fe17288022e9b59350cdd49de97acfb9af4fe2dcb394538e9c12ce0
 MISC metadata.xml 330 BLAKE2B c6c9d215cd38a95f824fac1761bc4e6048ac50688318fa33a94d6d97739e726efaff57e4e0814d16b5336cf4481498580d4e2743404a619cad0d81c052880b6f SHA512 6bca1bac9701b2dde509f25dd18dd819d769cda23669faf680800747a37369002eb3954606fc6541dec324473eb13a78bc0c8a97085436072ee076d85e7a2345
diff --git a/sys-apps/install-xattr/install-xattr-0.6.ebuild b/sys-apps/install-xattr/install-xattr-0.7.ebuild
index 2da2f9601445..2da2f9601445 100644
--- a/sys-apps/install-xattr/install-xattr-0.6.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.7.ebuild
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 3cbbdeb5e906..c74255858a2f 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,13 +1,13 @@
-DIST inxi-2.3.37.tar.gz 454862 BLAKE2B f1eae662a2b33b4c3a50f3a9a0a500c9c3d2055f61d8a5096c24bc58f92884ca2e53822953e80ba79e435e7fbfc1c33f65a076145f5eda23fa701782987e3c40 SHA512 0a47cd920e80c518d6d6987945eb9526ee1ce7f6bf62754196e05736db44fbced615d29b6e12787bf55f769ed9963dff0088c96f9dbe13dae7f57744b0172802
 DIST inxi-2.3.43.tar.gz 457941 BLAKE2B cbcdb3061643ba3516c93dc13e5e0e25d0740e4aa39519643467b03913a10e4ad1eed9cd52f62e7dd344b70f41124f248e48e7d1abacd55dbcb1401b07b1a88b SHA512 33c9ae788ab139f5a2511a3b5bd51276dafb3b847920345b02ad717e1da71f9a78fffc9e55b1085c91d014c2da940b1c64f72db9b59f7bb8d7e442bbbc0bd947
 DIST inxi-2.3.47.tar.gz 462826 BLAKE2B c825b80b5b05fabfad22cbcee685d5c5caa7835493555f1e930dfc11aac35fbe7529fa4738d41dfaae4c6130211d42f576d77ba9f764864bfe89b70a4c0d602a SHA512 be2e0f1880e1b7604acd1f7b8f6595536e12fbe0998f85a195e0892bf1b9942c08f791779f99526a337d097259ea8d3cd0b04da465f8deb1b30bbba9fea4dc4e
 DIST inxi-2.3.50.tar.gz 467912 BLAKE2B e4d42fbcf073c5815451848d55ad24b782a0851d7701ca87f88ec97467a7968577d6ebe3818cd2b5a59017fecc11baa686d23ffaf0f18ab086bdba0393a07fba SHA512 5f32abb56f8466b5c166616680bc7b6ab5d38b76720ecf3d7d065c5ae08de0bdcf14c31b9ab207adaa7c46f4f292c9971022f27aabe5aa14bb3e828a01bff97c
 DIST inxi-2.3.55.tar.gz 471764 BLAKE2B 0615ab13b4d3164ea180b3c34ec6e2d4cacad9712d1c7d3161821398498ee31515db8a84019ac64f7e5c8bfda12473341869432dada4649d4d0e65f411eb0903 SHA512 4b5ca427bfe77bbce95f2889e118cc051c7219328f26c1281d8c4fff5b6de1a34c9813367a79d1a92f5808cbd13c669e463d6a5b965def7c3d4ed29c2aa91148
 DIST inxi-2.3.56.tar.gz 227754 BLAKE2B e3edc0cbe2bc98304b950f420f39f25d52717f7ebda83e7106b35e6b04c8fcef118108f95ebce53140ef50a017d3be1c02dd58653940c23b5e3049c3731c3b5b SHA512 db14a63f59cecf490cc456a4b9d7d7d42ee8c1041785c4635611634e3fbe653d2bcd39eeec3becb42e85d100bcb2d2fadba806566eeb8a6182cd0485e97ac1cd
-EBUILD inxi-2.3.37.ebuild 682 BLAKE2B 04680e7cfe7484c592f47222753684436ee0e15bc8cdcdba1886e11cf25fa39c9b38d6faad71558856554793c29e83a78edb9ea7b6291801d3d59b4a7c8e41dd SHA512 8eb8387e4530484bd717b0449ecba493b0551328789afa5b742b9eec6c67d96fa1a5600385e32bf7521f2e4e9f279bcdafbcfb03e2efa3aae7659e287f9d6044
+DIST inxi-3.0.33.1.tar.gz 306370 BLAKE2B 9ebd8d6e00fe241d5fdf52ddbfc01bdb03682f10baf79cf600a4ad94d36870cd5676fb74cbaebd5edfe9288df3c8f649e4f99dd6bbcd12681663423554f74114 SHA512 7239920311e8066f08a6d81525f3608bb555d229bc4f9e33d45442cef4ee219266bdd7c4a7a25de386db8079d1ef496e3fc22620ada772ce6a51c04cb7023256
 EBUILD inxi-2.3.43.ebuild 801 BLAKE2B 5d96bf7434461c805136f71af2f8cbe29455aea670309ef8502a2fda215d2a682532d1bddbcdc720abea7b11e32abb1b6352476dc388dedc0f9ce951dcf4d993 SHA512 d7b716fabac1c5ca6e00fb3baa49c5563a7eade4dd06bd15f87016d41c93caf19903e342bc96284a16d48cf5fb0301e39f65818a9bfaf4b90024ccc8a9720cf3
 EBUILD inxi-2.3.47.ebuild 801 BLAKE2B c4ad47cdced83771be89576fbe0f67f0696335db10111390987c8f690d75027e2bec0ad560b0dea0c88ea0cc4ec142c5ea24aff658597337c4c50cfca4d522aa SHA512 610b8fad3e0c45416edf0b0e313461b7beefcfd8321624209995fec0af9c29c68b0816853931dc665cc7db33d18fe7fec01830bd8d79ad1bd04b074564a5342a
 EBUILD inxi-2.3.50.ebuild 801 BLAKE2B 76fb610a56e89e59f823f63459c8b25f1b1de1e94d20f348b005d3c2100157cb1ee3f952c81facc762950fc9af14dac3cf1da09a944bcd0180cdb3a6a2b5c1cf SHA512 00fb80778b5510756ac782f17c81e57efb6f8aeb35cf30c8cd460b69993a7664795a22ea83954a8fc4775455d10e240878c0896c861f67315198f8ad67b2e616
 EBUILD inxi-2.3.55.ebuild 801 BLAKE2B abb1c53cb6a091142fdc7357a88e1808399c144a131cf1a593fe07961893d7a9d5ccb80583c9cd9624c4c6f50d013e0933b13a3a8c445871b0f4e56dd0b9f62c SHA512 408a987ff2be27b1f0e59a7269cd9b05c4ea60703c9ad385ef75760cf9406ce9f8f11acf8b0d626193b725ce2a3521f877f0723d92d4ca59175f517240b537a3
 EBUILD inxi-2.3.56.ebuild 875 BLAKE2B 9e5145e256cbf92de2e449678fd433195ae3f7f74a20f1a77b7bf251b54b56afdb38865c6cfa270d84f6a5996a27dca7a2fe9e162b5749b52990d5729ed902ce SHA512 a4ee67b58ee48ce462dee98ff3255409fbd0252e516bcdcb78e0bd9cede4c2ffb9e7906fb44a5b0e0c1f9ab062b7540d3d1608965c8ac2c2f39c8670d0514015
+EBUILD inxi-3.0.33.1.ebuild 812 BLAKE2B 45822e1ef6a20bf7680aa2b271ce51b7188bf36f30258a537cb57e31edc2e1dc93d12461c038cee37d8484d1d82d5883399c0dcd681a9b7a6b34e805fb4f3415 SHA512 2c43a3b5264058f0854603c3cdf149549749940daeed273da814422435d58fecd7227c22f2947dec52401348c4dd1a60f9b5adf144eb9a7a42c561e1364a0053
 MISC metadata.xml 444 BLAKE2B 0b67e0f6a42d8b68edcb1fc907729e80cee8ccb0a77fbf768cb40f62e1d665852bf17897466f76b578e2c4225dd5180ccecce899588be420064c5af4b89e99c8 SHA512 f44e29945d98ff44784623624a9c891942c0b69b6272322bd4665a5d49684cc16ee9b01b7a6f60872286a0a96aa437f7b9605aa6820435016e84d92fc96d6fd0
diff --git a/sys-apps/inxi/inxi-2.3.37.ebuild b/sys-apps/inxi/inxi-2.3.37.ebuild
deleted file mode 100644
index dd00c31e2e57..000000000000
--- a/sys-apps/inxi/inxi-2.3.37.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_COMMIT="2b4e89b21ffd06e888d89a38aaedb797ecea4403"
-# ^^ because upstream refuses to tag commits with version numbers
-
-DESCRIPTION="The CLI inxi collects and prints hardware and system information"
-HOMEPAGE="https://github.com/smxi/inxi"
-SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-apps/pciutils
-	sys-apps/usbutils
-	"
-S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
-
-src_install() {
-	dobin "${PN}"
-	unpack "./${PN}.1.gz"
-	doman "${PN}.1"
-}
diff --git a/sys-apps/inxi/inxi-3.0.33.1.ebuild b/sys-apps/inxi/inxi-3.0.33.1.ebuild
new file mode 100644
index 000000000000..430ac49c150b
--- /dev/null
+++ b/sys-apps/inxi/inxi-3.0.33.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=$(ver_rs 3 '-')
+# 2.3.56 was the last version with no tagged release.
+# It was also the last Bash based release. Later versions are Perl based
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://github.com/smxi/inxi"
+SRC_URI="https://github.com/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth hddtemp opengl"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	sys-apps/pciutils
+	sys-apps/usbutils
+	bluetooth? ( net-wireless/bluez )
+	hddtemp? ( app-admin/hddtemp )
+	opengl? ( x11-apps/mesa-progs )
+	"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/sys-apps/kcheck/Manifest b/sys-apps/kcheck/Manifest
index a1eb429b822d..3d8d9f32047d 100644
--- a/sys-apps/kcheck/Manifest
+++ b/sys-apps/kcheck/Manifest
@@ -1,4 +1,4 @@
 DIST kcheck-0.0.2.tar.gz 8519 BLAKE2B bc1a4355e1d55118386b34d6f5aca0f11cbf519c0f7d3bb0cf143cca4682af782e6728585fa6dd36c21fc6cea73d21d0ab35571f93096b9eba4a9b461808f2b0 SHA512 98e3ad4835f8c1bacf68f98e112c05788394feb00683b7a02aa92cc2b5f8b4edeebe2b962c07a171b06bdfe7324e715d58057f6c8550004acc52cc0d9105ba9e
-EBUILD kcheck-0.0.2.ebuild 726 BLAKE2B eded1b9c4ed3632ef6c1d328749dc7dc17406cedba26379e2d36c128446ee4ec533a998e8d1f6f5914912bc5947f104e9a39ee1cd383442dc9f59502fa567a00 SHA512 39226338b36fe8f4d616031b0f982c2eb010b270a65f0ba1002988acf03f6fda4e110540f58eeae2354854b225f4f7cbfad48b63fd6cbfdf2c18da4e4046d66d
-EBUILD kcheck-9999.ebuild 726 BLAKE2B eded1b9c4ed3632ef6c1d328749dc7dc17406cedba26379e2d36c128446ee4ec533a998e8d1f6f5914912bc5947f104e9a39ee1cd383442dc9f59502fa567a00 SHA512 39226338b36fe8f4d616031b0f982c2eb010b270a65f0ba1002988acf03f6fda4e110540f58eeae2354854b225f4f7cbfad48b63fd6cbfdf2c18da4e4046d66d
+EBUILD kcheck-0.0.2.ebuild 721 BLAKE2B 30fbf7b488eca844572f07c18bef7866e528b02b8b2803e15ab4de31cf1bca44f797783727ba2d029052e0bd364cd6be33b4f7cbf44d34ba7c55ffbf78db67b4 SHA512 3490ef7ad617611c32199fd31b5e931b228a9beb02c73959cdfc865990d8e0139879f61ae7ec4571d33ed3ce2c3a051926cfc760ff898c2a0fdfb6a2990a7d97
+EBUILD kcheck-9999.ebuild 721 BLAKE2B 30fbf7b488eca844572f07c18bef7866e528b02b8b2803e15ab4de31cf1bca44f797783727ba2d029052e0bd364cd6be33b4f7cbf44d34ba7c55ffbf78db67b4 SHA512 3490ef7ad617611c32199fd31b5e931b228a9beb02c73959cdfc865990d8e0139879f61ae7ec4571d33ed3ce2c3a051926cfc760ff898c2a0fdfb6a2990a7d97
 MISC metadata.xml 463 BLAKE2B 77a1a0f53f5df31119da4ab7c48dd8c2c58a89c6fc1ea71841bdeba5a5ecf35f1665ed446860922c7ce54a266c90f5b431d3fd9fda22b31c517d0e1941502095 SHA512 16e2c48494780679725e178fa97dfef167833c2cdb37c9694de136e32ae9ed834a56232e3d71bfcaf00719a3fb7cea7d62f67807ff9249baf2a08d25f58bc88e
diff --git a/sys-apps/kcheck/kcheck-0.0.2.ebuild b/sys-apps/kcheck/kcheck-0.0.2.ebuild
index b1030d75db3b..3b0e9ef42b3f 100644
--- a/sys-apps/kcheck/kcheck-0.0.2.ebuild
+++ b/sys-apps/kcheck/kcheck-0.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/sys-apps/kcheck/kcheck-9999.ebuild b/sys-apps/kcheck/kcheck-9999.ebuild
index b1030d75db3b..3b0e9ef42b3f 100644
--- a/sys-apps/kcheck/kcheck-9999.ebuild
+++ b/sys-apps/kcheck/kcheck-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 0bcf8f4440cb..8e94dd270869 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,7 +1,7 @@
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
-EBUILD kmod-25.ebuild 4917 BLAKE2B 666468a4d5f66810f78b5d66c03187012ade1e18ea90b35387fda5482abb6b7a985938bdda7df9a5eefb0e3e0d5c7d4da0ad5b51de388a1d1980f502e84c0dc0 SHA512 7e822688bd75e3deecec00bde3a7f196e7c41a51670d12b23d1235da4538218accbfeba6966a7052ca9640fce264987f046194c7b8f09c6cd217a94fdd0f8e47
-EBUILD kmod-26.ebuild 5004 BLAKE2B 405dc355fd930ee0f2613937733b56756c3eb4208a1140dfee500fa0e8904c9a7cbd881d6a855b94f892dd5ca0e65b6ca179777f25de6304f89c783b3b49238c SHA512 e0d2abae0bf6109828143bca2164b1f3ba2f9a5339b29c486df17c1243e93cb2ba9237abd6f8f800f29ec5c4095a87ce2787e80b2c1f0e8afc7a7cbd63ed9ce3
-EBUILD kmod-9999.ebuild 5004 BLAKE2B 405dc355fd930ee0f2613937733b56756c3eb4208a1140dfee500fa0e8904c9a7cbd881d6a855b94f892dd5ca0e65b6ca179777f25de6304f89c783b3b49238c SHA512 e0d2abae0bf6109828143bca2164b1f3ba2f9a5339b29c486df17c1243e93cb2ba9237abd6f8f800f29ec5c4095a87ce2787e80b2c1f0e8afc7a7cbd63ed9ce3
+EBUILD kmod-25.ebuild 4913 BLAKE2B f17beda49f104502c22d5f1e83b36b0869829460be48a3d30edec854891b836c185afa85cd46d36279fea0cb01415038e0a2682037638a3723d86b6b51bc4b5c SHA512 ff8089459817c08226c91243aa8582e4a275b813b5569f6dcd2c591bade7db8832c38cb21736e50f8440eeb3b734197c3971b63e3e0899a6baf8f8dcf7f074ff
+EBUILD kmod-26.ebuild 5002 BLAKE2B f5d77bb0b1bc1b55886a7e31b52bd922e616b080d1ee710d889e6465685a8b47c74500d2852dba03d8068abe5def621628c63ed5e7c096b28f449f7ce0755729 SHA512 2df4cf048aa392368c00f338d5fd46382cc7b362717d6fec5e2efb6f6c38f9783201aecfbf54db02f2e3275cb8dfa6e53aeb8a59f7acedbebedddd0e45ca0172
+EBUILD kmod-9999.ebuild 5002 BLAKE2B f5d77bb0b1bc1b55886a7e31b52bd922e616b080d1ee710d889e6465685a8b47c74500d2852dba03d8068abe5def621628c63ed5e7c096b28f449f7ce0755729 SHA512 2df4cf048aa392368c00f338d5fd46382cc7b362717d6fec5e2efb6f6c38f9783201aecfbf54db02f2e3275cb8dfa6e53aeb8a59f7acedbebedddd0e45ca0172
 MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
diff --git a/sys-apps/kmod/kmod-25.ebuild b/sys-apps/kmod/kmod-25.ebuild
index 33a370a26392..543b412451a1 100644
--- a/sys-apps/kmod/kmod-25.ebuild
+++ b/sys-apps/kmod/kmod-25.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit bash-completion-r1 ltprune multilib python-r1
 
diff --git a/sys-apps/kmod/kmod-26.ebuild b/sys-apps/kmod/kmod-26.ebuild
index 7738137ba641..0e0722934952 100644
--- a/sys-apps/kmod/kmod-26.ebuild
+++ b/sys-apps/kmod/kmod-26.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit bash-completion-r1 multilib python-r1
 
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 7738137ba641..0e0722934952 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit bash-completion-r1 multilib python-r1
 
diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index a0be9731680b..0069edeb5a19 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,4 +1,4 @@
 AUX likwid-4.3.1-fix-gnustack.patch 1014 BLAKE2B 68ac831c96f826156238bbb4178c4923cb869a2757928af12f788a01067fb129326fec0c7a98b073f504f0aa8234d42dcd9fe7cdb0185b8107a6db3962cfbc08 SHA512 ab12e2ebebfca5c87b1ad2c89c5073aaa6987e8d440cfdfffc107233fc5b66c6562f25fdbd6720df3c1477becaaa3c3ac470fa4f99ac15bb78ea09fa06460a4b
 DIST likwid-4.3.3.tar.gz 1579433 BLAKE2B 9ec468bba009dec860b24c9c55c3d6023ffda3ab0985d835796686ba52d1d3372b2bfce926cf229388978de34e1ab0b41d8d27c88623c51c3e8ff1e9d674906b SHA512 ae4d68e238bc40e4a4ab5df628561c9bb7a0ef8727d5779dba2c32fff0be1dd333532bee7e4c197e5fe286de81d35b863ef09f4bc8b9f9145360e6e461f3d94e
-EBUILD likwid-4.3.3.ebuild 5585 BLAKE2B efd92d64517d84e798b9db705aa656091e8d4176d94190e44c51fb058548a9a5eb5f95d129f4bba637f12ce745595618bd4d2120d2872ed75192ea52f5dcf2ad SHA512 e5ff5bf6288ffe65b45193199b9dbfcd2af65c703c34b2e0802fa23600c17607774998ca499757c98cd59aee16b62906375d32ef01c69411efa19f9308b77b31
+EBUILD likwid-4.3.3.ebuild 5583 BLAKE2B 88aceb31971bb97444abd86c40c825842f758f1ec52d85176c802b0211217b427b6d470fd63e00a255ac38e94c3ab4de59fe9af65918b35a2fa69353af83fb06 SHA512 63164046373be52f1eb05256afe6cb11947a4e7ec89392101efad31431152276bfce64dce78f13143baf97393a28f2e9f1e44596e875d2debf9e11d28ad19049
 MISC metadata.xml 333 BLAKE2B bb0321ece26d2e67d8c0cce9895247e8dcb84d72ca1b0186f066e639805e4006d9a8288403042c6fd96fd02489b554eb208843eafe436140f6e352121e5b1806 SHA512 bc44f5e8d86426c7fc32dc2d75c42d85a456c69cacccc1f44dbb8c561defb1748dd665fcc916d3a6577766a3d7bbd0944fa73f7df04b2d17b3fd3353929fa2e2
diff --git a/sys-apps/likwid/likwid-4.3.3.ebuild b/sys-apps/likwid/likwid-4.3.3.ebuild
index 05afdd520646..eba012a63dbd 100644
--- a/sys-apps/likwid/likwid-4.3.3.ebuild
+++ b/sys-apps/likwid/likwid-4.3.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 FORTRAN_NEEDED=fortran
-#PYTHON_COMPAT=( python3_{4,5,6,7} )
+#PYTHON_COMPAT=( python3_{5,6,7} )
 
 # 4.3.4 will need python-single-r1
 inherit fcaps fortran-2 linux-info toolchain-funcs
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm_sensors/Manifest
index f94422529509..aec553fe8daa 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm_sensors/Manifest
@@ -7,8 +7,6 @@ AUX lm_sensors.initd 334 BLAKE2B 377cea5d1f0c2baf94a2a17dd870ae3ba545bb964534328
 AUX sensord.confd 695 BLAKE2B e435c63a48da41218b793f9beefd5f9d1702aa80a525ca378eeef36654933f0ec2042683e1b13bc48349eebc4d2dde26d20ac7e7681c01ceeb0b3b4e27576d2b SHA512 83c71b9aaae273daff62da31ae45ffa682460e4d4a8fbca54dfa83b1db58d4d042bba08eb62c62f4d8f6647d222ef5a11181a3fb7bedffbb4138ef02f6143535
 AUX sensord.initd 574 BLAKE2B bbc4e39d6b906a0e7539c4521420b9da686722eb6d26d486c29554c2cdc1b8c45d770c5e587f707d4fad0e34e083b2388dda194908a78c89e3ad4606cd61e464 SHA512 69abc9a92bfffae59f17a93e4792fd1f6b64285271693a443e1007adb73f95cb62a8dbf318f407f60fb3e3573d0e7ea11357076f14dbb58a0964f7b0bfe30b4a
 AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc095446e64de85d829f3d34802d4f762967cc503d527b8f28deaeaf3e0a93b3a4384b9c9b62a8b71d4dfe SHA512 83132636209f3e3717edad28ed230f767ee8bf00eabf3036238f64c370d1e42db1c14d1ed965c650da8aa3a6deb3ce7a0794425491ff7f8ce67e2fde934fc4fb
-DIST lm_sensors-3.4.0_p20180923.tar.gz 264263 BLAKE2B 7444934429b16ae19af0390e8d3e6a2cf979dccf3c83ee8a3fd0f1f358d07bbc3e446197d44deb994a6d3313cff492625b8fd5c7462c39eb5e10b998b6588cb1 SHA512 cf6ea7898248420e2927aa673ba166ede8e774f605038fad4e503f178ab36c2b371253c69197739fe533663dac191b40dce7c3b4ad71488e4f15e4583f6ad363
 DIST lm_sensors-3.5.0.tar.gz 267133 BLAKE2B f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e SHA512 bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
-EBUILD lm_sensors-3.4.0_p20180923.ebuild 6320 BLAKE2B 242d73cfc7ed55267738e977bbfe9642e3904adae2a5780ecde1455d4e298e69e0cd6a84d0222e0c0e7ad8237644425d00043677919530141623bf9063165702 SHA512 33072f5d2b2d85414688edf2da873aa704797158f57174c5abea2b34f755581058ee6e7e08ae621c1a364309ac7f5126ab4900a1139786ad76816b8a434d39f0
-EBUILD lm_sensors-3.5.0.ebuild 6449 BLAKE2B c98ec26eb7742a9b1f69b581e3fead8b8b71f11e063c42d1b468dbe9b2313b3d3311e187e79151735fb42db66ff46f74e0dcf174d08731819b75fedba8a07ed4 SHA512 b09584eefea6085d5b6c7eae47e267878520ba2c6ca4ff5756f659be522e8cdf7d6aa21d10d88ac378b89b9628760a2f12a4ac59cce76c84eb2f08cfb6d3f58c
+EBUILD lm_sensors-3.5.0.ebuild 6448 BLAKE2B ae7e54bae38d9374a65df2f2aeaf4dad562e91357a351789e985674101253cd6f150b4366c4491cf5dececf1ee561ddd2057ff6a915b9a22b3feb345addd7050 SHA512 a7fb2556fa53fb57ee9e34b60fe9375ad67b326b5f1fd23ff31a2f6c0b98f0c51a184bf7817fbf3d5b28b4cc67c1bf2caf5421a1052efb64df0d9c286d2ec07c
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild b/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
deleted file mode 100644
index 3a69d17218d9..000000000000
--- a/sys-apps/lm_sensors/lm_sensors-3.4.0_p20180923.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info systemd toolchain-funcs multilib-minimal eapi7-ver
-
-DESCRIPTION="Hardware Monitoring user-space utilities"
-HOMEPAGE="https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors"
-
-COMMIT="807f9b1529892c0ac89bca0c7ae781c59f9c8393"
-MY_PN="${PN/_/-}"
-
-#SRC_URI="http://dl.lm-sensors.org/lm-sensors/releases/${P}.tar.bz2"
-SRC_URI="https://github.com/lm-sensors/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1"
-
-# SUBSLOT based on SONAME of libsensors.so
-SLOT="0/4.4.0"
-
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="contrib sensord static-libs"
-
-COMMON_DEPS="
-	sensord? (
-		net-analyzer/rrdtool
-		virtual/logger
-	)"
-
-RDEPEND="${COMMON_DEPS}
-	dev-lang/perl
-	!<sys-apps/openrc-0.21.7"
-
-DEPEND="${COMMON_DEPS}
-	sys-devel/bison
-	sys-devel/flex"
-
-CONFIG_CHECK="~HWMON ~I2C_CHARDEV ~I2C"
-WARNING_HWMON="${PN} requires CONFIG_HWMON to be enabled for use."
-WARNING_I2C_CHARDEV="sensors-detect requires CONFIG_I2C_CHARDEV to be enabled."
-WARNING_I2C="${PN} requires CONFIG_I2C to be enabled for most sensors."
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4.0-sensors-detect-gentoo.patch )
-
-DOCS=( CHANGES CONTRIBUTORS INSTALL README )
-DOCS+=( doc/{donations,fancontrol.txt,fan-divisors,libsensors-API.txt,progs,temperature-sensors,vid} )
-
-S="${WORKDIR}/${MY_PN}-${COMMIT}"
-
-src_prepare() {
-	default
-
-	if [[ -n "${COMMIT}" ]]; then
-		local _version="${PV%_*}+git_${COMMIT}"
-
-		sed -i \
-			-e "s:LM_VERSION.*:LM_VERSION \"${_version}\":" \
-			version.h || \
-			die "Failed to update version.h"
-
-		sed -i \
-			-e "s/^\$revision = '.*/\$revision = '${_version}';/" \
-			-e "/^\$revision =~ s.*/d" \
-			prog/detect/sensors-detect || \
-			die "Failed to set revision in prog/detect/sensors-detect"
-
-		sed -i \
-			-e "s/^echo \"# pwmconfig revision.*/echo \"# pwmconfig revision ${_version}\"/" \
-			-e "/^REVISION=.*/d" \
-			-e "/^REVDATE=.*/d" \
-			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
-			prog/pwm/pwmconfig || \
-			die "Failed to adjust prog/pwm/pwmconfig"
-	else
-		sed -i \
-			-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
-			prog/pwm/pwmconfig || \
-			die "Failed to adjust PIDFILE in prog/pwm/pwmconfig"
-	fi
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile || \
-		die "Failed to sed in LDFLAGS"
-
-	sed -i \
-		-e "s:^PIDFILE=\".*:PIDFILE=\"/run/fancontrol.pid\":" \
-		prog/pwm/fancontrol || \
-		die "Failed to adjust PIDFILE of prog/pwm/fancontrol"
-
-	# Don't use EnvironmentFile in systemd unit
-	sed -i \
-		-e '/^EnvironmentFile=/d' \
-		-e '/^Exec.*modprobe.*/d' \
-		prog/init/lm_sensors.service || \
-		die "Failed to remove EnvironmentFile from systemd unit file"
-
-	if ! use static-libs; then
-		sed -i -e '/^BUILD_STATIC_LIB/d' Makefile || \
-			die "Failed to disable static building"
-	fi
-
-	# Don't show outdated user instructions
-	sed -i -e '/^	@echo "\*\*\* /d' Makefile || \
-		die "Failed to remove outdated user instructions"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	default
-
-	if multilib_is_native_abi && use sensord; then
-		# sensord requires net-analyzer/rrdtool which doesn't have real multilib
-		# support. To prevent errors like
-		#
-		#   skipping incompatible /usr/lib/librrd.so when searching for -lrrd
-		#   cannot find -lrrd
-		#
-		# we only build sensord when we are building for profile's native ABI
-		# (it doesn't affect libsensors.so).
-		sed -i -e 's:^#\(PROG_EXTRA.*\):\1:' Makefile || \
-			die "Failed to enable building of sensord"
-	fi
-}
-
-multilib_src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)"
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D%/}" \
-		PREFIX="/usr" \
-		MANDIR="/usr/share/man" \
-		ETCDIR="/etc" \
-		LIBDIR="/usr/$(get_libdir)" \
-		install
-}
-
-multilib_src_install_all() {
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit prog/init/lm_sensors.service
-
-	newinitd "${FILESDIR}"/fancontrol.initd fancontrol
-	newconfd "${FILESDIR}"/fancontrol.confd fancontrol
-	systemd_newunit "${FILESDIR}"/fancontrol.service-r1 fancontrol.service
-
-	if use sensord; then
-		newconfd "${FILESDIR}"/sensord.confd sensord
-		newinitd "${FILESDIR}"/sensord.initd sensord
-		systemd_newunit "${FILESDIR}"/sensord.service-r1 sensord.service
-	fi
-
-	einstalldocs
-
-	docinto developers
-	dodoc doc/developers/applications
-
-	if use contrib; then
-		insinto /usr/share/${PN}
-		doins -r "${S}"/configs
-	fi
-}
-
-pkg_postinst() {
-	local _new_loader='3.4.0_p20160725'
-	local _v
-	for _v in ${REPLACING_VERSIONS}; do
-		if ! ver_test "${_v}" -gt "${_new_loader}"; then
-			# This is an upgrade which require migration
-
-			elog ""
-			elog "Since version 3.4.0_p20160725 ${PN} no longer loads modules on its own"
-			elog "instead it is using \"modules-load\" services provided by OpenRC or systemd."
-			elog ""
-			elog "To migrate your configuration you have 2 options:"
-			elog ""
-			elog "  a) Re-create a new configuration using \"/usr/sbin/sensors-detect\""
-			elog ""
-			elog "  b) Copy existing \"modules_<n>\", \"HWMON_MODULES\" or \"BUS_MODULES\""
-			elog "     variables from \"/etc/conf.d/lm_modules\" to"
-			elog "     \"/etc/modules-load.d/lm_sensors.conf\" and adjust format."
-			elog ""
-			elog "     For details see https://wiki.gentoo.org/wiki/Systemd#Automatic_module_loading"
-			elog ""
-			elog "     Important: Don't forget to migrate your module's argument"
-			elog "                (modules_<name>_args variable) if your are not already"
-			elog "                using \"/etc/modprobe.d\" (which is recommended)."
-
-			# Show this elog only once
-			break
-		fi
-	done
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# New installation
-
-		elog ""
-		elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
-		elog "\"/etc/modules-load.d/lm_sensors.conf\"."
-		elog ""
-		elog "You might want to add ${PN} to your default runlevel to make"
-		elog "sure the sensors get initialized on the next startup."
-		elog ""
-		elog "Be warned, the probing of hardware in your system performed by"
-		elog "sensors-detect could freeze your system. Also make sure you read"
-		elog "the documentation before running ${PN} on IBM ThinkPads."
-	fi
-}
diff --git a/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild b/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild
index 3254e2449209..f5c4e1a4e7f1 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/5.0.0"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 2fcd343fe0e3..3d14447c5577 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -4,7 +4,7 @@ AUX logwatch-7.4.3+-openssh-hpn.patch 885 BLAKE2B 2a381c8b321ae4e545e8620e1ad3ad
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 DIST logwatch-7.4.3.tar.gz 462552 BLAKE2B 98ecba949d9fa2737da6b22ff2cced14d384ff4f119a7a8e613a66869102ea76ce1093ef5f0b38e6d4e948a8e9e0dafe8b4071e028c5f5f5be2ee48e9b1f186b SHA512 716d87238f487010f2bdf230fc66c16f3c3fe769e6bef04b0e7881c6b0563e1a4b4741235b8a40a16ab21d3803562e87e6bcf5cfbd0ace42414f1d1feae7a13a
 DIST logwatch-7.4.3_p20171025.zip 704529 BLAKE2B 12f4e34d9cd044f677b1b4cbe473c425e9b3ab2f222e781a0a3df95b9cbc088cf16321ccd67ec9acaa4c21b8da3deac4d58d84cba2259b272717337c5c87c3ff SHA512 aeaf57aa8d4e89b716766bf89a6b58dcb18f1ba6de864b913d93474f784f382e322b6dbfdf9671c8b91404d399d770146ead9959b1202e91b4672e70f6abb268
-EBUILD logwatch-7.4.3.ebuild 2051 BLAKE2B 43fb1b4be85200f43852f5c71c6612c6df3ab5799a49cda5f1774a4938bf6717c97c6fafa0a02dbffb1329a5958954b869f681631b1bcf7a677fef8d4cebd1c6 SHA512 311e5ce37341ce3ff2ab033b301f0264df8f6dcb6615efb2ea2920a7d365c1a6b19244d9a7d6644c249f33348c2371076935b86df2470378e0659476518aa457
-EBUILD logwatch-7.4.3_p20171025.ebuild 2832 BLAKE2B a3eb1ca700145d31b89dbd6f20b1da6f1b6d5fbedc048cab8e1903d6c0cd4967bc0e46c9af13bb2055da735024d5012e0c6dc7a7364024bef2c3b5fe495fc91b SHA512 2c8a06ee255b6c4f2ca8d42805668cd58eeb287b95d91758118da8edd7c5cb80f04addfe175d1bdde5a87b5c1136fbfd435287029d9e22f35c917ff6ba62177e
-EBUILD logwatch-9999.ebuild 2426 BLAKE2B 808ca4e5e26cda3016defe23c1700829c5593a6af24728c0796d41914741bf4ffd68c350b48cff18263a6902a1b6062538ab436b4ef02581811a439443fac683 SHA512 ccbe5db0bc4ad431766e82c7b1a680c2cc1288a93fb3fa653eb744591ae32aab920467853792cf79ae2b3d2b62f03652bb1f7b6a6207615daac88716bf6d2252
+EBUILD logwatch-7.4.3.ebuild 2054 BLAKE2B e7ae5b810b3bc55e481fa4dbd35c923f3c8737b14aa2c52e166c86dc55165a1977a21b33d2e8c518f21f24ac16f206263e5ccc0ce4655bbdd17fd1d03faff755 SHA512 975fe721a5bee017d9da2efb98914749ae4f6a1a52e0563dedab92cf6c5b029fbb2b0ce880849f3ea143796cc06dd7001101ffe0fede0d07ffa6597dddd5fd69
+EBUILD logwatch-7.4.3_p20171025.ebuild 2836 BLAKE2B 8a7aad2786d4c7509e60106ccc5e00949416753103d986921f7964321972cf3cf6500e1a76e0570b5c71f63290774b718fe34b89aa3e69650c59e570a2f4f624 SHA512 0979e2451fbadb4a60f6c7b418dc31e00fb1d825f818ed13320225e8f026fa8cbf4ac90285dc16c78f4964ba568c53826b91fedc33f0923d7b42bd33e456ce45
+EBUILD logwatch-9999.ebuild 2430 BLAKE2B 02706b7a5c947f58f5d27eb3df8cf6f6f146b9943070ff22dd9015daf64968d07a6d9338b3718867e214fe971c5647e106b3c624d7b7bae60d4c3b67cc9bfb0c SHA512 9bce4d3643241d6214d0dca3290574e1fcb7fc560ad2d4e55d889b6faa72b09a51b1f921db8e7a1c95c7ade42db21b8e512402ddb10344e09784d1a4307478b1
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.4.3.ebuild b/sys-apps/logwatch/logwatch-7.4.3.ebuild
index b8dc95af0f58..1f058e2a889e 100644
--- a/sys-apps/logwatch/logwatch-7.4.3.ebuild
+++ b/sys-apps/logwatch/logwatch-7.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild b/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild
index 2cb75e82997f..391f0f2e9534 100644
--- a/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild
+++ b/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://sourceforge.net/code-snapshots/git/l/lo/logwatch/git.git/logwatch-git-${MY_COMMIT}.zip -> ${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="Analyzes and Reports on system logs"
diff --git a/sys-apps/logwatch/logwatch-9999.ebuild b/sys-apps/logwatch/logwatch-9999.ebuild
index 93f1e8caf378..971e5d621f38 100644
--- a/sys-apps/logwatch/logwatch-9999.ebuild
+++ b/sys-apps/logwatch/logwatch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="Analyzes and Reports on system logs"
diff --git a/sys-apps/makedev/Manifest b/sys-apps/makedev/Manifest
index c9a37900246c..b00c8bdef3b0 100644
--- a/sys-apps/makedev/Manifest
+++ b/sys-apps/makedev/Manifest
@@ -1,5 +1,4 @@
 AUX makedev-3.23.1-headers.patch 433 BLAKE2B bd8e6e4b32c69be3b5ccec72b425cdafbfa9723b0fdd1b634da6f130590a72fd251c6f21ff29224a705211274efad53f8fecff3ac3710eccff4833e1769c75dc SHA512 ffc80692b9bc317c0c14c5e7211155c4a7849967a9a3588a811f21feb6034da264c7aecdb7ce4e67786aa2a28f8d33af381ff410afd118ab44f47edddc421d0d
 DIST MAKEDEV-3.23-1.tar.gz 122613 BLAKE2B 2b0a4a02db36d7a3a71018378396c7d5ac8bbd4e9f8b24a1d3659084f381e8cc686f3d9198dc54e1efd93095ea09c21aab3b9866b942bff8e8a393355403f28a SHA512 5ca82cdcc4544042ede552370acf6266929fa34d177bd8e831573ccc1c57e06ec87766b9e60a686ec1449b204ae0ac3c048eab32b57ce8d610366219d3a77dbc
-EBUILD makedev-3.23.1-r1.ebuild 1348 BLAKE2B 3edd10645bfe7990a4f48b6599f2fa877d2673b8a858f2c1777ca3e1d80ea3682c7693f83d976ddbe28b725566f23aed702f2136ae1697fc9aa1acacd867382e SHA512 bca8095c07b8b2daeef6b4ac640e1ca29bd9004d6bf9ff3558043b59e54d7e3471b295f33d99f1bbfe4dca901cffc545c6ae92b4222e78d1c53c4aaf74af687c
-EBUILD makedev-3.23.1.ebuild 1377 BLAKE2B 636977e8eb82b2ef3ebad9a4c8e6c39f82e77caed2b7af2906fb5609f709dc5cf522e2318ce310d0a4624b313e9381f7ad5c0f5fb628adefd8e9b5a2b3291ae7 SHA512 6dd5eb8d3d1bcbe7d459bcebd0eb69e9dbdbb69c6d42e4231bfd0f46261b5f3fd99e9084217c56011a8036f477429accf6e355e21ef0e1613d8e4358ac921b60
+EBUILD makedev-3.23.1-r1.ebuild 1345 BLAKE2B 479d79c0416b6eedebe8e88c69dbfac6c68afdb3e5c4207a09388854b638293a811ce815bc6b01d2ab512f5cf9ce6aeabe078ff5875cb6714c48c42effed31d6 SHA512 322f19a8c6fab506b2ea79288253f6478df5a1d87f4598fba7b5bd813ffeb32ce4ed5dcd090aa7c8fdcd640d2da871a502e869d6ef022277e24875a13ab123e2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/makedev/makedev-3.23.1-r1.ebuild b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
index f81ec2bfe66e..633015b89f99 100644
--- a/sys-apps/makedev/makedev-3.23.1-r1.ebuild
+++ b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.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"
 IUSE="build selinux"
 
 RDEPEND="!<sys-apps/baselayout-2.0.0_rc"
diff --git a/sys-apps/makedev/makedev-3.23.1.ebuild b/sys-apps/makedev/makedev-3.23.1.ebuild
deleted file mode 100644
index a2b5d6f17d4c..000000000000
--- a/sys-apps/makedev/makedev-3.23.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-MY_PN="MAKEDEV"
-MY_VER=${PV%.*}
-MY_REL=${PV#${MY_VER}.}
-MY_P="${MY_PN}-${MY_VER}"
-DESCRIPTION="program used for creating device files in /dev"
-HOMEPAGE="https://people.redhat.com/nalin/MAKEDEV/"
-SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="build selinux"
-
-RDEPEND="!<sys-apps/baselayout-2.0.0_rc"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-headers.patch #339674
-}
-
-src_compile() {
-	use selinux && export SELINUX=1
-	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	# set devdir to makedevdir so we dont have to worry about /dev
-	emake install DESTDIR="${D}" makedevdir=/sbin devdir=/sbin || die
-	dodoc *.txt
-	keepdir /dev
-}
-
-pkg_postinst() {
-	if use build ; then
-		# set up a base set of nodes to make recovery easier #368597
-		"${ROOT}"/sbin/MAKEDEV -c "${ROOT}"/etc/makedev.d \
-			-d "${ROOT}"/dev console hda input ptmx std sd tty
-		# trim useless nodes
-		rm -f "${ROOT}"/dev/fd[0-9]* # floppy
-		rm -f "${ROOT}"/dev/sd[a-d][a-z]* "${ROOT}"/dev/sd[e-z]* # excess sata/scsi
-		rm -f "${ROOT}"/dev/tty[a-zA-Z]* # excess tty
-	fi
-}
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 59efcf74c7b6..8820d2ba5243 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -6,6 +6,6 @@ DIST man-db-2.8.4.tar.xz 1779488 BLAKE2B c5f9b06c4b24e046e4b8fbcf4f43015133d18d8
 DIST man-db-2.8.5.tar.xz 1787244 BLAKE2B b908a6fb0187d42f8d1f842063e0afdf1e052244ea727f0aaaf4d658bb8954a216c0555df5511b27246fd12c2a388c44dcfccf243449d25d6e741c5c3466d3be SHA512 8d1524c3b6459c9ac02d969149c18c198cb171bcd6acc493e863a466c01309958ee9f5ac52df4d7d27da29d35cb7c64132732f5b969181ab336500df2e6dad69
 EBUILD man-db-2.7.6.1-r2.ebuild 3162 BLAKE2B 5aefa5d09e68cc46d639cd09d55d8347046b9fab1b148d40e11a996cfbf94fcc43b8fc386941b3a157a2ac13dda2c6b4f8eafea75433af10560d86ee6f1270c7 SHA512 b42c3a488d2424c24a12f5eaeda2c15efeb18cf9b3c55230238e686712d78f127f9c9e2668dc0da84569cac1d532e19088cc78936d94146a981b776f82934fe9
 EBUILD man-db-2.8.4.ebuild 3433 BLAKE2B 3768e283d9d5f4d3f5527923cd0d3863433682a6d80e0b255324d4636419f0bf76b9b139a82f27f4c766696eac69ae915e3c891b3ae4d61142fb7bc44e2b11e7 SHA512 40848f7193559a635d8a340ca54db9739a8ffe43b6a3edbe602c17ec9d132843c3a7cbf82fca4e6bc96f832314e0fd2b7294644cfa430c76e4aae0c0620b022e
-EBUILD man-db-2.8.5.ebuild 3438 BLAKE2B d720f60b6e9293d6aad45cde18759dfa57a11a4bdf02bb838c11c1e4bd48bd830a555551c48c9810e0586403e6289f933866ebeed3049ebe01780488102dd09a SHA512 820abb62662cee73ca521bbd5a5c0fcab4fa736000ae18922443cb393ea82bb060e17e4c7a2f69db228aaf02d1f1f62229a8dbe3055e1b5f23ac5125462dbfe1
-EBUILD man-db-9999.ebuild 3438 BLAKE2B d720f60b6e9293d6aad45cde18759dfa57a11a4bdf02bb838c11c1e4bd48bd830a555551c48c9810e0586403e6289f933866ebeed3049ebe01780488102dd09a SHA512 820abb62662cee73ca521bbd5a5c0fcab4fa736000ae18922443cb393ea82bb060e17e4c7a2f69db228aaf02d1f1f62229a8dbe3055e1b5f23ac5125462dbfe1
+EBUILD man-db-2.8.5-r1.ebuild 3549 BLAKE2B c8d61f2fd82b02b857f21ac0d1dd735b3caabd62d55bde58f5ce6062b5f4468e34ff7de2758372183339c8ca5b93478df98caca1c59a720032491190d57ffb3e SHA512 63ae349604a07b81d79b90452188394d855f8a748081ab75b96ec571a3b365a9269a4bc5800496737d3af9b0404725ca5974ac513715c75dd539b1f0df57f432
+EBUILD man-db-9999.ebuild 3549 BLAKE2B c8d61f2fd82b02b857f21ac0d1dd735b3caabd62d55bde58f5ce6062b5f4468e34ff7de2758372183339c8ca5b93478df98caca1c59a720032491190d57ffb3e SHA512 63ae349604a07b81d79b90452188394d855f8a748081ab75b96ec571a3b365a9269a4bc5800496737d3af9b0404725ca5974ac513715c75dd539b1f0df57f432
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.8.5.ebuild b/sys-apps/man-db/man-db-2.8.5-r1.ebuild
index 6935f3bcadaf..ac0efdfd790f 100644
--- a/sys-apps/man-db/man-db-2.8.5.ebuild
+++ b/sys-apps/man-db/man-db-2.8.5-r1.ebuild
@@ -73,6 +73,10 @@ src_configure() {
 	sed -i \
 		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
 		src/man_db.conf || die
+
+	cat > 15man-db <<-EOF || die
+	SANDBOX_PREDICT="/var/cache/man"
+	EOF
 }
 
 src_install() {
@@ -82,6 +86,9 @@ src_install() {
 
 	exeinto /etc/cron.daily
 	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
+
+	insinto /etc/sandbox.d
+	doins 15man-db
 }
 
 pkg_preinst() {
@@ -92,7 +99,7 @@ pkg_preinst() {
 	local _replacing_version=
 	local _setgid_vuln=0
 	for _replacing_version in ${REPLACING_VERSIONS}; do
-		if ver_test '2.7.6.1-r2' -gt "${_replacing_version}"; then
+		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
 			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
 		else
 			_setgid_vuln=1
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index 6935f3bcadaf..ac0efdfd790f 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.ebuild
@@ -73,6 +73,10 @@ src_configure() {
 	sed -i \
 		-e '/^#DEFINE.*\<[nt]roff\>/{s:^#::;s:$: -c:}' \
 		src/man_db.conf || die
+
+	cat > 15man-db <<-EOF || die
+	SANDBOX_PREDICT="/var/cache/man"
+	EOF
 }
 
 src_install() {
@@ -82,6 +86,9 @@ src_install() {
 
 	exeinto /etc/cron.daily
 	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
+
+	insinto /etc/sandbox.d
+	doins 15man-db
 }
 
 pkg_preinst() {
@@ -92,7 +99,7 @@ pkg_preinst() {
 	local _replacing_version=
 	local _setgid_vuln=0
 	for _replacing_version in ${REPLACING_VERSIONS}; do
-		if ver_test '2.7.6.1-r2' -gt "${_replacing_version}"; then
+		if ver_test '2.7.6.1-r2' -le "${_replacing_version}"; then
 			debug-print "Skipping security bug #602588 ... existing installation (${_replacing_version}) should not be affected!"
 		else
 			_setgid_vuln=1
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index 772dfa16e7a3..8d2062fc1eb6 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -2,5 +2,5 @@ AUX mlocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc
 AUX mlocate.cron-r3 1389 BLAKE2B 678aa37c9a092d0caccca9279f6d75aa1c23a39a36bdf2006ff0c64009a783a302eaae148d9bd88ea49af44647f64ede301e131f586e77381cac314eaa808a68 SHA512 20a25a7f83886a43cb61599a65ae78170d1b5cececc953117986d27cbfb6707cbf3613b569e0bc24ce6416ce1f2cc792dd5968f0e1bf3a7a6ae72c4e10b638c2
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
 DIST mlocate-0.26.tar.xz 359204 BLAKE2B 48ff448b0316169b35a3c421970b280632c4a056b7566d8fda7a2c3284ef46d3abaaa96e2411d9e408cc39466577a5bd3f8fde3376178e8b7bcc9e4e01997bd7 SHA512 b1207047e30a551cba39e70812439b554def567ebe9b8b81fed6f26435bb575beafe4875a21cd72876eadd85da4e7bfc942eb28b17c430b537c351690364837f
-EBUILD mlocate-0.26-r2.ebuild 1568 BLAKE2B 48a406b357ccd43ca6bf13f0a6b2712f534ba0d02979295959fdbf1cbb56cbe65ff74b213849eb646157ca38fe8f7076ee6f6bd8a09c3462fb14927678fda53b SHA512 f26ab45e80000cea9edb0631c0f62a58630f1126328f1c410779f5472264fda85458f5caf8b22001ac311c206b49bdc85cf576a6f8554b80ce9aebfb4c7aef65
+EBUILD mlocate-0.26-r2.ebuild 1567 BLAKE2B cd1e32bf0de4ae2bd56c43132972a9845272d4d38e9d421d523d32353f994a6e9ddeae02523ead6a98304df37c31ca9b3e02a0850cae5b862985e2167b050a13 SHA512 b3626bcdfa703cfc99a698299cf309b39b696109e022e70bbc2e646ee01f1f9af3d1a9e0f0cbf0996a173b94bba3a10a762ad09036e923ced424c12a39320dfb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/mlocate/mlocate-0.26-r2.ebuild b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
index 5bc4fa3c0f64..3758e48512b2 100644
--- a/sys-apps/mlocate/mlocate-0.26-r2.ebuild
+++ b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://releases.pagure.org/mlocate/${P}.tar.xz"
 
 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"
 IUSE="nls selinux"
 
 RDEPEND="!sys-apps/slocate
diff --git a/sys-apps/nca/Manifest b/sys-apps/nca/Manifest
deleted file mode 100644
index 847d557c9572..000000000000
--- a/sys-apps/nca/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ncad.initd 348 BLAKE2B 6da8468a4ad51797b1ae32a5ba1401c74dd1f79609e2138236736416e70a4923acee26736152c9cd9cb6b477189dbcffdfec775c7943b344a7a9c8542c3c6a04 SHA512 f70d471606d0eb8c7327c0c7693047d8e21d1273a36d14d764f74afb359cb39c559ebc7f5c6f62c717f061f77ccf2c0f3d53a6b961f316552c6c6071cdb47297
-DIST nca-0.9.0.tar.gz 818721 BLAKE2B 597be0bc788e750cb7552bf818a1631850e50f33bbfd051e029f3f35b55056f49cf239e03cf48e8af6a8c9d4ede6d38792e288c073f45a80f4e40b9c630f308e SHA512 375dc747414af7e8971a9112fa6a4583dd543f6f4b3a84b2c16f45ee2487363929c2eed3c1837687b802161c630443885e6da20ac738017d219e9a608b4d700c
-EBUILD nca-0.9.0-r1.ebuild 955 BLAKE2B 944ed7fdd4f5104b763f81cb5335b0af206478646f9c9bd81e0beaee5c357a4fcc241018be5c8df989514371ef3f8d7f0e5021ecc61ff64391dce8ad6794c635 SHA512 92a0fca038ee1349599fe134a25511f108a47ace206a375fda0040412ba3b012406fb217d80fad42c8b4801c167beee6f2bfe06767223dac9ad015cbba9e350c
-MISC metadata.xml 699 BLAKE2B 2f1594058e2e1d20660603ed3d0e800291002d229e405cbf4ac7722f7eeea1e85e89014fc541e5d835bf181508979573f62157edba656c99ff0b620acde854b7 SHA512 b852fdd4b6bb507c118af56a1e3880ae17843e74b172b2a33d637c46d3451450c27f55205b3b3f8d9ff67b831efbb89e2df3480d0af783881def31df1a8ca6e1
diff --git a/sys-apps/nca/files/ncad.initd b/sys-apps/nca/files/ncad.initd
deleted file mode 100644
index fa2adcd9b3ec..000000000000
--- a/sys-apps/nca/files/ncad.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec /sbin/ncad
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --retry 5 --quiet --exec /sbin/ncad
-	eend ${?}
-}
diff --git a/sys-apps/nca/metadata.xml b/sys-apps/nca/metadata.xml
deleted file mode 100644
index f60fb571575b..000000000000
--- a/sys-apps/nca/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		nca connects a pseudo terminal to the console's virtual terminals
-		(/dev/tty0...n) that are normally only accessible to someone with
-		local keyboard access. It is particularly useful in conjunction with
-		ncad since it then provides remote console access via SSH; with some
-		appropriate system start up scripts, ncad can be started immediately
-		the root filesystem has been mounted read-only, providing a cheap,
-		and only marginally inferior alternative to a serial console. 
-	</longdescription>
-</pkgmetadata>
diff --git a/sys-apps/nca/nca-0.9.0-r1.ebuild b/sys-apps/nca/nca-0.9.0-r1.ebuild
deleted file mode 100644
index 1207d405ec81..000000000000
--- a/sys-apps/nca/nca-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Network Console on Acid"
-HOMEPAGE="http://www.xenoclast.org/nca/"
-SRC_URI="http://www.xenoclast.org/nca/download/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl
-	sys-libs/zlib"
-
-DEPEND="dev-lang/perl
-	${RDEPEND}"
-
-src_prepare() {
-	sed -i -e "s:^\([[:space:]]\+\$(MAKE) install\):\1 DESTDIR=\$(DESTDIR):g" \
-		-e "s:=\(\$(CFLAGS)\):=\"\1\":g" -e "s:=\(\$(CC)\):=\"\1\":g" Makefile
-
-	sed -i -e "s:-s sshd:sshd:g" ncad.patch
-
-	eapply_user
-}
-
-src_compile() {
-	emake -j1 CFLAGS="${CFLAGS}" CC=$(tc-getCC)
-}
-
-src_install() {
-	dodir /sbin
-	emake BINDIR="${D}sbin" MANDIR="${D}usr/share/man" SYSCONF_DIR="${D}etc" \
-		DESTDIR="${D}" install_nca install_ssh install_man
-
-	newinitd "${FILESDIR}/ncad.initd" ncad
-	dodoc ChangeLog README* rc/ncad.template
-}
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index f3a12497e2e9..f17a73c65584 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -1,8 +1,9 @@
 AUX netplug-1.2.9-ignore-wireless.patch 938 BLAKE2B 0c1b720ddae54fca0b313da21fb0af9222ecc494dcc7e4da3fa8d70269b1e6e02cd856b23d3760506aa0b2c6064779e74835af2739bfc7a2ed245ec5ce1194d2 SHA512 a045d1a1dfc6d29334aff6ec035244d68e80887bb05f79d0512c87d7ac0dbb3cdf866569762e575b13a6306604e85e0ba951f10d54f88a39ef558ce2a65ddbed
 AUX netplug-1.2.9-remove-nest.patch 5516 BLAKE2B 08452daf4d9966abaf7ec628c7a70357bc42ee357c8584797a2316c2d5876f01824c2eb57cbf759480e558465dac4ab1fc2acfc2db89160c7dce8a9abfd34841 SHA512 dfcb72f1977cefbdb231c0e7a1ab758e9c753c434d9e5ccc5336a7f606e787fcec943cd1055481d1ba9f2ce9da0e33bf93852a106eeda4b2539d0c66c433945b
 AUX netplug-1.2.9.2-downandout.patch 340 BLAKE2B b4089082011cfabc2f91b6480332e2ade7997036896309c12489e0dc8369ddbf7bcd52c0c98c03c54731b8a11c5553483eb48762cdbe9b76c6b72edc032b3b27 SHA512 b1b7e99afda7988245f574c7ecffcf50f78493be71290d0484f0df2c94580f25ee3037db01d5fc2e577a2cd1ec721f93663bce3e1b59dcb38dd009a133d034f8
+AUX netplug-1.2.9.2-multi-waitpid-sigchld.patch 1865 BLAKE2B c70d7fbf21c27bdaf7043446f7808f8d078e2fbf914f2ee5119ac25628b597e0e0c5e2a35108eff008155757716955b1652163a20dccc6f5709a8c31ebabbcf8 SHA512 d3be3f90e1f676e68e14e54491c832bdd739b44a79290f2c134d8f579e1de03c2c0d6af065a1d255a55247a8bc18e74c713514e549163bb9804d7e2dc124ad64
 AUX netplug-2 715 BLAKE2B df2ffc7a904a86bedb5c160ad0ba8a2d49a8125ed3042f85a361a6270ab79668cdb4dd693e022908b2637a4522f8038f22c0c03b19909d1cdaca2e7da0da21ae SHA512 11efb8b8916d40615840c5721aba089dc9f81bf30f2af6f47d6df2fd8f2b6f22e0cd59ebd37fd9875c4af31e064128e93acbef5cf859b3cabb553fbdd2f3c9ee
 DIST netplug-1.2.9.2.tar.bz2 22332 BLAKE2B 3a4232178e782417e30da3dc33361c4043d5ff9bb610c2f9a82281d395af470ddeab9cf12f91ef4a18f4fe6ff49f85b7015fecc7018b1b561e2e7f179d8d206b SHA512 b68a00eb8874ec7dd6aa9f7b7f529a6e1d9ecece4b798c8cee996b7f3534c556656f642de0ac4b2a6d06fbaf18e3bfaab00934a9292b95939a4935e673e9ca8c
-EBUILD netplug-1.2.9.2-r1.ebuild 1291 BLAKE2B 4d56bc811038d0727f0abaf838dee5e4df946ba0a26578dc74ba55a68b8c83cb1a8c2348d2e39225e7efd6ff57f78fbeed233c12883f227325af461a04edfb05 SHA512 09767a936ea26835db3f3db8e5106ad38a8711dc40bc4e1f021820ca77933c910747d9cf573202b9d59869d434687c2663c00dea63923785a92028724f413e76
 EBUILD netplug-1.2.9.2-r2.ebuild 1377 BLAKE2B 1ae7cc9e0b60712758d738334291d77c70f3f80da431767cea67b1a679aba91a73359f131b7be0f110fdd8062a103716e970026a83c40f2980d9752107dd73c1 SHA512 33cc9f8c2eff68ef1ea16873db91aa7116aa2fbecd540a100f5db38bcd3421e242e0f5b5272e386d5a66ad29f0b90ce9af4f41c4e548aa171b35e9ac0526183f
+EBUILD netplug-1.2.9.2-r3.ebuild 1482 BLAKE2B e8824dcc19b0bcf8ea470ad12f9397bc0daed15a2dc290496e05be3a6ce3b25475f1b6a085dc1fb6d7e0610412aa7bd01e41a1559f31a103d3961d92fc8560a3 SHA512 88cada59afc0e373415eb14955141967ebe541bda2f1669354e73cb5018fbca88afb2938be6bf3919050f0878e70c37fdf31d2624c14b6690803fa058d429da0
 MISC metadata.xml 367 BLAKE2B 5d55fc1e2c617f0957b0d73d2f1bbe9147989dd5d8827fadbd399c71f4721045db39df680166baacc972db498331e48b29fdb4bbe7b21454c20fcf985c79d77e SHA512 d2cdfcaac3690abf52d3ee9ebd7086815b84802d4918778911b63d4ecb36ac8928178ac7d02ebbf3823ee50ef2917069a20a4cdce319097298d7f66ad15e272c
diff --git a/sys-apps/netplug/files/netplug-1.2.9.2-multi-waitpid-sigchld.patch b/sys-apps/netplug/files/netplug-1.2.9.2-multi-waitpid-sigchld.patch
new file mode 100644
index 000000000000..06e645c1dee9
--- /dev/null
+++ b/sys-apps/netplug/files/netplug-1.2.9.2-multi-waitpid-sigchld.patch
@@ -0,0 +1,65 @@
+# Rework SIGCHLD handler to anticipate multiple children dying while the
+# handler is being executed.
+#
+# Without the patch if multiple SIGCHLD signals are received while the signal
+# handler is being executed, the first will be left in pending state and the
+# extra discarded. Due to the children processing logic in netplugd, the ones
+# which were missed will never be waited, left as zombies.
+#
+# Implementation of the signal handler is following suggested handling in
+# https://www.gnu.org/software/libc/manual/html_node/Merged-Signals.html
+#
+# The patch strives to change only the children wait logic in the signal
+# handler, it doesn't try to enhance write call error handling or the unsafe
+# call to exit/do_log. Also the formatting is left as it was in the original
+# code.
+
+--- a/main.c
++++ b/main.c
+@@ -153,17 +153,29 @@ static int child_handler_pipe[2];
+ static void
+ child_handler(int sig, siginfo_t *info, void *v)
+ {
+-    struct child_exit ce;
+-    int ret;
+-    ssize_t s = 0;
++    int old_errno = errno;
+ 
+     assert(sig == SIGCHLD);
+ 
+-    ce.pid = info->si_pid;
+-    ret = waitpid(info->si_pid, &ce.status, 0);
+-    if (ret == info->si_pid)
++    while (1)
+     {
+-        s = write(child_handler_pipe[1], &ce, sizeof(ce));
++        pid_t pid;
++        int status;
++
++        do
++        {
++            errno = 0;
++            pid = waitpid(WAIT_ANY, &status, WNOHANG);
++        } while (pid <= 0 && errno == EINTR);
++
++        if (pid <= 0)
++        {
++            break;
++        }
++
++        struct child_exit ce = { .pid = pid, .status = status };
++
++        ssize_t s = write(child_handler_pipe[1], &ce, sizeof(ce));
+ 
+ 	if (s == -1)
+ 	{
+@@ -171,6 +183,9 @@ child_handler(int sig, siginfo_t *info, void *v)
+ 	    exit(1);
+ 	}
+     }
++
++    errno = old_errno;
++    return;
+ }
+ 
+ /* Poll the existing interface state, so we can catch any state
diff --git a/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild b/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
index 969fd2dbc4d3..a452c1ad1c3d 100644
--- a/sys-apps/netplug/netplug-1.2.9.2-r1.ebuild
+++ b/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Brings up/down ethernet ports automatically with cable detection"
 HOMEPAGE="https://www.red-bean.com/~bos/"
@@ -11,34 +11,44 @@ SRC_URI="https://www.red-bean.com/~bos/netplug/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc sparc x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug doc"
 
 DEPEND="doc? ( app-text/ghostscript-gpl
 		media-gfx/graphviz )"
 RDEPEND=""
 
+PATCHES=(
+	# Remove nested functions, #116140
+	"${FILESDIR}/${PN}-1.2.9-remove-nest.patch"
+
+	# Ignore wireless events
+	"${FILESDIR}/${PN}-1.2.9-ignore-wireless.patch"
+
+	# Fix DOWNANDOUT problem #599400
+	"${FILESDIR}/${P}-downandout.patch"
+
+	# Wait for multiple children in SIGCHLD handler #631316
+	"${FILESDIR}/${P}-multi-waitpid-sigchld.patch"
+)
+
 src_prepare() {
 	# Remove debug flags from CFLAGS
-	if ! use debug; then
+	if ! use debug ; then
 		sed -i -e "s/ -ggdb3//" Makefile || die
 	fi
 
 	# Remove -O3 and -Werror from CFLAGS
 	sed -i -e "s/ -O3//" -e "s/ -Werror//" Makefile || die
 
-	# Remove nested functions, #116140
-	epatch "${FILESDIR}/${PN}-1.2.9-remove-nest.patch"
-
-	# Ignore wireless events
-	epatch "${FILESDIR}/${PN}-1.2.9-ignore-wireless.patch"
+	default
 }
 
 src_compile() {
 	tc-export CC
 	emake CC="${CC}"
 
-	if use doc; then
+	if use doc ; then
 		emake -C docs/
 	fi
 }
@@ -53,7 +63,7 @@ src_install() {
 	newexe "${FILESDIR}/netplug-2" netplug
 
 	dodir /etc/netplug
-	echo "eth*" > "${D}"/etc/netplug/netplugd.conf || die
+	echo "eth*" > "${ED}"/etc/netplug/netplugd.conf || die
 
 	dodoc ChangeLog NEWS README TODO
 
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 57a905812b69..31a37d3f68ce 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -8,8 +8,10 @@ DIST nix-2.0.2.tar.xz 796404 BLAKE2B 0906488bf2c800544c0747a6860ef51f667467f5003
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 DIST nix-2.1.3.tar.xz 816396 BLAKE2B 9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760 SHA512 d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b
 DIST nix-2.2.1.tar.xz 818648 BLAKE2B 2e836bd40ea1ee22c308bd287b1ad1e5607729574b5cfe3494fbf017c618d7475d6150a9b97966f1aaea6bcb37b6535db1b2d693f0fedd0598881efe1a8c538e SHA512 42055fcbecc664899203d90d47f85ce2b12987fac6cb776f09dc202d5f3e07a4b2d6a7ee67fe8d6094062dc516dfe42eeb4acc05dfebd31f2b5670c0979bddd4
+DIST nix-2.2.2.tar.xz 818408 BLAKE2B f13bf79596d6292bea9897805421b388241d670f2b36bc13882f610901a9bb9aa1dc977d7a7d9314139791f20be38ca85becf5c4e863b22fc0b39503a7a4a079 SHA512 c8b1d5f246c53f13cfa25cba0d0721a2628329c10f67fcccbd9a55279cf475170a105156559d0a62638822a8e972f85e8a58769444d51f94ba15e2af7f90e220
 EBUILD nix-2.0.2.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48
 EBUILD nix-2.0.4.ebuild 3329 BLAKE2B 1093e5ef73fc38e907718d3b23083b4de9e51c79e3f60cb9ff6fa1bf0aeaca292981dee1d9db63774e04f0770d0be48275a699cb6b54fc287fe823f2ff9f1c0b SHA512 9efd2e7ddcab6f63a08fe0eb3554aaa8f4de7e8274b4a9bbb3784175dc024634a7b2fa7378c62cd51d4797d8ffaacbed99b9fd8eae05a8960c2c6c11a6a18a38
 EBUILD nix-2.1.3.ebuild 3359 BLAKE2B f91cae5d9562ea976222b7f893d4beba3f2f99967dac16381270afe69ecda3df6ffbf1896fe487999c80648477ac22431dc3af9cd3b7fcf09778bc92f9f1c0fa SHA512 f6c9c8a0b1fd25e5484f6c13e9c564868b432c84961e600ae9b3cdb5646c2e4286b8cd6b5dff43f63c58646583d70c6445ce61530f143f4654903bb8e1380971
 EBUILD nix-2.2.1-r1.ebuild 3464 BLAKE2B 9b8dc5694712babc5f87aada82909f5b5cbfe93528a4bba3a9b55f051ca8365bdc0ff9aaf8dbf5c12daee85e98c0d527085c2441064961f0fe8d21a0ceba43d3 SHA512 21441ce424c2c667ae2df383e2f41551b907218aa473b85ac3a91e9b8c744d6ed5ed57e24276f9185937eb4430f04992a4f5e34938d26143f4fdd981f742b596
+EBUILD nix-2.2.2.ebuild 3464 BLAKE2B 9b8dc5694712babc5f87aada82909f5b5cbfe93528a4bba3a9b55f051ca8365bdc0ff9aaf8dbf5c12daee85e98c0d527085c2441064961f0fe8d21a0ceba43d3 SHA512 21441ce424c2c667ae2df383e2f41551b907218aa473b85ac3a91e9b8c744d6ed5ed57e24276f9185937eb4430f04992a4f5e34938d26143f4fdd981f742b596
 MISC metadata.xml 681 BLAKE2B 53ec9e4c35af4d73756dabebcc9d0423c3708c24e085d35ec589334971d2b76b40408793b5202d625043fe3bd23399a457b7cae4eea665156e2ba3c0d60fc292 SHA512 b473a72e96cc53eeca793b60acd627ebafb918a05fc328126d3a3f32fe8f09d95ebd4643c17f27a69ac64c0b3bee87f6c0818b0316ab2e5e7158999adc8e8a94
diff --git a/sys-apps/nix/nix-2.2.2.ebuild b/sys-apps/nix/nix-2.2.2.ebuild
new file mode 100644
index 000000000000..dfa1ac2e7c6d
--- /dev/null
+++ b/sys-apps/nix/nix-2.2.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix"
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+#keywords are blocked by boost-1.66
+#KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc s3 sodium"
+
+# sys-apps/busybox is needed for sandbox mount of /bin/sh
+RDEPEND="
+	app-arch/brotli
+	app-arch/bzip2
+	app-arch/xz-utils
+	sys-apps/busybox[static]
+	dev-db/sqlite
+	dev-libs/editline:0=
+	dev-libs/openssl:0=
+	>=dev-libs/boost-1.66:0=[context]
+	net-misc/curl
+	sys-libs/libseccomp
+	sys-libs/zlib
+	gc? ( dev-libs/boehm-gc[cxx] )
+	doc? ( dev-libs/libxml2
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)
+	s3? ( dev-libs/aws-sdk-cpp )
+	sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-2.6
+	>=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11.6-systemd.patch
+	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+	[systemd] # systemctl enable nix-daemon
+	[openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+	\$ nix-channel --update
+[as a user] install nix packages:
+	\$ nix-env -i mc
+[as a user] configure environment:
+	Somewhere in .bash_profile you might want to set
+	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+	but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+	nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+	enewgroup nixbld
+	for i in {1..10}; do
+		# we list 'nixbld' twice to
+		# both assign a primary group for user
+		# and add a user to /etc/group
+		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+	done
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	if ! use s3; then
+		# Disable automagic depend: bug #670256
+		export ac_cv_header_aws_s3_S3Client_h=no
+	fi
+	econf \
+		--localstatedir="${EPREFIX}"/nix/var \
+		$(use_enable gc) \
+		--with-sandbox-shell=/bin/busybox
+}
+
+src_compile() {
+	local make_vars=(
+		OPTIMIZE=0 # disable hardcoded -O3
+		V=1 # verbose build
+	)
+	emake "${make_vars[@]}"
+}
+
+src_install() {
+	# TODO: emacs highlighter
+	default
+
+	readme.gentoo_create_doc
+
+	# here we use an eager variant of something that
+	# is lazily done by nix-daemon and root nix-env
+
+	# TODO: will need a tweak for prefix
+	keepdir             /nix/store
+	fowners root:nixbld /nix/store
+	fperms 1775         /nix/store
+
+	keepdir             /nix/var/nix/channel-cache
+	fperms 0777         /nix/var/nix/channel-cache
+
+	keepdir             /nix/var/nix/profiles/per-user
+	fperms 1777         /nix/var/nix/profiles/per-user
+
+	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
+	keepdir             /nix/var/nix/gcroots/per-user
+	fperms 1777         /nix/var/nix/gcroots/per-user
+
+	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
+
+	if ! use etc_profile; then
+		rm "${ED}"/etc/profile.d/nix.sh || die
+		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
+	fi
+}
+
+pkg_postinst() {
+	if ! use etc_profile; then
+		ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
+	fi
+
+	readme.gentoo_print_elog
+}
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index af260528a7ec..6b960d131ac2 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,3 +1,3 @@
 DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
-EBUILD onerng-3.6-r1.ebuild 746 BLAKE2B 9b413a16a2986e3adfc7a354e5781c3be943d9ba95363a78e2b19e15436fb01e3763b56a63e4d49944dcc61ede29b62be123e6e1977fc0a0c862a805ebaa7683 SHA512 cac7fca96cf841caff1d1dd8c5ee59875695f6a903c5dba8ce2a99836a47ddcc2d24789e93b756dbb951d2f635b642667d7a169116f68a7232c56acdf57d3cbe
+EBUILD onerng-3.6-r1.ebuild 745 BLAKE2B 04a0c6a5ef21754f4803729b089d2d0125ac1b7d19177487f3f9469f52978ed04874f8cd43452a29a4073ac48f8ad55970947e280abe367f285a9f92059e6fbe SHA512 fda21c90fbd856d0422e15bba6faa8df7f876412eba52333f2d2b9000458be43281a6a683a94060fd9c091abb2bc0a47d1e9f964b528fc2ed02d77d2760ded24
 MISC metadata.xml 834 BLAKE2B 8aba260b830ee41c11c1e843ecfd3130768366ab46a89b838b8c846c48699e0e570d99005d775d8560f4de179a4cf6ef0833294ae1699faabb550a1c0862585c SHA512 8fe1f05b03c98ee95f3fd6d81cb52165d96a6a8385b9c988a667f9b0f714875bb3bc291706ee5e53daf022c2cbd4d16f52bf4e7abfafa94d9cd0481ebb58fc1d
diff --git a/sys-apps/onerng/onerng-3.6-r1.ebuild b/sys-apps/onerng/onerng-3.6-r1.ebuild
index 953e639e7f88..918f7245cdbb 100644
--- a/sys-apps/onerng/onerng-3.6-r1.ebuild
+++ b/sys-apps/onerng/onerng-3.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/OneRNG/onerng.github.io/raw/master/sw/${MY_P}.orig.t
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index 4cfff5d2714a..a971c97e7b97 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -2,6 +2,6 @@ DIST osinfo-db-tools-1.2.0.tar.gz 447185 BLAKE2B c8ac2556d552bbeee0b8e0615ac5cbb
 DIST osinfo-db-tools-1.3.0.tar.gz 456012 BLAKE2B 5c29581f4947caf4ee06f435891cccaeb53b9514cc2bf4ad4bac1e8ee38ebeb61678ee886389f837c9f578f1df93ed94f8492165e1613d1bb60b246ea5c52428 SHA512 e488db70b85ba8d5abadf6c50a772f7cd338405c9465189a70eb0da1b488434cd234118f44933847cd05406f55831d08db767932794798270be5964fa4c3dc1e
 DIST osinfo-db-tools-1.4.0.tar.gz 519089 BLAKE2B 2c2e0cdbcd0a795f8deb09727b8b971748f5d0ecc08449238d3054cbd947a0f6059456d4e9feadded47cd0e0aaa87132f1bec7524a3183115dd459eca989d1b0 SHA512 f4813f948551f630cc9936986abc3ef4455647ec529b353dc4fee71f8071beeebac0a2ee1988cede92ea3635bca9bedd400ac9f275e3f5592ff50236d97cfb91
 EBUILD osinfo-db-tools-1.2.0.ebuild 837 BLAKE2B b6ef18efa3f75872bc3ce03e134b3b2e37cf8192bff0fb2cc8e14bc51033a7917233acfe87c9029dd151ef70b5ffca6501ce703feb369601dfe45d780d8442c0 SHA512 8ed562896a204d14fd3d421ec64ac75ca5617f53b1b35f1e99cd18da86eb232fe108bdfe99d4adac99fcb2b954f8ccce4c2a3a784b71877514bedc42ea1b8fa2
-EBUILD osinfo-db-tools-1.3.0.ebuild 858 BLAKE2B b3f7efbac31b1d8f97053c23a35cb2d6578b82953afbd35328078b026f5b22180387423f9781b7ae91fb14e40532e8333d3b347d5f9b6271c3b52c3f0b7ee8c0 SHA512 6fb3e9311f5c1e9056dd341e30f19cdbb682ba4966e98d948683d35b6620709f17e9476bf38763f1f2a8c1bc6c6a0867f85f02010fb997d78d081f2c6d5d9976
+EBUILD osinfo-db-tools-1.3.0.ebuild 857 BLAKE2B e1b75f5ca6052eb15fbf9fe485db0674587f065f0b525f9638d40ed98ee97dfb3e25566bc1923f0fcc98bd00ffc2ac07fd546962bd098c89f6f60ce3564a6d76 SHA512 136f2c0103b370fac5880ba3b53ba8f5dc6fbf31138eca1a44efb73a28876c2dba6d0e0088b0f07b473f22783a69ce5c3faa3c412492fa4524d34ab9e42b4e42
 EBUILD osinfo-db-tools-1.4.0.ebuild 859 BLAKE2B f10102e3647b3886a5f38bb0c93e2039f708d362911a1895b6f7053ffb262bf6b19deaac7c8896bc2425b488f758b6e5e67f8a38723307aa244c81ee7b5731ee SHA512 347a9ba28c4749a5e8f2d6038edcd305ae8a5065d9ee5ac0641cc6de0c761aaed60769292be401979f3bbb4f4f8d3a2677238f81e0c701c7d099b2b80996b6e7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
index 9a6db3d47ee5..9dd1c75e8cb7 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # Blocker on old libosinfo as osinfo-db-validate was part of it before
 RDEPEND="
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 844edf628925..d3068420f9fb 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -2,5 +2,5 @@ AUX 99-pcscd-hotplug.rules 358 BLAKE2B 6ff034ffd1a1942d5d0429f9ed35428853ff8daa0
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
 AUX pcscd-init.7 408 BLAKE2B 15ba28f80cc0f44598a553bced62bf8972b698bf8c02a715531ffbb0724915004e47e2779fefa6349adccfdc7d32e8880f8d6d82ea98178e8556b9453c31019d SHA512 e4dac959dbea3d418a3e4012788a3cc7b8aeea295f56f1c3e2f0a599cf469d302f3eaadf05cd0b3c7929a583f8d0b6756177ebe2c497c404b70e9aed7fb7d003
 DIST pcsc-lite-1.8.24.tar.bz2 755670 BLAKE2B 22cc072978e221d455373e1fdeb21ae8f3dacdd188a4e8a69ef44202924e6c17c4282d424c88ac32b04c62af6e67787f2d2ba936bd3e3667452b32c40254de28 SHA512 df2e6a7a8179563a6dbf654ab75cf78a4b297b0562214a081d7d2b5d00fd4adf92fd892bd16aacf9d5e2867f3ad46c88a88e5834e311011f37556dd7e8936a0c
-EBUILD pcsc-lite-1.8.24.ebuild 3146 BLAKE2B 24805ee673422fb504751af28a91915146c23a34660d99652a4bb971b2aca5a401c6bdc39f85eaf4e2a3f2083aa89ea772e4c9401ba9bc3662c2494a1520e34c SHA512 8097f4f33ba849596115e309ead0b4b09ff1a9170a1118c3b5677a10e4ce2f6830ff734832f0ab7e71d6b5156deafa28b5fa6fb4e6c0173695b3d38c9490246f
+EBUILD pcsc-lite-1.8.24.ebuild 3144 BLAKE2B 0235204e65ba8bc7539ff5266847603adb349ed82426cbb189db15baa12ef8d7f2066a120107a3e9abe08b5eef2dda841692d6aa3c9572eb7483219058ffb5ac SHA512 9c4cdf1797b7b0438fd07b5f5bbb32f8bfbc6e3ba8c4df6f6e6d0fe5a22a62305e59c19665c936a7a815835ef70d97db5eae38e154a18b299105746c6efc63fe
 MISC metadata.xml 1077 BLAKE2B d13414e4b691e3df98ce7fefb9939a2cfd224d7ce76b78a72c0585c22acf18939ccee85a5f19791ccdbb8e31e8ba93cb0c537dc86a8a8820435efbef07c7d941 SHA512 4abc19855a868236dfdcfa6d42fcb901fdf52796e08b589a1413c78b931aee74fd482121ff67da632c2cf2e1ba018ff02f1122f1dac5c2185046f98952efd838
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild
index fbebff377d13..39ccd7d8856f 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit python-single-r1 systemd udev user multilib-minimal
 
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 1415705ae1fa..9b07dfbdd02e 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcore-0.9.7.tar.gz 592202 BLAKE2B fa16380e89ad2fb2a05d8f08387c3cfa2203b4e6faad3fc4758d572eb08d6c64f781eef8c2d56151f1facec3a202325d4c4a271a1a3ced88df7371f2af75dbf3 SHA512 cb996fd35a8e4e73acfacf1942d498932ec092a282397bd41df72eea26b6d08c15e01b96ece8ebb6876e84281d85d4f8ef81e1f2ef107adff1b984ee592d6a6f
-EBUILD pkgcore-0.9.7.ebuild 1497 BLAKE2B 97b9457800e9cccef06aba9b566adbea6c7798fb1275b08646afb4bc2145f0e65375055d4430e06ee063b95b00417006a0824d6285be2cff420934561adf921f SHA512 07ad1813bc307022300766e424ae9b09a995300c802d2f89557be74dbb3783da1cdec9b56c409d6bcc647c2be49aa1524a8b63ab2f14f965d6f099a2e8deeeb5
+EBUILD pkgcore-0.9.7.ebuild 1490 BLAKE2B 867dacbb663e06ddfc7595da418bf5b71a5481972317496a9c93ca00ebee64233abec8790304c1b10097ba6b2444fc01f1713803b09940608cd1b4535ccfeac5 SHA512 362e413b8ea9d0bcefdfeeb66272ce9e922a2461ac158977634c33a9b9fb672b6ac6741223feb43c82ba393dc8b8274a7825781c4f3a8790b6f1da7dd75731e7
 EBUILD pkgcore-9999.ebuild 1444 BLAKE2B e0c21c8d621b1e744b4fd75628fd5d5ceaf2d640850eaff8829e6cb71487964dd2f2c63e2df53b091b52e7add8cd54973c619a3300eb34fccbdc1663147fd389 SHA512 0dcc2275d0049f6e00a7dacd8ef1a4ec70ecfaff6e7081e6054d040026fe26e14a2b47a0d65ed29ddac6b7ba4e412e48f33e9ef053c45591397234113ff60d0a
 MISC metadata.xml 409 BLAKE2B 42709aa3a13109a21d1cfa0db9ef758216a2e902d68a10f0db14b4019464a702ef0c91079d0856f9389a2221886bbd3d5d5480ca99efc708543d198d00b7ed3e SHA512 ec04202f105a62a697511c7a89dad118b3618fdce4044c25648492e1557a95b9e29c01a08fca21e106273485471af98c52a6db6b2a40605a67a632938faebd29
diff --git a/sys-apps/pkgcore/pkgcore-0.9.7.ebuild b/sys-apps/pkgcore/pkgcore-0.9.7.ebuild
index 90d96abc2cdf..d48195c029f8 100644
--- a/sys-apps/pkgcore/pkgcore-0.9.7.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.9.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 883f4c968f88..6986a0473a30 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -3,5 +3,5 @@ AUX pmount-0.9.99_alpha-locale-regex.patch 749 BLAKE2B d1e777c57ba8b261f6fdf4612
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
 EBUILD pmount-0.9.99_alpha-r3.ebuild 2018 BLAKE2B 68a02931e5df37140b5afbf5d1059096e7c329d395ed8684042de47d2b192a055338cc11ed79d63ea30f60fb976ee878c9da3a9939791e5c5a4505a5852c067e SHA512 179c2588a00cb8b856899f99078dc21970664407f5b1fb278b91733577d72687429986270db4ea94dcd7cefbfbf9f886be3884a5a1fb4baa3e0d39cfc6a32b06
-EBUILD pmount-0.9.99_alpha-r5.ebuild 2125 BLAKE2B f6898ac31961928ede2efb37673bc0ebf615c576a4a2cec197bdb87ce81fa537a776f07809f936e622e86410bd2fc5bed35a16903aa298c61219906098f72cd3 SHA512 d62feceae9e61190673e3bb9f891e1ce416dbc2d657e89c53b7ff4134df95c4947a5046ce3290f7a595d52b2a227f96392657b28187c9e63be6e86fce2f9d9de
+EBUILD pmount-0.9.99_alpha-r5.ebuild 2124 BLAKE2B 2073f3ad217e3363e5975a5de8aaa0ed6ac8986ae2e1bb03ced2ae89769c9754e808ff78e4d326f45bf31f95f766eb97c19f93b59f43fb92b1e9f7c2bf830095 SHA512 2de42f2e6b51de2cd968342fba847af8c12aab377065aed9fb7baf32bdfa64235165717f041f3aa82a88eb536dccadf064158bb4ba766c36dbbdea15ea5dc741
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
index 1ab89f8962df..c4a9fda505b5 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sh sparc x86"
 IUSE="crypt"
 
 RDEPEND=">=sys-apps/util-linux-2.17.2
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 96e59d3e7728..1847b1b5bdb0 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -4,9 +4,9 @@ DIST policycoreutils-2.8.tar.gz 2796775 BLAKE2B 36115cc2faf72a4b647312f8faaf4762
 DIST policycoreutils-2.9-rc1.tar.gz 2797222 BLAKE2B 25f51cc1b17744e573450245064b8b65e44fff44693d886e89097308c80ed61b2cb46822d581e8b970053a771262722bdb4a59619d6a94e09505b71e476e45b3 SHA512 6a3a7d4652b44e54c287b327ad691dd0575c6a45fbf1f4676b8182e05760defc37dfa6aaf2e6ab5a77e124d76d1f699c4859c0595a3f9e8ade04ff5ad186fb32
 DIST policycoreutils-2.9.tar.gz 2819360 BLAKE2B b0af912e3b4fb2c9598b10ce413c8ffb3f5972a4d5d59270cff40abe8d4e385e0664e24a4f533a95ad2d1657644f3368213f955ac63d9f8c46a661417b07c8b3 SHA512 d8356115671ba66de05f1c13193ab47fab69cc4d09603a92171ed40afafc084dd191591bf336b7d722de637378ad09622ebb6eca85c06063ca9ddd6db10e02a2
 DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8a8b144e4e15ca5581381e76a529dbbaca304d5587b30419797c8c70cbd7c2b2588e5ecd62adcf97294e429950899c1c318346 SHA512 c6a18e6fb2d65f51dc55b88907f23241f2fbfc033d3d2888b109596d9ed31d509b2c93456727ea4d1f98544831afb15c449ff72d6aedf93b9e474b27817f7fb3
-EBUILD policycoreutils-2.7.ebuild 4966 BLAKE2B 1e252c86aa33e9ac68c14d859ced7e277fc0cf5f5ad6aa335ae7b334b5ff56417ed8ff973a57e2858bae832dde946a7080d1d9eb72e7b2ed0e583b1badf8ccc9 SHA512 f068c7fb1d918bcf305b8f8a72433774e5dcc23e8b5a22fee2e64fbb54cd4e14d897da33c893b948247600350bf4f54ab64f6d81be405d2c6930ea40176dc729
+EBUILD policycoreutils-2.7.ebuild 4959 BLAKE2B 4aae2fe833e0137281ca3d164676757ac9775a6c372001e9a209faffc8072830f913ad7d580684a679a54192d83b78ff14b763e7365237c662b0af4487f01e87 SHA512 c51e74c174f523107b3ed820c124602afb19fa1d4b962e04be839d3f55924e4dce1014ccea385f20c2af466a33997f861326e7f89db55574bdb71ff55f51b6b4
 EBUILD policycoreutils-2.8-r1.ebuild 4864 BLAKE2B 1715247726992270cfcd287fac903d161b049c5c1d098b4c2dad14e0905e909d5cece922de96b118a1096060e5c5766496581e6025ffecb896b894bc2a9296d7 SHA512 88ab065fab0dcd89c104e2deaf61557eda5facd6e15adcce68598314d0c9585a8478edf5877dcbbe0c3e82061b7d384b5f257d5c08c0d981eb67cb6135e99aa9
-EBUILD policycoreutils-2.8.ebuild 4873 BLAKE2B 5e43e9a43917e935d6a34f6756135f4cff6d978963d998d5bbda8bcde273bf3051b575e10e837ea003b99b63f5f0bbb9ada12989fe1e98db558b89706cae5a70 SHA512 1aa16f096647afbeb78218d4b9a1a1f408d8bba250afbfca4f16149d32b20d3e35f08b502df2c441c0775ddc834af1e6e4f015c7cbab137a3dbc825e95a093ef
+EBUILD policycoreutils-2.8.ebuild 4866 BLAKE2B 501db50e3fa183cf6b2d021673f84de47f8a99cc5736ed9dbfc79af207e79d223b59f391dd1f66c9c280c154d34360e11e289644b60ee7bde51f95b922211a23 SHA512 11d58461577a70ae586287fb012ad128fd00de59a398a5fe580ff51c7b8a8d6fbd5ec5bffb00df9d8d69f98e5bfc98fbfe455288fe663e4d44058507db4b9eff
 EBUILD policycoreutils-2.9.ebuild 4847 BLAKE2B 26adcb0b780d5fe63567dd844c3af85d8d675f99db4f30879adfb934f019a576e081d8f9028f815335c91c33aa8b69a04af3d01786d7632a00879294f2a541e4 SHA512 ceff596c71d37377a10bb351c48786774bef004305fc8f711c197f97c3c17037d2600d4a6abae30e3d97628e1467c9864b7f378179aa07575dbc00143aebcf80
 EBUILD policycoreutils-2.9_rc1.ebuild 4847 BLAKE2B 3b0212ca4408497b8d56373ca6a366ddf46383ab74099d24d1f52fc2829d5282132c800149e2efaa0500e7447c2ff879d36e93e40109d5375b4e226c23a5ec48 SHA512 85f81d41f22a100c296361b383651535f45d9c4f8900de740713a768836227ba63aa446946f6f3d8a1b79b7b911a0a786201439f8e0708abd1777740198aff0d
 EBUILD policycoreutils-9999.ebuild 4847 BLAKE2B 26adcb0b780d5fe63567dd844c3af85d8d675f99db4f30879adfb934f019a576e081d8f9028f815335c91c33aa8b69a04af3d01786d7632a00879294f2a541e4 SHA512 ceff596c71d37377a10bb351c48786774bef004305fc8f711c197f97c3c17037d2600d4a6abae30e3d97628e1467c9864b7f378179aa07575dbc00143aebcf80
diff --git a/sys-apps/policycoreutils/policycoreutils-2.7.ebuild b/sys-apps/policycoreutils/policycoreutils-2.7.ebuild
index 67a003d2f990..39b802e8f628 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.7.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
diff --git a/sys-apps/policycoreutils/policycoreutils-2.8.ebuild b/sys-apps/policycoreutils/policycoreutils-2.8.ebuild
index 1a29b60298ca..336f99c3789e 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.8.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
diff --git a/sys-apps/portage-mgorny/Manifest b/sys-apps/portage-mgorny/Manifest
index 6747273e62b5..e31771d87cc5 100644
--- a/sys-apps/portage-mgorny/Manifest
+++ b/sys-apps/portage-mgorny/Manifest
@@ -1,6 +1,4 @@
-DIST portage-mgorny-2.3.49.1.tar.gz 1255740 BLAKE2B a64b3d1a96d7ec808168830fee03e40dd4070745f8670ec50e3d286173178bd3af8e6f823e2f732f374b59f3b88b4f44033eb6dcc21633edd25a9c8d563d04d7 SHA512 bfdf4aad186635770b05178e3c552fdca42a20790d4db17c7a204af27117b540545ba19f253924ac6ce18dd5036fe9a0503630a522303739f536b6e3b5178319
 DIST portage-mgorny-2.3.51.1.tar.gz 1257484 BLAKE2B 85761b1fb5b44e4457173f8820166643fb3afb3115e9eab1436f16ee3a10f4fe1c8ab62b3e70239b4f2b00977d8421bc24a441d4a60d122c450185ff56e1e531 SHA512 8d2bd540a82f0d4aa5b089032d41c72a3d33b88041240e480ffa7d924eea0197e674b29241eb30ef13f154052514419e038d98aa72e89a5e1977dfcb6a86fa83
-EBUILD portage-mgorny-2.3.49.1.ebuild 7168 BLAKE2B 4ef17f24f9d2cdc07b0951ffbbd6ecc1ed14cbe6948457103583d691c0fe2d8e2394e73157759ccbe886ad3b90033742f1c0c6d3908796fc96a0fc46c1ec9f3c SHA512 7ce5aa4b699a9b5938e13c0f6d6a5592bbe1edeb1d01e8ee9869a5e9bad7f6b6270cf7b79e47e98677bc7868aad0751fb011da22ad0fa89dce53646186f2dd15
-EBUILD portage-mgorny-2.3.51.1.ebuild 7168 BLAKE2B 4ef17f24f9d2cdc07b0951ffbbd6ecc1ed14cbe6948457103583d691c0fe2d8e2394e73157759ccbe886ad3b90033742f1c0c6d3908796fc96a0fc46c1ec9f3c SHA512 7ce5aa4b699a9b5938e13c0f6d6a5592bbe1edeb1d01e8ee9869a5e9bad7f6b6270cf7b79e47e98677bc7868aad0751fb011da22ad0fa89dce53646186f2dd15
-EBUILD portage-mgorny-9999.ebuild 7080 BLAKE2B 703c046e27a79356ed4a0c88690e83677ef0493ea63e4a19be21778513ce9a3f8f14ff03e8116aedbfe9c8baed2f31fbe613d88586eae647386b2625527a6c2c SHA512 d7fa51354786bb879c6f2954b633a07d863126becaeede41e11f8f3d1c52ad80f8ffde671ccd4ffafc5552b2074e5cd6c30270f525f828244d5a7b339147b445
+EBUILD portage-mgorny-2.3.51.1.ebuild 7159 BLAKE2B ed371cfdd7ed6e71ae4ebdeda65325407dbd3a2643e2a8717dade24320faa47d567f62b1420b43473010c725f6124c262a93e9c2170e75b59938f730a41e89c0 SHA512 73af7d3c8b6227a4b61502f73d0f0e837cf0139fdf4bca15bf1f3e824bbcb28f3bff56a9485308d370fc5af0cd332079e143d8262b051ba59f404fe8b4567af7
+EBUILD portage-mgorny-9999.ebuild 7071 BLAKE2B 8223a3f01c9819b88aa15963784dd64d5d20773017b630c7c4f5aa37e138a88c3eab7fa3a759ccc5fb4c745fda216a8400b4dc89e1e600cdefa4df146387e0f2 SHA512 1e62d73fc575790d2770be08ab6e806e4697733bad70286a3b05c22f7c47872bc72bae397006b7f03f90d0e3eb98f7a52246c4f3fff579f63a49712b4ffaaffd
 MISC metadata.xml 817 BLAKE2B 8792bea6f73e3d72c747a11a0946c119abd9a24e3a1f40c457563536a9a1ce304c8c2ff0682fad3f94913d171806a262cf73de7437b5f250215810d8ffb32447 SHA512 e3498363b89e349d37b13dd40c7b3225f8c445b1ea2db9f70f2a1d718b7576103296d52581aa5ae0edc4ddd3fa8123161425c2732753f88e997b1cca818572b2
diff --git a/sys-apps/portage-mgorny/portage-mgorny-2.3.49.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.49.1.ebuild
deleted file mode 100644
index 36bbee3032b0..000000000000
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.49.1.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-mgorny/portage-mgorny-2.3.51.1.ebuild b/sys-apps/portage-mgorny/portage-mgorny-2.3.51.1.ebuild
index 36bbee3032b0..7c190529617e 100644
--- a/sys-apps/portage-mgorny/portage-mgorny-2.3.51.1.ebuild
+++ b/sys-apps/portage-mgorny/portage-mgorny-2.3.51.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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_COMPAT=( python{2_7,3_{5,6,7}} pypy )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1
@@ -30,7 +30,7 @@ RDEPEND="
 		>=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)
+			python{2_7,3_5} pypy)
 		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
 		>=sys-apps/sed-4.0.5
 	)
diff --git a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
index 6cf930b1eddc..6c03fc1f54ec 100644
--- a/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
+++ b/sys-apps/portage-mgorny/portage-mgorny-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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_COMPAT=( python{2_7,3_{5,6,7}} pypy )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 git-r3
@@ -31,7 +31,7 @@ RDEPEND="
 		>=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)
+			python{2_7,3_5} pypy)
 		>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
 		>=sys-apps/sed-4.0.5
 	)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 4c3c2cea24c0..739f8f24e767 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,16 +1,13 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f82cd46aa1523eb0f70109551009a422546f2fbde1beee7a18dad4ecbfc6465b3b3052a25720196950f7da81adeb66d87940f2b477fbeca27afba56fa18e SHA512 b0482b8dac8af97b841ded426001872c1c708f649dc7774bd3c7003179888fd4d126ece33d001d127b643d88b8a70b9af75bbeb36beeaca7b8ad308f92ff72e7
-DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9
-DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
-DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e10772bab9539ff27cb165b6749090be887b6f48d449f4e7650e618d43be1b0d26ba59597996a9d3d3ecd0caea166a SHA512 d3daee0075eee61c354ad1d4865b1cf433d9afe5ed56101758219694325c7c5ad62a0d9ce41bf2205934b6e073d0eba3ef3f7c8b6633b5a3448e469783c5329a
-DIST portage-2.3.51.tar.bz2 1013015 BLAKE2B f7f5e6c9e627db5a9e4bfcc9a6cbebb40fda910d3cc928922870b295c706a9f669d3d812e726b220610efe6b182460811eb9420d6fa5b8756481df64a88fe2b9 SHA512 6c22b97959d4b5be263b9a1de6bb343b1f8300e989f37c7334a9d5d6fb65fe2390958e222bc5379ec95099124fc51a049ecca6e1bfc18f0a6c57e4601342bb94
 DIST portage-2.3.62.tar.bz2 1021442 BLAKE2B 37d5dab0e678ced78e0ff4dc9907af3d20370a4b0f52cea9118be3d06bb14e24fe6597d86c9bbd9d3ed2fc51f9e031d4e9ba84f354b945f7a399da3cbb95d74a SHA512 d4eca7e70573aae07a0522b4bf361191fded00fa02c5e6d8f70cf72c19c4dcfa9be7169a267afdc58cdd0a8ee333774a7779ac08dee3490aa8e8a1ebd39deb49
-DIST portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch 1584 BLAKE2B 452cd4cb25e42dcfa05c4f9da2bd3cc279556b9cd87037d0d965d39678f347b701dac0eaa59bfdebee9e3715abb506bf3744900ebefafa8fa729a1eb442889b9 SHA512 5bbe163e8eec00ece831c113676e87f0cf61a40f30a75a0de548490eeb789479336feec5bf81868a284bf32bafa00209176156cfb9ce557390d0f4a2ab6d1c1a
-EBUILD portage-2.3.40-r1.ebuild 9684 BLAKE2B 25337738dd51a60f4b8348796348572bc92e95af3178ae4c4097225697923aa14bbc5e206160ed569bf9f84cbe354823c2326eb54173bc455c4d46566050d002 SHA512 20184f3260d3d8c413ea2a87eaec2eda08e94a27290f658c12ae3490712e6773c95e52818b8224882380a55c4eca77b42d9233d23ea64aae6cbdfb43e90bdbe1
-EBUILD portage-2.3.49.ebuild 8681 BLAKE2B b09a5d1c4795765ffe01c31eafe0578b9c6b8177997799c15965b4be5a5d00d69cd0747667384eb4ba33fb2f52f703b3b03ad4e64c4f8581754841ed0979d912 SHA512 737694cb627e10191769e820903a66fa2d74bc0b4a6070c59cdc3c865a20e2d7c1c8ff949417202c97c2e217e0214c251ef956cfa6b99ecd83b71ec607d910bf
-EBUILD portage-2.3.51-r1.ebuild 8934 BLAKE2B 4929d861ef8569848abb8eb79f3326cb23d8ff66eef7895fc1e0cbeb69f0310f97b0b3094610f1d97919c09ecca077273671b5879b3bbbce807ccc7b52b643d4 SHA512 cb55dbc52d5b7af35083e60c83a7085458686ff03f03d8d1f5d03e42c4437bf8c14de026cd11ede70389d0c039320c08fcf901175b40413e09c01a0cd46c43f9
-EBUILD portage-2.3.62-r1.ebuild 8042 BLAKE2B 509833584f8f47b0611ea7bbda01f9c31c6d36c1b025e714f594aa8c66cd16f3d2eb707b65f5d00d02c7e9c39507b1fcfed7b14bd815689f78c0e358d9daf568 SHA512 f1837b32ed8815c47525364179216aeb6a66de0ad1673bc5c3c9fdf760f71b18169e6bff1e0c7a4e8e70f17354c5316e8273c900b48975510a8bc21545046f5b
-EBUILD portage-2.3.62.ebuild 8825 BLAKE2B 3a5416eb637da5fef2523e6bc66994d6cda9e8a91d8f6da61c023bc73ae7e282b2f7ffe6f074271236c84621e9bac073798dc00739384f922d2c370ab1daba1f SHA512 ff45fcb144be1ce4d66951f807738ff2dc53f012f2125b00d9fdb214b4d681eaeaa2086f367f1c5c921749fbb5496442f369f0ea63eb1495d3946614e243196f
-EBUILD portage-9999.ebuild 8686 BLAKE2B 828f8099e038313c4bbf4a17361f1ef42d71c288f8973f59ae18adad176473ff32e869749d48793a5e6e0ae7e139b8560ad06b508718a73d68081520e57ee3ca SHA512 17a3682b8e897219bb29b6ecbc39d2ce53bf7c949ad0ae6faf36f948730bbc25818f59e23622802f09b078f61bb85814dd3ec1c588fef99bd87d057bab129fc9
+DIST portage-2.3.63.tar.bz2 1021603 BLAKE2B 8a9fe026e92880c2fe42ddd8441c3436d940c918fdd89a7d6e46c0bf4f3ec1a6f948d9821ba6de092d289230c6395dee5e37526d157d8e7cbd9d43ce2b27acf6 SHA512 27fbd09b586bb9743700e90d41ce94ed22aaf64b465755978c8d6489417ff3ab88d2ee400944c983f095f2aaff9490910006af9d2645d259ac0d3fc89bc00a19
+DIST portage-2.3.64.tar.bz2 1021942 BLAKE2B 592146bf3fc39cf2a4de72d55c59fe6fb0f557bd2dd63d662925753d16435719255f682b2c1fbd294ba54f1935a44a5f4bc0ef8a8bc00980791dc1dc7046af5d SHA512 847d558dc33960f3989b6676a2569bc8c600864f5024b82db77fd45e31215700c25759168d7aa46bd14773c37bd363c349ee8b95250f1db3630d70e7fbff5da7
+DIST portage-2.3.65.tar.bz2 1022351 BLAKE2B 819cfe2b975e23ae35f03c9499a12839a181eaaf92196717efff0475a327f828cdadda0d5f5994fdafd66f65b19a61a9100a29a510b4ca73ab967c64a184ce8d SHA512 b7765060be6b13e2bcc628c32305973821bdc193a2a5a9dedf9cae8a03d5c4809b022bb643852dfdf7323c6d427475423284231f04756e70697740708dc3f3a5
+EBUILD portage-2.3.62-r1.ebuild 8028 BLAKE2B 2ee1bae9c507fa7b6c34de2b202012f6cd6bdd682c5d12e32fb670134ed57ad02699dd4d79c2a092eebef806e92f1f9deffc741975c95afa2e26e7eedee18f50 SHA512 e4caeec1ace1e5f3f60079293983cc3210c2ea6899261a3fefeee9fd172a72256db167618f89b9a880504d420ae83424306d824e08c5c9b6cf6f459bbd67c64d
+EBUILD portage-2.3.62.ebuild 8810 BLAKE2B 14fed4a7ea5c2bbc9f1140eb52dac712c0464770278b907feb258c79032e59fe25214f5ed2e21b35433d93b3dbceedc18cbe40c41073c8827047aac92c4126fa SHA512 8b5bde88c4a6c6687d0b53c01ea1afd691975b329c19219b13a5b21f47add22ce42250e8cb38a5ac3532f7db56f5e15672315854205b5d4920fd0489924c0794
+EBUILD portage-2.3.63.ebuild 8028 BLAKE2B 2ee1bae9c507fa7b6c34de2b202012f6cd6bdd682c5d12e32fb670134ed57ad02699dd4d79c2a092eebef806e92f1f9deffc741975c95afa2e26e7eedee18f50 SHA512 e4caeec1ace1e5f3f60079293983cc3210c2ea6899261a3fefeee9fd172a72256db167618f89b9a880504d420ae83424306d824e08c5c9b6cf6f459bbd67c64d
+EBUILD portage-2.3.64.ebuild 8031 BLAKE2B a711c39e61d1beef69e8b38a724463958faff3e81f3b654bde67fa4c90826b1c2bce2f07efadf9ecd21dc3fbf36706d5fb979366773e5469b05af69028df81bb SHA512 1244a8414560fe0003ae6c4ec0259e139994797a56e2da95610b7e34cde7d483cdd9ef117687a009040b34c4853f8ac24720cce346a0c35e05d5ee58b7d44728
+EBUILD portage-2.3.65.ebuild 8031 BLAKE2B a711c39e61d1beef69e8b38a724463958faff3e81f3b654bde67fa4c90826b1c2bce2f07efadf9ecd21dc3fbf36706d5fb979366773e5469b05af69028df81bb SHA512 1244a8414560fe0003ae6c4ec0259e139994797a56e2da95610b7e34cde7d483cdd9ef117687a009040b34c4853f8ac24720cce346a0c35e05d5ee58b7d44728
+EBUILD portage-9999.ebuild 8675 BLAKE2B b49a405da2d13baa80938559b5a570f74b67e47fca1bae46e43e5cf7caea7beb8e729b4dae3a1462733cecc1e03d821accf0a3cfb4d41a686ef12ff3586e4574 SHA512 f4664ee367396b7eb2070885e71edeed724604c1a5b004366488741ba7dbe0d40633c07b28d3544c6603bcb6cdd211c2c076902577c6167c1faca495d20c5795
 MISC metadata.xml 1415 BLAKE2B 0bad16a272e536342079102034e68130eb96a93e46fb811d1c89d00a4b4bf911f8cf42a93bb4d8fae8086c9e47601a709bd4fa5fb41c3e754c1f08c2f7acbe33 SHA512 a4556fbc0ae69691bff793e73b504e9898a5ec187df28d23a37a3290a94c78d4eaa3a3ac70a997c6456be9b72281916965fdea6a057df58aa15090f630d2ce59
diff --git a/sys-apps/portage/portage-2.3.62-r1.ebuild b/sys-apps/portage/portage-2.3.62-r1.ebuild
index 1d1742200872..6cf03c9e61ed 100644
--- a/sys-apps/portage/portage-2.3.62-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.62-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_4 python3_5 python3_6 python3_7
+	python3_5 python3_6 python3_7
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -43,7 +43,7 @@ RDEPEND="
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
+			python{2_7,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-14[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
diff --git a/sys-apps/portage/portage-2.3.62.ebuild b/sys-apps/portage/portage-2.3.62.ebuild
index e8c8e0ea9f45..7f8f6880e6f7 100644
--- a/sys-apps/portage/portage-2.3.62.ebuild
+++ b/sys-apps/portage/portage-2.3.62.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_4 python3_5 python3_6 python3_7
+	python3_5 python3_6 python3_7
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -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 m68k ~mips ppc ppc64 s390 sh 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"
 
@@ -43,7 +43,7 @@ RDEPEND="
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
+			python{2_7,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-14[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
diff --git a/sys-apps/portage/portage-2.3.49.ebuild b/sys-apps/portage/portage-2.3.63.ebuild
index 17a87caa73ec..6cf03c9e61ed 100644
--- a/sys-apps/portage/portage-2.3.49.ebuild
+++ b/sys-apps/portage/portage-2.3.63.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_4 python3_5 python3_6 python3_7
+	python3_5 python3_6 python3_7
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 systemd
+inherit distutils-r1 epatch linux-info systemd prefix
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -43,7 +43,7 @@ RDEPEND="
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
+			python{2_7,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-14[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -54,6 +54,7 @@ RDEPEND="
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
@@ -88,6 +89,12 @@ TARBALL_PV=${PV}
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
 	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
 
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
+
 pkg_setup() {
 	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
 }
@@ -131,14 +138,8 @@ python_prepare_all() {
 
 	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"
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
 
 		einfo "Prefixing shebangs ..."
 		while read -r -d $'\0' ; do
@@ -149,15 +150,9 @@ python_prepare_all() {
 			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 make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
 
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
 		if use prefix-guest ; then
 			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
 				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
diff --git a/sys-apps/portage/portage-2.3.51-r1.ebuild b/sys-apps/portage/portage-2.3.64.ebuild
index f12290187fec..b3a016883b33 100644
--- a/sys-apps/portage/portage-2.3.51-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.64.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_4 python3_5 python3_6 python3_7
+	python3_5 python3_6 python3_7
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 epatch systemd
+inherit distutils-r1 epatch linux-info systemd prefix
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -43,7 +43,7 @@ RDEPEND="
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
+			python{2_7,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-14[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -54,6 +54,7 @@ RDEPEND="
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
@@ -86,8 +87,13 @@ prefix_src_archives() {
 
 TARBALL_PV=${PV}
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://github.com/gentoo/portage/commit/74d2509c99fbcb43e018ead4950b938e41e524e5.patch -> portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch"
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
 
 pkg_setup() {
 	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
@@ -96,8 +102,6 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	epatch "${DISTDIR}/portage-74d2509c99fbcb43e018ead4950b938e41e524e5-bug-671472.patch"
-
 	if use gentoo-dev; then
 		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
 		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
@@ -134,14 +138,8 @@ python_prepare_all() {
 
 	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"
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
 
 		einfo "Prefixing shebangs ..."
 		while read -r -d $'\0' ; do
@@ -152,15 +150,9 @@ python_prepare_all() {
 			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 make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
 
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
 		if use prefix-guest ; then
 			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
 				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
@@ -245,16 +237,16 @@ python_install_all() {
 }
 
 pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
+	python_setup
+	python_export PYTHON_SITEDIR
+	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
 	# This code runs in preinst in order to bypass the mapping of
diff --git a/sys-apps/portage/portage-2.3.40-r1.ebuild b/sys-apps/portage/portage-2.3.65.ebuild
index a13a4a8b0add..b3a016883b33 100644
--- a/sys-apps/portage/portage-2.3.40-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.65.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=(
 	pypy
-	python3_4 python3_5 python3_6
+	python3_5 python3_6 python3_7
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
-inherit distutils-r1 eutils systemd
+inherit distutils-r1 epatch linux-info systemd prefix
 
 DESCRIPTION="Portage is the package management and distribution system for Gentoo"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 SLOT="0"
 IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -43,10 +43,10 @@ RDEPEND="
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
+			python{2_7,3_5} pypy)
 		rsync-verify? (
-			>=app-portage/gemato-12.1[${PYTHON_USEDEP}]
-			app-crypt/openpgp-keys-gentoo-release
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
 	)
@@ -54,6 +54,7 @@ RDEPEND="
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
 	elibc_musl? ( >=sys-apps/sandbox-2.2 )
 	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
 	>=app-misc/pax-utils-0.1.17
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
@@ -61,7 +62,8 @@ RDEPEND="
 		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
 			python2_7 pypy)
 	) )
-	!<app-admin/logrotate-3.8.0"
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/repoman-2.3.10"
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
@@ -85,9 +87,13 @@ prefix_src_archives() {
 
 TARBALL_PV=${PV}
 SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://github.com/gentoo/portage/compare/b7f94fccf4163364ab7b4c4f0dcd42b8847f03e0...937d0156aa060bdba9095313dedbb62e0a993aea.patch -> ${P}-bug-656942-bug-657436-937d0156aa06.patch
-	https://github.com/gentoo/portage/compare/937d0156aa060bdba9095313dedbb62e0a993aea...1fc628eead43fa5da4b142479aa004ded8acceab.patch -> ${P}-bug-657436-937d0156aa06-1fc628eead43.patch"
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
 
 pkg_setup() {
 	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
@@ -96,17 +102,10 @@ pkg_setup() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	epatch "${DISTDIR}/${P}-bug-656942-bug-657436-937d0156aa06.patch" \
-		"${DISTDIR}/${P}-bug-657436-937d0156aa06-1fc628eead43.patch"
-
-	# apply 4fb5ef2ce2cb
-	sed -i "s:\\((self._poll_obj, 'close'\\)):\\1, None):" \
-		pym/portage/util/_eventloop/EventLoop.py || die
-
 	if use gentoo-dev; then
 		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
 		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i pym/_emerge/create_depgraph_params.py || \
+			-i lib/_emerge/create_depgraph_params.py || \
 			die "failed to patch create_depgraph_params.py"
 
 		einfo "Enabling additional FEATURES for gentoo-dev..."
@@ -122,7 +121,7 @@ python_prepare_all() {
 	if ! use ipc ; then
 		einfo "Disabling ipc..."
 		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
 			die "failed to patch AbstractEbuildProcess.py"
 	fi
 
@@ -139,14 +138,8 @@ python_prepare_all() {
 
 	if [[ -n ${EPREFIX} ]] ; then
 		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
 
 		einfo "Prefixing shebangs ..."
 		while read -r -d $'\0' ; do
@@ -157,15 +150,9 @@ python_prepare_all() {
 			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 make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
 
-		einfo "Adjusting repos.conf ..."
-		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
-			-i cnf/repos.conf || die "sed failed"
 		if use prefix-guest ; then
 			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
 				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
@@ -250,16 +237,16 @@ python_install_all() {
 }
 
 pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
+	python_setup
+	python_export PYTHON_SITEDIR
+	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
 	# This code runs in preinst in order to bypass the mapping of
@@ -269,19 +256,4 @@ pkg_preinst() {
 	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
 		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
 	fi
-
-	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
-		has_version "<${CATEGORY}/${PN}-2.3.3"; then
-		SYNC_DEPTH_UPGRADE=true
-	else
-		SYNC_DEPTH_UPGRADE=false
-	fi
-}
-
-pkg_postinst() {
-	if ${SYNC_DEPTH_UPGRADE}; then
-		ewarn "Please note that this release no longer respects sync-depth for"
-		ewarn "git repositories.  There have been too many problems and"
-		ewarn "performance issues.  See bugs 552814, 559008"
-	fi
 }
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 42273cc4fdd3..aa44b4b671c1 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=(
 	pypy
-	python3_4 python3_5 python3_6 python3_7
+	python3_5 python3_6 python3_7
 	python2_7
 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
@@ -43,7 +43,7 @@ RDEPEND="
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_4,3_5} pypy)
+			python{2_7,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-14[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -247,16 +247,16 @@ python_install_all() {
 }
 
 pkg_preinst() {
-	# comment out sanity test until it is fixed to work
-	# with the new PORTAGE_PYM_PATH
-	#if [[ $ROOT == / ]] ; then
-		## Run some minimal tests as a sanity check.
-		#local test_runner=$(find "${ED}" -name runTests)
-		#if [[ -n $test_runner && -x $test_runner ]] ; then
-			#einfo "Running preinst sanity tests..."
-			#"$test_runner" || die "preinst sanity tests failed"
-		#fi
-	#fi
+	python_setup
+	python_export PYTHON_SITEDIR
+	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
 	# This code runs in preinst in order to bypass the mapping of
diff --git a/sys-apps/prefix-chain-utils/Manifest b/sys-apps/prefix-chain-utils/Manifest
deleted file mode 100644
index 02088c2890a9..000000000000
--- a/sys-apps/prefix-chain-utils/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX prefix-chain-wrapper.in 2229 BLAKE2B 5b60884f9f9c2ac6660d6d977970ba4c26c7f067dc8e83614a625256f2f8e363d1dd23969512a351076fd4739dc5fa7ff23a7e4a0cbe853359e6ace9c4cdf3b0 SHA512 9bdc4ef2ca011a60bdb6f28aa94d111bd9683884de051e214ef6911f7cd18387fec2a5ee684f27bb74dc81f59c5d7d14b01647e7860920e2c23c34e75d134afa
-AUX startprefix.in 1630 BLAKE2B 74cb5ffc45207260f3ad380f6d8b5f72f6c6d0354ef7ae36a3f2b8b9b5fec4415e186861335df8e06a99b80cfdafded442fa4c9fefe17ea1a63b7187097c4d4c SHA512 2492a12ed4a58bbd3af596fdfbdf57b6f158b8ada18a00c5b07dcac737197f232a044bb6277c186a272f423eeee0d805bcb6bf9756c574fd9248570743b99d03
-EBUILD prefix-chain-utils-0.2-r7.ebuild 1678 BLAKE2B 53ba92f411a4b792f09414be9ffe9ad90ff27014b8b26dd64f5c1f1f3d55d7b4f4afc5c229828809781787bfaf0e9a81a43c3cc53bc1ac0bc242fd88cf30538c SHA512 a7dd2d2822bb27fea0d94539c84abbd04198e0c906e39513e6afa00cff97d2a95a29a51d21b48a2b483f1b82f947b0ca2cdc02a607169665e2198c32519c1c82
-MISC metadata.xml 243 BLAKE2B d650658b3e248940751d20c9e517a011a34f8d99df54d5203162d67c21df384f507e44ed0c848c1adc99fae8d511e204129f2709f5bdc5d1b2c8e41120bbe6db SHA512 8489be9ea6eac385511b0d193b1b61fad9c8e0d4cb86fd711e6faf04e66b2c935ae64ce6ce0a044d036e76de6787e5d440d67f831e89261a71e74b645a0999d9
diff --git a/sys-apps/prefix-chain-utils/files/prefix-chain-wrapper.in b/sys-apps/prefix-chain-utils/files/prefix-chain-wrapper.in
deleted file mode 100644
index d612cc46bb28..000000000000
--- a/sys-apps/prefix-chain-utils/files/prefix-chain-wrapper.in
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env bash
-
-if [ -r /cygdrive/. ]; then
-	winpath2unix() { cygpath -u "$1"; }
-	unixpath2win() { cygpath -w "$1"; }
-fi
-
-link_dirs=()
-opts=()
-chost="@GENTOO_PORTAGE_CHOST@"
-prefix="@GENTOO_PORTAGE_EPREFIX@"
-absprefix=${prefix}
-if [[ ${CHOST} == *"-winnt"* ]]; then
-    # we may get called from windows binary, like pkgdata in dev-libs/icu
-    # in this case, PATH elements get the "/dev/fs/C/WINDOWS/SUA" prefix
-    absprefix=$(winpath2unix "$(unixpath2win "${absprefix}")")
-fi
-[[ $0 == *windres* ]] && mode=compile || mode=link
-orig_args=("$@")
-
-for opt in "$@"; do
- case "$opt" in
-  -L)	link_dirs=("${link_dirs[@]}" "-L$1"); shift ;;
-  -L*)	link_dirs=("${link_dirs[@]}" "${opt}") ;;
-  *)
-  	case "${opt}" in
-	-v)	
-		# -v done right: only use mode version if -v is the _only_
-		# argument on the command line.
-		[[ ${#orig_args[@]} -gt 1 ]] || mode=version
-		;;
-	--version)	mode=version ;;
-	-c|-E|-S)	mode=compile ;;
-	-print-search-dirs) mode=dirs ;;
-	esac
-  	opts=("${opts[@]}" "${opt}")
-	;;
- esac
-done
-
-save_ifs=$IFS
-IFS=':'
-new_path=
-for p in $PATH; do
- IFS=$save_ifs
- [[ "${p#${absprefix}}" != "${p}" ]] && continue
- if [[ -z "${new_path}" ]]; then
-  new_path="${p}"
- else
-  new_path="${new_path}:${p}"
- fi
-done
-IFS=$save_ifs
-
-PATH=${new_path}
-
-# toolchain-prefix-wrapper's ld-wrapper understands '-R' for aix and hpux too.
-# parity (winnt) understands -rpath only ...
-case "${chost}" in
-*-winnt*) rpath_opt="-Wl,-rpath," ;;
-*) rpath_opt="-Wl,-R," ;;
-esac
-
-pfx_link=("-L${prefix}/usr/lib" "-L${prefix}/lib")
-pfx_link_r=("${rpath_opt}${prefix}/lib" "${rpath_opt}${prefix}/usr/lib")
-pfx_comp=("-I${prefix}/include" "-I${prefix}/usr/include")
-
-case "$mode" in
-link)      exec "$(basename $0)" "${link_dirs[@]}" "${pfx_link[@]}" "${opts[@]}" "${pfx_comp[@]}" "${pfx_link_r[@]}" ;;
-compile)	exec "$(basename $0)" "${link_dirs[@]}" "${opts[@]}" "${pfx_comp[@]}" ;;
-version)	exec "$(basename $0)" "${orig_args[@]}" ;;
-dirs)
-	"$(basename $0)" "${orig_args[@]}" | while read line; do
-		if [[ "${line}" == "libraries: ="* ]]; then
-			echo "libraries: =${prefix}/usr/lib:${prefix}/lib:${line#"libraries: ="}"
-		else
-			echo "${line}"
-		fi
-	done
-	;;
-*)			echo "cannot infer $0's mode from comamnd line arguments"; exit 1 ;;
-esac
-
diff --git a/sys-apps/prefix-chain-utils/files/startprefix.in b/sys-apps/prefix-chain-utils/files/startprefix.in
deleted file mode 100644
index 3882ffe14a9c..000000000000
--- a/sys-apps/prefix-chain-utils/files/startprefix.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ -r "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh ]]; then
-	. "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh
-elif [[ -r "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh ]]; then
-	. "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh
-elif [[ -r "@GENTOO_PORTAGE_EPREFIX@"/sbin/functions.sh ]]; then
-	. "@GENTOO_PORTAGE_EPREFIX@"/sbin/functions.sh
-fi
-
-einfo "entering chained prefix @GENTOO_PORTAGE_EPREFIX@ ..."
-
-# inform profiles very early of us beeing interactive (or at least,
-# we will _start_ an interactive shell, so we want the according bits.)
-set -i
-
-. "@GENTOO_PORTAGE_EPREFIX@"/etc/profile
-
-# if there is no local portage, foreign portage instances need to know 
-# where to merge to - and thus we need to set EPREFIX.
-# the other way round, if there is a local portage, EPREFIX may not
-# point anywhere else than to our local EPREFIX or be unset...
-
-# DISABLED: this is done by etc/profile now, to be able to start a
-#           prefix environment by sourcing etc/profile.
-
-#if [[ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/emerge ]]; then
-#	if [[ -n "${EPREFIX}" ]] && [[ "${EPREFIX}" != "@GENTOO_PORTAGE_EPREFIX@" ]]; then
-#		ewarn "EPREFIX is set. this will render portage unusable, unsetting"
-#		unset EPREFIX
-#	fi
-#else
-#	export EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-#fi
-
-# a common problem: the child has no less installed, but baselayout insists
-# on setting PAGER to EPREFIX/usr/bin/less. everything gets back to normal
-# when unsetting PAGER in this case.
-if [[ ! -x "${PAGER}" ]]; then
-	unset PAGER
-fi
-
-bash --noprofile
-einfo "leaving chained prefix @GENTOO_PORTAGE_EPREFIX@ ..."
-
diff --git a/sys-apps/prefix-chain-utils/metadata.xml b/sys-apps/prefix-chain-utils/metadata.xml
deleted file mode 100644
index d33cce94b0d4..000000000000
--- a/sys-apps/prefix-chain-utils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>prefix@gentoo.org</email>
-	<name>Gentoo Prefix</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r7.ebuild b/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r7.ebuild
deleted file mode 100644
index b447752a1536..000000000000
--- a/sys-apps/prefix-chain-utils/prefix-chain-utils-0.2-r7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix
-
-DESCRIPTION="Chained EPREFIX utilities and wrappers"
-HOMEPAGE="https://dev.gentoo.org/~haubi"
-SRC_URI=""
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc-aix ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-devel/gcc-config"
-
-src_unpack() {
-	mkdir -p "${S}"
-}
-
-src_install() {
-	cp "${FILESDIR}"/*.in "${T}"
-	eprefixify "${T}"/*.in
-
-	for x in "${T}"/*.in; do
-		mv ${x} ${x%.in}
-	done
-
-	# install toolchain wrapper.
-	wrapperdir=/usr/${CHOST}/gcc-bin/${CHOST}-prefix-chain-wrapper/${PV}
-	wrappercfg=${CHOST}-prefix-chain-wrapper-${PV}
-
-	exeinto $wrapperdir
-	sed -i -e "s,@GENTOO_PORTAGE_CHOST@,${CHOST},g" "${T}"/prefix-chain-wrapper
-	doexe "${T}"/prefix-chain-wrapper
-
-	dosym $wrapperdir/prefix-chain-wrapper $wrapperdir/${CHOST}-gcc
-	dosym $wrapperdir/prefix-chain-wrapper $wrapperdir/${CHOST}-g++
-	dosym $wrapperdir/prefix-chain-wrapper $wrapperdir/${CHOST}-cpp
-	dosym $wrapperdir/prefix-chain-wrapper $wrapperdir/${CHOST}-c++
-	dosym $wrapperdir/prefix-chain-wrapper $wrapperdir/${CHOST}-windres
-
-	dosym $wrapperdir/${CHOST}-gcc $wrapperdir/gcc
-	dosym $wrapperdir/${CHOST}-g++ $wrapperdir/g++
-	dosym $wrapperdir/${CHOST}-cpp $wrapperdir/cpp
-	dosym $wrapperdir/${CHOST}-c++ $wrapperdir/c++
-	dosym $wrapperdir/${CHOST}-windres $wrapperdir/windres
-
-	# LDPATH is required to keep gcc-config happy :(
-	cat > "${T}"/$wrappercfg <<EOF
-GCC_PATH="${EPREFIX}/$wrapperdir"
-LDPATH="${EPREFIX}/$wrapperdir"
-EOF
-
-	insinto /etc/env.d/gcc
-	doins "${T}"/$wrappercfg
-
-	# install startprefix script.
-	exeinto /
-	doexe "${T}"/startprefix
-}
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index 73654b09b5f8..de2271479eba 100644
--- a/sys-apps/razercfg/Manifest
+++ b/sys-apps/razercfg/Manifest
@@ -1,5 +1,5 @@
 AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d1128026ffc5112f9a0611d6eff9fbf2aacb9660bd3698727da5812da5b8937205246d70a20a5f876156b6ebe46638289c0e6cabd9 SHA512 c34c7f314420a1597b0c5aa44f6ae3b55e212d1bb9c00498f5e1525390bb2e62d68ebbe5dabc48468e79f0fe8f2f30b81459a5e9cc0b3e837239d39230fd7238
 AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1
 DIST razercfg-0.39.tar.bz2 178142 BLAKE2B cf2d92d24a0dbfdae4045c2dab30a64bc4de64d730c075a4d852790ff62bcbadd714953fac925e69b671355cbdfdec7ce9db5693fbfa8e2aab69de6247c95c1a SHA512 165fee898a01b7f0086eb6705ef9f24fd8b8836025c071f7851a493181b8d193d0db70fc1731a8586de1f1c795aab4d20bb4ee8526b612c66ba3c434c6e10137
-EBUILD razercfg-0.39-r1.ebuild 2114 BLAKE2B dbf1b48a86ebcd442c506d68b5fd826b27f352215df07de9c36b2ce042cd16bb391de18bb4191d681ba371a62471d48b5bbc9805fbd5b2dfadb1af5a16854ecf SHA512 1365c87d757057e2cc1ff7fe6878e74d7343842eb81e5fe70aa1b7501104f0d0fef0998e6dcba73bcc35de64796913b509cdca7c860eeda4bbbf6e53f5d41e90
+EBUILD razercfg-0.39-r1.ebuild 2107 BLAKE2B e2ffd6411790eb38f73398595d0627f5e4c9dc3ac3072eb963476fe41051356e536250551aaf6451c8d84099a1f42e77400d8f0d0c376608844930f3e52e07e8 SHA512 d2710c22cd9c0d8a00199a4993a998501fc2451bebc21104c7336887d27f5a01e3b4ca14c046c1490fd13bf745d59a769df863042f9c79107508da8889696a72
 MISC metadata.xml 805 BLAKE2B 6be95bde1f31d215ead8de0546bcae9860c5ea24109803d44dcb889e7b39aa21972813893da53ea0817a77f9158d18be4fccd166cb2fe8d82627411f25b1d975 SHA512 bf8d583f50967b6a2a77e3db46595286a717eef57e61bb3f8aa230c0b0fbc5fce265fc95bdb57c25b44564b22e8ac2940986a04f9c0f8a6d378e027612ab478d
diff --git a/sys-apps/razercfg/razercfg-0.39-r1.ebuild b/sys-apps/razercfg/razercfg-0.39-r1.ebuild
index f39e614cb880..c3b85d161675 100644
--- a/sys-apps/razercfg/razercfg-0.39-r1.ebuild
+++ b/sys-apps/razercfg/razercfg-0.39-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit cmake-utils python-single-r1 systemd udev
 
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 6196a304558e..ade2e8936622 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,88 +1,157 @@
 DIST aho-corasick-0.6.8.crate 26786 BLAKE2B 877bac172514332ef3c607fa3c9b4708822543f69091b3151d31d9297306dbcb0b6ce9cf5ba02f3c08f5baff337e3525ada8f22477770fd6aa12cce428694a36 SHA512 1adbce716a3082c3fcd3514c49af3872d926df14044767266707862c0ad7ee22848a6ce99903003c04a3e8f8cd91b38ec8ca5d4a2c9031bfec4c93cf71c15556
+DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
 DIST arrayvec-0.4.7.crate 22946 BLAKE2B 93d17ae9e706969e319980b4e00dd0a6c040c8d62cd41d1de34ab997e28798329e00d3dc3893da45ce5bc066fcf70dd5d8e98a79fbac8fc06d33a073a97b7b89 SHA512 195faecd7709eb908227cda7111e1b736ecf96120f9b615f1dc0a9a1cc61947e2ad4fedc7fc81d14405b51a4c8a216f81b8ed1d1d603a9fa451a38b4637e2bae
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST autocfg-0.1.2.crate 10444 BLAKE2B 1e37c97d6d309a5250552fc4c38066ba004674af6e6d091f08b24f47475c11b2db4b0967ce55d2208b9e2ba080e2bcb4b4226acd0da9d4c15dd844827ea6f0b4 SHA512 0f692f4062d22be01c32af2ceb6ed3887a7d65843e1a6ec696fbaa46517d02e62d573055efe5da3a63847f05bc37b254bf2dd750738b528774f63352eacdabe4
+DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
 DIST base64-0.9.2.crate 37967 BLAKE2B 91c72280ade562664619aee3130ebf0c51db4b593ed08858757649cdc3abb2c04c4352cfef90bab7f40c3398d7be4d343da334ffcd41fcbe607e463590dc12eb SHA512 d7c859ebddf17171daa2ef803a7cfd12871fa95cba47ebb24fa7491bf63fd33a593d98b3045149cc23f310c13292d703b045834431a0acf2cfcf4952127b8402
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST bstr-0.1.2.crate 330601 BLAKE2B b477c2c7ff5a13dc1daa5d9ea3e6d9ba9e844cf2e055bfbfdee99d3310dcf9d12fcae36aa7b29601ca965d5ffb81d0d0a640c2f0e40f2edd33748bbb2f5eadf4 SHA512 93e57b17e06c9f67179e31338a7fd8f69ad7e807955d8483ac781208edf59339e89b8e11223d79b2b640a1679d61e2d4c7ca15ca6fab602b97b8558757f2899b
 DIST bytecount-0.3.2.crate 11026 BLAKE2B 2a2a556e2cdead9c70ce1c69cc5c4a0cb3c11d34a078720d3847ffa8be54d34df9f8986a780331f5c80f71c998e12491b94795d3d3f59f9da949a6d9e7f301a0 SHA512 fa3453f220112f83280dd3a123b25cf3ec07d2487c89cb80dc383f12e9f4d759e316d1eb05bcb0633186dc3f26d2ed58d979ba4ca86404a7f6edc4c174ae0edc
+DIST bytecount-0.5.1.crate 11888 BLAKE2B e7e72cd64f12315f6883c013ae4d309948cf6a577d653238742332d166d8072d30967b134a59fe22f14104e1764db3e9ff855a7e85511fca71b6e40eb120802d SHA512 9017ed0545266c1f55cc9cd65fb63906bc50ea28c8de30770cb618029a605744a5234487766d52c77ded01a8b08c91d08264175eb4f4352e6777ad5d152670a9
 DIST byteorder-1.2.6.crate 19985 BLAKE2B 717b3c7a497fc1624a32c38a2f1a5ab48ac76ab996e2b7170c9a295002a64da05538489d7e497d88ae13b66c2d4911daff8840232d4201cef3d26f4e30cdc820 SHA512 7106b5404a213b080a231c4bcc3010caa2f2743a0d0b64553e0c789ad849970ce1fb547b330711d03374cba5a7ff56b728f5259d0c6fe7ac00c8c13324503dce
+DIST byteorder-1.3.1.crate 20959 BLAKE2B dcc5d3b97a0bd82272616599454673790d64d799b699b9e339feaf1d8a75b64b6f4cde19642d5359babf6c769b14325b89a51d29594f1e8ce48c2190348bd4cf SHA512 b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25
 DIST cc-1.0.24.crate 43132 BLAKE2B 16e2a57abbb94642dfd98e829f3179c6b44183a491c67025d288b1daad9e90d290b1a1789159bbf97fcf573c605f9b70a072f78a2bd5ea6cc136a9885e1b9e83 SHA512 97bb515c57448dfa67c57ab69402893181ad5324ec870efe49b8185facdcd536bff3550f4db7deb79a5b397e387a8f734d4cabcdac2661dc020c82ea993f42c9
+DIST cc-1.0.35.crate 44369 BLAKE2B e74583fd826dcda590d7d6b853f751a3f18b10705f62a35a954bfba2a38768870b43046d98b6e8535143cb40950bfd8daa21c86b1a24d30c3cab485b7bebeaea SHA512 6d2c2708d696598e403027b3ee3e4cda4d7119185bdc2ab8c825e36bb2b9f48f40b84392b708100b812ed4a74626b7fef5b3698a9f5513de8f00ff6d922a3f04
 DIST cfg-if-0.1.5.crate 7363 BLAKE2B ca668ccdb4cf082d2b874976e6ac38e85e2618430cbb5123f9359e328e38b61e59a492116bd6a9f8ed986796095a763d148291378d32ac3a9e7d501c5ac967fb SHA512 48ab0bb1fe89d6e388ac4bf851b9aaed6479f9ca7da62945e2ebe58800b5201897feaf6aabd2b028110b0205b33d5abca7f02826ab3c688647b944e7140e6d94
+DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST crossbeam-channel-0.2.4.crate 59889 BLAKE2B 0876078d5506060fc25b757e89c778ef4bfe2537eaf9412f2c7e0ae2b4197581607e2126c4a94af5d5a39aab287d232889bf19c041344bda0f0accdb453bd61f SHA512 d753fc9114e2dc0f7b2e3a4048457a859034f80f6be245f46771933e9352685b20b256ce389223d9426e50ec600c681a819b9cc7701bb888b98f3d2bf18b630b
+DIST crossbeam-channel-0.3.8.crate 79923 BLAKE2B dae78c49f0a2c425c20481a9ab1150fa8fc1c1bb8007747f3cfa9b9e763f72c8f440b62f7d6ccc6f5a92ad0545a2b0918d71fd3e7ce1bb4af95c583696d0cda1 SHA512 9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583
 DIST crossbeam-epoch-0.5.2.crate 34136 BLAKE2B 7ee6c696cca686748215ed9b1e368b639d9c7d632ec56ff45d04066dad807441b00a37dd0699d9435933237b2565b5d4b58ee6a50b2ea8a35d33dffaf2020fb3 SHA512 2b54b0e7a3af100e336d9b6b7c9078907de9d98c3694a39f353865b4b618cf004941108d274803d91bfd98eb694ee9d8d593e67efe2d7ccecd5c66dbaad7564e
 DIST crossbeam-utils-0.5.0.crate 12162 BLAKE2B 63366fee26c4012ba705ad415db867e0b9bcf81b0880ee3c5ec3c06d2ec8776e64585ddc04ad072d363ddff3acd1382069e591c25daa27141bbbf75412d96113 SHA512 eebb6bf81517c930fdb4c15a8eaf92693907fe58dbf1913a9c2f4315a6c0550eb772cb15c47e2ac4e3f4decdd47f69ea8e42910ea649bd2e2279ad4cbf9d02c4
+DIST crossbeam-utils-0.6.5.crate 31735 BLAKE2B adeec7df0627b73169e04b53883f44b9d4c54f0b97ef2e49cfadc565c5c3324bf3dfe39158a65ec4b6676a8fba2696d43b2ce1aea75fb8bf2120ff4ad9eb45f9 SHA512 5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8
+DIST encoding_rs-0.8.17.crate 1401378 BLAKE2B 95c7e545bdc14ba2870432e0c884f14cf56a43d3c5d9c063cbd1dcd9d18e70ddba5632bb1cdf42cef846eb86a901943c50af246b32fba478d2b60a9a44f2642f SHA512 db7a7d469d34feaa899195c336fb9211ee358c226597d0900850fbafac2ee39a89bff253663744ec737a055bf7582e96b9825e96e679da4bb9fb3b0cc59d1453
 DIST encoding_rs-0.8.6.crate 1242813 BLAKE2B 8208d1d69b926688ce7702942306269dbb7966b4efe51494a0dba54ec00dbca0b78f5fafb7d60aa83733b2ad69635507269e4f654924dacc14675dc73c65a7ba SHA512 e3bca118c94d947eb0e94ca73affa75092821623e5e32204df8093c181c4f5df58ff9ee54fbbfa5c5215fdf3bfe97f5dcd83dbf289abd86e65e0c0199c812456
 DIST encoding_rs_io-0.1.2.crate 15356 BLAKE2B 4cb62c8816f99771452971537dc0d80573d3b79f0193461a424aa490f3fc7d6de54237766c153b1f9075afdfbabbb56ef8939d05502a39fd4114b48e8472ed09 SHA512 ba955cfd1e571afab630db77e44fe9ff3c20866686d94be750c15b0d99909b0863deda81704326ae831897e169361ccda7ac831e0d44e8e62f70519b2089e82d
+DIST encoding_rs_io-0.1.6.crate 16392 BLAKE2B cc3be4956c2bd26ae063757e815c9360f382a358ddec640361267b6abcd882129e924f59601e30eebf2b1e2e2025ece727de06ce11c8fb1907de35452705a8a5 SHA512 ef8e9d93ff5395c0a5dc0f777907632cd2d38cdef4d0b9d4ee0697701a1e4320221605ff699d6c66c0d80c582378ad7ca10a56c3914e8466192189a47c3cd9f9
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.2.crate 22474 BLAKE2B 0ae4fb4dcb52822a7c46d8e078ecac18775c1125c905e0769c0b204c2aa606828d902f4c0996899114e57ca39c42b43fa892d68f6ae7cd25f1ae58b71af74d89 SHA512 53b8d9cce33258882b8ad2bff526b31a94322742553ac2d01e41693a333947e0ed9d8a3c98f3ca2131731eb50935eec8f1f7b161338cf3cd10cb1a9f722570a6
+DIST globset-0.4.3.crate 22348 BLAKE2B 1ebe2fa2a8f730526cfabf23d3fff8390bf6152d039eab03afaf98557de13da50b84e291820ad13e0efbce01c4b0389748329c63c3e2b6d5d804315b8d514d47 SHA512 255ffa4234c7014fc1de961fabb2a8b8f3285d72f84ac03d89f613467594767ef424b84bccaa4c68ae289ae603de189ddd4c44b0d156680aed1252ef961f748c
 DIST grep-0.2.2.crate 3959 BLAKE2B 89778ec58270bce7dee7ba04e395f5522a3b7c31b602cde3f3fcae2af4a062353bd70de34fedc87e7a13e2607b4e8ddb40515626a465f039dbd4e82f5fa855a1 SHA512 de4bc3931921884c06cf53bcca6e0fa9b08c703bc9eea5446fc7b2bdddd7ba444feda545f48f323f6f60a6e2a11edeffe511e4b8afe020ed16eec1d1b3efd35f
+DIST grep-0.2.4.crate 3890 BLAKE2B d1d8ab33a8914e7ebd302ced46e24a79f3d1527ad8f549542dba1f45280c030ca493a0d242923545b6349493660bccaa14934bc820d05d3e823f3190bbac6a0c SHA512 c6983df9dcc268bc9835173189afc28ffec9dd234a0949389a40629e5644707b7c1b90025882c2580cc5f963fc4902070b191ecc6cacd602fa4c140ee8bdfbd1
 DIST grep-cli-0.1.1.crate 17335 BLAKE2B edb24fbdf4ffc6abb84359632419418e28cdf408e9be3f13a708c1fd9dbc710bc9e644d4603c7c872abd3fb4ad563a3d363e0f7a792fbe14514b2e0ccee0463a SHA512 c9f4ccde63e16cfe190786ccae82b4986fecd2d5c1f1c507ecf796d0f8511b79349e0482170bbd92f5865e7cd13655a708fa3b448259e38d8dc5fa215ba1a09c
+DIST grep-cli-0.1.2.crate 17012 BLAKE2B cd86ae2c715030c8a6e0188a6c408dc3e7a7fafa66c6dfd12c7073d4253d113f7a1bbd24066efe6cfb13aca21a9d302240c80dade186b6e61db19e52a472502e SHA512 1dcfd004cdddd02f4e77e96ca1d75009fb088b3b163c08a484b89d234e5262e655139f5f02c4471f9585e9655423eb7650f68c8ec7f6c316bf63b2e243bd3213
 DIST grep-matcher-0.1.1.crate 15577 BLAKE2B 60c4f3714e742008b16fb447536330442af1d613ea9a2f13dc0883beb7b6e2ad2589c2ddf956bed3d9c4d430fe7c26e914ed3e9b70ef0748ac48247c4c481958 SHA512 42e7966113c722646ed1c6bb4e7f9d00cb6c4ea2ee6f00543591c1765a028b7ea5ca4073f91a9148f2b0b6d963532119326a153ef75bd503954f6601a77acaf9
+DIST grep-matcher-0.1.2.crate 15521 BLAKE2B d68795e2369b621a9aa4dc0fd70c1ef2ce5cc19b83038f58173ce1fdd8b9459738da38877a7490e2bf150271297ff30d78ea34145ccf02691c54b538e122b03e SHA512 d948460d67f90a6cf289f2d704a3dab05f8005bcc24eb89266b03fc2b2c35f6aa81d73412302de8f48afc2562c8bbf3d0e5b94070bad2ebcc933b4eee8a91e3b
 DIST grep-pcre2-0.1.1.crate 7439 BLAKE2B 8aef9325cb006f08f421851a12f7ecb3f8fec34925c5a41c4fc6b20a5404299c030ed0bef8e22b59ed63fd0052d36e7ac7aa49cc6cc6b807f56e66f1262f485c SHA512 077e8241912ac865ff94659db7e111ee1093d77e013ba77555187c834c1cf246b7c3e353ec24c5900fd625d6f84eccc5d79ea8c6a70c91b55d09b5a95a694bbe
+DIST grep-pcre2-0.1.3.crate 7804 BLAKE2B 4dc462f9b527d6a0c6f3a0fd3ef396ddadea5e5ed87cbafc5d3169227e8d4dae3b48c955207d47633a3384e011868d0b97a1acb90bd6c1ac200f0e7e34c9afaa SHA512 49777885abbf028ac7845d76faf4d1f566d7551e71cdd9788bcc237f110d1f77fb438c42e965ec0b3b2943022acf0fd1b28f7b6e5ed3bf20525476eb9e9aa749
 DIST grep-printer-0.1.1.crate 41441 BLAKE2B a5c244f142eb43796340f1038e7dde253edea28894833e0601c18b6c1e841ffcb358b9465b823b93ec61c64ff690fb9e16e298e3e6e74300cfee90ea1c9d9343 SHA512 579b57bae2b0583b32658855960f974587ad462961d0853ae42c00bc53121892c3870bb475eb02707dc24a3d716cef6be941b5147b35e188f277c0d3898705ef
+DIST grep-printer-0.1.2.crate 43391 BLAKE2B d4690c3fdc0e5b518d2c4961dee160b939b9bef4be702555f9ecbbf8af5a68f62bf2e2b33f5e450e96f92cb0a93a3842adb9833ba89a141fe22c672e14df9e31 SHA512 a430f24e97e44c56c3faac2e49acb9ad96263614042f007252af944580726c38931f7fa272d0bc26d6d8b99bf47f9d55c3c3014210360f10290c16a6ee151a59
 DIST grep-regex-0.1.1.crate 22683 BLAKE2B 59c40a1d1d0da56dc282ab93273d8722bc665598135be34048f8d51ecfb080a796ecf087329f987bb7e4ed892f8d3b6b1fbe0ccddfdd581c773072a20c2e0d0f SHA512 281585dca0d8e42778bda7a23780ddef38d31145c36e3ea831b1edb98be66c87bba553303fb973af1211aef21d1deb11d2f9466947fb0622b2d1bf180af01a1f
+DIST grep-regex-0.1.3.crate 26614 BLAKE2B 01976b0626b596516090cf1397a2ae3752fbd609efb4568fad6e6f61f1a0b0bbcf73cb213106a33ec4c4c6c3ded126fe5ea042460e34eeb9293e6e96adec2814 SHA512 9d84fbbd703653a671340d1ba812331841d1c446f00170bfbe7df7775b9eb398693dea19c55db4a7d0f69de226d7ab73866519a81dfaebb65867a6597891f4d4
 DIST grep-searcher-0.1.1.crate 42673 BLAKE2B 7ae6e9df98061331c5a6e3d37febee36a4fe26fcca22ea65f4accd0bb2cdf07d9eac98b88f3d8645e193b3499ea556c182d0a62573009a4cc9aa2a6dbeae4e86 SHA512 523c8f994e01f34c403601795e6fedcc515e89f1f0188d2ced03f21c9abbe2aa61009705e393713b032a6346583f5ef79c722de6c58bca03f88f2ee283b3518c
+DIST grep-searcher-0.1.4.crate 42589 BLAKE2B 757398a8288e18ae67d7cb7d6f00f85b10fdf6992c055b2bfdbc4122c6d0962376eb29b1a4a8ca18dbe4b0b88e0f7bd2d2bb2695958394ec9efc077205ba8a22 SHA512 de61c95e66ec221005168bf0e855b800bccdef92c1c11153586d4577b286851534050b6976b14d45e3bcb12121085a5a1c4f71a057a3ed22a96b1de343609712
 DIST ignore-0.4.4.crate 45482 BLAKE2B e810688495dd4e23747c0b9f650688029033f2e49c2acc2f12ee7d11db1888d425267c8e89a661e44c5a5bac1812120db95c87177fd9abf1366f260d0c55a2c4 SHA512 b7dd5de1c14b77483d22235c4738f39123011bc8c19b785fb528d30fbfe9e9c2f8e3b137ad2d3516ce8f59c2ae06bddbe80811423fcc5ef76cb851fa7ad866d9
+DIST ignore-0.4.7.crate 46444 BLAKE2B 7809a535bc38a8e575fa5775545f913803442d21881a3db15ad82cc399b580942b93e8ac45c485fe4ca44b369eb57fa3f6150755338b58a721b6dcecb82ea594 SHA512 8db0fcaa966e81b4407700131f3b609165aa3db4fa046410a56f7e4f5a571f5f0bde399b022610f3967f0a640a1da5e268580b6d0e59b6f1be60687f0d3e9685
 DIST itoa-0.4.2.crate 10581 BLAKE2B 4ef219ac121ff82d0bcb9fbf7a0d44cb268b40564ba656d88ff52217061f33935172e23a76c5e7ee6c0531b4b0fcd551001ab951c0def39ff52350e0681c1b1c SHA512 d7201f9bb44f5dce15a90dedfbe6b722aadecf15c3defe1eb1fcb5f8fe64300a594c9acef4f14538129a787044374c71d69e69dbef76d1bb780309fe7d55a796
+DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
 DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
+DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
 DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
+DIST libc-0.2.51.crate 397323 BLAKE2B 51306c2ab8eed6de1fabd4d59b7618ee74d8d699eaec776d21fa5df20c63cdd743a50ace3a37334b282e3050dd718faa9f95d359abd2495a2bb8de0384738b15 SHA512 d05693e7106e1887d94b23ddff5692111c2164e7ce59d9c60995af2a49fcf03ea8723e837370867c1177315aecdf25be82bf723c5e798ada66f5cc7886c22857
 DIST lock_api-0.1.3.crate 12167 BLAKE2B d01453c4232ccbab72706f4932af598cf6d6d15482c065f7e900f0246973a130d2db1d01779585a6b99ab9a36e074a787ee49d99947bebc2079201b380f985e0 SHA512 5c088cdc3a5321ac9e9f488acca11c554be5d91b2de0e48171d2ecba15d7e5960ee0a8ed82fef15377ddf17646ca350d9749b2579d5ec74cdb66ffd327e61c5f
 DIST log-0.4.5.crate 22221 BLAKE2B bf60a62e0fcef107e66cb0f673bdc2d6eabd364424ad82488fb09655258855401f394c4c5fab584560798953e188591524d9c3044d8b42d16bb3f9cb255b747b SHA512 19b1d82ccd929a63d661512dadbb0ce11f6e3679431a40f4c0139d0c2f68d77dcb05be71605eaa23c01c920a38d11e588339ab6d3982418ce61c9df55a4f2b11
+DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST memchr-2.0.2.crate 10092 BLAKE2B aa90acad8c25a67ceecaa5bef086cae873cc71336efa38dcc71e770808c2288538b88b0f561f405fcbe7e829dbf2dc86392bc975eedee8dba7645af64d2dfbcf SHA512 92dfcb5a60077e0906d17c76a5eb3203cbdeb066cda40a2c8eb2acaaec366ce45bf1bc57876ca7d0794be2aee639f296ccaf5c54a7e941875f3a78f0126ae9c0
+DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST memmap-0.6.2.crate 15015 BLAKE2B 0bcadeff2c355ca77c7828e71f87b1c05ed6eb27d1a244d4bac8c05463903c7c237b1b5aeabaae421af2046a83aea1c4d184a3622d59358e71e083fe2bdd618c SHA512 67e05abb90f5c771f719492b3ac00fb2059e6eb94106be597dd3204cc9f23d91b90476ec1d36b7fcda1fe3d011df596052ac666c239bbd2e1df16bdafed46b4f
+DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
 DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
 DIST nodrop-0.1.12.crate 3033 BLAKE2B 69792f5ac9722dc570749795b6e0e6c6373c44614bf5861846af08d426d18e5929ad3c5b957adf3480e8c77444cec9d33b3e8b272eea9c7200f0cedf0d78e7ac SHA512 8f2856a6467715565ea5b3be181fc957f6cbc885797c15582ef5be5a71089201292ea58f94877496737dfd427b19523228fa4bde49d9413a8399d2e7888b99aa
+DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
 DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
 DIST owning_ref-0.3.3.crate 11710 BLAKE2B adf07d01a82c1eadb5f4e74072a69e0a76603bd5f7a4fe2fe86f71c9733360a769eeaae4bbf830fe125da463a909ad0a690e99a30ffcf766165cf63dc3c43202 SHA512 260f3d77f23b092c5ca96dff6746d378caa1bac965745a71ca18eed30a12c6869af62259daafc91c8666baf95e04619ad0d8fe06b47d5e517688b35f0c59005a
+DIST packed_simd-0.3.3.crate 97485 BLAKE2B 50d9c18099a75d8529ec8687d47b4b04dea280ae75967ad40fb778b39a2303ebc2b835de257072ba3fb6b339524a128f26df8d2106ef82e89d2655177065e7fd SHA512 f0198f5c589be082053ae156372ea826c66e31aad993f64af097faf36045f1d1b6cc4b4b46d9cc8a1c7a28e11f707026df6c419a42e2011b1c4a34f579018826
 DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
 DIST parking_lot_core-0.3.0.crate 21965 BLAKE2B c5ff23d6ea0860a98e80fc9b66c0865748d9aa1156bf887561b6cf74680ca4a9521c59b75c6685141f896c067d5c2534ddd2aa585df2e5968df985e0aeccb38f SHA512 da3d05da132c3abf2735695d9322e8353ba88c2d9c5d69008f0d90bae570fae521fecff4998980fedadc3dd250a6a6142d2bd0a996c13e8f7d3111ad70319b26
 DIST pcre2-0.1.0.crate 17574 BLAKE2B 22810c4f0d1789925d07b259465ae52fb5a674cfa63e69720df1fa36d9ea275193af565639d22fad51328380e69154fff26103aa144f0424763f4e9ddec47cba SHA512 20490a4d79894e67d3affb0bcb13f9d68e5fb5fb874fcb5ab9aea7b826c7480741ca341edf24c1118471dccc6a660117909fd28d664b00bf1b5f41fd6469034d
+DIST pcre2-0.2.0.crate 19322 BLAKE2B f5c8980788bb34c4874ec301df2a408fa144c4249583e59fafc5ea509834f9dd80bc6abc7f6a65ba9e480f2d9874686d710ba2bcf8053e75434ee6f7061e66fe SHA512 c8d6aa4e357c9b5cc7e8d527a0d0a605378f975f41fe0a5f4996175be1f620e8446bc7e6135927b50bf3687618671ca85bb2a67314b78989818efe30d25d3521
 DIST pcre2-sys-0.1.1.crate 2136686 BLAKE2B 78da08ef356b59e225696db956231cc1b04385c43aa0fff459e93872ca18714a2c07bf51cd2df28f3c446eda674c05a0f12cf91ce21aebf21031459b5f18da04 SHA512 7c859e0e7c7e62df1ddbef7d6a7f3938905aaaa2e6de6cbdc957c8fcdf5b5f3b3fb4a30ead84326d9ad13fa9581c0b8729d735678aa649b242d8e57055472adf
+DIST pcre2-sys-0.2.0.crate 2184217 BLAKE2B 1a82654b070e15563a1977097f30df0badd233844a7e0654117ceb9e6172f4ce1a50c057f6e6cc018729361ad64945ca648b5e19a0ac8f39215d64454cd8adf7 SHA512 23255712188fd517ca9cd0760c6da649006916b6e3b3295bc6078942706d622504da1b2b9c1199cd30208cc48aca08667b23941a357e4ac0f5fd20a1be3daeac
 DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
 DIST proc-macro2-0.4.18.crate 29919 BLAKE2B a8fc28a2b8d7fd6c3ea457d2877cc6707fec579766a37dc310039d66fd690c5c90412cc12857a816dcf2dfb6a7fa4086485525e0167e66869139a72a2df7602a SHA512 f6f9c715af1f39ed83aea15a8689e99e523c2b781d2f35c7ac15ef97a38220ce02e7ac1075a85e4bef53ffa682224cc0093aa9b94a664d2a944e6a3309550870
+DIST proc-macro2-0.4.27.crate 34098 BLAKE2B ecec94ab4c79dbdfc77731054e3c370c2ae330baa3502efba34d2f900ba9ddcc5d89373adb06a465fa10c9bda061f7b3040c5f20fcf1b1accaba177632b6edb2 SHA512 b1ec1f59355c122022ac93f7ac03ddcc092b8712321f4ad74bf346a0dbea06c31cc695b1edfb735010620ab5eac5c62d3bde423c8458691edd0336127462359c
+DIST quote-0.6.12.crate 17541 BLAKE2B 0d09f5075358c8c7cee6503c55ad489a2ed4efa31dd0bb47c77a01b7bcb3ab4319cdcedaf5799cd25738c8f6a9f6256f91e509b60eb18ba99664693efbe45afc SHA512 5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798
 DIST quote-0.6.8.crate 15530 BLAKE2B c33d890eb5b1fb530d261d49956ddae082129a76d8b3fdadf96df68aa57b05b0e1867b371968def9ea7ae8cbe205c4f696e2b3d5f73bd50c4949c19fc98a8816 SHA512 d436fd7b1a4a16362b5d4a67e051b87ca91012522b0ec2835654dbb15db46953a944521c1c7b7c411b7964ab1ecdab178bf003ef5569c6ab0592d753ab81d6d3
 DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
 DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
+DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
+DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
 DIST rand_core-0.2.1.crate 19262 BLAKE2B 6ab239b11f08b79f5319e0d278ec56985f4c91406f938c206f017f706508d73aa78ed3ef799ca7f20a9bf3ab860f76c5527bf14fb2464db914af3dac55ac0b64 SHA512 5e919f4229ee2e7d00f47f8bbbb7fd27e11f34aa5bd85a9d9e34d45af1601bdbe2507d9b0182b5af7a6eb4d93da3004d2708729f7e864b6c66ce9b3274fe1c64
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
+DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
+DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
+DIST rand_jitter-0.1.3.crate 18341 BLAKE2B 6bc99b148765ca0ad7ce1d457eaf4c039e825a7178fea200eded79a7897aa407ba39d9c8ab1693f28511fbf6def1bc9594e29ffe108555d3e1a3f709abb802e6 SHA512 a70bb59677bc82b4f0b6549d8907b1cde2e1529435866b9161cbbef28ae79f7edaa4067fc6498800267f944d853940670bdd093d437ca8cc84eb2b0ea6dcd551
+DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
+DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
+DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
+DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-1.0.5.crate 245770 BLAKE2B 2bb5dcf7778ff6e6316f80a028e9e0df34d77660dc1fb21250238de250335ea2546050b0c56c077c4e64788a0fd2b27f7ea6de639feb2b99590fe9e8a2d32e1b SHA512 a4ddc78fcae0a2b3c0e041382bc8c85a216ff380212762459637934c863782445cd289f5cd60c2a923ea9161f4dad9891210fe6a86cd6bbc8db8abd98ead34ce
+DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
+DIST regex-automata-0.1.6.crate 92110 BLAKE2B c0ac8d3979c72be3c261a3e26c41fd04a4fa0c4e974a1cb4fac1857e74926b6f14734f14f65d43833b2f364c65de19504d6f9814213b81bd0f91fd41c49d5f50 SHA512 2e438167ef10459cb1f7ab7afe0297e3a93e34b8195d631206c804b4fc5498e03df243531df282928fb2b3bc4ab8dd0a15a101f9aa368c104fc24df190e85f14
 DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
+DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST ripgrep-0.10.0.crate 212925 BLAKE2B 389e7b488685cdc39f36f9884a6ac94fdb86dbf73f2e7c13202c5b893fc37327aa6ba6e5c7b9c08e0b00c644d35410cac5af51640770d0cf1869fead67833780 SHA512 d96c12be497999d0db777ca5fd33f907ed01cba121e3fb43a7a6a5f3176291f04b7bcd6e26f04f98b305cf50ac422a77a10d6a34c3a7510d233fa76228784576
+DIST ripgrep-11.0.1.crate 236512 BLAKE2B dc6033e5acd8bafce9cccd7cda5fda4fe4e84aaf672d6a78873d522bba50d006b22d246d0f1c6742ebdc21a5a000fd556324c1fa956ab61691005aad34cd4269 SHA512 91a06a11e94cfd595ac1cc5ed6db481cff8b319de4fb09d1d29e800b60f75a4e696df75f97e0e29d53d7d68fc3fd7cebc5ae16b1329214fb1383d454fb2b0864
 DIST ryu-0.2.6.crate 39911 BLAKE2B 3dda01a1da474c106d36f63dbc762f5b7eb37e5b0c545bcc4cc992ebabaf02e0649cbbb27f81971cd4c27cc51453f4981eac869768a0cdb31ece3a68a6f8976d SHA512 fa7596d53f3a16673df016aa75a4cc7a637456db595daeb9e4a0a393c7ab7d18b669bcd2886f65a4421897c0261ac57ff85d9c452772e172a4bb6c11b61a8f1f
+DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
 DIST safemem-0.2.0.crate 6450 BLAKE2B 44598e47fa6185ec0890b4ba6d0e7b5f52f8892875741c3819559dfa61491736d4326fa1713916ca41d6daac72829ad31d0905f2e339a069a987d9715f340795 SHA512 71901f472668572e849504a8a830d4dd9a742729b0158d2c6865a5ad86e65cae8b5bb83707240ba03a7a74c610ace87f8b59bde68998d2bd66c19849aec4fc8a
 DIST same-file-1.0.3.crate 8995 BLAKE2B c2df54cdcbcaa3645bb17f3c78bf8f48711534c108d7439b791976224e126911b497049b720186fb5d97bb2207ca1407ed2c2a4f54014afe79ea77ab0c9a7715 SHA512 eba49f77a94d3f46cf063545f31050dcf67216ab7c723381dd75ec25aea22de217c2919ade87970922750bb53a5a6bc2ebed6fd68ecbfcce97cb987e69582402
+DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST serde-1.0.77.crate 72861 BLAKE2B a7eade5b92fd525c281ca664ce7cc8c0053ccfcb1ed84dbd6fae6578ad38af269cd8851f50b65a13f18c880a49726b8012d4af9eb54af9d19de2bb35d23d025c SHA512 0849ba48765586b0df9b49a6077cf05dc72ae15938dab8bc748e4488b64663caf7b3e8ae9540ea106fcf259278fda615ddb78fceaa7b9eccba1e71283d3cd8eb
+DIST serde-1.0.90.crate 71415 BLAKE2B 7793a7d5227ecfa4645c9ce6cd22e0d9c76b216012bc4028e4f940938e1e4921c337cdd27deaa3ccb54df9fe57bee7ffc35f2c2d69c98a6b8e0964d7831af60f SHA512 6ad37dc002a7b8db9e38590f70a9dc26a93a82a1f6d9414fc2a45dd2f57b974a947c1a4c350c970f69199de08d5a94cb6ba5b53c0cc7efa817e3442957638a5d
 DIST serde_derive-1.0.77.crate 46352 BLAKE2B 0eefd0947bac23c9de1660784b87bd8b58b73583556ef97dbb70622c63a24467555bcb5c5d6ee3bdbe2cebe02c8a85a5271483713bd91c9fdbe24893ad6b52c0 SHA512 6bb9fffcefc2087a1d70192ffef6f941984163b2c00cafd2f2896340fdea0e763b2ff2799af172bdd2bfc3e7dd49b2dc4a2c6ea582140e8f4cab88b63a0a624a
+DIST serde_derive-1.0.90.crate 48815 BLAKE2B f662383f4fe4cd5fd46f763bcd3228eb54ec681231e6749ffe9c3710e3ebc49687eb25435cf9b976322df2cc478d4c9febe1d1d770aa4f11c4102745f52162bf SHA512 50ecd5c54dda7708959a2163e365cff09489489893d421e5dda09bca8a6f824b42722af1eff76fcc93f8b9f507db33019f7eb743301025b3504e19ab3d64d015
 DIST serde_json-1.0.27.crate 65402 BLAKE2B 9b2a4723b49f80a3757b66ccc4e293100bde9c403ad2cac7b2b8976dcc6882c6b72c340207cb9f039af06984b619d844bb930cfd474d987497f6eac49fe2302b SHA512 36c19e4b3e7f0969fa13571b6a6334e3176eac204f74f91bb0345f7069f2e850dfbad86a17d36bade38eabac35cbe201f0f78481c77cdc34c0928202e8d0ff8f
+DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
 DIST simd-0.2.2.crate 37477 BLAKE2B 647b2bc68400f7a1dd126c1954254dca7914d7790a9a47c1685ffb59a42da13de0dc9736556671b844c556f8b6634d24558b30c33500fd518b60c733c13d1a21 SHA512 d4641898dabad23421575024d5240bfa1f6781c57953bc20ab22810ddb9dd015a48a3847ea307a0fe0e66f4099e4f2c7c95608c3813d391489c4745f50fbade1
 DIST smallvec-0.6.5.crate 20238 BLAKE2B 2c75f111c37e8327e18b806cb038713f8e3a7358a40d35289a55dbdcb30961c8ea4bf4e243ddd939b6f9f4a4515f11eeb25ad697ffb52f3b7fc88e6ffdf65bef SHA512 8fed4990c761151bfb2d66392505bdb6a5591aee8b90aaf9032079d0a68c2b3e36c4136d307b6eebc714cf0cabc0155080a0f2cc5f59fa099363c5144e7eed31
+DIST smallvec-0.6.9.crate 21548 BLAKE2B 465f70349baa54a3b0ec1b21e732fc6b79362c866e24cb15acd09c753c4e4469a9f085859b5cc33c5a24849d64554dd64d6c66410c221c4c4bb6f3fae4b55dd9 SHA512 2bfd96b6c07a740b77c9d3221604e108bb730770970e7428a2a38d29711dff16eea08251e826d2d511d13a887c3256ec3a689e3c481ddb9029f47452fb2877e2
 DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-0.15.1.crate 142480 BLAKE2B bc0e334ff8e00003ff5d57faf0c1463f7677e1fa3199748295d932390b0167da21a368e5622cbf5b0a3c8910ee7eba37be1361922ea15e13f4d50163c49df3a7 SHA512 631cfa34619e514a976089924157ffc0100a9affc1ff8c41c2f867bf35749c129d68b67d78b3e0b3b131aef87c09537adf11408d06bce6bf14b01367441a0b58
+DIST syn-0.15.31.crate 146353 BLAKE2B 32501ffec548b675d405b24db7eeb53b04ccab9e58179aedd005094d13b42beadf831bf17d7e455cd6a9c7caf6c0df7ca8c345fb6b1a443c82a72b08314e4b24 SHA512 3c9ded90ae93d4634ddd10d51eaf08d89c5c0b1df67a8425299d9ff61ab09f40f7b0a9f222aedb276b231efd6f3c55776390c0d230fdcaa492167dc056c04ca7
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
+DIST tempfile-3.0.7.crate 23922 BLAKE2B ea7207d7a5c893751fedca320dc0b08c01de041eed2baf39c1e63f744b55ba3a823890d60fff504c1018950ff9e564eb17cc086f7c519279293570ef2e470751 SHA512 b6fb6a1f4f0f5483255f9672114fa6adf13edd4bfe8f7fbe6c4225a36ccab5b58fc5f5510c50e70746e2697f2cf503b20682e5b44cef0b65b7ffac4ee39529e8
 DIST termcolor-1.0.3.crate 14410 BLAKE2B 9870d48e19ebae86c90ed192bb5836803af952c9d24ebc509f62dd91202af10eca1fd7a8ec06a978fda0eb718eefdc398d70c07f3eeea36752d43b69a9c679be SHA512 403a0027b5e858a5b283a5b1f44dbb04207ea080ed9a4eb521f0f16e07292a29ccbd172d062b50bb2e41f03e4779d0d87ef21cd4c97a38b4795bb7b320224acd
+DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
+DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST utf8-ranges-1.0.1.crate 9247 BLAKE2B e1a4a867c32b54b239338ba4c9a209cd5265320349a0a691f70793f1e4f1c9eddfd477cf2f11e4d4cd72e8f78e09fa32562eb0c57a3c7126a37675008b5ce7d8 SHA512 c17ca6aa679f1f974c9673fac6116c5bb48ff59ca65a968520d5e89c52a7d4409d578df4b28dd3feb4aee208d796a47641c4f1de71810de36905c6cd3439ff97
+DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST version_check-0.1.4.crate 7946 BLAKE2B 1122354fd571c8879aa29d80aa2011ccbb0fc64545af4eb15a62c84ac81a4aeffe223bf776f48824a52c159f31acaf3501ffc2613a1041a1a1179446d830af0e SHA512 766fd53ddcdb7c60f7a62959c767cc10e498f92ad0eaed7a0ade90e13ee4293121153d5310fb987b9dd9ad32c3f6889339be29444a2bfaa73bb3b6a719f77e46
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST walkdir-2.2.5.crate 23985 BLAKE2B 9113b88c4742548040adaa9aae651599f1f3cfc41acb9d50cfbb5b32b379273f14786867d9dca0bf1be5c482379c3a60df6efe3e5521a2df327d64e34e144706 SHA512 2645ce9a0e665d0badf039df14da565e6f904e1b5443b4c60e97b05194e2c2798d8084a45bbd7edda56d58f2b37bbd8124656125338784f379e06fe39d38128b
+DIST walkdir-2.2.7.crate 23507 BLAKE2B 8c26d7970724f7fe2fb6b38f2d25ee4ffeacf115466c019c7fe082e9be1a3c3a0e076f248b53fca5f82234350e5f3d0521d8f7eef5463a372796e2485309dec0 SHA512 bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c
 DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb6d380baacf3455fa43ec2d18061fad25b83c2022ffa36e30132358f3abf3bfdc74dd3fba6a5b54cf2eb5d10 SHA512 6d79a5cce1a234b5645fd1798d580602f89a202adb0672a213bd2fe54aec94c75b489d3c47320c6d5f53d415766a7cf628874f0713a347d9e3017e904449bf2f
+DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
+DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 EBUILD ripgrep-0.10.0-r1.ebuild 2659 BLAKE2B 475772332840ff5192a16b30d1df0859f01e83d9b5e14d6883c03f11d49d84950b0d8956df9cfcd2ec75709abbda60e7555d37260fbe70194cbc28233a76faba SHA512 8f2a4a0ce6bc329e5ea1eb7a8746b5eb001e9245a9ae593db141a06e00e08dfd47876b88e1069c2ee8e1321fbfac7cfe2a7f12d24d29f05eee022389252bbcd1
+EBUILD ripgrep-11.0.1.ebuild 2594 BLAKE2B 37b84b44c6d8884107808a0a943ccf62dd63fcf66a519af9ba635758948a5254ff1195afec392cddba5777149f9be9fccabdc9c730659d80902bfdc9a643a78d SHA512 e16fac2a6efb185bce4bd61d1e2ace9c861a464747689d8a9c70ed369982b9932bab41f1c3f6dadcf002fd049f1412ee5bc8c47c5298eb12ead906848044f37b
 MISC metadata.xml 837 BLAKE2B c7f5f0c13fdb6d695a24724c84105b873fb2674212896bf2184a9ceef2efe2fe98a17a6f98284eaa0776457ca18729a184eeb22d31214f0f77e30bca99f26352 SHA512 b45056a97c83bd9ddd5d49f94d5f5b1d3c00c53fe14263be8eff908b14a5635f9ff5151344ac7d8b656d9c62937b0d63f3a3a228ad3256da14fc7bae8981a934
diff --git a/sys-apps/ripgrep/ripgrep-11.0.1.ebuild b/sys-apps/ripgrep/ripgrep-11.0.1.ebuild
new file mode 100644
index 000000000000..33bb53925e12
--- /dev/null
+++ b/sys-apps/ripgrep/ripgrep-11.0.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.3
+atty-0.2.11
+autocfg-0.1.2
+base64-0.10.1
+bitflags-1.0.4
+bstr-0.1.2
+bytecount-0.5.1
+byteorder-1.3.1
+cc-1.0.35
+cfg-if-0.1.7
+clap-2.33.0
+cloudabi-0.0.3
+crossbeam-channel-0.3.8
+crossbeam-utils-0.6.5
+encoding_rs-0.8.17
+encoding_rs_io-0.1.6
+fnv-1.0.6
+fuchsia-cprng-0.1.1
+glob-0.3.0
+globset-0.4.3
+grep-0.2.4
+grep-cli-0.1.2
+grep-matcher-0.1.2
+grep-pcre2-0.1.3
+grep-printer-0.1.2
+grep-regex-0.1.3
+grep-searcher-0.1.4
+ignore-0.4.7
+itoa-0.4.3
+lazy_static-1.3.0
+libc-0.2.51
+log-0.4.6
+memchr-2.2.0
+memmap-0.7.0
+num_cpus-1.10.0
+packed_simd-0.3.3
+pcre2-0.2.0
+pcre2-sys-0.2.0
+pkg-config-0.3.14
+proc-macro2-0.4.27
+quote-0.6.12
+rand-0.6.5
+rand_chacha-0.1.1
+rand_core-0.3.1
+rand_core-0.4.0
+rand_hc-0.1.0
+rand_isaac-0.1.1
+rand_jitter-0.1.3
+rand_os-0.1.3
+rand_pcg-0.1.2
+rand_xorshift-0.1.1
+rdrand-0.4.0
+redox_syscall-0.1.54
+redox_termios-0.1.1
+regex-1.1.6
+regex-automata-0.1.6
+regex-syntax-0.6.6
+remove_dir_all-0.5.1
+ripgrep-11.0.1
+ryu-0.2.7
+same-file-1.0.4
+serde-1.0.90
+serde_derive-1.0.90
+serde_json-1.0.39
+smallvec-0.6.9
+strsim-0.8.0
+syn-0.15.31
+tempfile-3.0.7
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.11.0
+thread_local-0.3.6
+ucd-util-0.1.3
+unicode-width-0.1.5
+unicode-xid-0.1.0
+utf8-ranges-1.0.2
+walkdir-2.2.7
+winapi-0.3.7
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.2
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+"
+
+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="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Unlicense )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+man pcre"
+
+DEPEND=""
+
+RDEPEND="pcre? ( dev-libs/libpcre2 )"
+
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=virtual/rust-1.34
+	man? ( app-text/asciidoc )"
+
+QA_FLAGS_IGNORED="usr/bin/rg"
+
+src_compile() {
+	cargo_src_compile $(usex pcre "--features pcre2" "")
+}
+
+src_install() {
+	cargo_src_install --path=. $(usex pcre "--features pcre2" "")
+
+	# hack to find/install generated files
+	# stamp file can be present in multiple dirs if we build additional features
+	# so grab fist match only
+	local BUILD_DIR="$(dirname $(find target/release -name ripgrep-stamp -print -quit))"
+
+	if use man ; then
+	    doman "${BUILD_DIR}"/rg.1
+	fi
+
+	newbashcomp "${BUILD_DIR}"/rg.bash rg
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${BUILD_DIR}"/rg.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins complete/_rg
+
+	dodoc CHANGELOG.md FAQ.md GUIDE.md README.md
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 6382037ba8ca..34a7e532fe43 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -13,7 +13,7 @@ AUX test-for-argp.patch 1245 BLAKE2B eb60f4d921f395d713e0ab9f132e47ce8783a096600
 DIST rng-tools-5.tar.gz 122182 BLAKE2B de7085d530e38de21a1c33792d67a72e0131b221082d690cdb299367b80b0a123c2976174aa3f895a4a2ab1216aacfaa8e09de485c85154dc4a5b8f960d05245 SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50
 DIST rng-tools-6.6.tar.gz 51468 BLAKE2B 47231c60d78a48ade07855dfe8a807d6c10b8e27dc662ff7d98cf232b50e6c32f24197291a813d6ed6d15325a33fe9683d82943109a80cac1d9e348fc30cb849 SHA512 00bbe7f817d8f228f357a79ca270c27c62c0e588a99cd76917ecb7e88dfb627028c66497a59c9918205f3551aaf631963c8fd6504cb4198ddf57f714204c21c4
 DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a94ab456db61dc45c69ac5e4849a1e74abbe0f7640827ffb4bb20675c1f639a5be852d21d0d1a3c6b2e96bb5e SHA512 2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d
-EBUILD rng-tools-5-r2.ebuild 1137 BLAKE2B 23776b640082f19239e62f95f940f42fd88f0cd2d9c448f2fadf3f30fb101059ebf8768646772a627dbebad8aa4174aef5e476ebabc09304ada927766aaee1ee SHA512 f0b5a692da2a5a692f72da546526cef1edbd398ae484eb6cc66f8e822fc64c374899b1c31dee1ab51df3b0ce66ed13a485948c466779359852055e77e9d03847
-EBUILD rng-tools-6.6-r1.ebuild 1402 BLAKE2B d57feb1614af1b1a03cba4176772459ac91504dfe675b6b6f4090cace54e7f13c84becc8ec4c8e37124818587bb456058603712c6d1dc2bdecb01bedec470707 SHA512 1a356d298d7f4dba3c621b57dd0d8a00a4e13c1f5eec24bd72e70e3b2d8807b6e170ecc4dad1681858db65870850d73c8070e4b153a64f35f7e8f1ae121c004d
-EBUILD rng-tools-6.7.ebuild 1891 BLAKE2B 1586f90ee426728ff69f0d96a4f8dc4b973d6b65a0fc37fb36b9ed75fe909694e2b8614257c7986bae174dbd2c800de3ca33d2ee8640573dca9cb3efbc402ec3 SHA512 c16d90d297a1c5cb8cb0f625e68b9f57e87ea139ac19f0604f4adfc1c5227f27e553d01bee4675f78da795b5fdf375a0eed981f58fb58d675a2f422c9274107b
+EBUILD rng-tools-5-r2.ebuild 1144 BLAKE2B 071f7d226fb3c5585be712206d4397c248501e1fb54122c01119444472b8888e7bc95cd21bfc7663bca9c0d40364361b012ef7dde824718918c6e8334436c74f SHA512 dfdbc4425a776b799c873948453091c4cfb674a190626b0d5035d872e31deb9255850f73f73e4e9f664c3e8d72ea316aff9dc0f8a0e70d5d676449aaf81e0339
+EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
+EBUILD rng-tools-6.7.ebuild 1898 BLAKE2B d86004a5599ee6df5b092dcbbe49a81613a08dd549052d0d8f29af4f5c0ac545e36cd8da5ff9423deed540aa1cd9340064c0d2c2ce5f60941cb8c6c207b07e18 SHA512 afa4b56582c89c04bb813cfd7574d17c6eb63bbacd4118f6a973689b7c0fbeed97cc45dd5ebd56c3ed35552f3851b3025f168380d527de44693bc8d4b87a9f4f
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-5-r2.ebuild b/sys-apps/rng-tools/rng-tools-5-r2.ebuild
index 50b73e605716..c204dd9c36db 100644
--- a/sys-apps/rng-tools/rng-tools-5-r2.ebuild
+++ b/sys-apps/rng-tools/rng-tools-5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc x86"
 IUSE="selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/rng-tools/rng-tools-6.6-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.6-r1.ebuild
index 7f64372574e8..7ad1a1edc80a 100644
--- a/sys-apps/rng-tools/rng-tools-6.6-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
 IUSE="jitterentropy nistbeacon selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/rng-tools/rng-tools-6.7.ebuild b/sys-apps/rng-tools/rng-tools-6.7.ebuild
index 3259cb07f84b..e674b8de1d30 100644
--- a/sys-apps/rng-tools/rng-tools-6.7.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/rtl-entropy/Manifest b/sys-apps/rtl-entropy/Manifest
index 9d34551a6ab2..8203c1a28f3c 100644
--- a/sys-apps/rtl-entropy/Manifest
+++ b/sys-apps/rtl-entropy/Manifest
@@ -1,3 +1,3 @@
 DIST rtl-entropy-0.1.2_p20180118.tar.gz 57495 BLAKE2B f4f1fcaf296594263c70e3221fedd35876d34f4a740332bc95fc3407393db05072507a83cebe5561bfc514d02f2a69f948a09c2e0176acae0a4d262cf478e165 SHA512 b09ccac5594d067c36e44683b1f67dde1255a4ea4e10bbd6b8cdff940158c9bdcf9aa1938a3ecead5a1c254fb641571c2ad6efb04933f9dba08a2f628f3e0ef8
-EBUILD rtl-entropy-0.1.2_p20180118-r1.ebuild 957 BLAKE2B daba93bf5d5b324fb811f6bbcc943a1e220a26a128278452ab09dac95f76d5d1c326e74af3febe5203d4f3e3a30edded83a1118906dfbd614cc2c6caa49f58a3 SHA512 52477968d11cbabf6f407de9baaffb04a21e13bdd24001a2a18c9e6fa8006c602944d17d48c5acc63d580740d6955587a2a5ff9e23be3f7003079a2135a1f248
+EBUILD rtl-entropy-0.1.2_p20180118-r1.ebuild 870 BLAKE2B 3b327f2bd8f1ec293c971bd7441148d7f1bb3949954b8a9434801390912abb737292e853d283a12d41aa9a10c47dd846cb41ae4fb49be016dd8eb09434ffa802 SHA512 92a50a7b0a63f57fc44c6aad88c1614322b84f3820a0d4f7dcd8331b6e6ed22b7d2d4b4fb1e93331ff95efc5a6065246752245a10ac2ebd6cdf0936c1b440e0e
 MISC metadata.xml 395 BLAKE2B e41c875a5b367e9ae1859073f681c08eee2832beaad60b445c019205d8dd4ce91d085c28b2a17e1b2693fe02252ac28ffd091b13a10eb1963bc9edf62a4f9a50 SHA512 f0c81eff4127887b150efd20cc0d94d58d17c666518a8025d809aceb6c41e2a7dd802adda16a1c131531e44895ff08a94cfeb39ee55d3e5adf910f9c6beb0d6f
diff --git a/sys-apps/rtl-entropy/rtl-entropy-0.1.2_p20180118-r1.ebuild b/sys-apps/rtl-entropy/rtl-entropy-0.1.2_p20180118-r1.ebuild
index 8b430e3b66ea..af725fddf5f8 100644
--- a/sys-apps/rtl-entropy/rtl-entropy-0.1.2_p20180118-r1.ebuild
+++ b/sys-apps/rtl-entropy/rtl-entropy-0.1.2_p20180118-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
+COMMIT="9f1768c35f6205a73a657cfc9ac7bd9f9a40936c"
+
 DESCRIPTION="An entropy generator using SDR peripherals, including rtl-sdr and BladeRF"
 HOMEPAGE="http://rtl-entropy.org/"
-COMMIT="9f1768c35f6205a73a657cfc9ac7bd9f9a40936c"
 SRC_URI="https://github.com/pwarren/rtl-entropy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -17,19 +17,21 @@ KEYWORDS="~amd64 ~x86"
 #sadly, rtlsdr support doesn't appear to be optional
 IUSE="bladerf"
 
-RDEPEND="sys-libs/libcap
-		dev-libs/openssl:0=
-		bladerf? ( net-wireless/bladerf:= )
-		net-wireless/rtl-sdr"
+RDEPEND="
+	dev-libs/openssl:0=
+	net-wireless/rtl-sdr
+	sys-libs/libcap
+	bladerf? ( net-wireless/bladerf:= )"
 DEPEND="${RDEPEND}
-		virtual/pkgconfig"
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_prepare() {
+	cmake-utils_src_prepare
+
 	if ! use bladerf; then
-		sed -i 's#libbladeRF.h#libbladeRF-totallynotreal.h#' cmake/Modules/FindLibbladeRF.cmake
+		sed -i 's#libbladeRF.h#libbladeRF-totallynotreal.h#' \
+			cmake/Modules/FindLibbladeRF.cmake || die
 	fi
-	#if ! use rtlsdr; then
-	#	sed -i 's#rtl-sdr.h#rtl-sdr-totallynotreal.h#' cmake/Modules/FindLibRTLSDR.cmake
-	#fi
-	default
 }
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 430290c70a1a..9af4c0da3795 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -2,9 +2,9 @@ DIST selinux-python-2.7.tar.gz 2068004 BLAKE2B 57c7f324a8faddf57a576f9ec5c46c8db
 DIST selinux-python-2.8.tar.gz 2068101 BLAKE2B c28f12e4bd453955148a6ba82fd28621d1a4600f872ac63d97372f2e0153091adf1cf871f89765dd300bc6b7b2d610b96f87e3fc5accbfad713ed8a0d8f76f5a SHA512 e695c11122f7f8105b75d1ef98355fd2b82b40d93c2fd9e733dcd95d4d7c392f60b646df81203c43ad2a0e8447f9901083007e1572b78e17368ad2764ffa1aad
 DIST selinux-python-2.9-rc1.tar.gz 2082516 BLAKE2B d1e6e859308739daebd979fd26b3a8b0cbef050f2c69177a93da5b79f103444b0800ce761e5483ba79356b67ce7c6c246c758d19bc85ec7d1061e6b8ab31c6e3 SHA512 afd7686ed21c55aa3fc45934d252da1a7d8a44651ef210bf54d4feeedcb72b9092be2d3becc9ff9c8caba53088d33ad97824e0655e04a47c122b45ea6c3e6455
 DIST selinux-python-2.9.tar.gz 2100185 BLAKE2B 8aad58264197dbf23dfa286ba6530150ca6ae1ddaeb1a58988c05d0b122420cfd7e9be2a1cb7082d73cd41f03c4df00ad81a0fb746b075db24e63f62f86a1bf1 SHA512 1138661128635004fec04dc5e39f035680b5f21beb1b79f3328690a1b93a3984d522a02724af793340112a5e647d363dda8a7d3536de959b34ffd69aa396254d
-EBUILD selinux-python-2.7.ebuild 2673 BLAKE2B 14692ea38d55be1eb9b17dde7b4f1c7195139543347314896527c442931812bdac4524cd75c66b654d9b778ed4d6d213d21f2b8b1f3dc424b4bf8101da08bb07 SHA512 ad6d6047b551c82464d58de569cbe7c4137d0e5c87125164690bab4aac5bb48fa01059e31e1cb6de99a0abfd942c7294fefecced7e4b19d8dc4715b398c788c6
+EBUILD selinux-python-2.7.ebuild 2666 BLAKE2B 5cee410508f3b5ace6be6d3a345daee625bd662cf506e2e4a5f10e8a4012f8e0e499eb399c82b763bff2743971d3482ad6ca67450af329b4400fda433c477756 SHA512 21a44872d251813ad0789d207da66c720c58352ee73c6285e4f5237449950c23b51fe9fc136cf63a20e1a302b740b9017194795406fb0dea8fd0d47a15c79853
 EBUILD selinux-python-2.8-r1.ebuild 2574 BLAKE2B fd485f85d9131effc46be7741a5aa1fb2d772d71ce3a01108e59ab8885ea6bb02b28ffbe174eeb3a4b6f195424d04eb6a0d42df5f3c2104506c6b26823f36129 SHA512 a0311ff67fd075219d140e8811cf19872d1ddebe0fc51bdeb870d27a58350459559a54b04ac3bf41d3074fc33446f110279710310afbdbbbd1b3c8bbba7c49e5
-EBUILD selinux-python-2.8.ebuild 2583 BLAKE2B db435532e1b00e5dda43f060753be5302b1c3ac490580e56756ee5f65f5ec1477de27afa9368c03f4501c789c071c44dfb926c5c8d26540bd709a6982099d97c SHA512 6a3c712d563d14e0bf203976a4251178bddb08a24725cab1b95c07664fd874631698c9c59c446499d87a2950bb1c29b2bf97e67465e3e2afa07f6cafdac101bf
+EBUILD selinux-python-2.8.ebuild 2576 BLAKE2B 80aff6e8e5e387c49b0415ec078fe62eb90a4650d554638c65a5c22acbe38b9ac0c5f0f6a3e7bb573b5cb05f37ca15131900801dbe9cc782f7b46e2967e9175d SHA512 568885949f11b5e9b5f2d1b5f6b046fd8d9fad31ac59c1a44132a6f62b6321b420c2a6cce621cf429ae56e0377263ef3e0d97e51fec4399daccfcf5914bea917
 EBUILD selinux-python-2.9.ebuild 2557 BLAKE2B 1eb76dfc5459e5918ec524a4daf64f4038e9f5d0eed94f2ae63ec33cd897f358f60c37a95ac2fbd5c1135294bd747c8d9a5a232d7c4de617b3d49c92752fafd0 SHA512 acfb0805be77ba5a86174dafae73e57d057a0d2bc7c8734a5bf0268f15cdec02db431d5ccd9f60f3cb19fbf08731d0132257b66935452d9310c221500372c938
 EBUILD selinux-python-2.9_rc1.ebuild 2557 BLAKE2B 0ad8742188c22fae9207a7de4d5c5e8a58146bae03f140324e3eb1e8fc3acd820d12d8cce21fd65d190c5600b82373dd3be0159d14ae476fb6fb1d6b8b77350c SHA512 897d2283a26663358432ac03cdbe357f582c8d8e36bcd2016259b3d33beaf97e2fffcbc376a996f74e6d6a18d919bf9a6e53cc66a5f054f8213c48e8458e994c
 EBUILD selinux-python-9999.ebuild 2557 BLAKE2B 1eb76dfc5459e5918ec524a4daf64f4038e9f5d0eed94f2ae63ec33cd897f358f60c37a95ac2fbd5c1135294bd747c8d9a5a232d7c4de617b3d49c92752fafd0 SHA512 acfb0805be77ba5a86174dafae73e57d057a0d2bc7c8734a5bf0268f15cdec02db431d5ccd9f60f3cb19fbf08731d0132257b66935452d9310c221500372c938
diff --git a/sys-apps/selinux-python/selinux-python-2.7.ebuild b/sys-apps/selinux-python/selinux-python-2.7.ebuild
index eb6630aa1643..5f01a11222d2 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-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
diff --git a/sys-apps/selinux-python/selinux-python-2.8.ebuild b/sys-apps/selinux-python/selinux-python-2.8.ebuild
index 26e11a5ad06b..799855a2979d 100644
--- a/sys-apps/selinux-python/selinux-python-2.8.ebuild
+++ b/sys-apps/selinux-python/selinux-python-2.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit python-r1 toolchain-funcs
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index 595ee1463aac..790d3cffd664 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -6,5 +6,5 @@ AUX setserial-2.17-headers.patch 236 BLAKE2B 06ba0f4ad6ecc3788115b02fa4f5762b272
 AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2adcb7adc8e04f6d20594395cc01e821364d04aeb02608644c88e511453599af451d00dda8c8ab54bdd1710030cbdc7833c32286f SHA512 6041894014b3d139a8c2d59460003310c17aee407dab2fa3713f98ea2c29fd347906f68f3d988f052cbee45de43fa00afadc4359b562bfd34fd4931b48505cf8
 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
 DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
-EBUILD setserial-2.17-r5.ebuild 948 BLAKE2B 5e9db8d88951b7d1589da953bacbf49a50692892706c625e687f6af472a5c3818da807872a14b02db948ddfa9afe7b68362f2691c081c5bc0b5babc6e7fcdab8 SHA512 00c6c3bece63afa5f91973e10f36039f1a215b6c4577f9e9f9883932579fa0fde8c74ade98be106810410e791c024b102378a98d3ebb3251cc08c23857e4bb0c
+EBUILD setserial-2.17-r5.ebuild 952 BLAKE2B 8ab9fdd4326182037c4fc3217d5da3f8e3f46a257257722cdc24bf2b54757a286ba118743679cbb766ef0b23d9b8ecf56fa3f361284f12e6827407459734ce67 SHA512 aec0146d7ab1ae9d1665f4722d1b75a2d14d2686638002bd54ba44b634ec855d320ad6e4a3c1cc05f1c6b975589b42fa0044bac8301f2be1da67650cf75c7246
 MISC metadata.xml 329 BLAKE2B bb11d2dbf0f468577593ce76b97e058f369f9ccc8f7442df8673ff0505b67b981c671b647872e05cbc858696759e0c3e01e56db9eafe2ce91099cedc4240eaa1 SHA512 7eb699d04a9f2d0c39997818037f6ba309499afd0b1635d3b2c28389331f19753928d78e69e4cad0b98de11335c350f092153357360bbc8b00d941400d1e2981
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
index 3548932db089..dddb2d6e21da 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 5842e7f8be0e..c4788c10754a 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -8,7 +8,7 @@ DIST smartmontools-6.6.tar.gz 903847 BLAKE2B 6c18884cf763c146abceed47587de0e77cd
 DIST smartmontools-7.0.tar.gz 944925 BLAKE2B 41b3894efa05471bf358fca4ba87a765e3a54df68c9a617804a9e0853752c57b68fdbaa9d55fa1462a8fa7de1d6cb5630c66929dfe521be38b180944cb80acc9 SHA512 96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512
 EBUILD smartmontools-6.6-r1.ebuild 4187 BLAKE2B 944a9dbe7e8daf1ebb14d8674117bc421d0d87e05877e313f3d3e78178b4a56cf795e3c60d392edc1310cd87c2ae4bfe78a9ebe29928db7643b7e977e905490e SHA512 51a378f9503dafbddf8b64a24cf30abcd5aba982b20ba632967198069fae9f5c65b900e14ad942d74884739aafd5ba24a88c65703c3435522eba4f589c6323b3
 EBUILD smartmontools-6.6.ebuild 4130 BLAKE2B 8128e1ed40b33fedd93a3c0d81d8de7bdc4240753df41779bb571ecae0e68d84e0f257019dc94fa539b4c334edc04e8091f2ee1e88fca4169f4b97391df628eb SHA512 b312edb0993e3c14505be45e08398e3d598d3bbdbd098b4e4fcae866b272b35ba61d9298f652a3437908f06289c64ffcbf4a50ce70e1938c0a710647d8a4ea88
-EBUILD smartmontools-7.0-r1.ebuild 4121 BLAKE2B ae44fb2240efd744cd44f6037b7d2476d3610145b2b5555a99d785904b811cee212d0b44f6450398536a2767933ab8a2c80fcd3eb7da8a4ba14dacfa95bc6e9f SHA512 0dc795252612d83de6e83d57c3ffc7a5341e360ec54ec3744974461cedd88fe09d4b04b3cc4c7d508c635050a38d6673522860851c5e92a6bf6cd9c14c4f8c9d
+EBUILD smartmontools-7.0-r1.ebuild 4113 BLAKE2B d8986e08cfe70546e49f3cfa9fc2b5731b10c99295cd81a5700940bd853b8ab4ec6457f21484673a0306b2052dff7ca39cc473bb681172b9a815da36af8c9d70 SHA512 0964280ef10d6606e6f97b67b7ab5cda85db5fe9e97ac78ac7e6fd466268e9b26e980e67c7d4ab499feb8028481031d8db9c19a0b796be76888aa9fe93f14686
 EBUILD smartmontools-7.0.ebuild 4183 BLAKE2B 46f268cc66b3222225b78760a6f55e2412ac846e8cfe8c943caad77b89ece5fa9338c458ec00bc7aba4cbebcd42cbb97bb38da283dd8574fdbdea4cc778e4668 SHA512 f8168c32b934e9905290da8ba6f20584a58b8fd3360c81307883ab02c8700b5f3e018337a46cd753dff385cc8461a647e8fa94eea7d58c2b32f627a84a617353
 EBUILD smartmontools-9999.ebuild 4121 BLAKE2B ae44fb2240efd744cd44f6037b7d2476d3610145b2b5555a99d785904b811cee212d0b44f6450398536a2767933ab8a2c80fcd3eb7da8a4ba14dacfa95bc6e9f SHA512 0dc795252612d83de6e83d57c3ffc7a5341e360ec54ec3744974461cedd88fe09d4b04b3cc4c7d508c635050a38d6673522860851c5e92a6bf6cd9c14c4f8c9d
 MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
index 7b807da03226..3dd3f74e6c5d 100644
--- a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 9f34c12198b2..95843ae01b0e 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,5 @@
 AUX 239-debug-extra.patch 1641 BLAKE2B 37dae0aa6fb95be3f6b7ad5647ddc7e6e7cf6654e0119c5a41280a0db630d13746d5aaa0d1de8e66f49525a0b5a25f4f1136e0b8edc27e628cc82b386f5c0759 SHA512 091f4a0a6d8f4f5963002f33ebafa36f00f7635caafa14ac618ed7c5e08538cffbe655930802e14a0f744851ed7acacc217d2ad7e625627eeb82e14cc3fabd4a
+AUX 241-version-dep.patch 5015 BLAKE2B 63a2f591c6199787cabc5af4c0df14c76e8dba189ca2d69cf539b13a0187fb7f29f7d6a2550b7eee046859d99c9b4de4af11573c624787968a8041e210d8bc75 SHA512 22667683fdec5b92d9dd7afe40930d7483f3025b24152a6d0f9497ac81e9e2a75b467d2b02770d2321ea53236444b5d01217b6f97d725913974ebd2522c6ac58
 AUX CVE-2019-6454.patch 6017 BLAKE2B 8feefe11f44e4136c5fcf87160197bfbc0557d5097bc12275411887005bed1fe56a532d114e2e49527a7f35016a6b5fc04cb1086b33445402ace21eb880c02e9 SHA512 ff84ae9a043f17fd78c7fc499fe532c4d3b46dbe34f24c8289c209a026c1eda20de3ba46b67c8a5b14e9889e6362a4fb2097d550e6bcdb5182455fc569e23224
 AUX CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch 1848 BLAKE2B 348c35881ce039f92d8fc8dc8c87af2efa95696afbe79ad8fc4e01129524bdf28b529ab86ec611d08446e589176c0678018d94d8c5fc068c65ab4eb429746cf9 SHA512 693afe328ebc20d34cbf07c632a8da90ee293147e793a599a4d2aac6f757738bfab93048a2f8ed6e68d16f865e9b4112e737c692ad01c7d4946f8c430714161d
 AUX CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch 6660 BLAKE2B 45acb2595245a5cbd10c2a9c7ffa2db0c4bd5b03ef8dc25eb51fc35dd51a49b3acd18bf4cf8db7f639e7a4e61592f3ce0bcb031bf27b0bf3ae6fc96c74445f77 SHA512 7c082ab4effc36543bab08700b84a3ccddfba5d5e87b324d6b935d75f5debb7a5f7be1c2e21208e8d1715f5d40619c8f775629acdde40d3c7b2f406b5c6d9460
@@ -11,9 +12,9 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1
 DIST systemd-239-patches-2.tar.gz 33416 BLAKE2B 9602d101cbac65d3b2490f28308e843c28fcaea848dd09005abef0da0bc79ba0766a1cbe7c3cac63f796accddf0295b4eb946e601a201f7e81a48bd1720051ca SHA512 5f5a764d317c43c6b1854171a753eafaca006e12e4f91c81e6ba1d50e80bbbaca23c900fba417264bf9f0d827a73aca71a6da8f2a2043aaaefefed62f5a92b23
 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
-DIST systemd-242-rc3.tar.gz 7818751 BLAKE2B 594555f3ecc39d29f57653614f8f03812cefc759a3faca3cab21aac79820e8851d70e94da7922a02dd0342ff3693c3007b0379cad40d049e55ba3a25c3b72e1c SHA512 89471959adfe8b80f8ae8993463cecbcb4c7115f2bf36d256eff1a1bbbe10ac6ce4301763f98594ee8faf547ec1187ff872b1bed0207e092e300345af92baaad
-EBUILD systemd-239-r4.ebuild 13321 BLAKE2B b08e0379d010f1ea7651239d4261d6138cd06ebb01489fa58185902ad6155ca05d021d147f8b24cfb8aa578cd69e8253bb267d4601e511cf29d02202b7057e0d SHA512 a6f96a05efe7f4152c2ffdb38b606f09bfc22f49ba3df0fba9bd914b3bcbd8cb09c1cb0858d43e94d3b91c2a809c8566b48a3ba6782521042dfa6c0c70512150
-EBUILD systemd-241-r1.ebuild 13563 BLAKE2B 0b7914e2645f3d850d05f004da037034014e063b714890d7eb5ec14a60ff3f1c17dcf3ef960d093b8eb5d7368d4b8081811b1cc51ab52a2573f65cce1d3b825f SHA512 cd8246d6f81970885259284b5cc385b45e68f6de5871927ce48112eaf9fa6eb3fd9d4a123c8a20c1ca8bdfe42e3231123319dadb1f05304904005fcfab3a2834
-EBUILD systemd-242_rc3.ebuild 13244 BLAKE2B 323d43eab84da1e0ca36d263370c52dbb20e8cc400007e4f0911f07a7f038af46de1f6cf94103674e76dca0a76011ae161aac556b66e447cdddf18f4ccf7840a SHA512 2fdd0dcdc97dd1e2d36af5cef504f19036562279f3b5716f1f3f129bcb2f976b07778a55bf0122ddea3db283d33d8c46cc35ca9e96536e19b28fd4834c52655c
-EBUILD systemd-9999.ebuild 13244 BLAKE2B 323d43eab84da1e0ca36d263370c52dbb20e8cc400007e4f0911f07a7f038af46de1f6cf94103674e76dca0a76011ae161aac556b66e447cdddf18f4ccf7840a SHA512 2fdd0dcdc97dd1e2d36af5cef504f19036562279f3b5716f1f3f129bcb2f976b07778a55bf0122ddea3db283d33d8c46cc35ca9e96536e19b28fd4834c52655c
-MISC metadata.xml 2062 BLAKE2B bcca3d75829a25da2a4b3b987c7b14a5295785987d5e4573c19cd39aa165080d71f9a581190365a595567d5f20b58f054de5631480a8dec34c3a10d04f1498b5 SHA512 287b000a32b1b8ddd8041c8303857249317e74492c22e3ac59d237c9c9b511a612a90ab0fdaa209fc8ee092b00a0db0edc364053c1efc42a28f538dd4c3ee7d1
+DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
+EBUILD systemd-239-r4.ebuild 13317 BLAKE2B d62f39c9d3ed7ae40c5d04ab463dc1e14140bf9a7b55292906420c088549ace6e491aa1fc598cc274c4518824e419a3d8067d5ea491a7736fc075393d3f68b88 SHA512 3fefb4eb2a28e511cfaba5f076fbbb63358b9adeaed5dce8afa289da7b8295fe793dd2f32a5dd58b84a4fabecf4a138bda6f7d4ed0719acc47a3bffaff2ad446
+EBUILD systemd-241-r1.ebuild 13777 BLAKE2B ecaf0b5b70feff791046f0c2bda624255ff03852a976abd7f4dc774ac362c843835d1ba907db4829094b950635cfd8d4c08956691515e8e31548afede35a8ff3 SHA512 b8da96c5a0ab2a16534c524c2feba074349e6d63128d171af07ff590541bc2a821aced4725fb9ee4111bb84224fc9b2d7b29bf47dd0602913dd1550672384f84
+EBUILD systemd-242.ebuild 13673 BLAKE2B d23c5d7f2963f102d98d388ba249400f52a96c95bf6d0e7471f4cae627ac5120289d5cb8c06c4d0c21667d513ac86fbaf4e4ec2bb274c37cc564b32afa239af4 SHA512 9ab3f1e0f6a7735a08dea7df7902427b9318b0edb2d4ed2c6717fb08c06bddd6b7ae7365dd2c88cbc8a36e2f93851769302e2deb2b6c6112affb9d4bdd871565
+EBUILD systemd-9999.ebuild 13673 BLAKE2B d23c5d7f2963f102d98d388ba249400f52a96c95bf6d0e7471f4cae627ac5120289d5cb8c06c4d0c21667d513ac86fbaf4e4ec2bb274c37cc564b32afa239af4 SHA512 9ab3f1e0f6a7735a08dea7df7902427b9318b0edb2d4ed2c6717fb08c06bddd6b7ae7365dd2c88cbc8a36e2f93851769302e2deb2b6c6112affb9d4bdd871565
+MISC metadata.xml 2125 BLAKE2B fed24f3b56a79016c4df8554626c7ae67ff50f97adb9af809a726b226c52690642f9df71b22eab320d3964d764dec1439009d8b8bf6979e407a5704e843829d2 SHA512 414d069185451f72eb1e803da7019da8800b08eade46824620632d795007bdec0e9201af93bb895674e3c48907593062610eb2f22f20ac15d099a593b450b8de
diff --git a/sys-apps/systemd/files/241-version-dep.patch b/sys-apps/systemd/files/241-version-dep.patch
new file mode 100644
index 000000000000..55abea989316
--- /dev/null
+++ b/sys-apps/systemd/files/241-version-dep.patch
@@ -0,0 +1,111 @@
+From 60722ad778d005790231038eecc4ba3034c1a0fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Sun, 24 Feb 2019 22:49:38 +0100
+Subject: [PATCH] meson: declare version.h as dep for various targets that
+ include build.h
+
+Should fix #11565.
+---
+ meson.build          | 19 +++++++++++++------
+ src/core/meson.build |  3 ++-
+ src/udev/meson.build |  1 +
+ 3 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index ed787d47492..82ecb4d0e69 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1634,7 +1634,8 @@ exe = executable('systemd-analyze',
+                  include_directories : includes,
+                  link_with : [libcore,
+                               libshared],
+-                 dependencies : [threads,
++                 dependencies : [versiondep,
++                                 threads,
+                                  librt,
+                                  libseccomp,
+                                  libselinux,
+@@ -2180,7 +2181,8 @@ if conf.get('ENABLE_IMPORTD') == 1
+                                   systemd_pull_sources,
+                                   include_directories : includes,
+                                   link_with : [libshared],
+-                                  dependencies : [libcurl,
++                                  dependencies : [versiondep,
++                                                  libcurl,
+                                                   libz,
+                                                   libbzip2,
+                                                   libxz,
+@@ -2229,7 +2231,8 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1
+                          systemd_journal_upload_sources,
+                          include_directories : includes,
+                          link_with : [libshared],
+-                         dependencies : [threads,
++                         dependencies : [versiondep,
++                                         threads,
+                                          libcurl,
+                                          libgnutls,
+                                          libxz,
+@@ -2555,6 +2558,7 @@ exe = executable('systemd-stdio-bridge',
+                  'src/stdio-bridge/stdio-bridge.c',
+                  include_directories : includes,
+                  link_with : [libshared],
++                 dependencies : [versiondep],
+                  install_rpath : rootlibexecdir,
+                  install : true)
+ public_programs += exe
+@@ -2638,7 +2642,8 @@ exe = executable('systemd-udevd',
+                  link_with : [libudev_core,
+                               libsystemd_network,
+                               libudev_static],
+-                 dependencies : [threads,
++                 dependencies : [versiondep,
++                                 threads,
+                                  libkmod,
+                                  libidn,
+                                  libacl,
+@@ -2655,7 +2660,8 @@ exe = executable('udevadm',
+                  link_with : [libudev_core,
+                               libsystemd_network,
+                               libudev_static],
+-                 dependencies : [threads,
++                 dependencies : [versiondep,
++                                 threads,
+                                  libkmod,
+                                  libidn,
+                                  libacl,
+@@ -2795,7 +2801,8 @@ foreach tuple : tests
+                         sources,
+                         include_directories : incs,
+                         link_with : link_with,
+-                        dependencies : dependencies,
++                        dependencies : [versiondep,
++                                        dependencies],
+                         c_args : defs,
+                         build_by_default : want_tests != 'false',
+                         install_rpath : rootlibexecdir,
+diff --git a/src/core/meson.build b/src/core/meson.build
+index 85021bdc010..88fb093732b 100644
+--- a/src/core/meson.build
++++ b/src/core/meson.build
+@@ -150,7 +150,8 @@ libcore = static_library(
+         load_fragment_gperf_c,
+         load_fragment_gperf_nulstr_c,
+         include_directories : includes,
+-        dependencies : [threads,
++        dependencies : [versiondep,
++                        threads,
+                         librt,
+                         libseccomp,
+                         libpam,
+diff --git a/src/udev/meson.build b/src/udev/meson.build
+index 2de88c0d93b..01e4c09f57f 100644
+--- a/src/udev/meson.build
++++ b/src/udev/meson.build
+@@ -180,6 +180,7 @@ foreach prog : [['ata_id/ata_id.c'],
+                    prog,
+                    include_directories : includes,
+                    c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
++                   dependencies : [versiondep],
+                    link_with : [libudev_static],
+                    install_rpath : udev_rpath,
+                    install : true,
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index ad89da665866..cdd607306209 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
 		<flag name="curl">Enable support for uploading journals</flag>
 		<flag name="cryptsetup">Enable cryptsetup tools (includes unit generator for crypttab)</flag>
+		<flag name="dns-over-tls">Enable DNS-over-TLS support</flag>
 		<flag name="gnuefi">Enable EFI boot manager and stub loader (built using <pkg>sys-boot/gnu-efi</pkg>)</flag>
 		<flag name="elfutils">Enable coredump stacktraces in the journal</flag>
 		<flag name="gcrypt">Enable sealing of journal files using gcrypt</flag>
diff --git a/sys-apps/systemd/systemd-239-r4.ebuild b/sys-apps/systemd/systemd-239-r4.ebuild
index f835c4706e14..2eae2f567674 100644
--- a/sys-apps/systemd/systemd-239-r4.ebuild
+++ b/sys-apps/systemd/systemd-239-r4.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
 
diff --git a/sys-apps/systemd/systemd-241-r1.ebuild b/sys-apps/systemd/systemd-241-r1.ebuild
index fc3afc337548..6c92c00d2eca 100644
--- a/sys-apps/systemd/systemd-241-r1.ebuild
+++ b/sys-apps/systemd/systemd-241-r1.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
@@ -99,6 +99,7 @@ BDEPEND="
 	>=dev-util/meson-0.46
 	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
+	sys-devel/m4
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	test? ( sys-apps/dbus )
 	app-text/docbook-xml-dtd:4.2
@@ -110,6 +111,11 @@ BDEPEND="
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
 			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
@@ -162,6 +168,7 @@ src_prepare() {
 	PATCHES+=(
 		"${FILESDIR}"/CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
 		"${FILESDIR}"/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
+		"${FILESDIR}"/241-version-dep.patch
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/systemd/systemd-242_rc3.ebuild b/sys-apps/systemd/systemd-242.ebuild
index c167a2fd0b76..201667ade310 100644
--- a/sys-apps/systemd/systemd-242_rc3.ebuild
+++ b/sys-apps/systemd/systemd-242.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi gnutls http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -38,11 +38,15 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	audit? ( >=sys-process/audit-2:0= )
 	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
 	curl? ( net-misc/curl:0= )
+	dns-over-tls? (
+		gnutls? ( >=net-libs/gnutls-3.5.3:0= )
+		!gnutls? ( >=dev-libs/openssl-1.1.0:0= )
+	)
 	elfutils? ( >=dev-libs/elfutils-0.158:0= )
 	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
 	http? (
 		>=net-libs/libmicrohttpd-0.9.33:0=
-		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+		gnutls? ( >=net-libs/gnutls-3.1.4:0= )
 	)
 	idn? (
 		libidn2? ( net-dns/libidn2:= )
@@ -99,6 +103,7 @@ BDEPEND="
 	>=dev-util/meson-0.46
 	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
+	sys-devel/m4
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	test? ( sys-apps/dbus )
 	app-text/docbook-xml-dtd:4.2
@@ -110,6 +115,11 @@ BDEPEND="
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
 			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
@@ -228,9 +238,9 @@ multilib_src_configure() {
 		-Delfutils=$(meson_multilib_native_use elfutils)
 		-Dgcrypt=$(meson_use gcrypt)
 		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Dgnutls=$(meson_multilib_native_use gnutls)
 		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
 		-Dmicrohttpd=$(meson_multilib_native_use http)
-		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
 		-Dimportd=$(meson_multilib_native_use importd)
 		-Dbzip2=$(meson_multilib_native_use importd)
 		-Dzlib=$(meson_multilib_native_use importd)
@@ -244,7 +254,6 @@ multilib_src_configure() {
 		-Dqrencode=$(meson_multilib_native_use qrcode)
 		-Dseccomp=$(meson_multilib_native_use seccomp)
 		-Dselinux=$(meson_multilib_native_use selinux)
-		#-Dtests=$(meson_multilib_native_use test)
 		-Ddbus=$(meson_multilib_native_use test)
 		-Dxkbcommon=$(meson_multilib_native_use xkb)
 		# hardcode a few paths to spare some deps
@@ -288,6 +297,15 @@ multilib_src_configure() {
 		)
 	fi
 
+	if multilib_is_native_abi && use dns-over-tls; then
+		myconf+=(
+			-Ddns-over-tls=true
+			-Dopenssl=$(usex !gnutls true false)
+		)
+	else
+		myconf+=( -Ddns-over-tls=false -Dopenssl=false )
+	fi
+
 	meson_src_configure "${myconf[@]}"
 }
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index c167a2fd0b76..201667ade310 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi gnutls http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -38,11 +38,15 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	audit? ( >=sys-process/audit-2:0= )
 	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
 	curl? ( net-misc/curl:0= )
+	dns-over-tls? (
+		gnutls? ( >=net-libs/gnutls-3.5.3:0= )
+		!gnutls? ( >=dev-libs/openssl-1.1.0:0= )
+	)
 	elfutils? ( >=dev-libs/elfutils-0.158:0= )
 	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
 	http? (
 		>=net-libs/libmicrohttpd-0.9.33:0=
-		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+		gnutls? ( >=net-libs/gnutls-3.1.4:0= )
 	)
 	idn? (
 		libidn2? ( net-dns/libidn2:= )
@@ -99,6 +103,7 @@ BDEPEND="
 	>=dev-util/meson-0.46
 	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
+	sys-devel/m4
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	test? ( sys-apps/dbus )
 	app-text/docbook-xml-dtd:4.2
@@ -110,6 +115,11 @@ BDEPEND="
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
 		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
 			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
@@ -228,9 +238,9 @@ multilib_src_configure() {
 		-Delfutils=$(meson_multilib_native_use elfutils)
 		-Dgcrypt=$(meson_use gcrypt)
 		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Dgnutls=$(meson_multilib_native_use gnutls)
 		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
 		-Dmicrohttpd=$(meson_multilib_native_use http)
-		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
 		-Dimportd=$(meson_multilib_native_use importd)
 		-Dbzip2=$(meson_multilib_native_use importd)
 		-Dzlib=$(meson_multilib_native_use importd)
@@ -244,7 +254,6 @@ multilib_src_configure() {
 		-Dqrencode=$(meson_multilib_native_use qrcode)
 		-Dseccomp=$(meson_multilib_native_use seccomp)
 		-Dselinux=$(meson_multilib_native_use selinux)
-		#-Dtests=$(meson_multilib_native_use test)
 		-Ddbus=$(meson_multilib_native_use test)
 		-Dxkbcommon=$(meson_multilib_native_use xkb)
 		# hardcode a few paths to spare some deps
@@ -288,6 +297,15 @@ multilib_src_configure() {
 		)
 	fi
 
+	if multilib_is_native_abi && use dns-over-tls; then
+		myconf+=(
+			-Ddns-over-tls=true
+			-Dopenssl=$(usex !gnutls true false)
+		)
+	else
+		myconf+=( -Ddns-over-tls=false -Dopenssl=false )
+	fi
+
 	meson_src_configure "${myconf[@]}"
 }
 
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 231970cfe79b..ba31d8252466 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -2,13 +2,10 @@ AUX bootlogd.initd 259 BLAKE2B 78c1a1fe8583685656edb85e29f8dbed40bdd7272590bbdac
 AUX inittab-2.91 1981 BLAKE2B 4917bad0474c3ab7aa02d481697ed0ce207b3c4c0f54beac794af07e76ad7d98420da77d7a08a32cbec32199196f630c92f67b9d57fedda23f49c97be113aa81 SHA512 2020a37686c3800335693b0ad977b4fcb5d6ee5abb09b5e683369ff0ab943e17c15a9a7cae02ca96d11ee310d7b8ad2814562f5a56fb82abedb3d60e2a7d2aef
 AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee
 AUX sysvinit-2.86-shutdown-single.patch 1229 BLAKE2B fc95e0a3db23300776bc61890f491449f0b078f3814d73b1fae278a3e28f8b3b567056f71ecfbd917e74aec1594cfdb7b15e6808a09ccda594ec8e1a683d5957 SHA512 b1fa6225cdb0d5ed6d2d3128a9ad29dc76f14845c3fe57aa2edf234af456ae49f700b25ed4170a6337f662be224bd6ddfd424331483b0c482fd33cd045ddc575
-AUX sysvinit-2.88-shutdown-h.patch 1626 BLAKE2B ba9aba1854f040c31862c5a1a0c9d1ea3186ced2415f9e0fe457a34fa4eec9d56d024467d7524133da858dc313b079ae5d3b1c926b8247804414fb4f23cbffcf SHA512 244ed7c2242f52674153ccfebb92c7a9bdc68a25f98aacbbf107ddfce11b195483e90150619fbeae3167136fcb54b878f8eb77e2dfe225d9f2eeb2c182e5e2fe
 AUX sysvinit-2.92_beta-shutdown-h.patch 2341 BLAKE2B 255f9831d59721fb3f59f6caeb9f6d828b5477d7b80668b279b29d036a292584965191bc204054fa71b1d53b3e9d83475ba8a1c09b92152fd9fcb29c40c0d1c6 SHA512 52d172aab471a0e2e8057292bfc401eade032da8c5058e22f35015e58635b8fe45ee8425c2a6cd7466942acd168f28c53c8c34f3b781a5c8c6c8b5714096439e
 AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0
-DIST sysvinit-2.91.tar.xz 114412 BLAKE2B 5e044f589f5001c2b5a30eda76bf5c24bb2a7e0d308b7027d54031848407e6b7667b59096044eb186a7f6a862521d4a670c05a17dcc929d07da6515058949606 SHA512 8dcf6de79b03567c300ef5f2b7dd211895745e231510d730092085a15f61f06f28cee7c504b0b022bdcb4b4e903f44946537d4fbb2b5069fb5d29bb099fd45f5
 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
 DIST sysvinit-2.94.tar.xz 120900 BLAKE2B e45a95246325e93ef49f11573924216937e238761cb9f5979ae2b272838fb3280b1d12c9553992271f7926dc7c7bc18e352a8019a70f54c592971fe043453804 SHA512 8d3b7b777f7c37cf5eaf73d4cdfad8ac54c6115577052bd7ddf3588da8fb7d16b812ffaade0ce300c2c6b7d2acd6e7778130544befc171eab174ee8766b3ec50
-EBUILD sysvinit-2.91-r1.ebuild 3340 BLAKE2B df7dab50132c8fef9c2bca3c09c4cc4dc1d2bece75ebf85858690f9030ba749a44da731a887dc9b0e4f84b23e40327da5065933faed68bd3fe3278c32fb6907f SHA512 e5ad8dc291b1497283ce0d0f6b572e0111a8a3c0ec9bf0f0d4d5e639fa5b9759a8dc680c75a8f841c4f71c45c6208e997ba8bbb434e910305312a0640bbeb16d
-EBUILD sysvinit-2.93.ebuild 3577 BLAKE2B 7a289534e92d33869d634804853137a8b66ef4df78474c04d27f1b2eb6e9a8405b480176f6dff0e65e8931b8912aeac6eab9e410f21f1478310226d46a23a375 SHA512 91bc0725b5a70431208197b0081cf0bcc670c7aa09d5d19d970194ae7c5950c2a6ccd53302e981162a7f771c655171cc02eae8ebe44f0a279e5c3532b8bdfd75
+EBUILD sysvinit-2.93.ebuild 3575 BLAKE2B f327a05eaa2e82baa05b0473f31591da2e61cff22db7fb1e3f8a6302990cc70df166484dc138bb03f8494a32a21c5af4ee4adeaff9f37e1edfa0db702bcfd57b SHA512 159ca13a88b9868ec717fa8d786322d04cc7f67ea3e3ec32e0369060a295a43a33fe6a19d5f3be1b8d30f8dfb659d596b5c0d01f49fd1fa28cce1a150decb900
 EBUILD sysvinit-2.94.ebuild 3810 BLAKE2B e9c6974b51eead3d9f0ec2ba9fe9a1c5f14f35f17f9431d57b1efa3934434929bdea688ffdf283242620c832c0dde2443ae9e3aa220cdfc5812e7485bfd011c6 SHA512 f232ec601224fb9efd689e59d4f7134124a73fea3ad0b790263449a3a104179b604c200ff0db049431849f0a3e6a894f64a147e1ca6ece418cc29c1d124efbb9
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch
deleted file mode 100644
index 716999c39c3b..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-other inits have moved to not requiring the -h flag when used with -H/-P.
-modify sysvinit to be the same since it really doesn't matter.
-
-https://bugs.gentoo.org/449354
-
-patch by Doug Goldstein
-
---- sysvinit-2.88dsf/man/shutdown.8
-+++ sysvinit-2.88dsf/man/shutdown.8
-@@ -66,16 +66,15 @@
- .\"}}}
- .\"{{{  -h
- .IP \fB\-h\fP
--Halt or power off after shutdown.
-+Equivalent to -P, unless -H is specified.
- .\"}}}
- .\"{{{  -P
- .IP \fB\-P\fP
--Halt action is to turn off the power.
-+Action is to power-off the machine.
- .\"}}}
- .\"{{{  -H
- .IP \fB\-H\fP
--Modifier to the -h flag.  Halt action is to halt or drop into boot
--monitor on systems that support it.  Must be used with the -h flag.
-+Action is to halt the machine.
- .\"}}}
- .\"{{{  -f
- .IP \fB\-f\fP
---- sysvinit-2.88dsf/src/shutdown.c
-+++ sysvinit-2.88dsf/src/shutdown.c
-@@ -514,9 +514,11 @@
-   		switch(c) {
- 			case 'H':
- 				halttype = "HALT";
-+				down_level[0] = '0';
- 				break;
- 			case 'P':
- 				halttype = "POWERDOWN";
-+				down_level[0] = '0';
- 				break;
- 			case 'a': /* Access control. */
- 				useacl = 1;
-@@ -532,6 +534,8 @@
-   				break;
-   			case 'h': /* Halt after shutdown */
- 				down_level[0] = '0';
-+				if (!halttype)
-+					halttype = "POWERDOWN";
-   				break;
-   			case 'f': /* Don't perform fsck after next boot */
-   				fastboot = 1;
-@@ -565,12 +569,6 @@
-   		}
- 	}
- 
--	if (NULL != halttype && down_level[0] != '0') {
--		fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n");
--		usage();
--  		exit(1);
--	}
--
- 	/* Do we need to use the shutdown.allow file ? */
- 	if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) {
- 
diff --git a/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild
deleted file mode 100644
index 18216a730727..000000000000
--- a/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="/sbin/init - parent of all processes"
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="selinux ibm static kernel_FreeBSD"
-
-CDEPEND="
-	selinux? (
-		>=sys-libs/libselinux-1.28
-	)"
-DEPEND="${CDEPEND}
-	virtual/os-headers"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-shutdown )
-	!<sys-apps/openrc-0.13
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.86-kexec.patch" #80220
-	"${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615
-	"${FILESDIR}/${PN}-2.88-shutdown-h.patch" #449354
-)
-
-src_prepare() {
-	default
-	sed -i '/^CPPFLAGS =$/d' src/Makefile || die
-
-	# last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux
-	sed -i -r \
-		-e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \
-		-e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \
-		src/Makefile || die
-
-	# pidof has moved to >=procps-3.3.9
-	sed -i -r \
-		-e '/\/bin\/pidof/d' \
-		-e '/^MAN8/s:\<pidof.8\>::g' \
-		src/Makefile || die
-
-	# Mung inittab for specific architectures
-	cd "${WORKDIR}" || die
-	cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab"
-	local insert=()
-	use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' )
-	use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' )
-	use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' )
-	use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' )
-	use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' )
-	if use ibm ; then
-		insert+=(
-			'#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0'
-			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
-		)
-	fi
-	(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
-	if use kernel_FreeBSD ; then
-		sed -i \
-			-e 's/linux/cons25/g' \
-			-e 's/ttyS0/cuaa0/g' \
-			-e 's/ttyS1/cuaa1/g' \
-			inittab #121786
-	fi
-	if use x86 || use amd64 ; then
-		sed -i \
-			-e '/ttyS[01]/s:9600:115200:' \
-			inittab
-	fi
-	if [[ ${#insert[@]} -gt 0 ]] ; then
-		printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	append-lfs-flags
-	export DISTRO= #381311
-	export VERSION="${PV}"
-	use static && append-ldflags -static
-	emake -C src $(usex selinux 'WITH_SELINUX=yes' '')
-}
-
-src_install() {
-	emake -C src install ROOT="${D}"
-	dodoc README doc/*
-
-	insinto /etc
-	doins "${WORKDIR}"/inittab
-
-	# dead symlink
-	rm "${ED%/}"/usr/bin/lastb || die
-}
-
-pkg_postinst() {
-	# Reload init to fix unmounting problems of / on next reboot.
-	# This is really needed, as without the new version of init cause init
-	# not to quit properly on reboot, and causes a fsck of / on next reboot.
-	if [[ ${ROOT} == / ]] ; then
-		if [[ -e /dev/initctl && ! -e /run/initctl ]]; then
-			ln -s /dev/initctl /run/initctl
-		fi
-		# Do not return an error if this fails
-		/sbin/telinit U &>/dev/null
-	fi
-
-	elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to"
-	elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps."
-}
diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild
index bd1fa88a9d53..9386bee6975e 100644
--- a/sys-apps/sysvinit/sysvinit-2.93.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-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"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 96cef9b21b1a..86cd6cd25864 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -5,5 +5,5 @@ DIST texinfo-6.5.tar.xz 4503048 BLAKE2B 9e194115a252500fe6048614a96c6992b6fbf9f3
 DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
 EBUILD texinfo-6.3.ebuild 1106 BLAKE2B 6456f7ce398bdbd562fae97d5d5ae3af7847b6b5acba44fc651d65b3c13abc9c4df752cb42f695b9817857b612790761a274def149631355f9a06e5d2425086f SHA512 b0d1b518a3376adb9b10f136ab97d2b4aecac29e7041465e5b6ad3f8c40170cfa42dd0087fa258b68c42b5435e7401c396fb1668bb9e12742ce6ddfe8168eae2
 EBUILD texinfo-6.5-r1.ebuild 1268 BLAKE2B 3cc36fe001c216e0b460df0c948ecad98c7635efc35181b950a4ba65896ddd07f04203ff0680515a1ab19fd89e57623902744ab546885483c5a79569a716eed5 SHA512 dabac9043745739d956fc299c59ffca8555c17fe076a1b74cdf880bfdd75a1abb9f0081d812c8c396d0c720537ec6dcdd2c72e670f7001a92d9576e23f72aa99
-EBUILD texinfo-6.6-r1.ebuild 1361 BLAKE2B 87148363d089c0e5bfea741f6f731a3b53540961924db05a27a9ba0369e346fe12b0e57f278741f505d8428c3d54ce7b6b5463248b5f976733c3682352169b65 SHA512 dc019e9176d76f3eaae7a1b209c43d1929aced640e173e2d2ff6b8479b1ce0ace2eccc40d08e49868a044f6bb46dc455e2a7ad25ab052b0f59a03f95ae2ce89e
+EBUILD texinfo-6.6-r1.ebuild 1360 BLAKE2B e5b2a4fa19824a11c849b7df518fcf09946bf6d12d43be65c16de78f805309cbfd4393487b338e2d051ec1bfc646ad36d23f715a22b0af277c67aec0e923066d SHA512 830d8a3ba834622996e7abbc534facd525202589ff81b0c1e6dcef8e0034cc7a3e74587ea88a756a7c57218fe10c6849e869c82475920405dff762bf2d649356
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/texinfo/texinfo-6.6-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
index 1be412160236..448f7b1fd3f9 100644
--- a/sys-apps/texinfo/texinfo-6.6-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
@@ -15,7 +15,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 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 86afe337b341..22002b9ddac2 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -2,5 +2,5 @@ AUX usbutils-010-fix-py3-support.patch 4251 BLAKE2B 46cb941e30da1b3b9f1a346bba58
 DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
 DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf80a1e1ae888fa498429a7a9e28eaced49047f8f793bad3c59f3b515557054860286b17d9f89f915d0db5943cc SHA512 8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3
 EBUILD usbutils-009.ebuild 1129 BLAKE2B 49d6b535c588e1efea718884e8f26cdf5b4ba42a7bb77fadb84da8f977a2128291af381f3150bfb3ac06e58af4378c7c33809cbdd76d739297fce252c560c5d3 SHA512 c19643160eb68654493506d4352a5cfcaf991ce24d89b6423a54d94d92be2d72a563d6cd3c02612860d86aee4b914e5e6f0bb50dd7ce88b6f654a2fa50dea893
-EBUILD usbutils-010-r1.ebuild 1249 BLAKE2B d81e58baa5928f383358b9b2adfb274c6cef0e5a547bf062e521b989e9e50a1a91c6ee0e4e1eb65815055044220496659ba3379fcb5d9ca86773e2d6ddfd9e72 SHA512 53b65fa4bf4bd01142527e51e2d6644dbf22a8f81f679d07f95ecb2a0d541936349d10c6d2c5aee493b1bcd2265e758dbde8292b6404bf238d9b119984608bd5
+EBUILD usbutils-010-r1.ebuild 1244 BLAKE2B 83facb9ac1635fe38fd6918bd634cdb61fc3e81db7913c85a9c556f04c9c29bef3aab7f164509234bd79c979d17fd6a3ae4057cb24597890d36e118ac8a6c81d SHA512 81443f5da3e12f93ef7dccefe311087382eb432cbc3fe465123c8e5e1b6c4c3ddb9a2b1e8a7f028fea582c96ca7f0b88a5dc78c1803b3e7e32bba75fdc2f41e0
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-010-r1.ebuild b/sys-apps/usbutils/usbutils-010-r1.ebuild
index 4d60030d8e49..de4dcec27252 100644
--- a/sys-apps/usbutils/usbutils-010-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-010-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit python-single-r1
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index c7407c601986..b2260e8cf054 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -4,8 +4,10 @@ AUX util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch 1546 BL
 AUX util-linux-2.33-sparc-setarch.patch 2353 BLAKE2B 16f3c627096644da973152db4b29d09f6e76d5576d1e9513ae29ed76e1112d71327ceef31b915e58652f8ead0b506819a2c5a996bda0c3670035f13d1f9595eb SHA512 d9e2bbe4a5c0d41dc199406a27187107121294b9bd13794b7f48b558c2dfe3f16b0dfa11e7ef70b6072fd6464d2220f35a0ab032bf6b99e11740056751ec7aed
 AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
 DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
+DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
-EBUILD util-linux-2.33-r1.ebuild 8364 BLAKE2B 5c947964d771de3126ae067d91ada70baadc42705eef4757ad51e27258d1fe43757014ea647da40ba5cc2afe313c8e9b5443e9a625618f90b2b1ab6afdeb871c SHA512 4eee994d6fce8689d1237e997ad4813be0db3dd428ae57c963f659958dbaa8754515cac33d6acce5cd65c37f00a3c90135b4d980d693dcfd57e546fcebe60401
-EBUILD util-linux-2.33.1.ebuild 8628 BLAKE2B ee4d9ac302d514dc99d6cb051d35aeb91290a43d82050b9773dfc488f40091a008d53c6c3f3dc2e90f0a9517e1b76d149a8d9926f264cd87dc5cb5ff90894e20 SHA512 9879577a284d932c67799967cc41f183aaffc825ecae2903316ed304d4c4663211a873470b9cd1c69b52dbfe8ed8f0c92cc5f5b008e4d5291aa797484c3f6c37
-EBUILD util-linux-9999.ebuild 8337 BLAKE2B 253fdd3aeb1b8fc7c883bbaac72d6158cadab391b304bc7eec720e9186283ceab719c8288003cb0b396923194460b978cafd2d1b63d312418636c20b85fed6c5 SHA512 f472e0c9a0e6b445bc8bbb22f1d8a8138d46fecec9d072ebdddcc73b88c9d7aebb3c15fcf6d61247ea297c9bf7240dc564aafd4f3f0395894394f374b92b348f
+EBUILD util-linux-2.33-r1.ebuild 8362 BLAKE2B d5794402f0ef65903a6ed8afe6eaff3ff0a0c49598c7bc8b1fab8c59086aedce50fee8c7173a0ad7968a3caf29a7ec7eccb3498e95c7593e33267c40a9c55882 SHA512 d0c627467ccaf2b86fe1c029c3fa066781c05c765688548ab0b3bd7382a74557d73bc54f3e5b3150c56713e186d080fca81fc15befab3ec1696a240b7bcf97f6
+EBUILD util-linux-2.33.1.ebuild 8631 BLAKE2B f9a0970e4c59302f040ea496d9207b7adf6573b541ab6bd676baba8f5fa2b1abfeb27f2eac1a7e8396457d3d3fb9c81ed7394d125b31ad89e37b29afe9ec59c6 SHA512 f87ccfe5a6286c26427fa461a9bbc216d8b45c2caedbc6ad296f2443f26328a09e3a3d0823d9498b45fcbd1f753ad8254f96b1c2d65b0135f2d6485181c53dda
+EBUILD util-linux-2.33.2.ebuild 8639 BLAKE2B cfe684c7717347a85c0c89da19b2a43f1c4362b0a59481deb2e5cbc025d4411b145b3f4b4682528156fd075a509c5127870ce9b1335df475a5da2604e0ee012d SHA512 f232f845b52884c68f5a699d740cde4720e14060035d469801db3761532260e8b9beb5381af6b0ec54338d66fa6d6f784f573fc6e7bd65809877a5e95f732b8c
+EBUILD util-linux-9999.ebuild 8335 BLAKE2B c590f2843a2939fa712b453a3365bc5baa345bf5e72f69bf9322dd0c7572485fd83f4f87fcd798c8cf87f9f4d18fd920efbf473a4ab62ea8f7b6e6c6ffdc28cd SHA512 81931d06ace0520658736a1cffea304c4d0a6211f2b755b81587157f220bfb10a7deac75be10cfbfad4f7586d226a7ca38ff77420a6a979d6979e8efeeb00917
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/util-linux-2.33-r1.ebuild b/sys-apps/util-linux/util-linux-2.33-r1.ebuild
index 41658738b1da..de1b49cd064d 100644
--- a/sys-apps/util-linux/util-linux-2.33-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	pam python-r1 multilib-minimal multiprocessing systemd
diff --git a/sys-apps/util-linux/util-linux-2.33.1.ebuild b/sys-apps/util-linux/util-linux-2.33.1.ebuild
index 503832c70fa6..51088f884c2a 100644
--- a/sys-apps/util-linux/util-linux-2.33.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -63,6 +63,15 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	# In glibc-2.29+, a lot of changes were made to arch-specific
+	# handling of `struct termios', which breaks atleast MIPS.
+	# The below patch from upstream fixes this, and should be
+	# in the next release.
+	# See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
+	"${FILESDIR}/${P}-fix-struct_termios-check.patch"
+)
+
 src_prepare() {
 	default
 
@@ -90,13 +99,6 @@ src_prepare() {
 		configure || die
 
 	elibtoolize
-
-	# In glibc-2.29+, a lot of changes were made to arch-specific
-	# handling of `struct termios', which breaks atleast MIPS.
-	# The below patch from upstream fixes this, and should be
-	# in the next release.
-	# See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
-	epatch "${FILESDIR}/${P}-fix-struct_termios-check.patch"
 }
 
 lfs_fallocate_test() {
diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
new file mode 100644
index 000000000000..067044624f0c
--- /dev/null
+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2019 Gentoo Authors and others
+# Copyright 2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
+	pam python-r1 multilib-minimal multiprocessing systemd
+
+MY_PV="${PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3 autotools
+	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-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
+fi
+
+DESCRIPTION="Various useful Linux utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+SLOT="0"
+IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
+
+# Most lib deps here are related to programs rather than our libs,
+# so we rarely need to specify ${MULTILIB_USEDEP}.
+RDEPEND="caps? ( sys-libs/libcap-ng )
+	cramfs? ( sys-libs/zlib:= )
+	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
+	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
+	slang? ( sys-libs/slang )
+	!build? ( systemd? ( sys-apps/systemd ) )
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bc )
+	virtual/os-headers"
+RDEPEND+="
+	kill? (
+		!sys-apps/coreutils[kill]
+		!sys-process/procps[kill]
+	)
+	!net-wireless/rfkill
+	!sys-process/schedutils
+	!sys-apps/setarch
+	!<sys-apps/sysvinit-2.88-r7
+	!<sys-libs/e2fsprogs-libs-1.41.8
+	!<sys-fs/e2fsprogs-1.41.8
+	!<app-shells/bash-completion-2.7-r1"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# In glibc-2.29+, a lot of changes were made to arch-specific
+	# handling of `struct termios', which breaks atleast MIPS.
+	# The below patch from upstream fixes this, and should be
+	# in the next release.
+	# See: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=963413a1adf6767ab17712097e288e1a346f63a7
+	"${FILESDIR}/${PN}-2.33.1-fix-struct_termios-check.patch"
+)
+
+src_prepare() {
+	default
+
+	# Prevent uuidd test failure due to socket path limit. #593304
+	sed -i \
+		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
+		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
+
+	if ! use userland_GNU; then
+		# test runner is using GNU-specific xargs call
+		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
+		# test requires util-linux uuidgen (which we don't build)
+		rm tests/ts/uuid/oids || die
+	fi
+
+	if [[ ${PV} == 9999 ]] ; then
+		po/update-potfiles
+		eautoreconf
+	fi
+
+	# Undo bad ncurses handling by upstream. #601530
+	sed -i -E \
+		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
+		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
+		configure || die
+
+	elibtoolize
+}
+
+lfs_fallocate_test() {
+	# Make sure we can use fallocate with LFS #300307
+	cat <<-EOF > "${T}"/fallocate.${ABI}.c
+		#define _GNU_SOURCE
+		#include <fcntl.h>
+		main() { return fallocate(0, 0, 0, 0); }
+	EOF
+	append-lfs-flags
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
+		|| export ac_cv_func_fallocate=no
+	rm -f "${T}"/fallocate.${ABI}.c
+}
+
+python_configure() {
+	local myeconfargs=(
+		--disable-all-programs
+		--disable-bash-completion
+		--without-systemdsystemunitdir
+		--with-python
+	)
+	if use userland_GNU; then
+		myeconfargs+=(
+			--enable-libblkid
+			--enable-libmount
+			--enable-pylibmount
+		)
+	fi
+	mkdir "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	popd >/dev/null || die
+}
+
+multilib_src_configure() {
+	lfs_fallocate_test
+	# The scanf test in a run-time test which fails while cross-compiling.
+	# Blindly assume a POSIX setup since we require libmount, and libmount
+	# itself fails when the scanf test fails. #531856
+	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
+	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
+	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
+
+	local myeconfargs=(
+		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--without-python
+		$(multilib_native_use_enable suid makeinstall-chown)
+		$(multilib_native_use_enable suid makeinstall-setuid)
+		$(multilib_native_use_with readline)
+		$(multilib_native_use_with slang)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with udev)
+		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
+		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(tc-has-tls || echo --disable-tls)
+		$(use_enable nls)
+		$(use_enable unicode widechar)
+		$(use_enable static-libs static)
+		$(use_with selinux)
+		$(use_with ncurses tinfo)
+	)
+	# build programs only on GNU, on *BSD we want libraries only
+	if multilib_is_native_abi && use userland_GNU; then
+		myeconfargs+=(
+			--disable-chfn-chsh
+			--disable-login
+			--disable-nologin
+			--disable-pylibmount
+			--disable-su
+			--enable-agetty
+			--enable-bash-completion
+			--enable-line
+			--enable-partx
+			--enable-raw
+			--enable-rename
+			--enable-rfkill
+			--enable-schedutils
+			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+			$(use_enable caps setpriv)
+			$(use_enable cramfs)
+			$(use_enable fdformat)
+			$(use_enable tty-helpers mesg)
+			$(use_enable tty-helpers wall)
+			$(use_enable tty-helpers write)
+			$(use_enable kill)
+		)
+	else
+		myeconfargs+=(
+			--disable-all-programs
+			--disable-bash-completion
+			--without-systemdsystemunitdir
+			# build libraries
+			--enable-libuuid
+			--enable-libblkid
+			--enable-libsmartcols
+			--enable-libfdisk
+		)
+		if use userland_GNU; then
+			# those libraries don't work on *BSD
+			myeconfargs+=(
+				--enable-libmount
+			)
+		fi
+	fi
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_configure
+	fi
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake all
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	emake all
+
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_compile
+	fi
+}
+
+python_test() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	popd >/dev/null || die
+}
+
+multilib_src_test() {
+	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_test
+	fi
+}
+
+python_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_optimize
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi && use python; then
+		python_foreach_impl python_install
+	fi
+
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use userland_GNU; then
+		# need the libs in /
+		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+
+	# e2fsprogs-libs didnt install .la files, and .pc work fine
+	find "${ED}" -name "*.la" -delete || die
+
+	if ! use userland_GNU; then
+		# manpage collisions
+		# TODO: figure out a good way to keep them
+		rm "${ED%/}"/usr/share/man/man3/uuid* || die
+	fi
+
+	if use pam; then
+		newpamd "${FILESDIR}/runuser.pamd" runuser
+		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
+	fi
+
+	# Note:
+	# Bash completion for "runuser" command is provided by same file which
+	# would also provide bash completion for "su" command. However, we don't
+	# use "su" command from this package.
+	# This triggers a known QA warning which we ignore for now to magically
+	# keep bash completion for "su" command which shadow package does not
+	# provide.
+}
+
+pkg_postinst() {
+	if ! use tty-helpers; then
+		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "The agetty util now clears the terminal by default. You"
+		elog "might want to add --noclear to your /etc/inittab lines."
+	fi
+}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index c6c744e0527e..cc38bb127c9b 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors and others
+# Copyright 1999-2019 Gentoo Authors and others
 # Copyright 2018 Sony Interactive Entertainment Inc.
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
 	pam python-r1 multilib-minimal multiprocessing systemd
diff --git a/sys-apps/yum/Manifest b/sys-apps/yum/Manifest
deleted file mode 100644
index 138c50dd9634..000000000000
--- a/sys-apps/yum/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yum-3.4.3_p20170619.tar.gz 1525362 BLAKE2B b2519fef3260f8c10bc2ac26f24b15cf7751d3620cb328fc4bf2db27fbf7cd23be86b474263887b6a5170e8896ce74627b868ccd2fc5b3ddd0679c1a21ca1be7 SHA512 4dddc3e30be8e86162b7786d7cf4e4e6f00e67c03bc3b16f347df1e54c3c67e5eaa01456e19952452a4eeaa4bc40c9a82a042d43772ad304c87c44bdc36e7ea3
-EBUILD yum-3.4.3_p20170619.ebuild 1233 BLAKE2B 4415b41b1deadd44ce74a1731183262fce033faa2f034dddd373deea219a39bd7311212283401f9a861fc515dbea4932aa9bab7da81870dfc1f9b316f15bf417 SHA512 1d30eef5387d870909272e1395c6cc97ae07e49edea0ed6d599b65e9cd1550e6e2649230085e8a8d6f76a58ac779a9a51fcba07ba564abf494d8677d878efc4a
-MISC metadata.xml 352 BLAKE2B 222cba08b12532b77d3b4a91fea34954c46a126176eafe5176aa8d8af89706f87b7781455af52c8f4a11d3aacc9ca1e9ab0cca673eb5d8bfbb95d0c231617aa6 SHA512 f4fcf3273a1ac36af9d26ce85a5c859fd64b646ab8020fa2dcd4a6bd3120b1b0256d7485a7690458df1dd8a5a8f7d3a9037595d6b269cd4f065fb14a4d73fb68
diff --git a/sys-apps/yum/metadata.xml b/sys-apps/yum/metadata.xml
deleted file mode 100644
index 22eb5e1427ef..000000000000
--- a/sys-apps/yum/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-	<longdescription>
-		Automatic updater and package installer/remover for rpm	systems
-	</longdescription>
-</pkgmetadata>
diff --git a/sys-apps/yum/yum-3.4.3_p20170619.ebuild b/sys-apps/yum/yum-3.4.3_p20170619.ebuild
deleted file mode 100644
index 25ff9b059b59..000000000000
--- a/sys-apps/yum/yum-3.4.3_p20170619.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 systemd
-
-DESCRIPTION="automatic updater and package installer/remover for rpm systems"
-HOMEPAGE="http://yum.baseurl.org/"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~ppc ~x86"
-
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-arch/rpm[python,${PYTHON_USEDEP}]
-	dev-python/sqlitecachec[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/pyliblzma[${PYTHON_USEDEP}]
-	dev-python/urlgrabber[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	sed -i -e 's/make/$(MAKE)/' Makefile || die
-	sed -i -e "s:lib:$(get_libdir):g" rpmUtils/Makefile yum/Makefile || die
-	default
-}
-
-src_install() {
-	emake INIT=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${ED}" install
-	python_optimize "${D%/}$(python_get_sitedir)" "${ED%/}/usr/share/yum-cli"
-	rm -r "${ED%/}/etc/rc.d" || die
-	# bug #563850
-	python_fix_shebang "${ED}/usr/bin/yum"
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /sys-apps
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)