gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-util
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
422 files changed, 4981 insertions, 2515 deletions
diff --git a/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild b/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
index 09f6de5e8c09..b698fdb12382 100644
--- a/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
+++ b/dev-util/App-SVN-Bisect/App-SVN-Bisect-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/perl
 	dev-perl/YAML-Syck
diff --git a/dev-util/App-SVN-Bisect/Manifest b/dev-util/App-SVN-Bisect/Manifest
index 4dd4d660785f..d3df8146a22f 100644
--- a/dev-util/App-SVN-Bisect/Manifest
+++ b/dev-util/App-SVN-Bisect/Manifest
@@ -1,3 +1,3 @@
 DIST App-SVN-Bisect-1.1.tar.gz 20534 BLAKE2B 047625fb0ff9495dd5873ab3fe958102bae81d14ce4afcabb9e3c0a6747d7b16c5d84f263da1a7b40400035a9c3d3d0c71fc4c103c03a86933307f3dee1c2dec SHA512 8eeab59dc83273aed8de751ff2c175a9bea9d858e112d24cb21be616582106e69824e2496b8d5860acbfcec4c01e79b1a8ddace5b0ca68a88d9cd9804ed84e57
-EBUILD App-SVN-Bisect-1.1-r1.ebuild 526 BLAKE2B e1669dde70b0fdecfda4e6c62d0f7fb21d1715034e996ebc1d4d683c13c8b9e5858dcd4c4ae3f4383fe89a6074651be679ecb7d1fd5c2924760e7cb0efb39cbc SHA512 da9067dd7e3b9ad5b2440c675f835ef39b15fbd109aff2ce1dbc4ae2ec11e0a285e290dac5e657188023881e7e04febbc7e7a987af7108898bf777592d6a10cf
+EBUILD App-SVN-Bisect-1.1-r1.ebuild 550 BLAKE2B 49385970c820d39cc14d20ea5fd37dd97fad2abbe8616188dea2df1e1f52b5bdad0461b4420337d97ffb54e1b870b64736b6d91940facb87e66e6180a5dc23c9 SHA512 fa3ae08fddce65a5035a237d0ddd1727f9cbdf8819689f5ec974bb045383f45b45b0175de1a6181a45022ed01cc8b2401de50e312791650b0fd20e9f73d623ac
 MISC metadata.xml 323 BLAKE2B 98d76ef31692a4bd1aa87b1acf8122b60789b2e5d8624b88d65ea32b2965f86d7d50a2b00ce17681849a38276ff0ec25cff5995964135ba51481aaa04d5cc7d7 SHA512 f12735c8cfcce8601c9cd5cf1dff4b4984ba0de68ba52ea99be0ac796f9c1b6bf250745c5a16ca3ed98161b8259f3b35311b1fe3e6f1a823c349c81451922be0
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 77a139f8c338..e8cf11fe1310 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/amtterm/Manifest b/dev-util/amtterm/Manifest
index 480a4d9633f1..8f12303b44fb 100644
--- a/dev-util/amtterm/Manifest
+++ b/dev-util/amtterm/Manifest
@@ -1,3 +1,3 @@
 DIST amtterm-1.6.tar.gz 40804 BLAKE2B a682bb6646e7ed57e3ee8f17f25bdd60fed37d614eb3e66f6b05fa4062ef99237c24d69e4795e7a9d8b83579728c8f8423389bf7e042d981b3e84a0037e56b0d SHA512 b10777727cf7f931e4b04fff7c621ea6e94989738833fe4f830bd795c8be3b0e983100b34a2ea5feb48221f022b3498a819c9f4fba9c7722226d56d374a1d986
-EBUILD amtterm-1.6.ebuild 1007 BLAKE2B a6e31ec74289ee24c57c5bd328874a28f89ffa68cecd8812a8005e923fda2819f2b649296c5aa0d5b861b4c7782d50333c26e404e9ea137978626b5cc125895d SHA512 1404756ba763dcd93dcbee6de2bee4413940fc304f4ae88af4829a88f6e1ed6451e1ec1f25adf6cbcaa00d956c1169650f2ccf8834f7bf1d6576d259eefd7e20
+EBUILD amtterm-1.6.ebuild 993 BLAKE2B f99b9b674619d58b2b27cb0350ae568ea41a20efa2fcf23a731920ecdc0fd44d81a5631aa1b1161cfd1993395c15cf4cbdbacd4695efd6384b75a27a6f5a0255 SHA512 5a29fe5aff274d0ec95f8a02eac2bea254eccdd424d2f6674b74dc1930d36747f8d68291a22f509fe60c6a103b3ee1e3727017a2ebe0d2e55c23e5a6b6fe0d04
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-util/amtterm/amtterm-1.6.ebuild b/dev-util/amtterm/amtterm-1.6.ebuild
index d9222f8bf2e6..7f7b43b37eb4 100644
--- a/dev-util/amtterm/amtterm-1.6.ebuild
+++ b/dev-util/amtterm/amtterm-1.6.ebuild
@@ -33,11 +33,11 @@ src_configure() {
 }
 
 src_compile() {
-	prefix="/usr" emake || die
+	prefix="/usr" emake
 }
 
 src_install() {
-	prefix="/usr" emake DESTDIR=${ED} install || die
+	prefix="/usr" emake DESTDIR=${ED} install
 
 	if ! use gtk; then
 		rm -rf "${D}"/usr/share/applications || die
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 80a15cbc79ef..8d0000ad7387 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -13,7 +13,7 @@ DIST android-sdk_r22.6.1-linux.tgz 101052129 BLAKE2B b1eb0a3a298bab8f4c4e0858312
 DIST android-sdk_r23-linux.tgz 137880977 BLAKE2B 3a0e0d321bf89bddd4f4e3ed4e6b6ef0276623168d482c0d152f7946b93f8ff72ade780e6c5bdd2dc2ef633bc5df446a640bd52062373fdae162aff71c5ed154 SHA512 c6d8de870e8697b31132b25db93d6b494b44240ca421cab6a48bbf53d142ba488d08ac77a9995ed06953e311dd14ea1ecf4d2039428ed31ab255f9aaaf94ad60
 DIST android-sdk_r24.4.1-linux.tgz 326412652 BLAKE2B 4263a5e942f0ee35069f4fc075504c637381820f40485c9753f5f586f713e614c204b3e5c35968acbc665644aaab4c2e05660e00675d956422cd7d1fc6445ed2 SHA512 96fb71d78a8c2833afeba6df617edcd6cc4e37ecd0c3bec38c39e78204ed3c2bd54b138a56086bf5ccd95e372e3c36e72c1550c13df8232ec19537da93049284
 EBUILD android-sdk-update-manager-21.1.ebuild 2942 BLAKE2B 820b6e694097d46d0e28ab459cbb48afcd7b0d27b6d1e635592c1f052a9e72dc6c1aec925ad978506f33b5256b1cb92c82c3eb9f2a0d5298c732c2921b4857e8 SHA512 89ac1e255b9b100fb54d62b7b92c91a498771abb31e41f4c5db6c9811f84c042bc128791ebbb6ed1438f6e07027faa629ddd8b0f5338e47953643b6bef291904
-EBUILD android-sdk-update-manager-21.ebuild 2957 BLAKE2B 352bab8594bad1837ea79ae669dfc94285f6a6a5136d939421615e067d97390768c6666b6a9ce9d62576cc099d7966cf04be6ebd4a11673c72791b18ee2163ff SHA512 22d1559c207806c8d984298ae280d6e256dccc1ad04675369f68869b878305ec47874ff9de22592a703e90358d8a6c57bf60d34d7ac96b375d316d058f273636
+EBUILD android-sdk-update-manager-21.ebuild 2943 BLAKE2B d2044ae6fbbefa07f277411ee89cd370553719c6c1515225e8d07b9892d0e3242ca0fef0983542ab147a1b885fb8e630e8c998518438fb2051f2c1adb5c8976a SHA512 9724d75bab59aa27b41f96a2b914451b9498f70fc9b4d6d996790bfd9e199c0d51586552d5f4ba9729d84cc1ee7f17fc199f97e8f9113e5dc2672cfe64311456
 EBUILD android-sdk-update-manager-22.0.1-r1.ebuild 3128 BLAKE2B 2c8b57429ce744a9904b418a9a7b71600cfe9d862e4ab49359fe9de788b80b1d5956860267e1623ab438021f230e8e2c1d2dea7cbcd1e38f5c28aceecb7ec3e3 SHA512 1c1cee2d30f591edf7843288914e8b8cfd3c002419370a9ac7181496ef0f7cff33c57a93e44adfb5935691738f84f04d0f21c0d513bf2416fe7501142dd2528e
 EBUILD android-sdk-update-manager-22.0.1.ebuild 3132 BLAKE2B 33f2bdadbb39382f6ffdf251717569b40e3993518dff6936cb95a1b592a0f83b27b6a490a34826e9939727481ab0d8d6e1abaa5b27812c8d7e828ab0a2df025e SHA512 0af64a571ffd05756a88f40b0fd1c8424877b658ff7d6b8e47d5cef0c1b7a2f514ad944f8c1214383561af0824e80786d2920ecd5b07eeba718a7a117929f8d8
 EBUILD android-sdk-update-manager-22.0.4.ebuild 3128 BLAKE2B 2c8b57429ce744a9904b418a9a7b71600cfe9d862e4ab49359fe9de788b80b1d5956860267e1623ab438021f230e8e2c1d2dea7cbcd1e38f5c28aceecb7ec3e3 SHA512 1c1cee2d30f591edf7843288914e8b8cfd3c002419370a9ac7181496ef0f7cff33c57a93e44adfb5935691738f84f04d0f21c0d513bf2416fe7501142dd2528e
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
index 6a654da49cba..d905b0019864 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
@@ -60,8 +60,8 @@ src_install(){
 	# Maybe this is needed for the tools directory too.
 	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
 
-	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
+	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
+	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
 
 	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
 
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index a4d1b83d47a0..008cc880a31b 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -16,6 +16,7 @@ DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd432
 DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
 DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
 DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
+DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
 DIST android-tools-9.0.0_r3-arch.tar.xz 7628 BLAKE2B d0d7267d41ade2031d72236c18850ea329afbdd57a2b5bf25837e405d3e66d7aaef5b48996e7aafd4cf6e4543de03ba6549823845e5e8cb35c6d4bc900b8e275 SHA512 534d99fe15b3a3ba4f2a7331662fdb8645424830122cc4c1ff0b44d43059280610389147d4a916c55b3be71ac84d019223c90993cbdae2588f9e9737f0b5606d
 DIST android-tools-9.0.0_r3-core.tar.gz 27484684 BLAKE2B d071adacd5be0341a9114e57242fe51f623773683b9db2735eac9231a77cc22651f09e1c63682e729494aa6409939696a5635afcd5e8a40ec0f75d2784c00ffc SHA512 0edc8b02b57085ce88b39c987284af1c681870594b20ab9ecf4be98a0cfdff2905bc80f5d8eeb7fbc7f4604b800b6f95bc6b2b0321c900bf833313dfcbb2eefb
 DIST android-tools-9.0.0_r3-e2fsprogs.tar.xz 5255616 BLAKE2B 5fe62da70686148d755c60c1cef4b64d80f0c6a891d13a778d2a3209f950b0f9c5b19bf39ed28c5d38d01103ef1ea474133f57b7104a4fdf80eafd8edc17a3a5 SHA512 a9c3c180ddb96f10710a18794b20cfc641d40af3643a1133091127a40c27fa724b6e6f1af8e66fc1e1ca33053e33499b910880eab05979a2de95a0d3d7a79f93
@@ -28,5 +29,6 @@ DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B
 EBUILD android-tools-5.1.1_p13.ebuild 2077 BLAKE2B edb2e3a9f69c2c8a4f86170b39aedb1f44b173df943b2edcb96f7d90384658c6689925e06873c3d5331c20f360732860f70e0bfecdb0d5518dfbb9d90816b671 SHA512 3659aca002096aa11dc94631de73f1081cda5a5728f2842aa767844b6b3e12e0bdcdd0abbc2903efbb1d9f11666e7bd392be694910ffae58fce1e8b52a8cd090
 EBUILD android-tools-6.0.1_p79.ebuild 2820 BLAKE2B a87ef5bc6d814ef772c3fe4292563c73beabd59cacebae706721d4019059be8b2cf31e27594c473abe202ed1f4afb78993ae3e947ef7c21b5016245797f90b45 SHA512 ccdd6e4fbc6a98ca0e9cfd89618c6a13e11e174abd6c6b3dd1d1b8f7a592a4574cf83e0f4770750918ee481b129d01425ae56fd55ddc323b3409add6ddf10279
 EBUILD android-tools-8.1.0_p1.ebuild 4012 BLAKE2B 9c0a75fefed96a2e86fb9d76c4897789d61eeba3434db61a7e3c0041b7dafa9f8919fb9ff20c14e90d070746d2e077cf9de86e0ecfc6ab55991bc4e01e210d77 SHA512 8ae858338e3c73666ca3aa2c1fcc831ea3902b0da5f91a7df01cc401c9917a7e10eaf7a5353e1f358fce0aed6e5a45c7a75b0de533dcb344f4fc4425ae114374
+EBUILD android-tools-9.0.0_p3-r1.ebuild 4848 BLAKE2B 05cd68fc40aaa7b9c4fc7c72670da0c369efdde7902150defa0f0db7bb4660aa841da45bfc5d9cb517b7b51558c548d9e935c699182f2a4026a4435df8f9692e SHA512 587e47584e6ad4980dedfd4e545d7e27d66ef9fd79ce04ee8b8de3d60d3ba89d76fac54afc0514236747d8f2c7aefba8d3487fe569b2b4956a330f73b401ccdf
 EBUILD android-tools-9.0.0_p3.ebuild 4561 BLAKE2B 9c975e4be98866b9fe5156bc4a90b1c787e73f3160fc97bc70ff2f89d0a537b5bf97c25236d8e6e28a96742a14796f11cafb067b7d38cf90a7845505f6394d65 SHA512 c381cf35048c7f40b519670064ab803bc879f5edf6b75e23e9089b01c0d5b421ef49e365cad881755537a8f979e0888fa396dc5b7df94200ea066de8bf3a0958
 MISC metadata.xml 714 BLAKE2B 2ec2b24289241323b1844412e6e0d1edf642dc3391171b474848ea376c51d420c98a4a0c094afad2dc1c7cf55b0efb744ca6a92beeed770d015a6380b07b85b0 SHA512 720b38485a7c248e6a9d43a7056e33a384fe7e295fc843c69e59d48350bb10d7d4446e6cc52b7c87e2b0322733553e16c9dda4e37104753d5aaceec5adf859bd
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
new file mode 100644
index 000000000000..973b6de27c5e
--- /dev/null
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
+
+MY_PV="${PV/_p/_r}"
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
+# See helper scripts in files/ for creating these tarballs and getting this hash.
+BORINGSSL_SHA1="45210dd4e21ace9d28cb76b3f83303fcdd2efcce"
+GLIBC_GETTID_PATCH="${P}-fix-build-with-glibc-2.30.patch"
+# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
+# No point in depending on something large/uncommon like ruby just to generate a ninja file.
+SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-0ffb7b41d599741d100a6a00a4bb20e162cd3f90.tar.xz -> ${MY_P}-arch.tar.xz
+	https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
+	https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
+	mirror://gentoo/${MY_P}-e2fsprogs.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-e2fsprogs.tar.xz
+	mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-extras.tar.xz
+	mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-selinux.tar.xz
+	mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}-f2fs-tools.tar.xz
+	mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~zmedico/dist/${MY_P}.ninja.xz
+	https://raw.githubusercontent.com/nmeum/android-tools/8a30dba5768304176fd78aaa131242f6b880f828/patches/core/0022-Use-glibc-s-gettid-when-using-glibc-2.30.patch -> ${GLIBC_GETTID_PATCH}"
+
+# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="sys-libs/zlib:=
+	dev-libs/libpcre2:=
+	virtual/libusb:1="
+RDEPEND="${DEPEND}
+	python? ( ${PYTHON_DEPS} )"
+DEPEND+="
+	dev-lang/go"
+
+S=${WORKDIR}
+CMAKE_USE_DIR="${S}/boringssl"
+
+unpack_into() {
+	local archive="$1"
+	local dir="$2"
+
+	mkdir -p "${dir}"
+	pushd "${dir}" >/dev/null || die
+	unpack "${archive}"
+	if [[ ${dir} != ./* ]] ; then
+		mv */* ./ || die
+	fi
+	popd >/dev/null
+}
+
+src_unpack() {
+	unpack_into "${MY_P}-arch.tar.xz" arch
+	unpack_into "${MY_P}-core.tar.gz" core
+	unpack_into "${MY_P}-e2fsprogs.tar.xz" ./e2fsprogs
+	unpack_into "${MY_P}-extras.tar.xz" extras
+	unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
+	unpack_into "${MY_P}-selinux.tar.xz" ./selinux
+	unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
+
+	unpack "${MY_P}.ninja.xz"
+	mv "${MY_P}.ninja" "build.ninja" || die
+
+	# Avoid depending on gtest just for its prod headers when boringssl bundles it.
+	ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
+}
+
+src_prepare() {
+	sed -e 's:elseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386"):\0\n  set(ARCH "x86")\nelseif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586"):' \
+		-i "${S}"/boringssl/CMakeLists.txt || die #668792
+
+	cd "${S}"/core || die
+	eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
+	eapply "${FILESDIR}"/android-tools-8.1.0_p1-build.patch
+	eapply "${DISTDIR}/${GLIBC_GETTID_PATCH}"
+
+	cd "${S}"/selinux || die
+	eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
+
+	cd "${S}"/e2fsprogs || die
+	eapply "${WORKDIR}"/arch/trunk/fix_build_e2fsprogs.patch
+
+	cd "${S}"/extras
+	sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
+		-e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
+		-e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
+		-i ext4_utils/include/ext4_utils/ext4_crypt{,_init_extensions}.h || die #580686
+
+	cd "${S}" || die
+	default
+
+	sed -E \
+		-e "s|^(CC =).*|\\1 $(tc-getCC)|g" \
+		-e "s|^(CXX =).*|\\1 $(tc-getCXX)|g" \
+		-e "s|^(CFLAGS =).*|\\1 ${CFLAGS}|g" \
+		-e "s|^(CPPFLAGS =).*|\\1 ${CPPFLAGS}|g" \
+		-e "s|^(CXXFLAGS =).*|\\1 ${CXXFLAGS}|g" \
+		-e "s|^(LDFLAGS =).*|\\1 ${LDFLAGS}|g" \
+		-e "s|^(PKGVER =).*|\\1 ${MY_PV}|g" \
+		-i build.ninja || die
+
+	# The pregenerated ninja file expects the build/ dir.
+	BUILD_DIR="${CMAKE_USE_DIR}/build"
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	append-lfs-flags
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# We only need a few libs from boringssl.
+	cmake-utils_src_compile libcrypto.a libssl.a
+
+	eninja
+}
+
+src_install() {
+	dobin adb e2fsdroid ext2simg fastboot mke2fs.android
+	dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
+	use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
+	newbashcomp arch/trunk/bash_completion.fastboot fastboot
+}
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index dbaaaba0d1e6..b7c9159584b3 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,3 +1,3 @@
 DIST anjuta-3.28.0.tar.xz 6382736 BLAKE2B 8872736d80d0a09d35706ef69c0de56c84b9abf025f9552ae4b21b0b51c3ab8ad93f07dd1564601422890e92155cc7be80bae8de77106035621a54316608832b SHA512 c8de0b0debf0a511d6c50fe2582077a33c04290a045cce637c05c15df984cc3e8ee942c0c3a75bfd01c48e6c302d5424565c4e54fe6eb118c87a3590563505ef
-EBUILD anjuta-3.28.0-r1.ebuild 3909 BLAKE2B 0667fa755bc539c507eac04270dd86b0aca17d4b6bacd7a28101b6c4ad0d0dbaea07917d7cf85ca1aa804782678d1ad474d569118549867a37fc2e6cea455846 SHA512 8cb9cbdf3b72d584aec671c95b40d5d83518c4238aa55f7fae0ccf4493ec21add988a7d7e8759e1cfb0f47c787cac3c0f5bd1cea1ad178db7d5dfc76b42ae199
+EBUILD anjuta-3.28.0-r1.ebuild 3936 BLAKE2B 683893d06cd59787db3911c2d68a3c8be2534ba4c387da7afa8a482f430d28305c0a5154bb7ed4bdf71b0697ca3cb2103245477eee828277172f167c7e9493ff SHA512 8ea1f8e247fd3b6bb7b89a246338f84a11a8950569144337f1ba398159cdd64632b2e9b7566bed8fcecb05fe61a9569caadf45cfad5a24a7cf7cb263f8ee5868
 MISC metadata.xml 562 BLAKE2B 928b16bacff2417a1b50749486d2dcd656184b6cd7bce6f17e534d253ab2e1af854e18bf40f3188714e973b9c49f1b2691d031bdaef0ec73d9a4844c05b99218 SHA512 c452f34b8489e3faeb8c272282233341e22c958f04d750d54e07c487895aab8b03f4df096e1f07fdb7686a0295c770cb1fcf38fdca01f71730e991148013d82f
diff --git a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild b/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
index 379f5e06fda8..73fadd9f40f5 100644
--- a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
+++ b/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
@@ -20,6 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 
 IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # FIXME: automagically uses libgda:6 if available
diff --git a/dev-util/autodia/Manifest b/dev-util/autodia/Manifest
index 2291b67124e9..ff0060146e64 100644
--- a/dev-util/autodia/Manifest
+++ b/dev-util/autodia/Manifest
@@ -1,4 +1,4 @@
 DIST Autodia-2.14-dbi.patch.gz 343 BLAKE2B fab5420ce032c87ac874ec345289d9d75f5d10d99eb483e8b2f9258dc9ae3b2a6e609098d600dc0dba5fcb4a8f6279bb2e1e51843fcbf98d7203595f581c9cc8 SHA512 2a7c1b4bacfaab3d0c0c16c12362be0a16161db0465ad1b5c4cc955296fd611824aa87b49e7c3672435d10004a383125e2edd3aff640fada2e1694cc02a8abd5
 DIST Autodia-2.14.tar.gz 78070 BLAKE2B cd7d68dd618599b46f59d9304a7c515f6c357a756c9ecaed50e7dfb7e404d4c9810ab5065310d549d5d8c2aede5c7156371c7e4855f73e5ab3893856f39fbd89 SHA512 41cd0d9dd8fc66d70aaf987a8a62ed8b916e9a38263c61cc1cb7994e7bfb24843bbd3440bbdad054fccbf0fbbdaa11ec3a35db2a6f926bc87ba65a5f4ac160ee
-EBUILD autodia-2.140.0-r2.ebuild 702 BLAKE2B aee73fea78c7814ae1aa8c6d26db39012546e1e7f708c7abc02856ef1f43c3d227d29d62e60cb66ee784a448fc331bd1be035411511255b7d13cc51f605c0caf SHA512 68a2d01e4dee1661840d99f931320f974426a37c2c7e634a14909d2a23db7f00ae92b92eb8da9b15fca158423a25a5aeeb55d64d88cc2d303618222f8cebff67
+EBUILD autodia-2.140.0-r2.ebuild 729 BLAKE2B 0ff6f548956e35946c2d2deedc37b22930d24a2e71d131692d4d3f331dede168f7db769ac1e14ae1c48168639c02f87b1c40b2595746d28ae9194c91c1112f52 SHA512 f78a9c76239cd50e3deff4e371ce9fdedc33539a5be2839e7c89a27dca5a9d0cf3333a7a215fcf998863c5d7531afa061f4b73248b2161a6ea0d2b5bee268795
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/autodia/autodia-2.140.0-r2.ebuild b/dev-util/autodia/autodia-2.140.0-r2.ebuild
index 0798ccd75ec4..4e8cb2652bf7 100644
--- a/dev-util/autodia/autodia-2.140.0-r2.ebuild
+++ b/dev-util/autodia/autodia-2.140.0-r2.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="graphviz test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/Template-Toolkit
diff --git a/dev-util/babeltrace/Manifest b/dev-util/babeltrace/Manifest
index c79ccc22aaa0..de29f7daea0a 100644
--- a/dev-util/babeltrace/Manifest
+++ b/dev-util/babeltrace/Manifest
@@ -1,5 +1,5 @@
 DIST babeltrace-1.2.3.tar.bz2 995094 BLAKE2B b917002ab3207e3c2763d556f98c190e691d0fe8bd20f6d03e1d2b4477fb374548b04eed591519fb88b15ef3133c847f33b1670cd35fd6a762f12d5fd40c0dd2 SHA512 de231c9e25797d0f3cfb8692fc75b8ce4159d317bb861806955f098a99d5749b627c830111d37788d0da486fdef92c83c020588a6598b4e95bcff6cbf9fce77f
 DIST babeltrace-1.2.4.tar.bz2 995829 BLAKE2B 99b4455000dd403bc86917ce1c5c6f32b7df8754c61197a03cbd3ec28c5756ae858965b81b06ed8cd72b910c2f0e5885c986d229f607f5c9179688cd1ccdd3b5 SHA512 5cfd4572519ec53ad531d333ac5e1df026ebd1a200e0fbec59c892cad5273316e07482a4199a1cb2dcb4994310b04b259748de169c4a7c1ddafd7e185f32c5f9
-EBUILD babeltrace-1.2.3.ebuild 598 BLAKE2B 6a9ea008da9a3c2de21867a3d0c63c00b9b5567a5826c8e308cd59122ef6134a06858c61f22ffd443ec4f567fee93eefae6353513ad7c02c3f1e711f62b0bc32 SHA512 fe8b5fa3c0e4e0437938eb064bb258a69acd78ca095a2f9db955f06e5de61e209aec4f4ab999fde25c26686c77ecaf998b4efcc67062f8dea37bdc9fb82c47ce
-EBUILD babeltrace-1.2.4.ebuild 603 BLAKE2B 84e65f70d1721646e12683b54e73f3d47f54d539d70b75c02968d2874207300384517728ee5c01432f0b702d7efd43128eacd46a98f0f35d0a3081ae43c7d856 SHA512 ed6306db096030b9f3353d6316efddd33bba4852713c26d33ad9388b305615cf8ae9925ec5cf9f80d95fa880d785a15cc02c2f31e4090883a41aa37e484f2a69
+EBUILD babeltrace-1.2.3.ebuild 622 BLAKE2B 5c0a5f4d0c20cbbb87318b71045a7386f3992e271310f843705cbe18d18c5a2b2dbf14a0cd95a2752c67689bc0794b1503418a2a514d6144d95508d674a6e078 SHA512 509add1dceff0d64dc4d6b9f490ba0227fd4c5a60a04bfb616904b07375b7024e059a1d5811b416b9b533b6f7d951a2d57c79caffaf5ae5b177ebbc3c549ced2
+EBUILD babeltrace-1.2.4.ebuild 627 BLAKE2B 8112006a66706a422c52ebb53fd363103c0218f4694fc2e5fee9a9dbadd2b4f664a45dc7774f974235d53585f6f5639f9f2fc3621964c55ff6c1407aa22f7d86 SHA512 62461e54b141bbb2d3c19963c91595ac1aa35f1bd7b2ad7640dbbdb9e78bd9b97de0cdbb7fa534ab6b9b4adf9791103f6b3b74794dae01be58b63dd6533fa675
 MISC metadata.xml 463 BLAKE2B 72758379b046978592bcebdc6d11a07aae6b14e052bf00fd3f40a45dc2858e59305d39fb1bbfba81ea3abdbf1dc81ce08bc6c57d7efa0bce77db322c55744a0a SHA512 385f56632473bd068e1a2b1aa15190eafe5cc25fc5fda59f91bd35355dbc549f7937d4a3f5fbd82c2009385b2c5113a93aa3954a18fefb4d9fbae933cfb52fd3
diff --git a/dev-util/babeltrace/babeltrace-1.2.3.ebuild b/dev-util/babeltrace/babeltrace-1.2.3.ebuild
index 6fe8e9289c0e..265e9c26010f 100644
--- a/dev-util/babeltrace/babeltrace-1.2.3.ebuild
+++ b/dev-util/babeltrace/babeltrace-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/popt
diff --git a/dev-util/babeltrace/babeltrace-1.2.4.ebuild b/dev-util/babeltrace/babeltrace-1.2.4.ebuild
index 65412aef2de2..78d9753afaa2 100644
--- a/dev-util/babeltrace/babeltrace-1.2.4.ebuild
+++ b/dev-util/babeltrace/babeltrace-1.2.4.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
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/popt
diff --git a/dev-util/bam/Manifest b/dev-util/bam/Manifest
index a91e03e75306..845e0a429d55 100644
--- a/dev-util/bam/Manifest
+++ b/dev-util/bam/Manifest
@@ -2,6 +2,6 @@ AUX 0.4.0/Makefile 508 BLAKE2B e3da9902bfb7252513b106df127b299ac80a595a9134be886
 AUX 0.4.0/bam-0.4.0-test.py.patch 266 BLAKE2B 48ea5564bf8c59f708f26f72a98fcd1f9f365c465ab4f79ed58f88d837bcdce3e7ceb24ab2e9b314bb6880d1302e48fa8ceeb818fe06bf9a32e2ba278a7a9d39 SHA512 5e6e3106f05ce2a3fa8cd6a51d9125700f3c962a7f5eeabbaf7cc2c64b98ebbb508f109c9587efc8ec58f377b4a78407e81d3deaac68e0bf220e92c1b78705bb
 DIST bam-0.4.0.tar.bz2 164033 BLAKE2B 75c3ccc2c0a22e793ebaf116257ad735db097870b84dd3cb7e9c12068e97b38ae2317c148f04b3d9b45e39a415e595d519d003c6c58af1230ab066538f93e2de SHA512 10ba53b05ac1604a9e9a01f4c008a8cbdc4e4e9df2fc039c8ca59251461e4c5f95770b5b72945d07693db7abe7cd312bc38725686b4d509d5dc21a585fffc810
 DIST bam-0.5.1.tar.gz 258693 BLAKE2B 145016bc9da49942c53d27d191f55d6118343dec725477b494a221fb40050ab165a301c743071bbda294720c481830c223b688d6f214ce8764fc6ad2daea9b68 SHA512 e6f1b3daad6073c58b0e3cbf836bb0a6b66f0c36532d6e6eca9949239ab8b584cc88f892cce6f74974e370a8a688f33a95dde86dd65cc1790e49e5f8aeab0fef
-EBUILD bam-0.4.0-r1.ebuild 950 BLAKE2B e56940f3136bd376cd7840aa3f2a2f1e2580b2a857f899707dde46d552687178ff6130abf2514b603a4c00a82be7e4027b1e91cabf0cdd5ea29c4a8270e473e1 SHA512 f87fe39e0acbaf0cc5c798e01e6428da5fefe03ac71c8be31b750908be219358b4be2218fadb282ed163b82be5839427ef16ceafc3bb505629f20a3f1863723f
-EBUILD bam-0.5.1.ebuild 979 BLAKE2B ab99748a02c4cddf25be70d746ba0e7619a95b9e46f79ce5a36b2e8c00d62bcf0b5f6057323e62ea82ed1a85019c3e5673b5fb644d37d3b193152d512c660d79 SHA512 faac21212ff63ceb89300a4b92c08cb6359c6ee8a366d6abb6e0cf7557d06a3c64a08293f4ce8264219f2ca479df069a3a74be33a1d540c495c28572f3317c77
+EBUILD bam-0.4.0-r1.ebuild 974 BLAKE2B 900b4f398acd817aefd98a3ccc771b700a1071fed88124e608382291067c23fc0642a476ce93a170cf67960e6509926b3ec71da8b2eb30dc376a634b61e23b0a SHA512 3d2612e49e962d2ee3c0bbf7126173999d971401a9fca6fa20ad9cbc7a96ae46430ec69ae692ea10d8498e7a0af169ab92e07ce499eafb71a7cfd3da980a1182
+EBUILD bam-0.5.1.ebuild 1006 BLAKE2B 73c0139ff520f8cf0d832ac8e7f2f5554a2f72b5687a52209ffa247a721b6c741d8d6be07c8c1821a51e9e612293f0b82aaa424a9228d31c187f9d91714fbf09 SHA512 6cf51e23bb591ff91a6cb36a2efbe928061ee6c8ac56367f753852daa50807c39604940046d532bec7fe5799874befd16a51bef7c959430e314a98aa6b0df248
 MISC metadata.xml 250 BLAKE2B bd1ea3247aed63356bdac68d882e6cff2c996f3052a4590dd0a404dd0838bdc6b512db7ecef1563aa9d508f995d13d02bdfab7119cc3822b1c75bcd1425283cb SHA512 abe615c77678bf004cbb59192db454cbd48846b5715037375f15dcc44b331da47f462bb625251ef8cb2e06c809dfc8abd69bb997c827ceedbaef6b54128c0834
diff --git a/dev-util/bam/bam-0.4.0-r1.ebuild b/dev-util/bam/bam-0.4.0-r1.ebuild
index 96a42af25130..78b8924a8951 100644
--- a/dev-util/bam/bam-0.4.0-r1.ebuild
+++ b/dev-util/bam/bam-0.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-lang/lua:="
 DEPEND="${RDEPEND}
diff --git a/dev-util/bam/bam-0.5.1.ebuild b/dev-util/bam/bam-0.5.1.ebuild
index 7684f85a3ebf..28b19976824f 100644
--- a/dev-util/bam/bam-0.5.1.ebuild
+++ b/dev-util/bam/bam-0.5.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-lang/lua-5.3:="
 DEPEND="${RDEPEND}"
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 189b460bbed6..a4c6e4cee211 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,18 +1,17 @@
-DIST bazel-0.20.0-dist.zip 87602213 BLAKE2B 0d10fc89a8bc2bf91a67317d42302b894abbec8c4e9f39dd4fbeae71fcba847d5ae35102e3ef4a26d7dfe2da9e47cec5660dd28e1804c3ad562583e9566b78cb SHA512 1628a99a2c95334b7b190c5cf1b80ad3ce61c827103844f68401ffe5cfa994d5b7edd9e314a2775b6ed5b8da70ad79bee0ef47b9acf409919a613069356623a3
 DIST bazel-0.22.0-dist.zip 88633015 BLAKE2B 7cb7ef53c9acb4089b92d82679ad82739fd3c1fd3af7147e13b1474353fdf4cba1f58deed6d1880ec85fe5a07940b8df14af2701361d86e638b5c0e6924300c1 SHA512 b93cd21f0f164c118b90efba761a9492eb9894e24f13ff468defd12b86c7e67f16e51060ac2fc4c2f8dbf51b1c833d41b255fdd8107988e5babf093cfc5b3254
 DIST bazel-0.24.1-dist.zip 174691842 BLAKE2B 56d42421ac6f5513f019f3b71ca0c5e7b499c199dd8d9f22ca4fdca832527a1974afffccd6bff6b1d29dc3156ee28ba7f91a9a37f2f8524da5c5f30645be97aa SHA512 a78c871eb517ec53a0d1d9592887288fa54e5e9f44b0b7dba44792a74a1ba0c98e38ff2f6094ab6e8b3add3ec4a0188de3b2489d94d419373e210d16db641774
-DIST bazel-0.26.1-dist.zip 244633948 BLAKE2B 667078bda6e52f696127b7a4914ec52ab67a84f89ac957304a281268615158cc813d7d7cdac58b336dd8ef1d3cd117f1474f64f741e0a3119034dc43ca3b58b0 SHA512 f43f156947c2e9effb1f3ab79235d47d00254103b5a5aac62001008403216b2330c9062ce85d42be4fa582ad52d14ba52a47875df40c58a7e18c391684407574
-DIST bazel-0.27.0-dist.zip 247946763 BLAKE2B f061793de89144c77bd42de56c495e8b3399ac1892bdd2b0e210102ea1c2835a848432b2964ddcc6ebe77aa580efa378d46afad1faa6dec0831666f201a6dd74 SHA512 f5c6a0c789eb55790479ff839f7f959e7d0e46e5f14b5cdcd720e4dc2c36122345c9dcd6bfa803f88fb5264553a3d63ae0c8e4c7b9779bfc65183e2aaee5a666
 DIST bazel-0.27.2-dist.zip 247948037 BLAKE2B ee3dafbb104f434080ad803cb40585e36a8c816eddac3d1a680752dd4ac65d588f1d5f4bb759dad0f59e9f6d7aad0ea5b54cd050d75a5434ee6ef079d8127641 SHA512 5fd7c2af2123424d3e5e4c9216de10d12ce604798f4831800c8d68cfd9bcf1133f4db9a947f0ee16db1a1513be17340ab8e36fba994a016d98c74ad5e026b4ab
-DIST bazel-0.28.1-dist.zip 256641169 BLAKE2B 489dfb1a27f83ff244cd05c11ec206689c12319a48f000379277073a108a79ad2dff61ed159efcbb1405531114ccb2d749e974004f969623cd4e9470166609f0 SHA512 640d3a9644436379e989d5993b5de9f2dc14d651a9f444c8795853989fdded7a62d71ab7cfa491d2aaf6402020c4931c8dc190d4dae63727b172ccb48ed55931
 DIST bazel-0.29.1-dist.zip 265744999 BLAKE2B 8495ab96947b02ec827cc2b5f542454e0d631eb077514c740d8be813495644f0be1020e706e2dbd321fa6f39af3060c4a7b2e68499201eaffc197704c1ecf760 SHA512 4da49e3f1ba681003afc2536d55954ed5a2c29de4a68e5a07f2627f3573d97bd6e244bc8a4f43c8951ecddd221041d87270ca9b7dd59ab16676306c9716f003d
-EBUILD bazel-0.20.0.ebuild 3072 BLAKE2B e357ef6c41a91ecd538250fd47830076db961e2234c7c734d24ae3c501517d0f16bf5934896a0e7efe271af926953b083c47c924c581b7ef208af2c4d53bf623 SHA512 982ca89595f13670dc117ba3504e8de6f3d5f4a7ec2af3a11bfadc3ce25bd75c85387b53464bd0348b0842d25454a1c1398ecc4f1146f9eb2fafa857e2193487
+DIST bazel-1.0.1-dist.zip 267211562 BLAKE2B ade5fcc2a799df4da24ce23a3f2f23d3f38aeec832ef2504a1a8ca7f23acafe3d5b5d94302f101ddadb366d7144624559c96c1c343fa465a976ca2c9b258c083 SHA512 94d81697d2f181659c2d386de23dae2655c4131633f8ce6d10c60373222756e8c0330ed3fe5ed20f81a8648bcb3acfc8b4762e96eb7950b58a4a5c94c715159f
+DIST bazel-1.2.0-dist.zip 267514282 BLAKE2B 1c4f9dcf2c18e6880d701dab3de2e880e55278216ba051f9ad753b9f8c539e5734346bcb20c706307b677f97736587ee11e3c3accabe4c82ac1a82a0cdafcd36 SHA512 eaa3e27d0ddd6102fea4fcdf5f4379355954ba25cd2f4b3530071d077411f8a501041d8fda9ac90325244296f31072faaebd91cf6338893752b25212822a6be9
+DIST bazel-1.2.0-rename-gettid-functions.patch 3303 BLAKE2B 75aaed0b8e5fe33910d1b428ad421bbf37cafdc38dc46cbe9d9fe516e957f1dc3a30333c40a6ec3e61580ca908189a8821937ddd28aa9cf119ae237d63c576fb SHA512 0d4dc5c5931ff3a16bb9ac228ec560fc0115444a3d3787f12866e11e8b3833ee8a26cc65c97aa9898c1f7a6c380820d62544d2ed7bed0d6f21aa4293e244eb04
+DIST bazel-1.2.1-dist.zip 267514406 BLAKE2B f9d316ac096f503a2c7fe101b103b88e7f0247f767a8dc28eb8c9d2cd0b6df6fa785f3b187e1a3963e2f9f0ae742a3330e5104e7a8aea75cb9b9e100366a5aca SHA512 bc0e6526bfbb8725a4f2ae95fc88b22229301b64559325fca3bcf5a9bc642cec2b2284eb9a6ce0699f1f910378b89ee23657dbea7928a92cc1900f1f2f405ff3
 EBUILD bazel-0.22.0.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
-EBUILD bazel-0.24.1-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 EBUILD bazel-0.24.1.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
-EBUILD bazel-0.26.1-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
-EBUILD bazel-0.27.0-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 EBUILD bazel-0.27.2.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
-EBUILD bazel-0.28.1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 EBUILD bazel-0.29.1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
+EBUILD bazel-1.0.1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
+EBUILD bazel-1.2.0-r1.ebuild 2931 BLAKE2B ea152126f1c20d98aaeaa185b66c2894e3cd8297dcfc27015cd62fcbd6c1d6e8665680fa531cab41236cddfdf00b190720ef2253f911696fd6e454f2d8fd0e17 SHA512 49a264dffcad16187685fce79693b8e87a210245b54979990019f86112da1d4db85428ddfccf657d7e1d06d13b16321b6d1e998990a241cf9725bc0ec6ddd410
+EBUILD bazel-1.2.0.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
+EBUILD bazel-1.2.1.ebuild 2938 BLAKE2B 608e27e1f2c857a0ff91fb5401d5e7a9a8ff1b97113cbe002a8b054be2637cf2b406b8e446afbc222ea83595fe42f69d44d3cf048409950716259b2cc00d1721 SHA512 c8fe75b8af817f312b0e472920a5b3ba8f0b2e0e8de5a821c2fb6ffdc4b06de9e9ff8254d2c6204fa00a89b489152107085a7c69da3a3881139ad6282ee58c98
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.20.0.ebuild b/dev-util/bazel/bazel-0.20.0.ebuild
deleted file mode 100644
index 44489b6bb068..000000000000
--- a/dev-util/bazel/bazel-0.20.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 java-pkg-2 multiprocessing
-
-DESCRIPTION="Fast and correct automated build system"
-HOMEPAGE="https://bazel.build/"
-
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples tools"
-# strip corrupts the bazel binary
-RESTRICT="strip"
-RDEPEND="virtual/jdk:1.8"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip"
-
-S="${WORKDIR}"
-QA_FLAGS_IGNORED="usr/bin/bazel"
-
-bazel-get-flags() {
-	local i fs=()
-	for i in ${CFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-	done
-	for i in ${CXXFLAGS}; do
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${CPPFLAGS}; do
-		fs+=( "--copt=${i}" "--host_copt=${i}" )
-		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
-	done
-	for i in ${LDFLAGS}; do
-		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
-	done
-	echo "${fs[*]}"
-}
-
-pkg_setup() {
-	echo ${PATH} | grep -q ccache && \
-		ewarn "${PN} usually fails to compile with ccache, you have been warned"
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	# Only unpack the main distfile
-	unpack ${P}-dist.zip
-}
-
-src_prepare() {
-	default
-
-	sed -i 's@//src:bazel@//src:bazel_nojdk@' scripts/BUILD || die
-
-	# F: fopen_wr
-	# S: deny
-	# P: /proc/self/setgroups
-	# A: /proc/self/setgroups
-	# R: /proc/24939/setgroups
-	# C: /usr/lib/systemd/systemd
-	addpredict /proc
-
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	cat > "${T}/bazelrc" <<-EOF || die
-		build --verbose_failures
-		build --spawn_strategy=standalone --genrule_strategy=standalone
-
-		build --distdir="${S}/derived/distdir/"
-		build --jobs=$(makeopts_jobs) $(bazel-get-flags)
-
-		test --verbose_failures --verbose_test_summary
-		test --spawn_strategy=standalone --genrule_strategy=standalone
-		EOF
-}
-
-src_compile() {
-	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
-	VERBOSE=yes ./compile.sh || die
-
-	local OPTS=""
-	if [[ $(java-config -g PROVIDES_VERSION) == "1.8" ]]; then
-		OPTS="--java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8"
-		OPTS+=" --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8"
-	fi
-
-	output/bazel --bazelrc="${T}/bazelrc" build ${OPTS} //scripts:bazel-complete.bash || die
-	output/bazel shutdown
-}
-
-src_test() {
-	output/bazel test \
-		--verbose_failures \
-		--spawn_strategy=standalone \
-		--genrule_strategy=standalone \
-		--verbose_test_summary \
-		examples/cpp:hello-success_test || die
-	output/bazel shutdown
-}
-
-src_install() {
-	dobin output/bazel
-	newbashcomp bazel-bin/scripts/bazel-complete.bash ${PN}
-	bashcomp_alias ${PN} ibazel
-	insinto /usr/share/zsh/site-functions
-	doins scripts/zsh_completion/_bazel
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	# could really build tools but I don't know which ones
-	# are actually used
-	if use tools; then
-		docinto tools
-		dodoc -r tools/*
-		docompress -x /usr/share/doc/${PF}/tools
-	fi
-}
diff --git a/dev-util/bazel/bazel-0.24.1-r1.ebuild b/dev-util/bazel/bazel-1.0.1.ebuild
index 84224be11667..84224be11667 100644
--- a/dev-util/bazel/bazel-0.24.1-r1.ebuild
+++ b/dev-util/bazel/bazel-1.0.1.ebuild
diff --git a/dev-util/bazel/bazel-0.28.1.ebuild b/dev-util/bazel/bazel-1.2.0-r1.ebuild
index 84224be11667..d9875eb6ce03 100644
--- a/dev-util/bazel/bazel-0.28.1.ebuild
+++ b/dev-util/bazel/bazel-1.2.0-r1.ebuild
@@ -8,7 +8,9 @@ inherit bash-completion-r1 java-pkg-2 multiprocessing
 DESCRIPTION="Fast and correct automated build system"
 HOMEPAGE="https://bazel.build/"
 
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+GLIBC_GETTID_PATCH="${P}-rename-gettid-functions.patch"
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip
+	https://raw.githubusercontent.com/clearlinux-pkgs/bazel/adefd9046582cb52f39579033132e6265ef6ddb0/rename-gettid-functions.patch -> ${GLIBC_GETTID_PATCH}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -51,6 +53,9 @@ pkg_setup() {
 src_unpack() {
 	# Only unpack the main distfile
 	unpack ${P}-dist.zip
+	pushd third_party/grpc/src >/dev/null || die
+	eapply "${DISTDIR}/${GLIBC_GETTID_PATCH}"
+	popd >/dev/null || die
 }
 
 src_prepare() {
diff --git a/dev-util/bazel/bazel-0.26.1-r1.ebuild b/dev-util/bazel/bazel-1.2.0.ebuild
index 84224be11667..84224be11667 100644
--- a/dev-util/bazel/bazel-0.26.1-r1.ebuild
+++ b/dev-util/bazel/bazel-1.2.0.ebuild
diff --git a/dev-util/bazel/bazel-0.27.0-r1.ebuild b/dev-util/bazel/bazel-1.2.1.ebuild
index 84224be11667..1a39ec814877 100644
--- a/dev-util/bazel/bazel-0.27.0-r1.ebuild
+++ b/dev-util/bazel/bazel-1.2.1.ebuild
@@ -8,7 +8,9 @@ inherit bash-completion-r1 java-pkg-2 multiprocessing
 DESCRIPTION="Fast and correct automated build system"
 HOMEPAGE="https://bazel.build/"
 
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+GLIBC_GETTID_PATCH="${PN}-1.2.0-rename-gettid-functions.patch"
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip
+	https://raw.githubusercontent.com/clearlinux-pkgs/bazel/adefd9046582cb52f39579033132e6265ef6ddb0/rename-gettid-functions.patch -> ${GLIBC_GETTID_PATCH}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -51,6 +53,9 @@ pkg_setup() {
 src_unpack() {
 	# Only unpack the main distfile
 	unpack ${P}-dist.zip
+	pushd third_party/grpc/src >/dev/null || die
+	eapply "${DISTDIR}/${GLIBC_GETTID_PATCH}"
+	popd >/dev/null || die
 }
 
 src_prepare() {
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 06b6e7f5c493..212b266c7a8f 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -2,14 +2,17 @@ AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f
 AUX bcc-0.9.0-system-libbpf.patch 3629 BLAKE2B e3fd70ccd29126bd2ac8582d8094ef0317dbc9dafc8924a05d994105573a6bd1bf382cbd3d6a0bb25390abc3b4ca3edc70293f4663337ccc203434ba380648dd SHA512 e7ca33a66ffbe4cb4b4bf169029d2325b4321018832803872a7fc7f1e99a75338e34bfe55a072f717d45f9759adf119ed5289f0febd45f81303c178999ef5dc7
 DIST bcc-0.10.0.tar.gz 2052430 BLAKE2B 562aa95d34ba329ce966bca3164af45fe6d78487e5f0d370a0a90c5d91af75b4adcc5aa1e6578bf598e55dc51394c5a218fc19e2b57b2f7241cc3fe1f3a4e513 SHA512 92ba0f57d22af610ac81661526fed8bec80d502bcbc8aa5048ba7c50911247c020832db23afdcf9b555b142cd387c228cf7baa0ddc94067165403e362227f235
 DIST bcc-0.11.0.tar.gz 2611511 BLAKE2B db12e10a3da11b1d3691ca5e0e036f56af4c5765d49e2edefc3e30bc90036a5f521d196db797e3725e618efa68ba2550848b3dc044015f6aea6b2da6ca2a34f5 SHA512 4854a5a15a89a8bd3a10daa6f0e831428316751280902cbdc74f3c6f78263ee1c58521ae9125804e72fec6482702818a5fec781436400640627e4b7c2fc189fb
+DIST bcc-0.12.0.tar.gz 2627075 BLAKE2B 44c435eaaf6233ad24249cf5da4e778cd31e41573199ded97d1f411c7424128fb11f838c55fa48c692b4d5f267ea594d6cab9992dc76137da1b41453285c98c5 SHA512 db3ea929b1296f4d9d82d2a11e89e11a1c31512d3f7f935475a7613e0128a5cf9441f3138969535ef41de0c0f677c7446f62f1c64575d41a9896e5339f3f112b
 DIST bcc-0.6.0.tar.gz 1986593 BLAKE2B 514c2c781eb94d99560232d8050b5664ce3565622b236e78cd111be27b3482849965600a1d574f59243917672f00bb3cef65cab63103f6c4a5cf62024c683d9b SHA512 1a8edf6da22f3119a74cf43f03ec83b97ed2f6fc18828d750d8a695ac1451b6b3209e5d2cf48bc87f53fa9447e8813a018a58d31588d477e4aa364a2d0217e80
 DIST bcc-0.7.0.tar.gz 2009289 BLAKE2B 370b553521289d983d1165633e76a5e405250b9b09dbf3e78c127d232908e73facce06097ce4dbf0bbccda929b6715a9b7460affe123556087c8ca00b8d62c0b SHA512 ebe6c4cbecba2d587c69af71ddc8cb451b2b8e1d49ef887f291c813320c2c60d49357500fc2751d5b418df2be1d02763c385d89de6efa6e10f049c25acf01b4e
 DIST bcc-0.9.0-linux-5-bpf.patch.xz 28524 BLAKE2B f0369e50eabd7b1eb9a492b9652cd7647c7c7fda3b01db1e7f2bf716e76357d07d67193b31189b98309e26895ac3dd5c755d4cef6bc592e4674f40710c33539c SHA512 fc5b828a5826da2cf1e1a76758c635f5443d202aecbe3f269d78abcaa0117ad7658bea6c43e7b60e1ecc6bcc65bd19b100217758a1203d278ddb03c5837c43f1
 DIST bcc-0.9.0.tar.gz 2036984 BLAKE2B cebbeb57f06af90442d28be1633a54c198bf796786c4fcca3a83dea03bc76949f958dd24f7d85feb2e3402576410f965754f3d031076486b7d378493c56035e8 SHA512 373080181380ec3bcb13469e29ff1f792e924a2df00a614da4647ed54060ad216525dd0f49c5d0afba7946a6d2f4e3475af97250a33db825945af3d165294091
 DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3bd7c7466a5484ead1cca5a9fe775e331838cd5645d7399cb5b1a5b2fcb3814fb45643660fd3f7d84b9986bae6 SHA512 ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad
 DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c
+DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
 EBUILD bcc-0.10.0.ebuild 1889 BLAKE2B 4083ff8d78dc4352eda14f27d269fa2cc847640a89d43553afcbf9a6d1df5c2c35bbe6dbdabd8bdd77034758bd580e9c1b8abd4b0b4dd949dc1e2f2d812b4398 SHA512 add2f25b8ff4e15ffb2e9b43247e4de405c857f1226dad3b56455e4c60e9971dee31c8681c2fabd560a7706310705e42b570ce8fdef954f5f2376c41dc07b4fc
 EBUILD bcc-0.11.0.ebuild 1890 BLAKE2B 20ea2a02282ab1b360a88430866df64f2d61717863db25efdcbd99e7174dbd5b65c8fae78c4a8d94d0b9cd6d5a23595ed181bfb55c55e37f69e3e45ea4f14fab SHA512 7f7fac9a3e85a06c18b1cb011cfd3ff4aef9a1995463ab3fed8146c410bae3a49e5e2f87117390e30e9c2f2af917912d9ee12cedfd455d505f5e79f425783e62
+EBUILD bcc-0.12.0-r1.ebuild 1914 BLAKE2B 0ba6809e0e5a10a3034d40cba47cf7687c4935e07338374a5084b46c36bf8592a614e0450671ca359e946122456e57d4ea7a646026efd8df0c5d927b946dad60 SHA512 44a739521fc7d17fd58cf9f57d54733b45e9f319f5033e152444276953a8f6ae8164b39e58841638642ed8db3462e8598064695066607eb9f3eef09b10277238
 EBUILD bcc-0.6.0.ebuild 1132 BLAKE2B 4f3fe126841b267c7ac676be765968163e350831a9dad18e9ecf923c6dc5fbbbcade831cce89c9d25d862174deaa512f5310a5a667ede2ee2cd356277ca38f2d SHA512 7359781a42c5470be2d67fed289c5aa45c1495a060e3e022d2e0b8a086b3b03bac422b85f8fd835e7dbe882d42829b24aee364e84c988ec744d2d45913873ca9
 EBUILD bcc-0.7.0.ebuild 1134 BLAKE2B a3a89ee433c77d182394f2cd4ab6200059430ef623d000f2e2f651a9c424bcd804414f19598fb1f192f0caf28aaffac3ed858973bb5c3f98e386b2167690fc20 SHA512 2f4ba8cb864ef80e5081d0f84092b0c2e1a2a31f522c3ee5ed8df134bd53023bfd8366e4e15e9c8ff5cd4f81897d28c08befa0ec7655f9d8696f574c9d9719e0
 EBUILD bcc-0.9.0-r1.ebuild 1677 BLAKE2B 6d2affa32b03f82c91071ff634e915093cd16baaf1fee9109c4ef4e63f24ae19d2827f954de09d86cf28ad2a3f34da54fb6da5472f3727deddf9d6043639df4f SHA512 076a60b122d350a2041c94fd29d23630e631c713611032aeb1525077c5c3b7ab138d065f4acced277f265e410284df52aeaa3678134f66cafaead924d4f1dc7c
diff --git a/dev-util/bcc/bcc-0.12.0-r1.ebuild b/dev-util/bcc/bcc-0.12.0-r1.ebuild
new file mode 100644
index 000000000000..cb592d045bd2
--- /dev/null
+++ b/dev-util/bcc/bcc-0.12.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit cmake-utils linux-info python-single-r1 python-utils-r1
+
+EGIT_COMMIT="v${PV}"
+LIBBPF_VER="0.0.6"
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+
+# This bundles libbpf, I tried to unbundle it, but I am not good enough
+# with cmake to do it. Patches accepted...
+SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+luajit test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=sys-kernel/linux-headers-4.14
+	>=dev-libs/elfutils-0.166:=
+	sys-devel/clang:=
+	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+	luajit? ( dev-lang/luajit )
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)
+"
+BDEPEND="
+	dev-util/cmake
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+)
+
+# tests need root access
+RESTRICT="test"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	rmdir src/cc/libbpf || die
+	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED}"
+	python_optimize
+}
diff --git a/dev-util/bite/Manifest b/dev-util/bite/Manifest
index 100da7aca423..f08fef80d7af 100644
--- a/dev-util/bite/Manifest
+++ b/dev-util/bite/Manifest
@@ -1,2 +1,2 @@
-EBUILD bite-9999.ebuild 1491 BLAKE2B b8fd0e78ec66d010a246e849bf630da5d5f5e4ff1936ef78fcf85df258fa3a86a5daf671c3d436c5d0322b21144655fdbb490b982cb975ebf7484fb3eabaf94b SHA512 ee4b75263d707a226e7296a82e84c96ec0c7f81fbceac7c53735eb5d1e07ecee8df77d3f10a0efbb8fd7e27cd9a2c6c7c58f3f37574e4e5cc0a3c6bbe2f7b463
+EBUILD bite-9999.ebuild 1518 BLAKE2B 143f821c71ac825dbbc2121ba96407c2e64c7f11a9882fe6263bee1fc8c58b711de733088e7b959f32b4425b91c83b6fc82ac4fad1e9f485e363c5e69d9fc400 SHA512 064968d1fb35c5a080620e91cca3dce4b72b99c5dfefa1344e1d181c6671240d0a61c6aab91aefc7d9fc5d2c79a45d55f5ee30ac4d018454cba9ab945c8cbb63
 MISC metadata.xml 330 BLAKE2B 84591ee05d14a0a3c7db1cd1fc966aca6a614c129babd365d5c2717ca19845a3b391c280e1861ae8c900e8a6124b725a15c775292181f2fc8cf6e5dc000eee01 SHA512 790542c11e1210fef48d1235385493814128da8cb6f1ab33e569e0f37e862b568ffe92f4a18ad6cf0ac8f8917bd884513fe40597540ad299af9feaf7722d2bb8
diff --git a/dev-util/bite/bite-9999.ebuild b/dev-util/bite/bite-9999.ebuild
index adddde77b9b9..c99164397694 100644
--- a/dev-util/bite/bite-9999.ebuild
+++ b/dev-util/bite/bite-9999.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://github.com/bite/bite"
 LICENSE="BSD"
 SLOT="0"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/requests-2[${PYTHON_USEDEP}]
diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
index 543b2b384b12..0a0b0a261bb5 100644
--- a/dev-util/bnfc/Manifest
+++ b/dev-util/bnfc/Manifest
@@ -1,6 +1,8 @@
 AUX bnfc-2.8-alex-3.1.6.patch 207 BLAKE2B 3e14851866c8ae0dda9245dd1dc920bc4554eb9eae80caec36b9a9b27d62e01727d23e2d716806c18e7e414def483dc192a1c7c8dbca1a5841c7278f40487264 SHA512 6d467ff25b7e8ef70c99b80f4f847b2c22ad39890f72a9a2dee851783af45a91567629f87685e0f8a2d3d64213161713cd7282feed4cd927aff7feab38b97b48
+AUX bnfc-2.8.1-ghc84-p2.patch 4144 BLAKE2B 19ac2a0e8edcbad7d441c248625904aa0021fc64e97d3f7ebcf3e0d1bdf693b442062a5126af1162404de59a022e8f573d7127c223209993755e99e60285eda8 SHA512 4a21d805f24d9f4729a2b95af04333651639324f7ec26996627007ffb5dc8657cb175b228e95e9356c2b47e70ac49576f58b024891c0ce6ddf299b4ee9299548
+AUX bnfc-2.8.1-ghc84.patch 986 BLAKE2B bf7ecd64654f04d701a2b7ec9dfc969cbf4a1bd51db7e6d31512c2cd7bfbaed83ae37a93bec7ce667cae2a98369086accf5d76dab84ae02df4af6d87703531bf SHA512 615ac9cf9b7eff19f675b4cb44e9a3b9d9acc53c827c57c2b556fb76c9c37832f8d137609df64c469eed0b298c0b9dbe01b1ba9cb8d5a1b3088fadadfe27af49
 DIST BNFC-2.8.1.tar.gz 225015 BLAKE2B 973f7a5ebc5fb995bf0014621ba7bfebe0d6adbb35bd276b3f7ec56e3fe1ab08c3811d27a2d58a73ca52ac4bf9ba35fba3d172a82684b1ef999a2fdd6dc4ece9 SHA512 d5ea9b4129a4f71c2d66cda2f859a2c39be6d4400cddbd5a5303b5b408f4cf03ce7a92825224f4674c6cc48bec07429c447b9b39fc4e6d144c922bf1b0829561
 DIST BNFC-2.8.tar.gz 183591 BLAKE2B cc14079bba767d85ae59a05057cba7db11bc7fcc39e28c29a5151e1ffae1c5b712351085eaa8affe79a36cac66e79df26335d48cfc24fbf41dff018727aa8dd6 SHA512 358700360dbfbeacf3276150856415e08e1498c6af27254302d406e5407b7b4f84ac0dcf9dcf8391128ac9d77a17a928c2427961ec8c3ffdb9af8d169145cafb
-EBUILD bnfc-2.8.1.ebuild 843 BLAKE2B 1435d1cc8dd2537dd7cd1183fc875c36bc4b7116c20471c7352ef999e74e9e6211315dd39022d449f2a6563624edf55011da3d506fcd59b8925fc7e0dba916ac SHA512 1bbb98afd62d1c82bcda69625c36bad5a7b238b780960181a7c895df0ff28303f140c3ec3b0b59bcb3dd44f25332050784395c174f8ead3b19f8b5326e2706bb
+EBUILD bnfc-2.8.1.ebuild 815 BLAKE2B 543658d36f34aa2d2e28eee8a953c35f53bceb1258d46ab950b0355b46cca9b61f7a7656978c49f91964dff38d5c2521ae14f3f38ebf049a823620f755c636f6 SHA512 c88a93a1294a99f20c8313cd70810a423e9236f46b72253614605ff3b8effdfd445fd759ee36b4451eafb4969dd82e5d53ac938643b75daf5d98f64be787d802
 EBUILD bnfc-2.8.ebuild 906 BLAKE2B 8d6c7e91b6f3fb2f10e4f85427f2af5eb414debea79eec8f2e210de9a39f600c9ceeff57a1985a77f00a79e3bf76370227d59329636d0a971d2f7b09c93f5a3b SHA512 12de94e7cf2fee3494d9aa5fccd0e819f746bd8213cc595f387198be769464e3b355efdb7bcd224b4be551bd52479b0ed2abfe4e18c8e3a80ce402a6bcf47d16
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-util/bnfc/bnfc-2.8.1.ebuild b/dev-util/bnfc/bnfc-2.8.1.ebuild
index 087c5aa0327c..0d11aa19de25 100644
--- a/dev-util/bnfc/bnfc-2.8.1.ebuild
+++ b/dev-util/bnfc/bnfc-2.8.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 # ebuild generated by hackport 0.4.6.9999
 
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour" # Broken test-suite: missing files
 inherit haskell-cabal
 
 MY_PN="BNFC"
@@ -29,11 +29,11 @@ DEPEND="${RDEPEND}
 	dev-haskell/alex
 	>=dev-haskell/cabal-1.8
 	dev-haskell/happy
-	test? ( >=dev-haskell/doctest-0.8
-		dev-haskell/hspec
-		dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.5
-		dev-haskell/temporary )
 "
 
 S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ghc84.patch
+	"${FILESDIR}"/${P}-ghc84-p2.patch
+)
diff --git a/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch b/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
new file mode 100644
index 000000000000..a1e944c2d154
--- /dev/null
+++ b/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
@@ -0,0 +1,130 @@
+--- a/src/BNFC/Backend/C/CFtoCAbs.hs
++++ b/src/BNFC/Backend/C/CFtoCAbs.hs
+@@ -50,3 +50,3 @@ import Data.List
+ import Data.Char(toLower)
+-
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/C/CFtoCPrinter.hs
++++ b/src/BNFC/Backend/C/CFtoCPrinter.hs
+@@ -53,2 +53,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/C/CFtoCSkel.hs
++++ b/src/BNFC/Backend/C/CFtoCSkel.hs
+@@ -49,2 +49,3 @@ import Data.Either (lefts)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
++++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
+@@ -50,3 +50,3 @@ import Data.Char(toLower)
+ import Text.PrettyPrint
+-
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
++++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
+@@ -49,2 +49,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/CPP/PrettyPrinter.hs
++++ b/src/BNFC/Backend/CPP/PrettyPrinter.hs
+@@ -32,2 +32,3 @@ import BNFC.Backend.CPP.STL.STLUtils
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
++++ b/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
+@@ -56,2 +56,3 @@ import BNFC.Backend.C.CFtoBisonC (startSymbol)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Common.hs
++++ b/src/BNFC/Backend/Common.hs
+@@ -4,2 +4,3 @@ module BNFC.Backend.Common (renderListSepByPrecedence) where
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Common/NamedVariables.hs
++++ b/src/BNFC/Backend/Common/NamedVariables.hs
+@@ -75,2 +75,3 @@ import Control.Arrow (left, (&&&))
+ import Data.Either (lefts)
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java.hs
++++ b/src/BNFC/Backend/Java.hs
+@@ -56,2 +56,3 @@ import qualified BNFC.Backend.Common.Makefile as Makefile
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ -------------------------------------------------------------------
+--- a/src/BNFC/Backend/Java/CFtoComposVisitor.hs
++++ b/src/BNFC/Backend/Java/CFtoComposVisitor.hs
+@@ -29,2 +29,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
++++ b/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
+@@ -28,2 +28,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java/CFtoJLex15.hs
++++ b/src/BNFC/Backend/Java/CFtoJLex15.hs
+@@ -46,2 +46,3 @@ import BNFC.Backend.Common.NamedVariables
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
++++ b/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
+@@ -56,2 +56,3 @@ import Data.Maybe (mapMaybe)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
++++ b/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
+@@ -58,2 +58,3 @@ import Data.Either (lefts)
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
++++ b/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
+@@ -48,2 +48,3 @@ import Text.PrettyPrint
+ import Data.Either (lefts)
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
+@@ -34,2 +34,3 @@ import BNFC.Backend.OCaml.CFtoOCamlYacc (terminal)
+ import BNFC.Utils ((+++))
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
+@@ -30,3 +30,3 @@ import BNFC.PrettyPrint
+ import BNFC.Backend.Haskell.CFtoPrinter (compareRules)
+-
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
++++ b/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
+@@ -25,2 +25,3 @@ import BNFC.CF
+ import BNFC.Backend.OCaml.OCamlUtil
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Pygments.hs
++++ b/src/BNFC/Backend/Pygments.hs
+@@ -17,2 +17,3 @@ import BNFC.Utils
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Lexing.hs
++++ b/src/BNFC/Lexing.hs
+@@ -8,3 +8,3 @@ import PrintBNF
+ import BNFC.CF
+-
++import Prelude hiding ((<>))
+ 
diff --git a/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch b/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch
new file mode 100644
index 000000000000..884b0a7e57a6
--- /dev/null
+++ b/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch
@@ -0,0 +1,31 @@
+--- a/src/BNFC/Backend/Haskell/CFtoAbstract.hs
++++ b/src/BNFC/Backend/Haskell/CFtoAbstract.hs
+@@ -25,2 +25,4 @@ import BNFC.Backend.Haskell.Utils (catToType, catvars)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
++
+ 
+--- a/src/BNFC/Backend/Haskell/CFtoPrinter.hs
++++ b/src/BNFC/Backend/Haskell/CFtoPrinter.hs
+@@ -29,2 +29,3 @@ import Data.Maybe (fromJust)
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Haskell/CFtoTemplate.hs
++++ b/src/BNFC/Backend/Haskell/CFtoTemplate.hs
+@@ -25,2 +25,3 @@ import BNFC.CF
+ import BNFC.PrettyPrint
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/Backend/Haskell/Utils.hs
++++ b/src/BNFC/Backend/Haskell/Utils.hs
+@@ -10,2 +10,3 @@ import BNFC.CF (Cat(..), identCat, normCat)
+ import BNFC.Utils (mkNames, NameStyle(..))
++import Prelude hiding ((<>))
+ 
+--- a/src/BNFC/PrettyPrint.hs
++++ b/src/BNFC/PrettyPrint.hs
+@@ -10,2 +10,3 @@ module BNFC.PrettyPrint
+ import Text.PrettyPrint
++import Prelude hiding ((<>))
+ 
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index e256e1efde32..ceccec6829f7 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,18 +1,12 @@
-AUX boost-build-1.48.0-disable_python_rpath.patch 341 BLAKE2B 5b25023aa0297f83134a403ca305141a8ad2381659453a4af49bdff85087f685974b4f96b5d8005f67a1fec0ec9ba1ff5298e7412f5173c550bd9180ea7e5c2b SHA512 1bc89bcf7210d6f3fcf88b48c7d173fc76c16dae804a9c927509f7ff525c6c77b09d9fa5c1f02e77ec36dac303d516b3d00bed08626007852a22c400adc992a4
-AUX boost-build-1.49.0-darwin-gentoo-toolchain.patch 651 BLAKE2B f5db950724eae738b6caf3cb2a5e52f334b0e905173c7fe6f1e84480999805f742c28cc92cd9745144f13a84520f834b9e505f8140656aa266af2a7c2c11e978 SHA512 54606684921997c4d280eae7f6033ef6d02dc76d8c56499db25b359879a5a89e0220ec9733d197c4c482339d9968771ddd90891edf543f11f622595ed2bf43cd
-AUX boost-build-1.50.0-respect-c_ld-flags.patch 1868 BLAKE2B cff27fe56fd3856364f687c3daea78ae86f1fc5e2d7307e2c84591b0254a6492078c1013aac1c868497553349c4afc4f2c69cce2dd63cac3237b4b7d42524fdc SHA512 821ceff3027c318191b0959c265c420c9f43b9e8185fc20c902a31efaf7bbaaa4dfe4f01408557f7b89774b15104ad391671f467ad2e70af93235e8a0b8d18ee
-AUX boost-build-1.52.0-darwin-no-python-framework.patch 419 BLAKE2B 1f9544ea26d8e1e93d85f2196ff13d55f8a735818881021472a0598bdfa993a066dcbfa26d4aa50b650c9a647b78dead18b290adf131549790ed4c9d13f39cb2 SHA512 23f281c53c3e580a30efbea83e2c63d28021151e299b0086b106d1148f3b20e81237a3141a6842b71403f36cd531a58c4eb7ab5bf030ce0e23aa08198202cc48
-AUX boost-build-1.54.0-fix-test.patch 363 BLAKE2B b64a87e69df3d4832e5704014a92b4588b60abc5ad361d3daad39a33a92aba2e0368373be26ea10ae2ea4396a18c098ca5dd00db995f03c9a35e2eb1f9002990 SHA512 d349ff3040c219c3a9f9f6182ca3f1fe7e25d8f2975dd04e66d8e281caf10a5b27cab5e6fa6240ed57b24524fa045a88ba1cf9220efcf065726c78c68378c5e8
-AUX boost-build-1.54.0-support_dots_in_python-buildid.patch 487 BLAKE2B 6b01c71e728d03897b1caa1b408592d95574a3723f86a4ac3a750ae8e458891d5c7fe123998b39b7422a84c3698bbe237555dbd6b759f6c706a409a4dadcc9b6 SHA512 41fbe223120452a6ddf7b8ec9f64b2f653ee3d18b2dfccdba90d9040632f911159ac4102947371e12af7e52ca251aa39db2be9b362251ec86c12860867e50e68
-AUX boost-build-1.55.0-ppc-aix.patch 228 BLAKE2B 80e1c943ae11e7ec7730e83a0126ef8fb041cbdf47dd5cb5eb33829166f98ac7f189cf70a73ae0d4835c6914a0041bc628be8b948eddb36ef74c98476088f4c3 SHA512 a320bfb744667312230cf601d034217f72e3a78fe06851678c5810bb47c8239007aaeffb5719513696922ffc2d4c2200e60e140b34e3992dc353ad0fc69177fe
-AUX boost-build-1.62.0-sparc-no-default-flags.patch 2646 BLAKE2B 65a3a5018fed0197fe2bd1f93e5de4e799a201274f7320f4417edd4978a338a800eef1aa911ec7729f4f3b02c9cf85106dc25d466eab0e0c87d7625c4b652936 SHA512 1767c0b72f18ddf7bf4dc9d51c911ce0fe3c775e60cc960f913b218850cae9361728fad192194589929808c6c89c63110810e668fc7f75c79a04cbab1e59834f
-AUX boost-build-1.66.0-add-none-feature-options.patch 724 BLAKE2B c757f0e2d9b096cad74f130ed8219f6d0ff81f7f020cfef7352a324f47167cc4c71f49c8d2781d06f624fec98e973add229ac731bf2f37f9dade907bb9c9fc3d SHA512 9d4149739139d268e54304d73d1ceb0073ca94265d8a84467c890c8f68aac3b0060e847b71e961a92f17813bad651d0515898dd4d0535f5cc6c1c4a024e9b39a
+AUX boost-build-1.71.0-add-none-feature-options.patch 484 BLAKE2B b1b8b3b837679ad1e3d2b3dc8aa22dd4c6e18687d159964851dc1ca852acd6cbd5000eeda69cfaee11160c37849ca02026de26ba82960235689d83da5401100c SHA512 954b0472cc25afca6a56b793419e4aec3bac2c4683309c9a43619ba5aed166d9b17c0f2b621c46c05507163fb98c314083df20681d148564a666b59fdfdda86c
+AUX boost-build-1.71.0-darwin-gentoo-toolchain.patch 651 BLAKE2B b6fe461f4db4a07d4961199dd3c707584b35af4a8ca3c0da8921eb366e80b81aa25506ef18cd9d732f3177e2505258be4268a0e58e5325c59deb7d76d3b55645 SHA512 80aa0b261b6aa1f89bffb34ec720c0b8a5b6e2e4867dcf4fc1cf58ba798243cf61a12c4ea1ce6ebc97ca9ec45fb959fb9c0ec997844d3c750d4a2f5a76f11c63
+AUX boost-build-1.71.0-disable_python_rpath.patch 343 BLAKE2B 7b8449db1054dcee76ecbe1b1c826ae3d6964acfcfc0850ff3c75d3c71b043587bccac6b96797229c6dec39beb593893d16ae93a4d7fd16b969129fe63f73d0b SHA512 99bc1260f3d36faf60ab2837039466201bddfeec5c60f65c1c5e52d6d6c1667d419376328f8202596aa2b66448308175d2504062ee6e1708ea0f44d02988ceb4
+AUX boost-build-1.71.0-fix-test.patch 363 BLAKE2B b64a87e69df3d4832e5704014a92b4588b60abc5ad361d3daad39a33a92aba2e0368373be26ea10ae2ea4396a18c098ca5dd00db995f03c9a35e2eb1f9002990 SHA512 d349ff3040c219c3a9f9f6182ca3f1fe7e25d8f2975dd04e66d8e281caf10a5b27cab5e6fa6240ed57b24524fa045a88ba1cf9220efcf065726c78c68378c5e8
+AUX boost-build-1.71.0-no-implicit-march-flags.patch 15700 BLAKE2B dc73dcbd5320db6c57b62a009371325c5e6964ca76dc66f1504a8ff3498c631dd6defc3b46288be3148048856c4385f95bfda32b60751e038b7da205eb4b3e10 SHA512 a4b62f5a0e96896dde641e2d59551036c2844fdff02c5f266f05fcd4b651c096d9af93ec468af3a5f2b98ca1020ca82612da4db3de498b9eb7e9e1bc40654bcc
 AUX boost-build-1.71.0-respect-c_ld-flags.patch 367 BLAKE2B fee2e2f2db024a1421ad7f7d59a17908d6d74bd95c568c27adf9853725d8d92b7460d1c520c2a591f4a8d41213e2bd822044aef490b7b50590a6dac63630dc39 SHA512 148171cd6b1946e4dd0c2cfe734ff9a7e7adb4789868a363bd6f0855fad882f69e34aa079c0e1521864db5f5b7dfa449cfed74236b5f6743ed520ed477e48d1c
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
-DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
-DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
 DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20
-EBUILD boost-build-1.65.0.ebuild 3891 BLAKE2B c47be692e2688b4fc97ccd937e68779859b8f0fc32aabe080ffda307b3fdb04fd67309c204348165b277e19504562d7fe1046ca2295a9f6971e7170d45edd570 SHA512 440452088de9c406150f18dfae2a586c3039d16dac623a065d524b6b3587d6f83346906e3e0e1697bc735c53c55ae19414750c8ab3c61090e49cc1a344b6ae88
-EBUILD boost-build-1.70.0.ebuild 3865 BLAKE2B e815fe470d6bc8e7c4e1a08e4ed6425c41c720615077478385710084582f5fba5048626b925a8e89c274b429e81f5b2ba2e820bd4cea3624539ccd3a337fa351 SHA512 d121308dcfb95e2f2b696ba00ef4cbc1279b84cdd2925005ea9f6557ef9763d35874c4e718a8f51da80fb492b3ac24a2799d5f285098a76b7c039ce7d7508dd7
-EBUILD boost-build-1.71.0.ebuild 3109 BLAKE2B 04ed336a2604b68298d139ec219d3d222b83f78b83f90b943bcc3aa7f38bc67425565a403a4d4a6b5d366aa4e44aa1749c76f5ec7bd911d1c35c28e343710ea5 SHA512 a6a00551bd039756814263a67af61be11a8f2cb9180cba5fb8fabc577e670daf3aaf677d6cd7733331d61a242b1395f253d1231b29390524469c3b9c2f53ea38
+DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
+EBUILD boost-build-1.71.0.ebuild 2666 BLAKE2B 44847ce5b01b52e5baff1e77e85892adaa97ebe20e1bf90d7908272f7475d780af5c19c6b2b213c54906343c69a46e32a2eef4ebd5498b9b0da3ece0c5e387cf SHA512 1a97524d7d1fd5504e0c76169291c1288612c68d11b74a1db2aa18f44d84fd9c36fe34ddf92e5db479c95a6ad0d6cfa44480e6f3f2d65c5f5c58215a4a0ca37c
+EBUILD boost-build-1.72.0.ebuild 2002 BLAKE2B b12230bcd018520bf04308e2da1c4c74043f4be8afe93aa058845716e27d35e05042f080c6dbe44cbfa3e2ced878c754c2ddc6e7675de412682c588731ce14cd SHA512 a8e1c3db057d062aeedb022c8136c34c89a1173bffcc58790b1bec8b8c3a1250bf2e6ae3ba5caae87ee4051956005104ce2b9aa4f31f7ee1f0dbf73bc7c11765
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild
deleted file mode 100644
index 4c164c8d29cf..000000000000
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic prefix python-single-r1 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://boostorg.github.io/build/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples python test"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/diffutils
-		${PYTHON_DEPS} )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch"
-	"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch"
-	"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch"
-	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
-	"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
-	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
-	"${FILESDIR}/${PN}-1.62.0-sparc-no-default-flags.patch"
-)
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
-}
-
-src_prepare() {
-	default
-
-	pushd ../ >/dev/null || die
-	eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
-	popd >/dev/null || die
-
-	# Remove stripping option
-	# Fix python components build on multilib systems, bug #496446
-	cd "${S}/engine" || die
-	sed -i \
-		-e 's|-s\b||' \
-		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c || die
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}" || die
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_configure() {
-	hprefixify engine/Jambase
-	if use python; then
-		# replace versions by user-selected one (TODO: fix this when slot-op
-		# deps are available to always match the best version available)
-		sed -i \
-			-e "s|27 26 25 24 23 22|${EPYTHON#python}|" \
-			engine/build.jam || die "sed failed"
-	fi
-}
-
-src_compile() {
-	cd engine || die
-
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed"
-}
-
-src_install() {
-	dobin engine/bin.*/{bjam,b2}
-
-	insinto /usr/share/boost-build
-	doins -r "${FILESDIR}/site-config.jam" \
-		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
-		build kernel options tools util
-
-	if ! use python; then
-		find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
-	fi
-
-	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
-
-	if use examples; then
-		docinto examples
-		dodoc -r ../example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-src_test() {
-	cd ../test || die
-
-	export TMP="${T}"
-
-	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
-
-	if [[ -s test_results.txt ]]; then
-		eerror "At least one test failed: $(<test_results.txt)"
-		die "tests failed"
-	fi
-}
diff --git a/dev-util/boost-build/boost-build-1.70.0.ebuild b/dev-util/boost-build/boost-build-1.70.0.ebuild
deleted file mode 100644
index a1e13511ec84..000000000000
--- a/dev-util/boost-build/boost-build-1.70.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic prefix python-single-r1 toolchain-funcs
-
-MY_PV="$(ver_rs 1- _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://boostorg.github.io/build/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples python test"
-RESTRICT="test"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	!<dev-libs/boost-1.35.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? (
-		sys-apps/diffutils
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch"
-	"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch"
-	"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch"
-	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
-	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
-	"${FILESDIR}/${PN}-1.62.0-sparc-no-default-flags.patch"
-	"${FILESDIR}/${PN}-1.66.0-add-none-feature-options.patch"
-)
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
-}
-
-src_prepare() {
-	default
-
-	pushd ../ >/dev/null || die
-	eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
-	popd >/dev/null || die
-
-	# Remove stripping option
-	# Fix python components build on multilib systems, bug #496446
-	cd "${S}/engine" || die
-	sed -i \
-		-e 's|-s\b||' \
-		-e "/libpython/s;lib ];$(get_libdir) ];" \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c || die
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}" || die
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_configure() {
-	hprefixify engine/Jambase
-	if use python; then
-		# replace versions by user-selected one (TODO: fix this when slot-op
-		# deps are available to always match the best version available)
-		sed -i \
-			-e "s|27 26 25 24 23 22|${EPYTHON#python}|" \
-			engine/build.jam || die "sed failed"
-	fi
-}
-
-src_compile() {
-	cd engine || die
-
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${ESYSROOT}"/usr) || die "building bjam failed"
-}
-
-src_test() {
-	cd ../test || die
-
-	local -x TMP="${T}"
-
-	DO_DIFF="${EPREFIX}/usr/bin/diff" "${EPYTHON}" test_all.py
-
-	if [[ -s test_results.txt ]]; then
-		eerror "At least one test failed: $(<test_results.txt)"
-		die "tests failed"
-	fi
-}
-
-src_install() {
-	dobin engine/bin.*/{bjam,b2}
-
-	insinto /usr/share/boost-build
-	doins -r "${FILESDIR}/site-config.jam" \
-		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
-		build kernel options tools util
-
-	if ! use python; then
-		find "${ED}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
-	fi
-
-	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
-
-	if use examples; then
-		docinto examples
-		dodoc -r ../example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-util/boost-build/boost-build-1.71.0.ebuild b/dev-util/boost-build/boost-build-1.71.0.ebuild
index 641d9b8e3999..3c8845c89132 100644
--- a/dev-util/boost-build/boost-build-1.71.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.71.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 RESTRICT="test"
 
@@ -34,11 +34,11 @@ REQUIRED_USE="
 S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.48.0-disable_python_rpath.patch
-	"${FILESDIR}"/${PN}-1.49.0-darwin-gentoo-toolchain.patch
-	"${FILESDIR}"/${PN}-1.62.0-sparc-no-default-flags.patch
-	"${FILESDIR}"/${PN}-1.66.0-add-none-feature-options.patch
+	"${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch
+	"${FILESDIR}"/${PN}-1.71.0-add-none-feature-options.patch
 	"${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch
+	"${FILESDIR}"/${PN}-1.71.0-no-implicit-march-flags.patch
 )
 
 pkg_setup() {
@@ -55,18 +55,8 @@ src_prepare() {
 	default
 
 	pushd .. >/dev/null || die
-	eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
+	eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch
 	popd >/dev/null || die
-
-	# remove default -march/-mcpu definitions
-	# bjam is trying to be clever and injects -march= in order to
-	# optimize code for you. This breaks on 32-bit builds, because
-	# -march=i686 will not work on an i486 CHOST.
-	# https://bugs.gentoo.org/624616
-	sed -e '/^cpu-flags\s*gcc\s*OPTIONS/d' \
-		-e '/toolset\.flags\s*gcc\s*OPTIONS/d' \
-		-e "/cpu_flags('gcc',\s*'OPTIONS'/d" \
-		-i tools/gcc.{jam,py} || die "Failed removing -march/-mcpu"
 }
 
 src_configure() {
diff --git a/dev-util/boost-build/boost-build-1.72.0.ebuild b/dev-util/boost-build/boost-build-1.72.0.ebuild
new file mode 100644
index 000000000000..00a3c7d53ddf
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.72.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="https://boostorg.github.io/build/"
+SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples"
+RESTRICT="test"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
+	"${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch
+	"${FILESDIR}"/${PN}-1.71.0-add-none-feature-options.patch
+	"${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch
+	"${FILESDIR}"/${PN}-1.71.0-no-implicit-march-flags.patch
+)
+
+src_unpack() {
+	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+}
+
+src_prepare() {
+	default
+
+	pushd .. >/dev/null || die
+	eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch
+	popd >/dev/null || die
+}
+
+src_configure() {
+	hprefixify engine/Jambase
+	tc-export CXX
+}
+
+src_compile() {
+	cd engine || die
+	./build.sh cxx -d+2 --without-python || die "building bjam failed"
+}
+
+src_test() {
+	# Forget tests, bjam is a lost cause
+	:
+}
+
+src_install() {
+	dobin engine/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
+		build kernel options tools util
+
+	find "${ED}"/usr/share/boost-build -iname '*.py' -delete || die
+
+	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r ../example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch b/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch
deleted file mode 100644
index 8775583cbc00..000000000000
--- a/dev-util/boost-build/files/boost-build-1.50.0-respect-c_ld-flags.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/engine/build.jam
-+++ b/engine/build.jam
-@@ -3,7 +3,7 @@
- #~ (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
- 
- # Clean env vars of any "extra" empty values.
--for local v in ARGV CC CFLAGS LIBS
-+for local v in ARGV CC CFLAGS LDFLAGS LIBS
- {
- 	local values ;
- 	for local x in $($(v))
-@@ -179,10 +179,10 @@
- if ! $(CC) { CC = cc ; }
- toolset cc $(CC) : "-o " : -D
-     : $(CFLAGS)
--    [ opt --release : -s -O ]
-+    [ opt --release : ]
-     [ opt --debug : -g ]
-     -I$(--python-include) -I$(--extra-include)
--    : $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
-+    : $(LDFLAGS) $(LIBS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
- ## Comeau C/C++ 4.x
- toolset como como : "-o " : -D
-     : --c
-@@ -201,11 +201,11 @@
- ## MacOSX Darwin, using GCC 2.9.x, 3.x
- toolset darwin cc :  "-o " : -D
-     :
--    [ opt --release : -Wl,-x -O3 -finline-functions ]
-+    [ opt --release : -Wl,-x -finline-functions ]
-     [ opt --debug : -g -O0 -fno-inline -pg ]
-     [ opt --profile : -Wl,-x -O3 -finline-functions -g -pg ]
-     -I$(--python-include) -I$(--extra-include)
--    : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
-+    : $(LDFLAGS) -L$(--python-lib[1]) -l$(--python-lib[2]) ;
- ## GCC 2.x, 3.x, 4.x
- toolset gcc gcc : "-o " : -D
-     : -pedantic -fno-strict-aliasing
---- a/engine/build.sh
-+++ b/engine/build.sh
-@@ -224,9 +224,9 @@
-     cc)
-     if test -z "$CC" ; then CC=cc ; fi
-     BOOST_JAM_CC=$CC
--    BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LIBS"
--    BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LIBS"
--    BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LIBS"
-+    BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS $LDFLAGS $LIBS"
-+    BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS $LDFLAGS $LIBS"
-+    BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS $LDFLAGS $LIBS"
-     ;;
- 
-     qcc)
diff --git a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch b/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch
deleted file mode 100644
index cacbe00a7ef9..000000000000
--- a/dev-util/boost-build/files/boost-build-1.52.0-darwin-no-python-framework.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Don't look for the framework path, we build Python the UNIX way for
-Gentoo Prefix
-
---- a/engine/build.jam
-+++ b/engine/build.jam
-@@ -82,11 +82,6 @@
-         }
-         --python-lib = $(--python-lib[1]) ;
-     }
--    else if $(OS) = MACOSX
--    {
--        --python-include = [ .path $(python-location) Headers ] ;
--        --python-lib = $(python-location) Python ;
--    }
-     else
-     {
-         --python-include = ;
diff --git a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch b/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch
deleted file mode 100644
index a04aa0b7aab1..000000000000
--- a/dev-util/boost-build/files/boost-build-1.54.0-support_dots_in_python-buildid.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/tools/common.jam
-+++ b/tools/common.jam
-@@ -763,7 +763,15 @@
-         switch $(f:G)
-         {
-             case <base> :
--                result += $(name:B) ;
-+		local matched = [ MATCH "^(boost.*python)-.*" : $(name) ] ;
-+		if $(matched) = boost_python || $(matched) = boost_mpi_python
-+		{
-+			result += $(name) ;
-+		}
-+		else
-+		{
-+			result += $(name:B) ;
-+		}
- 
-             case <toolset> :
-                 result += [ join-tag $(f:G=) : [ toolset-tag $(name) : $(type) :
diff --git a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch b/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch
deleted file mode 100644
index d8b6a5af1e9c..000000000000
--- a/dev-util/boost-build/files/boost-build-1.55.0-ppc-aix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://svn.boost.org/trac/boost/ticket/10122
-
---- a/engine/mem.h
-+++ b/engine/mem.h
-@@ -8,6 +8,8 @@
- #ifndef BJAM_MEM_H
- #define BJAM_MEM_H
- 
-+#include "jam.h"
-+
- #ifdef OPT_BOEHM_GC
- 
-     /* Use Boehm GC memory allocator. */
diff --git a/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch b/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch
deleted file mode 100644
index a3f450b0edf1..000000000000
--- a/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/tools/gcc.py	2018-09-07 17:44:59.668796217 +0200
-+++ b/tools/gcc.py	2018-09-07 17:45:56.378794314 +0200
-@@ -811,20 +811,6 @@
- # Sparc
- flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>64'], ['-m64'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True)
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite', ['-mcpu=sparclite'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'hypersparc', ['-mcpu=hypersparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite86x', ['-mcpu=sparclite86x'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'f930', ['-mcpu=f930'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'f934', ['-mcpu=f934'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclet', ['-mcpu=sparclet'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'tsc701', ['-mcpu=tsc701'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v9', ['-mcpu=v9'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc', ['-mcpu=ultrasparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc3', ['-mcpu=ultrasparc3'])
- # RS/6000 & PowerPC
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64'], ['-m64'])
---- a/tools/gcc.jam	2018-09-07 17:45:12.168795797 +0200
-+++ b/tools/gcc.jam	2018-09-07 17:46:25.498793337 +0200
-@@ -1134,21 +1134,6 @@
- cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
- ##
- cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
--# Sparc
--cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ;
--cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ;
--cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ;
--cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ;
--cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ;
--cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ;
--cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ;
--cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ;
--cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ;
--cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ;
--cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ;
--cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ;
--cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ;
--cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ;
- # RS/6000 & PowerPC
- cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ;
- cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ;
diff --git a/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch b/dev-util/boost-build/files/boost-build-1.71.0-add-none-feature-options.patch
index fd86c9e2fc71..ddd1641d15cc 100644
--- a/dev-util/boost-build/files/boost-build-1.66.0-add-none-feature-options.patch
+++ b/dev-util/boost-build/files/boost-build-1.71.0-add-none-feature-options.patch
@@ -1,5 +1,3 @@
-diff --git a/tools/features/debug-feature.jam b/tools/features/debug-feature.jam
-index 04958f9a..38b6acf1 100644
 --- a/tools/features/debug-feature.jam
 +++ b/tools/features/debug-feature.jam
 @@ -8,7 +8,7 @@
@@ -11,8 +9,6 @@ index 04958f9a..38b6acf1 100644
      : propagated ;
  
  feature.feature profiling
-diff --git a/tools/features/optimization-feature.jam b/tools/features/optimization-feature.jam
-index 761f76f1..fb2a5dec 100644
 --- a/tools/features/optimization-feature.jam
 +++ b/tools/features/optimization-feature.jam
 @@ -8,7 +8,7 @@
diff --git a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch b/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch
index 032feaf9625f..3693677540a4 100644
--- a/dev-util/boost-build/files/boost-build-1.49.0-darwin-gentoo-toolchain.patch
+++ b/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch
@@ -4,7 +4,7 @@ arch, etc.
 
 --- a/tools/darwin.jam
 +++ b/tools/darwin.jam
-@@ -227,6 +227,9 @@
+@@ -239,6 +239,9 @@
          }
      }
      
@@ -14,7 +14,7 @@ arch, etc.
      if $(version-feature)
      {
          if $(.debug-configuration)
-@@ -387,7 +390,8 @@
+@@ -447,7 +450,8 @@
              support-ppc64 = ;
          }
      }
diff --git a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch b/dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch
index 84734f7473fe..b7b47cc93a47 100644
--- a/dev-util/boost-build/files/boost-build-1.48.0-disable_python_rpath.patch
+++ b/dev-util/boost-build/files/boost-build-1.71.0-disable_python_rpath.patch
@@ -1,6 +1,6 @@
 --- a/tools/python.jam
 +++ b/tools/python.jam
-@@ -961,7 +961,7 @@
+@@ -1000,7 +1000,7 @@
              # linux).
            : $(usage-requirements)
              <testing.launcher>$(set-PYTHONPATH)
diff --git a/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch b/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch
index 3f8b177c7102..3f8b177c7102 100644
--- a/dev-util/boost-build/files/boost-build-1.54.0-fix-test.patch
+++ b/dev-util/boost-build/files/boost-build-1.71.0-fix-test.patch
diff --git a/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch b/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch
new file mode 100644
index 000000000000..cd184030deeb
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch
@@ -0,0 +1,266 @@
+Prevent bjam from injecting what it thinks are great -march/-mcpu flags
+in order to optimize code for you. This breaks on 32-bit builds, because
+-march=i686 will not work on an i486 CHOST.
+
+See also:
+https://bugs.gentoo.org/624616
+
+--- a/tools/gcc.jam
++++ b/tools/gcc.jam
+@@ -1187,128 +1187,8 @@
+ # x86 and compatible
+ # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default.
+ # Use i686 instead for 32-bit.
+-toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ;
+-cpu-flags gcc OPTIONS : x86 : native : -march=native ;
+-cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ;
+-cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ;
+-cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ;
+-cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ;
+-cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ;
+-cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ;
+-cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ;
+-cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ;
+-cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ;
+-cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ;
+-cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ;
+-cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ;
+-cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ;
+-cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ;
+-cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ;
+-cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ;
+-cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ;
+-cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ;
+-cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ;
+-cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ;
+-cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ;
+-cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ;
+-cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ;
+-cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ;
+-cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ;
+-cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ;
+-cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ;
+-cpu-flags gcc OPTIONS : x86 : icelake : -march=icelake ;
+-cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
+-cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
+-cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
+-cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ;
+-cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ;
+-cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ;
+-cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ;
+-cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ;
+ ##
+-cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ;
+-cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ;
+-cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ;
+-cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ;
+-cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ;
+-cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ;
+-cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ;
+-cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ;
+-cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ;
+-cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ;
+-cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ;
+-cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ;
+-cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ;
+-cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ;
+-cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ;
+-cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ;
+-cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ;
+-cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ;
+-cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ;
+-cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
+ ##
+-cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
+-# Sparc
+-cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ;
+-cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ;
+-cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ;
+-cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ;
+-cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ;
+-cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ;
+-cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ;
+-cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ;
+-cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ;
+-cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ;
+-cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ;
+-cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ;
+-cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ;
+-cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ;
+ # RS/6000 & PowerPC
+-cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ;
+-cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ;
+-cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ;
+-cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ;
+-cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ;
+-cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ;
+-cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ;
+-cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ;
+-cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ;
+-cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ;
+-cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ;
+-cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ;
+-cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ;
+-cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ;
+-cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ;
+-cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ;
+-cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ;
+-cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ;
+-cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ;
+-cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ;
+-cpu-flags gcc OPTIONS : power : power : -mcpu=power ;
+-cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ;
+-cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ;
+-cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ;
+-cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ;
+-cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ;
+-cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ;
+-cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ;
+-cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ;
+-cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ;
+-cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ;
+-cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ;
+-cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ;
+-cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ;
+-cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
+-cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
+ # AIX variant of RS/6000 & PowerPC
+ toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
+--- a/tools/gcc.py
++++ b/tools/gcc.py
+@@ -745,125 +745,14 @@
+ # x86 and compatible
+ flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>32'], ['-m32'])
+ flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>64'], ['-m64'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'native', ['-march=native'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'i486', ['-march=i486'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'i586', ['-march=i586'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'i686', ['-march=i686'], default=True)
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium', ['-march=pentium'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-mmx', ['-march=pentium-mmx'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentiumpro', ['-march=pentiumpro'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium2', ['-march=pentium2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3', ['-march=pentium3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3m', ['-march=pentium3m'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-m', ['-march=pentium-m'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4', ['-march=pentium4'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4m', ['-march=pentium4m'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'prescott', ['-march=prescott'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'nocona', ['-march=nocona'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'core2', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-xe', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-l', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'allendale', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'wolfdale', ['-march=core2', '-msse4.1'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'merom', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'merom-xe', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield-xe', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'yorksfield', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'penryn', ['-march=core2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7', ['-march=corei7'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'nehalem', ['-march=corei7'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7-avx', ['-march=corei7-avx'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'sandy-bridge', ['-march=corei7-avx'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'core-avx-i', ['-march=core-avx-i'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'ivy-bridge', ['-march=core-avx-i'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'haswell', ['-march=core-avx-i', '-mavx2', '-mfma', '-mbmi', '-mbmi2', '-mlzcnt'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6', ['-march=k6'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-2', ['-march=k6-2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-3', ['-march=k6-3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon', ['-march=athlon'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-tbird', ['-march=athlon-tbird'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-4', ['-march=athlon-4'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-xp', ['-march=athlon-xp'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-mp', ['-march=athlon-mp'])
+ ##
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'k8', ['-march=k8'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron', ['-march=opteron'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64', ['-march=athlon64'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-fx', ['-march=athlon-fx'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'k8-sse3', ['-march=k8-sse3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron-sse3', ['-march=opteron-sse3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64-sse3', ['-march=athlon64-sse3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'amdfam10', ['-march=amdfam10'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'barcelona', ['-march=barcelona'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver1', ['-march=bdver1'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver2', ['-march=bdver2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver3', ['-march=bdver3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'btver1', ['-march=btver1'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'btver2', ['-march=btver2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip-c6', ['-march=winchip-c6'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip2', ['-march=winchip2'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'c3', ['-march=c3'])
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'c3-2', ['-march=c3-2'])
+ ##
+-cpu_flags('gcc', 'OPTIONS', 'x86', 'atom', ['-march=atom'])
+ # Sparc
+ flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>32'], ['-m32'])
+ flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>64'], ['-m64'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True)
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite', ['-mcpu=sparclite'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'hypersparc', ['-mcpu=hypersparc'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite86x', ['-mcpu=sparclite86x'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'f930', ['-mcpu=f930'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'f934', ['-mcpu=f934'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclet', ['-mcpu=sparclet'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'tsc701', ['-mcpu=tsc701'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v9', ['-mcpu=v9'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc', ['-mcpu=ultrasparc'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc3', ['-mcpu=ultrasparc3'])
+ # RS/6000 & PowerPC
+ flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32'], ['-m32'])
+ flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64'], ['-m64'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '403', ['-mcpu=403'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '505', ['-mcpu=505'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '601', ['-mcpu=601'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '602', ['-mcpu=602'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '603', ['-mcpu=603'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '603e', ['-mcpu=603e'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '604', ['-mcpu=604'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '604e', ['-mcpu=604e'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '620', ['-mcpu=620'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '630', ['-mcpu=630'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '740', ['-mcpu=740'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '7400', ['-mcpu=7400'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '7450', ['-mcpu=7450'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '750', ['-mcpu=750'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '801', ['-mcpu=801'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '821', ['-mcpu=821'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '823', ['-mcpu=823'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '860', ['-mcpu=860'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '970', ['-mcpu=970'])
+-cpu_flags('gcc', 'OPTIONS', 'power', '8540', ['-mcpu=8540'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'power', ['-mcpu=power'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'power2', ['-mcpu=power2'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'power3', ['-mcpu=power3'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'power4', ['-mcpu=power4'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'power5', ['-mcpu=power5'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc', ['-mcpu=powerpc'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc64', ['-mcpu=powerpc64'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'rios', ['-mcpu=rios'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'rios1', ['-mcpu=rios1'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'rios2', ['-mcpu=rios2'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'rsc', ['-mcpu=rsc'])
+-cpu_flags('gcc', 'OPTIONS', 'power', 'rs64a', ['-mcpu=rs64'])
+-cpu_flags('gcc', 'OPTIONS', 's390x',  'z196', ['-march=z196'])
+-cpu_flags('gcc', 'OPTIONS', 's390x',  'zEC12', ['-march=zEC12'])
+-cpu_flags('gcc', 'OPTIONS', 's390x',  'z13', ['-march=z13'])
+-cpu_flags('gcc', 'OPTIONS', 's390x',  'z14', ['-march=z14'])
+ # AIX variant of RS/6000 & PowerPC
+ flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32/<target-os>aix'], ['-maix32'])
+ flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64/<target-os>aix'], ['-maix64'])
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 5320415ff610..ebec8b950f0f 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,12 +1,9 @@
 AUX bpftrace-0.10_pre20190614-install-libs.patch 4653 BLAKE2B 66229e4b3f7edc345eeac5f833348f7a434ee7f6c830c344b3c357fafec98b8cc8c725cf37ee01802d085cdbf9deb0fa13d9dd72161b230aff589c75b17890a3 SHA512 63f899bd119f86ee6e9bae0c2ef6e657a37a33c700414ea4757353f0637e89ef9ed3dbf1b70414eec1a5c2658451e8be3e7de1941a0796cac621361bcdd14537
-AUX bpftrace-0.9-llvm-8.patch 1306 BLAKE2B ef6c7cfd58f6683d3a234fef6a5aae6a8136b04e1ee5c14db76c62490f6b487ddb06465be16df4fda7cc92e2cfa1d97129e7e1e852a26468e24f8059314f13a6 SHA512 4067aee17715312cf49dc3510754d6aaaa4dba25dfb802dc434d068bf5f35135aca2c107b2463044e5f88890ac20c1ba97eff604616913f5246c57eda3aed7ee
-AUX bpftrace-0.9_pre20190311-install-libs.patch 4453 BLAKE2B d8b552a04fa4815c8b2209c57ad9dbecb3938531ef3c6ad481d5ec034e8a8aff323f29acfa920f00d612a2f859b0b03272955384c06ee5051d7c8844163fdae6 SHA512 0fe1ea870b5a963ac040a7a636cd0255e60577bd7e9aa6080e40116c964c4a4bc1b5858290c2f381916433504bf28118f9b03089fb0baee32085aad104b1621c
+AUX bpftrace-0.9.3-install-libs.patch 5117 BLAKE2B 6cad778dd19ab040f3bd88390329cc49261c83dcc0ff97f9e663d5fb0d55da87d0e4c1efaabbd31b11e383ea0f904fdab8bd7f34fbdd0805abe20d623673c1fc SHA512 0842712b8d32ba4f7bc0767e3748ed4e8517187c9c75d426e1946aacce3a46fd5f7100d4cef0bed655a763d102cfeff160d549065f6b9c6000a7b3f496cb8b87
 AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
-DIST bpftrace-0.9.1.tar.gz 704365 BLAKE2B 03c73eac9cc116df916536239124a6a649aa1a390c97848baedaf5b329f5eda8752c9e39053e741a485d623240954f6659099f0c0ab65cc4bbf00fc6e52d0b46 SHA512 e813c598b3acb85d94e1cb02f75b5fa849f10ee1cc39fb73e843a797946d7642463bcc3d083ff377d68b9e2a1aabb56995ab4ebe2be822f4f393448c7f02ca4b
 DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B 1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3 SHA512 5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
-DIST bpftrace-0.9.tar.gz 668655 BLAKE2B 650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc SHA512 771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
-EBUILD bpftrace-0.9-r1.ebuild 1369 BLAKE2B dc88a0672c969716d83aba591e99c477dee5527faa60bf418fe8547b5d86286d743ef04e673e0aeae418f3bab34da0768b2d3575f0a9ae84a8467180931ab903 SHA512 6865fad28da5145dc206c42a52e99efa372f1380751980b0210a0cb0e62bcde7be2cb3ddccd0724b9c9de1ffc4aac075e61df4b2fd8441b8adbb7183070e126a
-EBUILD bpftrace-0.9.1.ebuild 1402 BLAKE2B 539e79098fd31d8ade5449f53e9b63d4c8b3ecd3e2716eab76f8a7eab00e11480224502369899f68eb839c9cb48cebc1f5fd6d6c231f93a4a16d58e19e973171 SHA512 9021699f98686a48954e39d653797b10d68cc56b284bdc77a58778dec41c20617031b1ccf8e15283a6b630b366856f6ec0d1013c6150709cc37f25d786f289db
+DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232 SHA512 49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
 EBUILD bpftrace-0.9.2.ebuild 1402 BLAKE2B 539e79098fd31d8ade5449f53e9b63d4c8b3ecd3e2716eab76f8a7eab00e11480224502369899f68eb839c9cb48cebc1f5fd6d6c231f93a4a16d58e19e973171 SHA512 9021699f98686a48954e39d653797b10d68cc56b284bdc77a58778dec41c20617031b1ccf8e15283a6b630b366856f6ec0d1013c6150709cc37f25d786f289db
-EBUILD bpftrace-9999.ebuild 1350 BLAKE2B 76883153a41d52398860f2868517d2e6d2445547fdc2d3770d3988bc25d9dde5c709c1130b814c1cf312d632ee0c62fd40b348e0bc8a1f27dd356a0ab242ab81 SHA512 ba62b663bc23618228ce110fe4390414a463dec185fe1b2760d54073e61625264a08d305b65b0de2721a6d62e0f7488e6ca2abe7e31c36258864c01dbc82786e
+EBUILD bpftrace-0.9.3.ebuild 1391 BLAKE2B db3f13374aeac65bc6bbaccc6ae187c6f601c753d7b426562dad7af055c1c4a32965abd1a4d8100eddf96cc6b5cac8c1d839cbc4c9cd2ba4822f83c23bcb6c2c SHA512 1fc37e191621ba5c63d43e55f772b505eddff423f37d3697061a4a03000a5bbc8086cb5e4df87c98d080317213581058128b4a5a40c807e5034e6786ca8d37ee
+EBUILD bpftrace-9999.ebuild 1339 BLAKE2B 89932b8689799d37f5730662705d644059796e27abbb187e57f741450dbf1034d5322f3e94a4a493f0341f939fcc3902e3173d8b2357c70695c3f3dd957d7db5 SHA512 b7df8cb8af0c74599fb87a32ff1efff499e3559682c72fea78ea5d53e9513f0738fff86acbc91c54b21e3b20ba0e0ccea8f559e7d80f359e45e8448a7fa94000
 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
deleted file mode 100644
index 74351e85e8c4..000000000000
--- a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs linux-info cmake-utils
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace"
-
-if [[ ${PV} =~ 9{4,} ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
-	BDEPEND=""
-else
-	SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-	BDEPEND="app-arch/xz-utils "
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="sys-devel/clang:=
-	dev-libs/libbpf:=
-	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
-	>=dev-util/bcc-0.9.0:=
-	virtual/libelf"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="dev-util/cmake
-	sys-devel/flex
-	sys-devel/bison"
-
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
-	"${FILESDIR}/bpftrace-mandir.patch"
-	"${FILESDIR}/bpftrace-0.9-llvm-8.patch"
-)
-
-# lots of fixing needed
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeargs
-	mycmakeargs=(
-		"-DSTATIC_LINKING:BOOL=OFF"
-		"-DBUILD_TESTING:BOOL=OFF"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/bpftrace/bpftrace-0.9.1.ebuild b/dev-util/bpftrace/bpftrace-0.9.3.ebuild
index 5fcb41040f5d..74f1dd849d2c 100644
--- a/dev-util/bpftrace/bpftrace-0.9.1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9.3.ebuild
@@ -40,7 +40,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
 
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.9.3-install-libs.patch"
 	"${FILESDIR}/bpftrace-mandir.patch"
 )
 
diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild
index 659b5f9766a9..ccad41e9941b 100644
--- a/dev-util/bpftrace/bpftrace-9999.ebuild
+++ b/dev-util/bpftrace/bpftrace-9999.ebuild
@@ -38,7 +38,7 @@ BDEPEND+="dev-util/cmake
 QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
 
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.9.3-install-libs.patch"
 	"${FILESDIR}/bpftrace-mandir.patch"
 )
 
diff --git a/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch b/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch
deleted file mode 100644
index 14d6a167a863..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.9-llvm-8.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/bpforc.h b/src/bpforc.h
-index a6ee583..8d0e579 100644
---- a/src/bpforc.h
-+++ b/src/bpforc.h
-@@ -80,8 +80,13 @@ class BpfOrc
-   ExecutionSession ES;
-   std::unique_ptr<TargetMachine> TM;
-   std::shared_ptr<SymbolResolver> Resolver;
-+#if LLVM_VERSION_MAJOR >= 8
-+  LegacyRTDyldObjectLinkingLayer ObjectLayer;
-+  LegacyIRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer;
-+#else
-   RTDyldObjectLinkingLayer ObjectLayer;
-   IRCompileLayer<decltype(ObjectLayer), SimpleCompiler> CompileLayer;
-+#endif
-
- public:
-   std::map<std::string, std::tuple<uint8_t *, uintptr_t>> sections_;
-@@ -91,7 +96,11 @@ class BpfOrc
-       Resolver(createLegacyLookupResolver(ES,
-         [](const std::string &Name __attribute__((unused))) -> JITSymbol { return nullptr; },
-         [](Error Err) { cantFail(std::move(Err), "lookup failed"); })),
-+#if LLVM_VERSION_MAJOR >= 8
-+      ObjectLayer(ES, [this](VModuleKey) { return LegacyRTDyldObjectLinkingLayer::Resources{std::make_shared<MemoryManager>(sections_), Resolver}; }),
-+#else
-       ObjectLayer(ES, [this](VModuleKey) { return RTDyldObjectLinkingLayer::Resources{std::make_shared<MemoryManager>(sections_), Resolver}; }),
-+#endif
-       CompileLayer(ObjectLayer, SimpleCompiler(*TM)) {}
-
-   void compileModule(std::unique_ptr<Module> M) {
diff --git a/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch
index 68bd82559443..0ddb07b47408 100644
--- a/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.9.3-install-libs.patch
@@ -1,9 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ff6e1f..a276ba2 100644
+index 5e0d770..d51edf6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -43,9 +43,10 @@ find_package(FLEX REQUIRED)
- bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc)
+@@ -51,9 +51,10 @@ find_package(FLEX REQUIRED)
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc VERBOSE)
  flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
  add_flex_bison_dependency(flex_lexer bison_parser)
 -add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
@@ -31,25 +31,25 @@ index b8b0d96..0803c1e 100644
  function(embed_headers output)
    file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b47f66d..36de26b 100644
+index 65f3a34..b001a83 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -27,7 +27,8 @@ endif(HAVE_BCC_CREATE_MAP)
- if(HAVE_GET_CURRENT_CGROUP_ID)
-   target_compile_definitions(bpftrace PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
- endif(HAVE_GET_CURRENT_CGROUP_ID)
+@@ -56,7 +56,8 @@ if (ALLOW_UNSAFE_UPROBE)
+   target_compile_definitions(bpftrace PRIVATE HAVE_UNSAFE_UPROBE)
+ endif(ALLOW_UNSAFE_UPROBE)
+ 
 -target_link_libraries(bpftrace arch ast parser resources)
 +target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser
-+	bpftraceresources)
++  bpftraceresources)
  
  if (STATIC_LINKING)
    target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
 diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index 425926e..13b5d31 100644
+index a26f610..53627e2 100644
 --- a/src/arch/CMakeLists.txt
 +++ b/src/arch/CMakeLists.txt
 @@ -1,5 +1,7 @@
- if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
 -    add_library(arch aarch64.cpp)
 +    add_library(bpftracearch aarch64.cpp)
  else()
@@ -59,7 +59,7 @@ index 425926e..13b5d31 100644
 +
 +install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
-index 64db7b9..1a2eb6e 100644
+index 4d77c9f..2a00572 100644
 --- a/src/ast/CMakeLists.txt
 +++ b/src/ast/CMakeLists.txt
 @@ -1,4 +1,4 @@
@@ -68,10 +68,14 @@ index 64db7b9..1a2eb6e 100644
    ast.cpp
    codegen_llvm.cpp
    irbuilderbpf.cpp
-@@ -6,12 +6,13 @@ add_library(ast
-   semantic_analyser.cpp
+@@ -7,15 +7,16 @@ add_library(ast
  )
  
+ if(HAVE_GET_CURRENT_CGROUP_ID)
+-  target_compile_definitions(ast PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
++  target_compile_definitions(bpftraceast PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
+ endif(HAVE_GET_CURRENT_CGROUP_ID)
+ 
 -target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src)
 -target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
 -target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR})
@@ -87,7 +91,7 @@ index 64db7b9..1a2eb6e 100644
  
  if (STATIC_LINKING)
    set(clang_libs
-@@ -31,16 +32,16 @@ if (STATIC_LINKING)
+@@ -35,16 +36,16 @@ if (STATIC_LINKING)
        clangSerialization
        clangToolingCore)
    llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
@@ -109,3 +113,17 @@ index 64db7b9..1a2eb6e 100644
 -  target_link_libraries(ast libclang)
 +  target_link_libraries(bpftraceast libclang)
  endif()
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 2d18277..f66a8b7 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -76,7 +76,8 @@ if(HAVE_BFD_DISASM)
+   target_link_libraries(bpftrace_test ${LIBOPCODES_LIBRARIES})
+ endif(HAVE_BFD_DISASM)
+ 
+-target_link_libraries(bpftrace_test arch ast parser resources)
++target_link_libraries(bpftrace_test bpftracearch bpftraceast bpftraceparser
++  bpftraceresources)
+ 
+ if (STATIC_LINKING)
+   target_link_libraries(bpftrace_test ${LIBBCC_LIBRARIES})
diff --git a/dev-util/btyacc/Manifest b/dev-util/btyacc/Manifest
index 317f7ca61630..d4f42b1e4d71 100644
--- a/dev-util/btyacc/Manifest
+++ b/dev-util/btyacc/Manifest
@@ -1,5 +1,5 @@
 AUX btyacc-3.0-includes.patch 175 BLAKE2B a0da73e29099239e97d8fd67edf2743720fc3e97946834319c249e9bb0dd1949c70b492d3ec3fffed32d992dddc7ed2cadbf7cb2280b7cc24c26b1f00854b46f SHA512 c0ba2cf5ca3575862a6c683cf5a9461cc7008e7c8662732ef64ba68f041e810aceb8f0f1b75becc8cd910c87c60dc830e8823b15986fedf345319bedb50e3dd4
 AUX btyacc-3.0-makefile.patch 535 BLAKE2B f5c7f893dcbe98c17dc74efc6310924518447ea4d719af3dc700daea72d0106e5217d69cfb82b498a81392c8f0a447c92afcfa10954f4b7418efa76de3382dc9 SHA512 54df54a45147a7ca5c76d0c6665a46210af170671ba04762e8de80c0269b0a1aa947c1be049aa8660f8b96d4ec204e639f2a810130676d69fc54fb28c929a190
 DIST btyacc-3-0.tar.gz 74770 BLAKE2B 298d6ba020a47a8d894044c464c12efd3ed94b878cd152f4287a35fc0a8ec490186b7603909691cbf036f425fa96316c6cda8b8270b07e3c5c0cd11777d5e62b SHA512 55312e3de7cc783e1386ea98c97464d8d40bb496ce2ce36c84cc559e4c6982fbac730e76b8d44c4a44565f545ac50fb75f802bd8a1b4c926b1fc1af1a0058ef4
-EBUILD btyacc-3.0-r3.ebuild 916 BLAKE2B e8633bfee5cd45d4fc1066a97c77e53ca33590731c56c0e37e6d9e6c38cd325b524889e148025d03ca1be2a0db7c842823d2dbf5d5b31bd4d96905fe1c59b7d9 SHA512 032cf3f96caf2653ed51d79bbcc2e0bd0d9d25d85c04714bd8a820cd3cb95d38c39616e5e7b42b0d117309e3d557544b1a1eede317f1ed0d5c304bee09a3e6ca
+EBUILD btyacc-3.0-r3.ebuild 918 BLAKE2B 15f0536361ad5ac4f96a97090156503e1cd7703d81289c94152da01c25543a78b0784ed2763afc9e8df379251e803402c8e128181b62696bb4955d106b96959b SHA512 f5d2c02782319bc6814ad2fd47dcd00934974364f4700087dca1ae2c66f3a988f2a808d55c0f18ce7d8218e55fce3cf471f43fe2f86adf5cbcd3e6ff67935ca2
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-util/btyacc/btyacc-3.0-r3.ebuild b/dev-util/btyacc/btyacc-3.0-r3.ebuild
index a313d2c58518..e178a55e6cdf 100644
--- a/dev-util/btyacc/btyacc-3.0-r3.ebuild
+++ b/dev-util/btyacc/btyacc-3.0-r3.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=7
@@ -10,7 +10,7 @@ DESCRIPTION="Backtracking YACC - modified from Berkeley YACC"
 HOMEPAGE="http://www.siber.com/btyacc"
 SRC_URI="http://www.siber.com/btyacc/${MY_P}.tar.gz"
 
-LICENSE="freedist"
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
 
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 59f970253e0a..392eb9b54629 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,7 +1,7 @@
 DIST buildbot-console-view-0.9.12.tar.gz 640923 BLAKE2B cc0da84395aca571803e73260d826633553ed10ede6d66d112dfa8bcdc4f1bd376695ee0ee4a715f1fa3705329033044d9358731c0b807c54b40b4e32a04f565 SHA512 4a73994c29fe1f78c4432bdb42fe14106b8d7887bb35f2835b203f4818844d3e8d2ea308fc4fb2bd562de302bd7cf6612fe047476512feac068eca3891a49522
 DIST buildbot-console-view-1.1.2.tar.gz 640509 BLAKE2B 481b8049e606d47be8b171c24a210d6c95ce13ee4a4d46fd689ee836857e8d054f1799ce53de3931f820f02061cdd0c4a47686cd1724fe1c39ab33ca0f274d76 SHA512 23a14d3264802b2cf9a6a7cab0592c6391dc55a8805c17529c3279b129aaab1df97999ffd5fdc0927e7d5fb204e4114b4672018102381523599310cf7223950f
 DIST buildbot-console-view-1.3.0.tar.gz 640506 BLAKE2B bf68136edbe734514b662a580b9025626b6e0acd48f49ccee979c38d1a2eac13e8fd13bf4c9f62948694ed003de3ee6c44a9d734561a1b5ed4e1d9d330b39f3f SHA512 5b4fa27c8cca57df083c3044729bc6086086dabe819e215b02fe4fda0863b62658925433bbc90d9b38f4309af50b2312b3c9aaefff96a1f62b18d160ca66f205
-EBUILD buildbot-console-view-0.9.12.ebuild 1141 BLAKE2B 0f0e870f4063f2062efac2bc573d5e9dea7568ac2e4064299aa22eada3fba565ce1045f39c3c26918cba874125cf42233177c4b8cdf09236806de30cd2b307dd SHA512 e2b853c3c6039a9a70f2319c498f1ff2ca1ee2a9ee1016f55ba8a5cf5d6ccf9a550ba60e68e90180c51a3f1d1f3915cd8732ca5dfcc837d6e38d7cd238afca47
-EBUILD buildbot-console-view-1.1.2.ebuild 1138 BLAKE2B 389ff1f782f7da3bc61b06167d94d561090a099ca4c85fa2af47da25b6e6e02cf66148b51be8be768e636782439f60a8b1154f5f8e259e5ab0fd4296ab9b48d7 SHA512 e1c866d38d17c580245f873f2e7b7b34c5781e2c1468e717bb6fba7326a9509d5b57b3809e7959eddd311d92e3d79e3a3c7f6059a424a57220635a969123e320
-EBUILD buildbot-console-view-1.3.0.ebuild 1138 BLAKE2B 389ff1f782f7da3bc61b06167d94d561090a099ca4c85fa2af47da25b6e6e02cf66148b51be8be768e636782439f60a8b1154f5f8e259e5ab0fd4296ab9b48d7 SHA512 e1c866d38d17c580245f873f2e7b7b34c5781e2c1468e717bb6fba7326a9509d5b57b3809e7959eddd311d92e3d79e3a3c7f6059a424a57220635a969123e320
+EBUILD buildbot-console-view-0.9.12.ebuild 1165 BLAKE2B ae58de9b81d5093ca15e6172d2aa9bbb2b7daad41226d94fe64981b9b6cee04e749a49d2e55281de1d8b4756147012449bc5f2897454e86b807cd09f04e8a67f SHA512 1edd27af5f2c5ce1c2a41400e545a8ee28586597bf725454bb8120d8b963acb101f1ae3289283977cfb6c7c780e31e5db4be7e1dd5badea27d649ff0cf5ce5bf
+EBUILD buildbot-console-view-1.1.2.ebuild 1165 BLAKE2B ae58de9b81d5093ca15e6172d2aa9bbb2b7daad41226d94fe64981b9b6cee04e749a49d2e55281de1d8b4756147012449bc5f2897454e86b807cd09f04e8a67f SHA512 1edd27af5f2c5ce1c2a41400e545a8ee28586597bf725454bb8120d8b963acb101f1ae3289283977cfb6c7c780e31e5db4be7e1dd5badea27d649ff0cf5ce5bf
+EBUILD buildbot-console-view-1.3.0.ebuild 1165 BLAKE2B ae58de9b81d5093ca15e6172d2aa9bbb2b7daad41226d94fe64981b9b6cee04e749a49d2e55281de1d8b4756147012449bc5f2897454e86b807cd09f04e8a67f SHA512 1edd27af5f2c5ce1c2a41400e545a8ee28586597bf725454bb8120d8b963acb101f1ae3289283977cfb6c7c780e31e5db4be7e1dd5badea27d649ff0cf5ce5bf
 MISC metadata.xml 582 BLAKE2B 7b70e690ee782b2e32a79def5816c289e258339bd94aa5001297406ad9075e8dbf2623119c717a937a5dc42c034396700b1943e845cf7d7c4797714018280a56 SHA512 28aa58be60e1ce0675809fddfc84e864d801bc5438a9212b714a684cfbe97c9dcea40a74853656b5000de58e81c6babc5997ed3e354bc6d478071f968b379778
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
index cc2a6351b2d1..6db10ee36cbf 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-0.9.12.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"
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
index a1e2e8c473c2..6db10ee36cbf 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
index a1e2e8c473c2..6db10ee36cbf 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 5ccc42633b0b..bf4bf4a7678a 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,7 +1,7 @@
 DIST buildbot-grid-view-0.9.12.post1.tar.gz 638819 BLAKE2B 5e0bdc39ebe2b447b23abaddc414713c46e5544915d5564641a0534dfa9862f71d689c5df27a5f2a6ecbaa33c29ece5bc85e1c2d1f0a10b0f19273364699748f SHA512 3bc90dcee10781afa90a44d0ff57629f2fe8620fb1133a489282b3a69b884d33a7ad3cbf6e38f688755fcc2153c9ae1c0d48cd2797e33070f66a9093887179c6
 DIST buildbot-grid-view-1.1.2.tar.gz 638848 BLAKE2B c99e79af105cf07a6540c71fb7e604bca144ec5d462f6a38c50b525b2ba7bf9640b8d1d4e36e0beb121eafb042fefb67a8adb8b91d2ed8fca4daf982712fae45 SHA512 c2dddab25d1da173ae22d811a9c3261eaec6ac76389829cb1cfaa8b976573d6f12208541dce4065d45512c4c984d9a1d4c72f6e151ec3365ba1dca356ad0288d
 DIST buildbot-grid-view-1.3.0.tar.gz 638845 BLAKE2B fb52b8fccbce298cbaf715feb1d785856e879f9e9fe63add83c3b0b51df93417ef8b355b33569956e055771bc75a4b6ea318bd7bbcd157bce01f972730468b62 SHA512 f82316743c10c4fd2a509a754808535606bdfd114b86e5796887d47845b4ef83677c7af830b9e4c531a9857249a8b2de8411b30f2f5b2a617a54244658e4a528
-EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1110 BLAKE2B ee3ffc432b8844906ded608e3eb7cf01c8a9c303c111f8fb8c1bd728c9f32e0cdb4b1f04c70156576848e6443b2dbc80bd32ac6a43a02f1ab4b420f7cff74cb3 SHA512 775e3bcbc9643aa6e7bbdc70a53eb6cedbb66f3acec99e6fdb313a41ae39baf6c6f69e26311d8de3730892bcf999e8e04ae5442ae9207dafb2ff8e1625048c26
-EBUILD buildbot-grid-view-1.1.2.ebuild 1103 BLAKE2B 2e4977f8fe7e7aa6d443929189b36a7f79d012705e2fd27938044ad01445921042542db8e1f339bac74df60bc9d6bcbff1d764682babf6f457b013fec481f785 SHA512 2244a4b235452b00c24471c6e56aaba659be7c94bd8f423b2e74e4abf5caf09c245b2499462490349cac2959c820ccae09273d7369d233cce2e097c4623cdb5a
-EBUILD buildbot-grid-view-1.3.0.ebuild 1103 BLAKE2B 2e4977f8fe7e7aa6d443929189b36a7f79d012705e2fd27938044ad01445921042542db8e1f339bac74df60bc9d6bcbff1d764682babf6f457b013fec481f785 SHA512 2244a4b235452b00c24471c6e56aaba659be7c94bd8f423b2e74e4abf5caf09c245b2499462490349cac2959c820ccae09273d7369d233cce2e097c4623cdb5a
+EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1134 BLAKE2B 254884a22c46b1e963dc5049d00c14350747d1de7c0f4d2926c56b499b116fc58a2de1b88884e5fdc944657ada793bbb0cfad7239a63ee1ba806af04b7bc4f35 SHA512 1f6afe38123750777353220edc7741dd1dbcef5e3dc0ad538cc3e79a912982cd47f76473cf9c83c91c2a7f0668ad2798ba48a5f13ab5218631d8136f9ab859bd
+EBUILD buildbot-grid-view-1.1.2.ebuild 1130 BLAKE2B b39895a72a03e794415d5a856e1251baf9b37efd66dae8986443cd2fe9476bf298f8f4da8e29bf387042c09e3c06d4f944ede34ca536146ba47c98f9c78d75e1 SHA512 de9596d7689b5c6855ba59c10b81df9f2dd48a4ca2f6dc07ec2c637ec9c29ba4ba6e1b123f8b0b02dfca24e63a3fae20e7dd3116bf478c3bc38acc208232c196
+EBUILD buildbot-grid-view-1.3.0.ebuild 1130 BLAKE2B b39895a72a03e794415d5a856e1251baf9b37efd66dae8986443cd2fe9476bf298f8f4da8e29bf387042c09e3c06d4f944ede34ca536146ba47c98f9c78d75e1 SHA512 de9596d7689b5c6855ba59c10b81df9f2dd48a4ca2f6dc07ec2c637ec9c29ba4ba6e1b123f8b0b02dfca24e63a3fae20e7dd3116bf478c3bc38acc208232c196
 MISC metadata.xml 561 BLAKE2B be04eb0a5ba4b476810f1f53459ac6839ef9d83871c8e415ca09b3f6927aef34f6ebbcba8f67b6460b9ed940613fc9d754512e7e3d1deca401936c29a88856e2 SHA512 57e18994b8280d38538b93af66ecc756abbb8bbc70117cb1b89f0b30fde66fe5241faf9bad84cb2f8e11ee67d29ae30eeec435e0b6a9af7c178b2bf58d966b27
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
index 7a88dd5d6952..48ee8398c5b7 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.12_p1.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"
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
index cbf5ca68c8aa..203ef445478f 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
index cbf5ca68c8aa..203ef445478f 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-slave/Manifest b/dev-util/buildbot-slave/Manifest
index 8b55da3f23d5..d41e7eca8b1b 100644
--- a/dev-util/buildbot-slave/Manifest
+++ b/dev-util/buildbot-slave/Manifest
@@ -2,5 +2,5 @@ AUX buildslave.confd 217 BLAKE2B bd752869bc07ad6636b0035ad8f030536abbd9f703a7180
 AUX buildslave.initd 1140 BLAKE2B 45de77ef9400a19b98ebac2ebd7f438354466ef4a2fce407e9d57f0cef6f081683a79d7c5651c1dd14ffbc3e834e980316361ec3a2ec1c29bad8d86bd259092d SHA512 217a9e3f774bcc7e7773d6e3047dbbabe196d168f814485ae54d1a94b330616fd80ad82bfa67c9b6185c39b780eae7a71776e727810ff4df337baca44d5fdbda
 AUX buildslave.service 386 BLAKE2B e50acd31037a91f439330f09e74321e7b8eff67711357c28d661b124fbc36e434a1707629d4ffe151dbf53a7a5600004c3928b511c0aeda672be66e9e492fe18 SHA512 53d9ac95006fb4e43e0bfa82c935e17c577cd292c8fea373247e4cd9bb21843f2f82971ffd37f50aa16fe258139c22adbe24570e3017fa529f2258a1d395d8dd
 DIST buildbot-slave-0.8.12.tar.gz 118339 BLAKE2B e516a8fd212d92e1cb1ed9bc11d70aa4baaea70fd1aa7f4fa239ed1160da51b96391d252643a13a72786d0b676e0e1780d31f998da7b3f90f1b73b32adb6b6c2 SHA512 74f7f9ffab946000a5d31ae28140698ca259ba5b75815ed839d51fa5d9f702e998b61a716b66aab7946b6143d329244f2403d9b98cbbfc70223b691dcb70f0bc
-EBUILD buildbot-slave-0.8.12.ebuild 1564 BLAKE2B 17ac47bee796bc8f105cbd47eaf6f781190fe3eacac607f8affb9b690c00bd70733218d4661a8ed611824dcb3c085537ed6e535a607da83f08ecf153bce375d6 SHA512 e888c3fc0525d406778e51507bffb09f63f8ce553b615bf146a24cf1d91c981e56eee6c4e60ee144d6c30089f58ec1e5559873ae35f9e02dd9bfb23224a09f72
+EBUILD buildbot-slave-0.8.12.ebuild 1588 BLAKE2B 6add23a8e99d1d398539a45acbfc1946f1f8cd3ab83910a36331700ab312bc9386c8c72bacdb77b2991c850c8f7aa82a721d781cc513b9ba656977ec76934272 SHA512 f5e62ae2bc89f4f06eeaa90307d5603a85b84b37712e3a29616421b9cfc08d1555e803d6c4f7559db8c95a5505f03bd3a686900319e996f41c96a9b3a762a1c5
 MISC metadata.xml 301 BLAKE2B 122bc8d64dedeaf54418cbcf52e271379fb281900ec2bd0a4dac3aca8ba73b1d6ac46449e785cdfb0002bad8616b9d1c1792bd4fd591d094acd870605250ab3e SHA512 c343471dc7c2e104e7af1d713055d56bdf813796f6a488e51c1d4a3c732593660383f73735647015e780409839caa2ec0724cf961ab28f76d668b1568781319d
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
index bb90f9646953..7566aa4f8911 100644
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.12.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"
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/twisted-core[${PYTHON_USEDEP}]"
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index ac6ad5efc891..6f1153964025 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,7 +1,7 @@
 DIST buildbot-waterfall-view-0.9.12.tar.gz 714290 BLAKE2B 4867539275aa6c2b0ac149fe7f4a1f03f2c2593b89908fb0a8d748c32779b01b8d87327ec9a54e02561a40d273f03f46a8581cf224c333f1bbb3e14ba22a56ef SHA512 76abc01783c02980bc2d6e878536416aa046dce3259c65fa5c2f15d3f66d1b9b5e0bed2d4f6b9d6c338300637c6b91e9bdee3fca3e47022d2ea9b75ffa69eb99
 DIST buildbot-waterfall-view-1.1.2.tar.gz 713898 BLAKE2B 0873ca7d44a9da7ad260032a8153c45e864c605c79cbd826d4f5cb306dbcdcd1fd1e89fe59df57decdcd9ce94330d80ed20d8d7d95b4dc93d6d7cdf6340eb30f SHA512 cc14894281b712fe479ea19116948f69fb43a4cc8c7a0f159fcf97eed0c36a11cc967a0663042f34f64cc4d65468c58eb4398d66fb0d125cde6dec9ef7fc7e08
 DIST buildbot-waterfall-view-1.3.0.tar.gz 713879 BLAKE2B 42e838bfb5925850cfa679727a8f53a5a71c4b6ce9ad26b010480ba16e421f5eda0228d94f7efabb74f3493f868ef61274338f31e0ba6afa1fba4a3b533ac5d5 SHA512 4b8403f9f68ddc6fc980649cf26625834c6a271705e0b8396ab7c2fd739929c2878557df945a1d9c5411985b79f8b43d3fca2c7f74769e9e832b1a7c166f8a3f
-EBUILD buildbot-waterfall-view-0.9.12.ebuild 1145 BLAKE2B b04cf48ed5b4849436b4ea7e6414131307a1a3ffb9524543a6801b69df0ffc63282290d4b2ecedd88459d221e352d4e62f46bda68af1406466ba05a069166103 SHA512 6b6180ed60a93200a86adae7a006de353c9dad0ab8f5846896e4e76f255ecb2ff57e0431068288c3ff3daa01aa03992fd3be4246777ac12bcb6c2678c27dd819
-EBUILD buildbot-waterfall-view-1.1.2.ebuild 1142 BLAKE2B 1fe5002e9588fbedced771f8736e164194ab56fd93307bf4e2cc354b9c99eb912f792703bab9320c777a3c1fd291bd7a98458526bb06f3f347dc65fe45ca9bdd SHA512 0db5aa9024e4ac2634caac0da3a422ad34de6e7af10f5c210c7e97a65031e34cced4c6c947442fcc0a2d4f6950fa06fb4495926a998cfc75b30bc48469bc79c1
-EBUILD buildbot-waterfall-view-1.3.0.ebuild 1142 BLAKE2B 1fe5002e9588fbedced771f8736e164194ab56fd93307bf4e2cc354b9c99eb912f792703bab9320c777a3c1fd291bd7a98458526bb06f3f347dc65fe45ca9bdd SHA512 0db5aa9024e4ac2634caac0da3a422ad34de6e7af10f5c210c7e97a65031e34cced4c6c947442fcc0a2d4f6950fa06fb4495926a998cfc75b30bc48469bc79c1
+EBUILD buildbot-waterfall-view-0.9.12.ebuild 1169 BLAKE2B 44dbd4b88a9dd059fa17cc40ce9c38d136ac1bb8899fc4f227758c42b81aed2a5be7c1e0d589777d3baa3825349dd88ad7398326632f010684b4738517ca61cd SHA512 8cff39f981dd54c5fc341375d79d89b5e0d621c14e753350dd97026cbb79a169809f3e9cc4343347d01b1c3f9429161d5ec793307d29924a4aa38781f890d0c2
+EBUILD buildbot-waterfall-view-1.1.2.ebuild 1169 BLAKE2B 44dbd4b88a9dd059fa17cc40ce9c38d136ac1bb8899fc4f227758c42b81aed2a5be7c1e0d589777d3baa3825349dd88ad7398326632f010684b4738517ca61cd SHA512 8cff39f981dd54c5fc341375d79d89b5e0d621c14e753350dd97026cbb79a169809f3e9cc4343347d01b1c3f9429161d5ec793307d29924a4aa38781f890d0c2
+EBUILD buildbot-waterfall-view-1.3.0.ebuild 1169 BLAKE2B 44dbd4b88a9dd059fa17cc40ce9c38d136ac1bb8899fc4f227758c42b81aed2a5be7c1e0d589777d3baa3825349dd88ad7398326632f010684b4738517ca61cd SHA512 8cff39f981dd54c5fc341375d79d89b5e0d621c14e753350dd97026cbb79a169809f3e9cc4343347d01b1c3f9429161d5ec793307d29924a4aa38781f890d0c2
 MISC metadata.xml 602 BLAKE2B 345536cb04360976a1851b9979c40c8b487b7fecea7936dda78fdecdddc6aadf454aacf83f41406ea031ed22e4243ada64847acdeb0e011a839bb7c8757c82c4 SHA512 218340a7d39d3a7a7f410d18911ebfc4412dcef9041db41160619c6c77c855abf56e877c1d7976329c3017ee4462922735a3e3aee329f23ab1b6e4b4a7c2ffd5
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
index 1481782cc5d2..8f2ec7df2c10 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.12.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"
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
index 381cb9f5560e..8f2ec7df2c10 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
index 381cb9f5560e..8f2ec7df2c10 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index e95a583f9e2c..a7dd4988cbd2 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -4,8 +4,8 @@ AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e3
 DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57
 DIST buildbot-worker-1.1.2.tar.gz 103013 BLAKE2B b44593b71e61fee4037911759fa4f686aaabf5ef4be9efaecd539e88c5fc2ed2059d8dd8d6d1c4b3ba57d3563f79aaa404176529622003070c136803c90beb10 SHA512 3dd3da7e87d667307fca264d91af4671f76c3aad93a0512ae5777bb2e3972efe349968cf72fa17b99e45f2d7cec1ec16b1180c48d296e2702c9548bf858951a7
 DIST buildbot-worker-1.3.0.tar.gz 103765 BLAKE2B a5f06ad6b87442292f9fe0c7935f791d2fdb450db09c9614324f8230d0bec408380a7b1637dc32806259c4de7699b164f20f76d959232a82253f7134749531d7 SHA512 5e59aab6cecf8dd932df0e8063c69fda5613b76a46df63479ff554085275d4a19fb1b5142034bd4245423e99f3e46d45e765b10c3c74a9f28b92b70119fab9e2
-EBUILD buildbot-worker-0.9.12.ebuild 4808 BLAKE2B 56e8fb43e57c6a90054296637223fc719e4b52738a3d5037326713b10ef29ba9ac9c71c2f468c040e075310501720147d59b83f9e83a4cf45146784de22905e1 SHA512 9280d45f8db1a23af1aa1098b6dd8677a22036a5256f6bd36b54a45f488a7c4ea2dbda2b006aaa2bec2084c14fe30cec56b3e6d6d65ae5a00db86e3307c3c7f2
-EBUILD buildbot-worker-1.1.2.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
-EBUILD buildbot-worker-1.3.0.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
-EBUILD buildbot-worker-9999.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
+EBUILD buildbot-worker-0.9.12.ebuild 4832 BLAKE2B 4c0f8386b75445bcbb46f5e0332495b1b828ac3c7aa733641e6ab2846faca46e0034c5af41c3a3c20d82d5a9ff36087791f8d6441d42c28736a6103b07764fd8 SHA512 3653c3163471f67b15076c66a69b049355938034a0bcf63e6d48c2f885862409f947cef37cdd5a4ebb7702179d0c2e1aa2551906b8b9d6caeef5104ad645812b
+EBUILD buildbot-worker-1.1.2.ebuild 4837 BLAKE2B 1cf9f7e3e4d7f804e66612b5d2e7e21e8a1256f11955a4611f00980a5e28ea9901a54f7fa203802f8d7042875fe455c0228acf3793443b5252475fab770818aa SHA512 86de17e690c60f53d7b5cda2344111d278caeac86a2684aa486ba6a2cf51d00c39da43d87524316fa5a6c8742ec4e64374f5cff1ec5ded6b7d22be678524eca5
+EBUILD buildbot-worker-1.3.0.ebuild 4837 BLAKE2B 1cf9f7e3e4d7f804e66612b5d2e7e21e8a1256f11955a4611f00980a5e28ea9901a54f7fa203802f8d7042875fe455c0228acf3793443b5252475fab770818aa SHA512 86de17e690c60f53d7b5cda2344111d278caeac86a2684aa486ba6a2cf51d00c39da43d87524316fa5a6c8742ec4e64374f5cff1ec5ded6b7d22be678524eca5
+EBUILD buildbot-worker-9999.ebuild 4837 BLAKE2B 1cf9f7e3e4d7f804e66612b5d2e7e21e8a1256f11955a4611f00980a5e28ea9901a54f7fa203802f8d7042875fe455c0228acf3793443b5252475fab770818aa SHA512 86de17e690c60f53d7b5cda2344111d278caeac86a2684aa486ba6a2cf51d00c39da43d87524316fa5a6c8742ec4e64374f5cff1ec5ded6b7d22be678524eca5
 MISC metadata.xml 402 BLAKE2B 8ae4401e82aeac4b9e28c94cbfefaaf2f15d15dad0771fda3e1447dc98ef99fd4578b6dbc8e475eb3354ae781f481dd8c6422c06a67d0612ea89e7f39a1d33ab SHA512 a47717971189510d5781fa3ea41de026fe2518d32619eb6830cdc1cbad89182dc01dc2c57877c9689565fcea713ac08dd36af9f51ef47888319ea2380b488deb
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
index 475028a231a8..0acf8ca32c4b 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.12.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"
@@ -24,6 +24,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
index cbff1cfe433b..294e04869974 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
@@ -24,6 +24,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
index cbff1cfe433b..294e04869974 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
@@ -24,6 +24,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index cbff1cfe433b..294e04869974 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -24,6 +24,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index f3642dbf9108..d8327eced90b 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,7 +1,7 @@
 DIST buildbot-wsgi-dashboards-0.9.12.tar.gz 627274 BLAKE2B 26632ddd1577e9c419d13c07958c203440ef875bc4a79be6b894d0cf4dc457423528b7ea34c830511a5ef5d7f645fde2f71ac08578e1de32687c8b1ae2864491 SHA512 113c1616b08feb64fd3d94c1186e3d7dd7ea93e563a96ddb802e6ff8135e194014464ef09a23004518451626584bc531fc17419188ebbdd388e9363541b80c3d
 DIST buildbot-wsgi-dashboards-1.1.2.tar.gz 626825 BLAKE2B 396fa858cafd6dc3958c37ea2e9e685357de2185ce0b73d946d3eb2e99472339e176de1b49d821337535904c521e8dbaa662217c568306e7b2d889d11fdeb5ed SHA512 1eee2a38b525145e50812dff421613291f6b0b6a80a531b54383d771393d2a12c1c7840e2dabf7949918ac3f31ce5f6bd9514c08dee8fe5900c99438e63d4ee2
 DIST buildbot-wsgi-dashboards-1.3.0.tar.gz 626828 BLAKE2B 9c44bca995a1849246c71cdf8ecca1a72ffdca9fb8e99db4e05dc529e0b188b85f45078c0f961c03eeb688fae08975dc438ba7c85bfcd3bebcc14a0d56a69f67 SHA512 97885bb26eb03c40b8424063333a9bbc80b5111ce82c79e0ca466f2f820622df43c6913b6b6f4f9ead2a47e09496ff9442df4a6a9a34041f6b9a127544413330
-EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1150 BLAKE2B e9354da5dc2bcb0ed8570ba566a483c75c5d99616c36a897d429a55b3ddf8106acfa8552ad00da622c74e7f9fda20b6bbdbf5ea692d68c9e5fbcb70dabfc2e21 SHA512 c5f35d782a8f6b642d28ebd0c4038a89a0efe89f16a0581c2769c03f03655b618dfaf0a9aad5e616662e3dc99f2447e514897c6d87a51eaab82492650c641548
-EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1147 BLAKE2B 21659d6708b7bc8f29954d6d46765c238573a8cc1e2d4179f7ca51b709baa457499158d872a4e35f6c2a062c46bd9657bccf51a29388e98c36e56a9ad68dcf34 SHA512 66d0e207a955f066b974b9ab0e372de15e251f4fa87cffb7273870b94d728bd49b0af650b530e0e5613e35f9b6cc588fccc284208fa3724a3af3e82fd848da70
-EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1147 BLAKE2B 21659d6708b7bc8f29954d6d46765c238573a8cc1e2d4179f7ca51b709baa457499158d872a4e35f6c2a062c46bd9657bccf51a29388e98c36e56a9ad68dcf34 SHA512 66d0e207a955f066b974b9ab0e372de15e251f4fa87cffb7273870b94d728bd49b0af650b530e0e5613e35f9b6cc588fccc284208fa3724a3af3e82fd848da70
+EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1174 BLAKE2B 5fba883b6351dd0bb9cb4b85b84b53d59716dd9de7583b8d4244a4b3dcf07fa1ff3b8d53586013e656256506c888aba1e006c22036355c4d3579233257befcae SHA512 02c142f0a7541c22a18c34bb42a8d05795205c7bc72b561f62319d827a1917b716d645d0b558118f5eacb18cdf4d21707bd5f1e7b38dbaca5f13f3557414304e
+EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1174 BLAKE2B c7841ee76703b048058b35a711ee6b933fcfee28b28dff0ad85247fbba12c1f32c41f1daf922001bf44f1e57fc24c036043b78cb8903d2529b4224dd13904ef0 SHA512 a3b632dad392bb87f2c253c943a7bc72efbb2882d21f61bb82c484124b1e2ae90a7f20b490650de7733586a3430475da9e861711fe840185a156a2ed710e0cf4
+EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1174 BLAKE2B c7841ee76703b048058b35a711ee6b933fcfee28b28dff0ad85247fbba12c1f32c41f1daf922001bf44f1e57fc24c036043b78cb8903d2529b4224dd13904ef0 SHA512 a3b632dad392bb87f2c253c943a7bc72efbb2882d21f61bb82c484124b1e2ae90a7f20b490650de7733586a3430475da9e861711fe840185a156a2ed710e0cf4
 MISC metadata.xml 601 BLAKE2B eeb2a7e4d63561b48e7eb2e77fcae315008e4a567baff579bc086623118fba8675590e059ea3a6437d158e9e9992eea7ed8c0fa46a778d5dc333786dc70a58aa SHA512 2bd94cca6be055e75c5f772913570f01ef07eba909c8ab79c21df89a806548a8920016fb6fb139ddfc9c613101432e51bc9dd2600e3c6f01a6986d06107844b2
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
index 4cabf641f704..293af6741ad5 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.12.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"
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
index 3c6698a632b3..bd88b982d62e 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
index 3c6698a632b3..bd88b982d62e 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 870297b2296e..55f1a24e5dfd 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,7 +1,7 @@
 DIST buildbot-www-0.9.12.tar.gz 691551 BLAKE2B 9bef044fe9e48e34d3e314d9c9b7446a1e295898c432da5c8915e36156f2f934fd065c8075dd55f68da7bc29a567c1ef276bc415df38911aff7c33de46fa7942 SHA512 6c525d32407be24aa728a0bd9c9a09c64bb4bef092ef9e5285475527f7fcbd89d516ea376d90b22aa24af384d73125bc886360cf992dfe3d01471838193f351a
 DIST buildbot-www-1.1.2.tar.gz 718705 BLAKE2B 009ae0dc07693f9eee4e3982ccbecb32d64e7d27e374f539cd541a5f80d9b9bf798e8836502cd26a5477b0ee842dbfae2308608fa3320e682afd0bcda2f89f1e SHA512 e4a0f7aee5e38d0522d39c819d4b9865966e020fd89b156e79807417fd7f82d497fbceafcc8a89e5beb6def1f42e4bfc595053581cbe2634520ad2c806ce3968
 DIST buildbot-www-1.3.0.tar.gz 717517 BLAKE2B 57b0ed7ef46fecb242562a0f93e234985c9cc0ea55d273c1c5de74753f6ea83d25d5017515afb6ad4b7bff4f80cdfb9a6daf937c5cd133c017c9bd6fa9d6d7ee SHA512 e01d1d3528ab1f29ff136321b25f45b01733a4f23cd9d637c9e3290b5301a8ac3dc545decb178c1332e58dc3e11065ef73df49fbb46fca6068acabdd40a8bff1
-EBUILD buildbot-www-0.9.12.ebuild 1182 BLAKE2B 15e5f4e434388e046289db3cdab2419cff90b6878e2f206b33ee0add43709c1519a23d1bc9bb98f6538d16939e95b24f3e94a8f69045f1c34227effb42f6ef70 SHA512 040ec4dba0f0e5e15d64f368063a78244dbaa58ab1ba5ba12969d9e29a69a4c2a00d8dca1f42c84f08825c7f3a7aff682d34f8305df10b50d024201ca839ae9c
-EBUILD buildbot-www-1.1.2.ebuild 1179 BLAKE2B 68e1cb0c1f5a70246eccc70c4b8f480cf6d36936492bc195ff502d3b02732453e2f65a7c09251ed963a73d93c1349f2a1d2265c0326b04435c0fc862f845b9a1 SHA512 7b133af1d0d2e56b84895ba6be5901a4e2ad9fd72dec9d27470f6aa68da816067c437045522c152020269b9ac82e3673635d857d78041a0babe682ff063e8a13
-EBUILD buildbot-www-1.3.0.ebuild 1179 BLAKE2B 68e1cb0c1f5a70246eccc70c4b8f480cf6d36936492bc195ff502d3b02732453e2f65a7c09251ed963a73d93c1349f2a1d2265c0326b04435c0fc862f845b9a1 SHA512 7b133af1d0d2e56b84895ba6be5901a4e2ad9fd72dec9d27470f6aa68da816067c437045522c152020269b9ac82e3673635d857d78041a0babe682ff063e8a13
+EBUILD buildbot-www-0.9.12.ebuild 1206 BLAKE2B b0d2678b7884a67cf9118f2c5b5acc2f9cd1da59a524d814f822a0c9f25b5608b5db284adf67816dfac080cd829de5b03c4b2c4cd9ed1ebc93c4898ff22303fe SHA512 b68b3b45dd0e4b610727181b936c4854385de7d81411158dceefaa8c1c0341ee4ef6f6946e0392a3130c59eecfc84ae7dbe6588d1e31e5972494a9a72b14de36
+EBUILD buildbot-www-1.1.2.ebuild 1206 BLAKE2B b0d2678b7884a67cf9118f2c5b5acc2f9cd1da59a524d814f822a0c9f25b5608b5db284adf67816dfac080cd829de5b03c4b2c4cd9ed1ebc93c4898ff22303fe SHA512 b68b3b45dd0e4b610727181b936c4854385de7d81411158dceefaa8c1c0341ee4ef6f6946e0392a3130c59eecfc84ae7dbe6588d1e31e5972494a9a72b14de36
+EBUILD buildbot-www-1.3.0.ebuild 1206 BLAKE2B b0d2678b7884a67cf9118f2c5b5acc2f9cd1da59a524d814f822a0c9f25b5608b5db284adf67816dfac080cd829de5b03c4b2c4cd9ed1ebc93c4898ff22303fe SHA512 b68b3b45dd0e4b610727181b936c4854385de7d81411158dceefaa8c1c0341ee4ef6f6946e0392a3130c59eecfc84ae7dbe6588d1e31e5972494a9a72b14de36
 MISC metadata.xml 588 BLAKE2B b50149f2f21f5ddb5dfc4bbff2830c3a6f047ab04df1487fb1a462b403d6d4201eb7945a069ce662fb6682782e98720970c58fd3b27c4252d2b7843ae083599b SHA512 a215b7802240ef70f0c64e6fb511913aa83f514a79e79e24da98c36b68ed0105288f4515b0b016bda96ff3ce187694b41e508b4d22fa5a42ab57306fb8511491
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
index 04389c8bb423..ca7e4b8583a9 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.12.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"
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
index f0f9c7e69d11..ca7e4b8583a9 100644
--- a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
index f0f9c7e69d11..ca7e4b8583a9 100644
--- a/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
@@ -27,6 +27,7 @@ else
 fi
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index c142dfeedfe2..b95758937cee 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -8,9 +8,9 @@ DIST buildbot-0.8.12.tar.gz 4834352 BLAKE2B 16d06d6ccbbb90581471cf1727cc9cdd556a
 DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d
 DIST buildbot-1.1.2.tar.gz 3101168 BLAKE2B 35ec56440014015850a69324d475c4ca9555ad90da85b26a7a43eca74f08361137021aec72ddca37cbb24f21519ebf45948e66214291f356b4a1fbada7c0b3b8 SHA512 14c28d6fae18a10d89d41509635188d881ac76e7b61758481a9afbb22eb384d7ab5080383242e5850af13bfe46877985a91036270c3c4fbf01eafee5b7699815
 DIST buildbot-1.3.0.tar.gz 3119185 BLAKE2B d366b83baad7e865481535a2462ceb222aadce6c90a6229e82a72bf86518b8ebb0624d8ac8b64867783d58b6e9033b942a1ccd31fd6664a2b527eac9f11ab852 SHA512 e5ecf3eafe428a188c2410d270ee9bd5afc39122e62d35747288cf85347368ab4a94190b4ff6fe687269dc19cc7b91d33be8d3e3b637741e421a2cbd83572830
-EBUILD buildbot-0.8.12-r3.ebuild 5487 BLAKE2B 65e94e3913dfc194381b8c86b0743f2ddb278f90cf5f0d32e1ddeee50cb5da314a6c35c892264985841ebd6227453f699794db30786e329a6b5219e6ece0ec6b SHA512 b628b1cec97419b16289c219967eee1154a1b022004afb25981bc83ff60924e462cd652e2c88f51a799c8bec7acdd25dcaf6e2657f0d3f44a69a793d205bfcca
-EBUILD buildbot-0.9.12-r1.ebuild 6434 BLAKE2B c5d990555a23357803c9e6dfdaf569467113034c0791f30f6cb8f93b4974bae3298123b281527a360bc7a20b96150ae3d2ba00aea3c23cb3e76457ec374b54e4 SHA512 86f1296ac15f80822606e7f7ef23853fe46b10440c774353dec387bfa56fa34da624811b7b4c7979b10ce05f230f98dbca77d6bcde4ae3a64cd8aa95089ed302
-EBUILD buildbot-1.1.2.ebuild 6545 BLAKE2B 4047c82720ee5495ed62a90a6059aece3b21605983cebdb654db29c3ab2121a8e384f8b4a249141f0ab2611108059ebf597191a6600fd16483b769d801fbb12b SHA512 1ef262f9231a59a30ac907e631c7fd415d0b5a0cbb387309feb0bec672e505ad714a1ee1f35b31b4c38e640d2cde0c3dfe44d98a62de9e3b48eb93e16513d6d8
-EBUILD buildbot-1.3.0.ebuild 7198 BLAKE2B c663e73bf0fb73325d368c48647d8ec9709b89f9142d906c4f7f97e8453b28da1729ea50e1b879dff4d14ee1000ced786cbe188e6c8ad4bd642d5465af805e5f SHA512 4c5802a4c0a7ef5c638eaddd65540b26f69181b7e44fdaa444404e4be4f0d3ec3e3dfe813ac39e3d5697220479763447f73e964fdd3db936a8f552365cebaf77
-EBUILD buildbot-9999.ebuild 7198 BLAKE2B c663e73bf0fb73325d368c48647d8ec9709b89f9142d906c4f7f97e8453b28da1729ea50e1b879dff4d14ee1000ced786cbe188e6c8ad4bd642d5465af805e5f SHA512 4c5802a4c0a7ef5c638eaddd65540b26f69181b7e44fdaa444404e4be4f0d3ec3e3dfe813ac39e3d5697220479763447f73e964fdd3db936a8f552365cebaf77
+EBUILD buildbot-0.8.12-r3.ebuild 5511 BLAKE2B a21ff7c34a35f810a90d9b28664c23f3c22fafbee7c6beb059dbd84a2b875991304648c4a1b71e1b82cd964bc9da7ec9727609c0ed316d143e1ade0c19f29128 SHA512 7b533e30b3359024029f6e379d41e63c9b0722fc8483c5c0badcff0050bd9c9b6451aa644db4aa0c02223d7041e530943432842ef7308d5d712e69cf0c3812a7
+EBUILD buildbot-0.9.12-r1.ebuild 6458 BLAKE2B bc3e45a56cb090989e852cf332439a57f00595fb7437c529842b9c02a941ef1f2d08f863c546ddf9199b74b685594bb1b8d75d275f40340a447c79220a9b7d08 SHA512 5b67b19d57ca86d1e993b269cc3466dd315c6014a7831d50e191fa31353a455a81f86bf41000c07dc80ffde987fc47df78c48bd73b8eae519d30c254e36ff48f
+EBUILD buildbot-1.1.2.ebuild 6572 BLAKE2B 4f1b587333dcd026c67082e0c4d589c657df56f792a26c1fcba946effc9e7f84280033279a0aa7bd91b9fbe8881c854cad49d2e54711847e7bd22ca704fd1d18 SHA512 c6d5127fae9a9ee3376dc8898b7f7d43412c32be562dd29b4380cabbf79f3e6eb535a952af693a9b29e7248b51843830e38a51910c6cbf384b748d2214b2c91b
+EBUILD buildbot-1.3.0.ebuild 7225 BLAKE2B 200417b53b7ecaebdac8f6b8e4b34ea0331f07e63d2719c2ec678e3eb58c33f1045cb18f4ed47de041fd31f37fc1b298faddbef1d1431020d7f16b62dee9d62a SHA512 d30439fbcaa792fcc129f99c96e1dbb7222b03313fe2c4350d554d793d5824bf6d735ecea62b58d9ab35ffa2b58171401a44dbcfde5902a4f677170de253e24d
+EBUILD buildbot-9999.ebuild 7225 BLAKE2B 200417b53b7ecaebdac8f6b8e4b34ea0331f07e63d2719c2ec678e3eb58c33f1045cb18f4ed47de041fd31f37fc1b298faddbef1d1431020d7f16b62dee9d62a SHA512 d30439fbcaa792fcc129f99c96e1dbb7222b03313fe2c4350d554d793d5824bf6d735ecea62b58d9ab35ffa2b58171401a44dbcfde5902a4f677170de253e24d
 MISC metadata.xml 1427 BLAKE2B 61fb937ec5b16eccfbca293455b8f1dbc8b98f489eeb150a0209b32bf53d79b3ea12841a2bd2a39d9b120009e897469e40aaa189fab33e67e9ef6a396353acd9 SHA512 eec1f2c30d650ae90c80266ffac401e432c75605422110511d40162635da39f3428e33bb04ef58de8124830e34434d2e8b582600d75ffed0bfa8d8e25e2ad1a6
diff --git a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
index dc3c963ebc9c..f4f29f9274c4 100644
--- a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.12-r3.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"
@@ -18,6 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples irc mail manhole test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	dev-python/twisted-core[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
index 5164daeadabb..6f20fa2048de 100644
--- a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.12-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"
@@ -26,6 +26,7 @@ else
 fi
 
 IUSE="crypt examples irc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/buildbot-1.1.2.ebuild b/dev-util/buildbot/buildbot-1.1.2.ebuild
index a904b1708e96..11d1a6f2e89b 100644
--- a/dev-util/buildbot/buildbot-1.1.2.ebuild
+++ b/dev-util/buildbot/buildbot-1.1.2.ebuild
@@ -26,6 +26,7 @@ else
 fi
 
 IUSE="crypt docker examples irc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/buildbot-1.3.0.ebuild b/dev-util/buildbot/buildbot-1.3.0.ebuild
index ef67bc4187ac..4007eaa7c96e 100644
--- a/dev-util/buildbot/buildbot-1.3.0.ebuild
+++ b/dev-util/buildbot/buildbot-1.3.0.ebuild
@@ -26,6 +26,7 @@ else
 fi
 
 IUSE="crypt doc docker examples irc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index ef67bc4187ac..4007eaa7c96e 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -26,6 +26,7 @@ else
 fi
 
 IUSE="crypt doc docker examples irc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index da24d27f99d5..6e4652b44c13 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,7 +1,9 @@
 DIST byacc-20170201.tgz 741550 BLAKE2B d72e2361cbc02d37754d7ca2b0cdabe39bc5b60728e7edf6c0040ca87f991469c918fb0d4c96239d1483ccce0b729698cae9fd6d9988626c1a7ca2d58f47bf1c SHA512 f45e6f5eefe4a4bbcd233fbe06cf25fecec3ecabebea9064db0f52d900ae90783dd180f90d70901f82e2b632ce0432d28a913d312b15225e6256344c176a3638
 DIST byacc-20180609.tgz 745317 BLAKE2B d544e2c81540c711fac57ac3179aec9f44b4db808e44318b3046443c29870351b5251383542caec9f65e06a6d83f481f2c8c4e73a28e59d5a57e854532404df4 SHA512 45aa6de839ca23385ab832685fdaa49225dcde6a40bdb990eefde8ab1be2cfe063875072e844629ac91e9533e6e310fa0bb8a6bd01e246a1cefc67bbc3c175f9
 DIST byacc-20190617.tgz 799465 BLAKE2B 2baf34b20da049b3b1d2a569ec6b5470fe4935c9b13062fc58e6c73de6cbb1823736532686d4c9c083771432ce1caccc369c87070b27d59e9cb7c5c5bf1391c9 SHA512 79d04d7aa976e8b4e1bbd69f75ac1f0dbe005b1a7b072ce5ef75c877e8ece043e4adf48645c10ef036ee02de639b56b9befebb34f6e46cac1a59f8f641cc7cc8
+DIST byacc-20191125.tgz 871913 BLAKE2B b779fd05a98bc794544d84568720979ede374c7c821f3883e2568dd97bb2ded2dbc85471f5dadb7aa2953d9cc9665f4f1f18b77717aa63eae0786f70683fd9b7 SHA512 ef35ec6a294b07c71958dbd7106cc9b4a99d0eb45336d71c2763b3861a2cf97ed1de7f8c242a5eeb2841578711ed4a0bd874b7d6ac5e63db7f1d418847767c7f
 EBUILD byacc-20170201.ebuild 606 BLAKE2B 17b57c9e8ac1f5d3982f29d274e40458de77171d38bc4d82cddd7580fd021664111e4f430469939548650de434885854f74e7411c8c370a4a8205ecf05d803fc SHA512 63f4b681f52dda6dcce887be1d5cc276f01969346bd5aab0e7248f0cdd353c6a1bc6a0735f6983707311e42587421143f2d444c7ce19b4f029c07bc68dece774
 EBUILD byacc-20180609.ebuild 631 BLAKE2B 1bc795a89457b62902407f047bf3989043137e5bb864cd342617522ae7bffb85f18bcb74cc60ff31a099940ad85d9404a550c7a30c00421d7cdc4b18be6144cd SHA512 52450be448ddbaef7e5292870ee6f48e83f0629fa6793410f65533e1af7c66715928bb3283968063e631260f821789b37a4eb5d9b37fcb439b3c876edd624099
-EBUILD byacc-20190617.ebuild 628 BLAKE2B 7f22364a3b39f7f0eefb08c1a46a59e7e6575b15f97fd635ef58d24550b525f9584955cceb19423332128b6781c61d2b28bff072064954a4c09b3d259e85a26a SHA512 69977bf34eca30e0bd311395d6c9a201de6fecfa24418c4f7cd4e1011b4c045931e08ef5f4e10077aa66ddff7a121def2abbd72e76be2383f57dcf6c7660f9c9
+EBUILD byacc-20190617.ebuild 619 BLAKE2B 473ac72abadcbb62b64c14e194d32155e635f610d623f0861d3713e4a34dcce66f874d5ca47eb615d6dce8531729fb2111c6901ffe77b9305fe9d92f39eb995c SHA512 f6d7289adb775e965e22cb647ca239b68e1a08bc45ca31b616b365a6d3f81672774ec66745e61c6b3f2039e8e0370414061eca10bbb69b0d31d3ad9b186ff64e
+EBUILD byacc-20191125.ebuild 628 BLAKE2B 7f22364a3b39f7f0eefb08c1a46a59e7e6575b15f97fd635ef58d24550b525f9584955cceb19423332128b6781c61d2b28bff072064954a4c09b3d259e85a26a SHA512 69977bf34eca30e0bd311395d6c9a201de6fecfa24418c4f7cd4e1011b4c045931e08ef5f4e10077aa66ddff7a121def2abbd72e76be2383f57dcf6c7660f9c9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20190617.ebuild b/dev-util/byacc/byacc-20190617.ebuild
index 52031138194a..f96e778f6be8 100644
--- a/dev-util/byacc/byacc-20190617.ebuild
+++ b/dev-util/byacc/byacc-20190617.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/byacc/byacc-20191125.ebuild b/dev-util/byacc/byacc-20191125.ebuild
new file mode 100644
index 000000000000..52031138194a
--- /dev/null
+++ b/dev-util/byacc/byacc-20191125.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
+SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/cargo-tree/Manifest b/dev-util/cargo-tree/Manifest
index d430b9ebcd6d..2399949943bd 100644
--- a/dev-util/cargo-tree/Manifest
+++ b/dev-util/cargo-tree/Manifest
@@ -1,34 +1,48 @@
 DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
+DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
 DIST aho-corasick-0.6.10.crate 26122 BLAKE2B 752eccb2fbf36fbc73b8694033d2f80f6ab6d2a8c2ae023329b90bb252b537adb1e80a604b4266bfb1ccc2963fcaa6579be48ef011c9728734c7cb77fa3eab99 SHA512 4a21b0e68c416e5dcfe99ded917577abdbe7c92e50227b7906a2b3bd25105f8e7d03103514d388171a41090cc7bcb63bb5b4dc3c6847a9b4e09bb3856a1bbd9d
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
 DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
+DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST arrayvec-0.4.8.crate 24260 BLAKE2B 0445e8cbbe7781fe7890dd98d46bb4451de8441fdb99b74b9f08a6a93016eb8c94978f2bda263c6f2ba6d4ea31176446c0bba43f5cb12ea644289fd4568007fc SHA512 a20753d9b9ff320162f9d02f72d2756ed9e85260238e43c0528889597016525c4bca5ebd57f9a5c63727cdf707a3e3631f83401ea565f64e55208349785c625e
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST autocfg-0.1.2.crate 10444 BLAKE2B 1e37c97d6d309a5250552fc4c38066ba004674af6e6d091f08b24f47475c11b2db4b0967ce55d2208b9e2ba080e2bcb4b4226acd0da9d4c15dd844827ea6f0b4 SHA512 0f692f4062d22be01c32af2ceb6ed3887a7d65843e1a6ec696fbaa46517d02e62d573055efe5da3a63847f05bc37b254bf2dd750738b528774f63352eacdabe4
+DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
 DIST backtrace-0.3.12.crate 33665 BLAKE2B 860f98231701f1e75a414297e663df48de739ac5b75f049831a77884ae11df499957c599ec66c8f92c41654c436117a11b92829b095c62eeb721962ddbf5f1b4 SHA512 40e5aa214691f9c3ea5a609b96ea364d72b7a1596c42f74777ac5906cddf0207f591922ffeb53ffcd62e47d3f296daea0c93b469ee3426cf34866397dc40f47a
 DIST backtrace-0.3.13.crate 34101 BLAKE2B 853f1527736d049559688f4ec49a800f0280c11ad24dcb88b7fab5a18c777f39e0307061c107d4b1d60d52183aede3db7b8f7145ad1df50d28dd13929dbb38ce SHA512 434037b8b9bae57bbc788d5db05d02464cab8aac92be1bee9636aec17b02f14110e7d6bcf0c529ce5ffbf632c2fc939fbcd96600bd90656ac489c1ccf1e8e439
 DIST backtrace-0.3.14.crate 33452 BLAKE2B a3177739d2d2877a5b0257636b6a14b1fdb7aee440fbbafb9602a199b09b73702132e99bd4826245371f9a9acf33739dcce9b15e7ab6be4c29e0c30ed2b6a9b5 SHA512 6ed74aaa996c30b7d97e2eee2aff72347ed3d26d6f5e9f5af4047dcf13170fcd9ea8edf7e44134faabfa34d41de0700f8c4b814f81e8f450729ef5db2d03a435
 DIST backtrace-0.3.15.crate 33807 BLAKE2B 4de08c8ae6ce4ac650a94fbbdc16ae5f4e4a4b8364d946dfbbd13c6349edaa4600f77e311d1dfc52582d6b72bcdb8c107557f39f33222f40c802faa7baf69a9e SHA512 d2850033ff2478e4f6547af922c5c2f43a8fa15f749e00f2763734f57040a017670c90a5fda62e35593748560a498f65c81f4a8c225393e7c67c1f612bb61daf
+DIST backtrace-0.3.38.crate 68133 BLAKE2B 75794901cf8d322cb642672eaab9403b00f802a917f04505d8a4df1466d340f92f1824cd0cd501d5f6017ff98cf17e4ad61ce32fce07b061fbcdaecce5ac0c55 SHA512 a962b8ffd435691bf229f6db6cc86a0e9fabec1dea589824a85f11ee77e2c36458cdebd68acc0624d45195df27a9fb6dace0afb98a9fddc0291bae93928345fe
 DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
 DIST backtrace-sys-0.1.28.crate 522603 BLAKE2B 6150bee74264cf2383aa27cd33b28790b3c70da0c21c327dbc4af628b5f12afe941c1f3ecbb556f8dec5638b6be29f5db3867514417b267d7099202c5ea89f52 SHA512 4b16bc8500258d0e75db0c6cca3e2a68d9024106a0e8a4a46cf5865fe1e08304d9291a6723e4fd337b7d7f5bb14e9cec7b3aa2e40bbaa4642562764c803d345d
+DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST bitflags-1.2.0.crate 16814 BLAKE2B 5b7aee7388b01cebf96651e979025e9bcac85f7324982055d7d805361f91da2b9489a07f00350133c8a58eaf70c5397e3561c15b3f2544aa8202bfdb852c145b SHA512 bd9e3797fb9b91e815308a5286439e7eedb285666c937184493cfce45ff1d4c10f505f29be3a6317add313a7fdc72a006682c1b3e1cc9fa05166f6c4ecaffcaa
+DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
 DIST build_const-0.2.1.crate 4499 BLAKE2B da7f1040560862b76447426be8884bf0ac62d2f2faca0a572b8cf566fcbbaaf27dd1f260fb1333c3cf9410251433239616aaf0ca1a2be644fd4cbcc2b908eeb1 SHA512 4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658
 DIST byteorder-1.3.1.crate 20959 BLAKE2B dcc5d3b97a0bd82272616599454673790d64d799b699b9e339feaf1d8a75b64b6f4cde19642d5359babf6c769b14325b89a51d29594f1e8ce48c2190348bd4cf SHA512 b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25
+DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
 DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff SHA512 a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
+DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
 DIST cargo-0.32.0.crate 825669 BLAKE2B b3d1ae376d5c4438e1f2912dcc242e61f52633dfba0f8ace9ee4646ff8a49c1ad02ed4feb6d20ed303fc6534b937b2f4095ded193c014c1b6e1035314ff9dc0c SHA512 fadcf5e8f830920de1fdc0a6dc061d22616d98e2ddb7816ddc219bac4d51fea70ea249f3779d86875e4e5ef2b4d5b84ee64ccef1e816ab6db0f9088539b4a80f
 DIST cargo-0.33.0.crate 836765 BLAKE2B 78a06124ffb1d34bde2bc465093cc045a7a3e3c271ac6098ed0f4c0c129d6055d125f837e1a9ea19830cf3949f9f78381a9964a8df0d17a5cab6abcc70638c33 SHA512 00170f3d89b10a9abe8a5aa17bcb2ece4dd3aba15e86c01aefeda3de12ec5fa26041a1fb5ae27ea5fb15d2db80d9aebfe268cc140019b0d500a1dd0a7a1e2b05
 DIST cargo-0.34.0.crate 919411 BLAKE2B 6862f5a35e50aa6d81059c0628aa8587b80f395f1a32d2dfdd9479c48be32ab0e5bbb062122e230c706402e49d6bc13f07cf3d28b38534c99d7f120b0c8d14b4 SHA512 9490748eb6ddaf120e67acd6642433b2626b114a2ef127cbb1e0feb49546983d91272ddff432e7d9ba5e271b56d8fe842d7be058f8edbcfcb5a82ed4030d8e2a
 DIST cargo-0.35.0.crate 933578 BLAKE2B ef8831460b3d10d33790525f6a4937367d39d32843cb5b0fa2790f3b86e1a36ffc243296f0bc8d39190515ee91a771c9e0a36a356a077e103784c38928eb25af SHA512 df653278d9fbc41e4932217e9283f01b9ed55f46333a10a5879cae50f188a9c49b04100e4a63b55c0ed89b90a47d58da3db451a0f30127757c3cab38b62d496b
+DIST cargo-0.39.0.crate 1018907 BLAKE2B 5f9c27d1d14cf10a641dfe5e803d21338a7117d67a1667c997c87584593c853e808cdd108c4a9069bd86cf4914092e96035d742b61f1b07a54aec71e8493e7a6 SHA512 541baf2c863e8f9784e8bc06e0a8fe4bfe7105da2c082a28deb85056eaddd9b8cf77f585110d267e3f3dc84412ada85e263c4e4df141448f9cbc7ebd90c3e07f
 DIST cargo-tree-0.23.0.tar.gz 23212 BLAKE2B 464936a2ac923600dadb282077e0d7a792f03da796df56d9360ce5a6340a1397fa2f9f314d677c53c27bb43f39c2619d70b5bd17ffdae89ac67493eb526e05fa SHA512 aecb14738f97b75123412100c1e4a0e0bb073070b25c13d2a002776bad4710ccd0cb1e863283e3aaffac4124754be76aaabf4b5e88337fbb579202351b60391c
 DIST cargo-tree-0.24.0.tar.gz 22603 BLAKE2B c0cc265e9dfb02dd8c14fc7944d2d6096b7a48a39b79d04dc70fddc31a0c65dcf52f9a4e3052def20953bfb57ff229ab44f252b90cefdf9c3301fd6e47df3b17 SHA512 ba4f8d01ff3c47632c54f81731ec35fa9b5afb2df5c1866ae730c981164f18579a803c2917bc1f327dd21aab39310d99854d7c2376c604be1b252705853045cf
 DIST cargo-tree-0.25.0.tar.gz 22695 BLAKE2B 04ebb2a2175ab5b4c714bf81326509b2d256955165aaa89b08effbcd1c88e7a1a61e04538e335d15a5e4d654e030588ffb16054b59a44d756ea2f52ec0305b2b SHA512 7162eb1dd33e8e4b1d374b2d83a4a350999375c932dcd5d0ab88fa704d5e4f2cf8366de41e1a48ac9f7200c8e0972715ea5c36ab0f0df65447d7b98aa0f9b265
 DIST cargo-tree-0.26.0.tar.gz 23042 BLAKE2B bb3db7341fb8f45cbc5194e834f90b2b82a7049b013ac37ed952c0b0141f987d02c330cb5cbcd8a671d0fa99c5ed594809cfca1d26e7608a8488ead8a594b216 SHA512 ab5741f61dc6ac8ea5f9d45ff1b811edbd53e4639154a0e7d8648ff5b17f72e30bb505308ca1b3b9ad786daba7de3f2ba10f22027af792027118c0ae026e1dee
+DIST cargo-tree-0.27.0.crate 23748 BLAKE2B c6765f20f042718704ce9f6baf8896712225661ccd7e2f3d89c86ff0c32a5531cba20cc3ef316e11ae064ffaaf74d6e5373493eeab15bdaaa24439a2fae01a1b SHA512 8194375966b85b7dbecdd86c651f84788e8b2a7cb1a404c5baebdf03cffc4163b496f8465f437defa80571c82e22a6e29a09d36ed0b46b7aa3fa59888e7210ac
 DIST cc-1.0.26.crate 42350 BLAKE2B 3a31535c6168036179930c8f8a4aab0a52632d733c9e0b54fa8d1e8a5d6c426ffca4e7da55bf23ea9fddb7ca72e6894a1f6a8e9175fc4058a37b7a181afd7bc4 SHA512 f4ab851d2aefce6d9e6b08b2af99e7b6c63238c6ef931d3f7872d79edb139f62627911335b62e8ef0c62f54bec65693a97411487af449b1f750a5b6652c785f1
 DIST cc-1.0.28.crate 42422 BLAKE2B 632455257fdfe0be6efddc6aee1a32a8a450c49f3a49b7dd13f770cda69334acb0d11e69a4bd4b94c09133ab4319a529c29de993b960276f7506511e4c0fda9a SHA512 2d1e8e34dd8d60aafb0337a86516b152f7f5b04ed5313079fcce66460b5d9c753afbf5e5ba13ada56bbaa7f5ffa1678eb3c2e27b9d58cdcec9f1a5374e6a32ab
 DIST cc-1.0.30.crate 43009 BLAKE2B 1fed399a931869a1927caf1a572ec04fd30ad1bac18478c2e329ab67c0028182e6d3f9c42926042ba041ace8c855b41f7ae8b14cd11f10fbe22da08d7472c802 SHA512 3ca9759808cddecc011ba202c75ce65f338568d5254b10f5de091829aeadc5acb9d2fd1d0da8411ce9c93cab7e8a84de5bb3e8045cc1e3459382e8fb2f83e307
 DIST cc-1.0.35.crate 44369 BLAKE2B e74583fd826dcda590d7d6b853f751a3f18b10705f62a35a954bfba2a38768870b43046d98b6e8535143cb40950bfd8daa21c86b1a24d30c3cab485b7bebeaea SHA512 6d2c2708d696598e403027b3ee3e4cda4d7119185bdc2ab8c825e36bb2b9f48f40b84392b708100b812ed4a74626b7fef5b3698a9f5513de8f00ff6d922a3f04
+DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
@@ -43,31 +57,41 @@ DIST crates-io-0.20.0.crate 7996 BLAKE2B fd60658cf2822132815bca3b63e39b12220cdd3
 DIST crates-io-0.21.0.crate 8009 BLAKE2B f640e0cef1cb1b06624d4b2fe1961341a2ea8245847b97501c8b252bb2b62ef3003688c15291c91ec1f07799c8125c48af06d6eddf4e2f6992c3cd3eb7def994 SHA512 977c874aab867255950096445c069823aedadf4de3b1433f186c059bf3d00a2626be2aafaa8a7b5b9399ef9f8636be23043716e6d0d1861a17c60b62a5222318
 DIST crates-io-0.22.0.crate 8098 BLAKE2B 7175d48a19fe4c68d08e3c4535ec4b4c09846d27d4d3fec8b2e1e7263d6cfda0e3b2985675c302886e5412da5fca634f82ea180eaf35a6abee519b75cfbe00d6 SHA512 c99e96cbfd0c7be19019fe92b66168aa1d2bd8e187d95bea6c4e5bf60b21c62fdfb70e2c01ee57c65c7c6e1d9fc43fb3422456485f7ef85bc080a46a40924449
 DIST crates-io-0.23.0.crate 8149 BLAKE2B 5ee479317e8dd966ad8de27cfb0e2d8940bb310b61229df82318ff7e54ff2e30d77b348e574134b76aeec8386e28f9cd34373ee9c945570e28b1645fa5acd19e SHA512 93530752c0e72b04ef3c98b48b75eac30ef7da35b62d4c2cfeca87597739f00139456b0783e2810da8d575a336419ed5c1005158f0726fe7dc83cc1156df8650
+DIST crates-io-0.27.0.crate 8281 BLAKE2B f5dd6159363c8314a368f9f1cb82ad4a7afcd94ceb9d76e14d8db07c549b553da1ead8b529b00dbd04d7bdc158af1c39a9d984aa8539fcf1ebe2459831ba8ec5 SHA512 b5409152c238f86bbe775baec5da80df5658583c41c9c285842c07ac1f9696d1af35f5370c8c5ac9eca7f2c9988a7f9427a8108ea4e15519713c9da3469c534f
 DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
 DIST crc32fast-1.1.2.crate 38312 BLAKE2B 7448304242aba1798491da328eacc326132dd7c8bab21c9909bdd729b9b70eb321d00f992f6c7fc026ed2d0f6a562af1113e45baf61b907b8bdb4412357436e1 SHA512 f0ff5c889a89e0c235ff876d2e0bf50a5c97b85c6f19abbc3d12de26c97e678e784c04cc975be7d008b45fba7ac68c9a129680e37492d77f7a0f433fa895c659
 DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
 DIST crossbeam-channel-0.2.6.crate 64953 BLAKE2B 281d8ccc60ab2f4afe0e7b5d9fba5fab7cb2f3a36b8a04d4ac445bdd9f0838fea6b41dbe08be7f25e5154ffe2eb0fdb9304034080d881918a84ae3ef46bffd00 SHA512 6c124ebcecc70277b9957d3908acaa7c22c346f99b4e678eeda6a54406e1a6d703da6a95971dca248839cf831a830d172650dbc032de138c2d398f0f80a20c51
 DIST crossbeam-channel-0.3.8.crate 79923 BLAKE2B dae78c49f0a2c425c20481a9ab1150fa8fc1c1bb8007747f3cfa9b9e763f72c8f440b62f7d6ccc6f5a92ad0545a2b0918d71fd3e7ce1bb4af95c583696d0cda1 SHA512 9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583
+DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
 DIST crossbeam-epoch-0.6.1.crate 34089 BLAKE2B e99a20c26bbf6cd94978d0aebba43b5e49e76a97ffd4113cd050c262140e257a3d3640f85b0ef7b217064dfd2f53ba016fd14f33906b9f50567eeddbb9ba00b4 SHA512 f2be7ffda167935b4a30ff0264762477690bd7e7916ad26e6bdfe8a7a0a6fe0bea5e8662b2a6e7fa7dba26baf4c2c2944307cf19b5565a957af1f9f3b336e7ed
 DIST crossbeam-utils-0.5.0.crate 12162 BLAKE2B 63366fee26c4012ba705ad415db867e0b9bcf81b0880ee3c5ec3c06d2ec8776e64585ddc04ad072d363ddff3acd1382069e591c25daa27141bbbf75412d96113 SHA512 eebb6bf81517c930fdb4c15a8eaf92693907fe58dbf1913a9c2f4315a6c0550eb772cb15c47e2ac4e3f4decdd47f69ea8e42910ea649bd2e2279ad4cbf9d02c4
 DIST crossbeam-utils-0.6.3.crate 22304 BLAKE2B bb2c1cff2806cb7e8eb219d4bd63e4b2444a47f00c08b925bb165622cb1c50147732d939ab0a0e91fa7edbbae6c60cc9f78afbc9f49c3d097e6f5c2db5bf74bd SHA512 3a6df428dc2791a76823be7658905be2c45bb859703bc13e5c1142c4e5c815f2c0bc12da7419370c541afbba8e85c078f0ee0da65c27502972a6187c80b8ee7d
 DIST crossbeam-utils-0.6.5.crate 31735 BLAKE2B adeec7df0627b73169e04b53883f44b9d4c54f0b97ef2e49cfadc565c5c3324bf3dfe39158a65ec4b6676a8fba2696d43b2ce1aea75fb8bf2120ff4ad9eb45f9 SHA512 5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8
+DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST crypto-hash-0.3.1.crate 7858 BLAKE2B adcd2b397a0226df7b326625a6ed179eafa2f550395782018b5daece122f0d02c68529dfe802aeb933e7ccbd4c969ad9fc0876673002b57ee23b881abcff6e72 SHA512 4c4002a08e68a03409096da5b3f3c8c4db9a23bb331c54c7f4a615ad0be64e3fdca3291f4a20b682dc4bc6d13b95950f02a306423c4cecb48664df05c46209c3
 DIST crypto-hash-0.3.3.crate 8139 BLAKE2B f42f7879369c90ded8dab271d5f207a327722dc3a5e386a31c60ca78e71198d3f44d2583bedf23530eda4970f6bbbcb2f4dab3855dd9c0095a5cdcc1a89f887e SHA512 a4c48e543f45c0752c4057ffcf0d6d50f7238a0b43cc509ad8451412a46df7f45f917cf3df26a6e3aa6fa66d73eb459c43c24d23d0f5107bbe585e412bd27954
+DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d742fb304f4b271b75db305d5afa8ea5361c0b6adb23c0fbfd212f3c4601bc7476b4874eaac00a26c8a65b711b0ae SHA512 57d020650689c988859f51ec9252702a7e8510526364b00058b263f4decb249d7296811adf3b8c5e76f8aa744cd5e444aa198f3dfe134c98257b99cdeb824537
 DIST curl-0.4.19.crate 73204 BLAKE2B 668d81467c9cdd215fcda75514d67ba286ba530f0122cb6406d8e8482c2146efb3ae472916822f47343ae809f5d031d20ee2beabd83c3dec4fe4a6b596c7e44a SHA512 dbcd94b7695db392ed2ad6b3335c0a9bd3db29319cf301489d5f902f250917c64fe6cf51476f0f1873275ab6984df73c39b6b3be3a7f43faddfb692333b68588
 DIST curl-0.4.20.crate 73228 BLAKE2B 79ef3f9b602baef5cbd94bc1c7d5892283b4b7d3c24e5bc5a5537db61421ff6056aa5b6fbe95c4423065e4fc722863c8193775a984bf7e5714c627516063f372 SHA512 0c6b00c184b6e5381740eee42f124b593beb3e35250794c4026779146b9560b71be9bdc7852c0ca35a4423f3e58e8cdbb9d2f1fcd0eb556424627a0bd9814c9e
+DIST curl-0.4.24.crate 74658 BLAKE2B 46f8f999f003d78a9872229dc428b948442a5817a3a8843279a1d7c3783534695888c3538c297b6218a0c1875ac1f6e59b075eb42c765cf67f4ceec53ab238e8 SHA512 27849755fdc704762f917ac781f926823adf1e90b654d84c69b77419b7bcf5e891bfb52b30d5472d872a21ece61da13745ca77cd768dcf78328659c474f257d1
 DIST curl-sys-0.4.15.crate 2860437 BLAKE2B 10a0d95b6e88a8e06494f5cdcd9c1a9f495d39edcf63efc63cdaf4678c48057f7b18f1130a8bafdeabdde8c719aa668ac88c1f9ce1249467ef2d7b8480cb1b57 SHA512 d56f3a13c833b24578f72f72989896e8d045798ed90fcc16e8f36860ed962ce47e50f9e03df387aca687dc08d8072be9883690169a0472f414cfd0b0f38482ce
 DIST curl-sys-0.4.16.crate 2860720 BLAKE2B f37aa78730778c3b44558df89d059baed7f79cbc131de6004cdd0d2427797cba16b73fd8e547690a67cd01fb43df118517f0f9d925a39dc8dd2651e56b077eae SHA512 22842a0c973ed6581b1cc80519772f83510b5be2d4982d761db7884fd20e8654b184894aab72b94cea4fa218fa05013026c02cb3e4e2f277d269527ca8d3d134
 DIST curl-sys-0.4.17.crate 2855342 BLAKE2B b5fc6db08feb85ac9360b94ec5bfa7901c6efdaf08222b5d0c3774ed937cec1bd8377f492fc0ef2b39dac93c381b92f8d5018cd3d8cbd93dcf66d164ea20b05e SHA512 e0b1db564ac22d7d2bb09122393fcdf3cfc196490ad344d4c8023636fe8dc553ed6fe94c7bba3027cca3d707ea511e95294c31bd3ea676f094126677e934e8c8
+DIST curl-sys-0.4.21.crate 2897924 BLAKE2B de000f75e31b6d53b16098f959e807c593eed29cc128096cc694e5a733ddc3ed517149a42ba931ff7c4da3ff097acfa96d4b428943b26e0f4baa9037d54a4cc4 SHA512 8d2a6d1a5282d78eb3bcfeec004e06d79faa9325e1fa9c1d59e68bf94f28a3c83feb52894d5056a3be2deb10c3e6cbf8c0fe2c38e22158507681b723ef718328
 DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
 DIST env_logger-0.6.0.crate 27887 BLAKE2B 09370d369b4516ad5ff02ab5dc155a329adb7431a966d45c2d2ca91d20ac0235680f5872c452d9e55e59220a625494f54b3709a3f3b97c5e2ed991e24c85f855 SHA512 b75d8a6cf2fc88c926f3df8096211a46c39da418657bab73e65df373e5c2c187397f75ff6b02b9a2f18626f0a661cc5bccb03b39c72bcfdaab6d478b43fad8df
 DIST env_logger-0.6.1.crate 28567 BLAKE2B a7302e44a807dcb1b523e1dde683a040837b1de2fbda5e8e7347478f77d4b7a39521aadd1d6d42dffbb6229e0dd6bd1b2b9fc47b860db45281a95612dd78faab SHA512 7e5142fa24e46aeb246515f42f9fc561364f266a693ec9f8c45dbe96d31174bf5663ef6233f41a5f96849dd19b61e2a97ab7ca1a7a55c51f741f4efa5af371c5
+DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
+DIST env_logger-0.7.0.crate 31591 BLAKE2B 886697d32364ea9b75dbe240204ee7f68d2c6ab12b5f4ce5f18445effd9bc361ff15c8cf3c3fdc9599338789e9b47073b2ea5b31b17b608bbb22eb967bbcba55 SHA512 ac9b1e46f73e4c16eb939063b5cd4c4c07ba90cd6acded125f63e449e47dfb59a5d896e94f5374d0a2b119967eadfe10bccdbda8e4d89a2d8a671dd4c4166911
 DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
 DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
 DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
 DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
 DIST filetime-0.2.4.crate 12044 BLAKE2B 563df5750ef95e392f8458c0a23f106eb310d8e8e7253fba6b2b8245afb103a37b505fa41b915691b8f93ac9d6277e2940ee219a4993232781269c9876c5eb24 SHA512 a27ea45b6de09c93a818f56436e49ed358cd7cdab2a39913de159144da239bef14677b5b521633c68bb9a4f38e71d7e2404b6bf628348b3573e509c9440d0863
+DIST filetime-0.2.7.crate 13469 BLAKE2B 6ec71f64de621b86c0ea46856fd9a7f364820916922f88611bc324696d5d34c73600ddaa204bd2119e29b0b38cdbbabc55aee669d87e9d77408dfdd844200a8d SHA512 410d45d9ad4d657da1d2cd16de58963f3096cf6e1978ffa4579b3696f0f4926cda303df7c4d02cfa8d71560518032750729a4184160a31229d590cbbec471d6a
 DIST fixedbitset-0.1.9.crate 11974 BLAKE2B 22d60a9dbac0717c00f95ebd687eefecea597edc5216ba080224eedcf732d4bc901b9f9d6c9dcbd10c0876376de49a7efb4e6ccf90c6776dd9edb5a7f19b9c20 SHA512 07b45fb7e676c6a1b450d23ff53651e1ea1eafdbfc5bc304b13255e0c30f72718fb37fe0f17f2baff799015aa29405b8a677eac604e3219e5ed3f9abecda1964
+DIST flate2-1.0.11.crate 68628 BLAKE2B a375952ec5ad14050e741fab7d62a56413bf50961c2c4e174bdc978b2e17681d4ae0398cdceeb5d4500e60c6b0a7d8b4c3692545bd2305d73a20d50874fcb7b6 SHA512 d2d67be2fa687d4a4e2f4486a14e95d2d73704e862940b9cf0072378916d8e41b70081d30ada2184827740450f5f73edd35ba3d960931e3edb4da8ffb4e35a4a
 DIST flate2-1.0.6.crate 64769 BLAKE2B 54a11a27a6db606bed5f2940fd35bee95afe9b4c4f9a434d7a607b248208586760cb28fb5b4dc2d43721d0e912764615cf8e1ae6bd4b7267f0d1d1a5c9294832 SHA512 b51c31d41db4f9732156a1f5ac956f0482d988174f06675498647d21cc70a22e97c2c01d8a5d0657b5d649c933f51582553da0be32b096f94fcf92402983967c
 DIST flate2-1.0.7.crate 65912 BLAKE2B ace7d04662b4880ca817d7d021d6cd06c09108548880b2eeb5f53329ac1ac482c83e046188a76895ef36d4c62bfeafc831119100c172c2b696f28793e580f751 SHA512 f45bc04ab7b82a2783734c9012eff7a2ca22ba871583229b6267e2798a1dab8e14cf273592e7e67da1e9b193149447419b64b5c4dd0e1b329d79b279c35b41d2
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
@@ -79,91 +103,128 @@ DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7b
 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 fwdansi-1.0.1.crate 4658 BLAKE2B 9ff7630d03280a27d4c58e858391bb9fa0e51d4f8aab875e8b1ac6ceb5f97e0db27f46efeb8e380cefc0348cfc845a10c72cb97ab5ae8a287b84fcfca0773acd SHA512 171044bcb47a672f0d22014741e4509c571a20511ed8d9cbc26fd857b65979925e5f51affff1033c9899a6b5448a696f661e6ee617a349dc732edb02456b7098
+DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc482af850ac3cb4378327de5afabd50826a686d51b00437d740ac4e3a0bfc761c54ed295806ac8b77ae6848742346 SHA512 0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518
 DIST git2-0.7.5.crate 145895 BLAKE2B 668dcaf167d5544a165d4609bfe278d84bed307239d0351f5fb1d56ebaedd874f11520a164f956af88281f70b48477df735fbb844b869c4155ca0676fc467580 SHA512 94d6ee17368a8476ff415dd4de61b02a19b756de44084a787d093323fb11692d17d30aadfc5c1037e7f70b0e5f94aa0d1b6639c9f9afa17c19d6638b7cdcee4e
 DIST git2-0.8.0.crate 151568 BLAKE2B b4bf47247e7add92f8c96e4e8c2b1ade9d7db8e79b799ebae9e07f11870b0c660b4355a0581eef627ebeec2167a501a498e4a4bcbfe9ffa1895ca123086d2e73 SHA512 06270d9f1284796d1c56c4bcac7de477b4665f6c32b5d8ea2fe816d4ff72d662f67f3482349d5d2b055232d9f1619f6fb7afcc7fe0a9053df7133efd9fd342d7
+DIST git2-0.9.2.crate 152866 BLAKE2B 08e7c572d1d9f8e4644aef794eb40231165d5424fb6e5ba762c1c5a9fdea308fd2890329093edc7fa80f6d3ecc2aacc10d0d1c506e2833f6c73a186e2a8c4954 SHA512 65425ddd03f6025021829ffe535ae8d7c98c865a41356815a2579cc41a6c5b3e3c87dc987a23860fe6ad0459cdffabfcc5bd8514609a0f8af36593eeb8aa1ca7
+DIST git2-curl-0.10.1.crate 9348 BLAKE2B ad6358a32e48019b38e8de9a2ac9bf1729e5283a2e6032fd3a0943c854cd049f8afcde1803275a33224f323ddb15dc13ee3d7d9e67c591473da6586a7077620a SHA512 2a1978685479cc186b928940a4fadea22eebeb027d372a0ef24fcc7bedf3d75d098e67a908433a7fa4da9ebb5772229c1e016003cee99abc4b6f5621a84b3c3a
 DIST git2-curl-0.8.2.crate 9187 BLAKE2B 6c42a6da60552fe38a2f83b79fcc2e884211e006369dbea7106434755ce60ffde4735e6d692afc848de914bab46affc10be751d75130f9d67b84fe74a1a3eeb7 SHA512 6713895f491341f1dc4dc3ca286358c8a20f8129c1a97776f60a8ab8c4e8b1fbb77e0d34b57cb1c09c8b917e7f4b8885f834f84e49813c7c6c57f1450b062888
 DIST git2-curl-0.9.0.crate 9290 BLAKE2B b90729fb3de5781f7d1ee180658be92a94fcde5b61991493703e7b60c34c0a730054f36ba49f42b9bd5d64d7bf9471f3f1e6e7eb5224d7f13eb928d3f6a0f981 SHA512 f43b1a9e62f53f96c4108975225ed4c0b214cb86cfe969ec399bc2483ae1eeec409d163fbbbcb78386208bcefcd26971f7a29537a29d37fdfd1051e02f0128ea
 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.4.crate 22369 BLAKE2B 7265cf19e3f7a8e710be40760098242fe156ddfa974a59aa29018c2c317876049dec21e70f8b416ea9a0d16c33754118c7f070dd0e50de70cf8cc10e484a6030 SHA512 b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985
 DIST heck-0.3.0.crate 54128 BLAKE2B e2b922c722afa5d67e2c8a1ec2195ce579541141c9fc983afb2589de4c5208702476bd57c928b5358a5f8d09c5e67c179c7c43bf6bcdf4031cc0b78385c92c94 SHA512 6987552f783d26064968c2860e1ffac9ec1cdeaf69bcc2966e81c151bc001e481157179742704d41d7094198559720b89ad4113b989a9d3288ef2f2550c67903
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
 DIST home-0.3.3.crate 4043 BLAKE2B cd15b8d83b386fb9ce130edbf21307917050865242230af141805b8892d8a295cfb2be0db09296025d75a9c8ee24f6e83188e525ca0fd8753accf1dddc07c7ba SHA512 674f782528c7fc9087d80ff73c224fb5c43d7e14146026064e633841ac08feb342a6a7cc45f29e7da5585a2c920fac8eadd5f143bcaeaec4bdfadf6653ba7b5b
 DIST home-0.3.4.crate 4167 BLAKE2B 8e71387f6063446aa565dcfc6f08f72e2e406681d413bae835393d31ce1f80d451928e3b434bdf569ba3ccde23e55be320f0081f2c2570c3e4e4069915dfc0a9 SHA512 0e6fa44f4464229e833f8ffa893fd84dcd0bff181c718adcbe5f202b76bd2e16044aa44e1828d4eb332fc71637a3e9ac432a048ad2c6e8f87c719e9e88d4a9b1
 DIST http-0.1.17.crate 98437 BLAKE2B 67a3e69d3e14d52df47cb4351bd210bc8748d5a270a906488b5526c1b897540c607d0ff18f434813109412d44c1e3ad2a141dc49ba5a50c58c0bfee6c5d527bb SHA512 4ec143aec78ca3c0834eed20926ade333c282fedb81aa482b75f25daffb2584756ab337de5fa0e9e8d5d24f39d5f9976d51a9b08e94c50d162ab23564924cf23
+DIST http-0.1.18.crate 101326 BLAKE2B fa8dcf6cb5dbafb5883dd27110cf583c4e656852170abba050568ced0241d4d62e0c299d9bcb50b707b495ed0ffbbf3688d7a5a5f29e6aac07657fdd0f279b58 SHA512 850145ca90272d5f474cc9998bdb173bd94a2a16cb08383815d30d9eb941b9fdb8b0d1a342a4c24bbf94d9e63336f4e10b2b95f5dcaeb26392efeef143cb0726
 DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
+DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST ignore-0.4.10.crate 49022 BLAKE2B 4e1fef531f800bf95bf1a601cb8f64d93ed46623217392368cd1f59fe6e353dae8e8e6d2a017c5b3bc89acf2a964eb682d30803f2d4ac3744935c4567d2675d1 SHA512 ef4b3f58bbdc3b5317a14244494ba9cad8e3d062f0c8e137dd2d33572dc8a06b20f59860aabafccb729dc682134aa4e2bdaea8c07b351aa73a8ebb00e361ceeb
 DIST ignore-0.4.4.crate 45482 BLAKE2B e810688495dd4e23747c0b9f650688029033f2e49c2acc2f12ee7d11db1888d425267c8e89a661e44c5a5bac1812120db95c87177fd9abf1366f260d0c55a2c4 SHA512 b7dd5de1c14b77483d22235c4738f39123011bc8c19b785fb528d30fbfe9e9c2f8e3b137ad2d3516ce8f59c2ae06bddbe80811423fcc5ef76cb851fa7ad866d9
 DIST ignore-0.4.6.crate 45507 BLAKE2B 3ab9c229049683b9fb32942dff77f9d8c5977d1e4aa331244f9de76c5bdaa2b48c94d93ad953a6ff37021c14556ef2bf5b0306a3f8bd632a2b93b42deff29fef SHA512 7876a7572e89379a3480208632c9f34d99a9ca835bc19c543ccad1a835449ac2107444e3c65d2980444a78572f571b5c669ee4600bd02a67d864b341cab757df
 DIST im-rc-12.3.0.crate 98492 BLAKE2B 0edb749ff8b20581c856cfa5d441ade046de26962eb39daf43592f6c4573a3cbbefa4b44b479c41960f31e6b9d1738ccd16c25118aaba633d9bd8a6b604e879d SHA512 a3981ccdce43de938d614f5f0ea7ed43b3d6eb5b8542c55e178cac83fe1e4ea0ffa4334f5a3499dea4e01934cb5ed9cb5898a71832e6838abd98662e1f68894c
 DIST im-rc-12.3.1.crate 90614 BLAKE2B b25683ee3949e797ea89fe9740e2324e66a5af3d8815ce17478163b0fd7ce6b754f943bd657269b95491cc88d08bdbe66ac7d5993e3301b6f3419fbc1117564b SHA512 9d8637a5a1967b7cece7776a364e5c92e303db9d799aa49114fe0287d0e53c566bd86aa5c4de8b5079bb46165505673a904d10f2524fcfb66d6140d0f13509bc
 DIST im-rc-12.3.4.crate 124256 BLAKE2B 6ee5fe39142b8a6bb96c9a2f50206b67088377ecba753b92fde0211df409b82faeaa5a534016aa91a70aa5b93396af2247c2094d10a0dc136ad4319303e4a22c SHA512 bf85209dca389ec4681a53fec3d58a1f98f56a1821e916d95b152ed8a1eb7ca1fe704062c27a8af27c209da1bf84fda9f39f92202b4d810dac36ead4e225bce8
+DIST im-rc-13.0.0.crate 124939 BLAKE2B 5c1ce3b02d06ad665225b4e11febf64a20afbfd618256a801df21dd91b544014fe9fca125f1c661f8965c3c5046a855211dc4844c05ade3dd2234596e36b36a8 SHA512 9ec49a8902a6392de1dd9216f13f84575e36af8e1b454a2ed9774dd9c4309b2efb14807a34ab4dad5d5b5e641f9da208d2278eb057e63d3b767f996c6cb6bf5c
 DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
 DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
+DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST jobserver-0.1.12.crate 19791 BLAKE2B 450588820d26d51a6b669faa042b8d9efc131bf2a077127468738f36f373d557ae4bad7ada5cd457540436d00d9805e67f1c886c2e2f445d5a78663dafb87986 SHA512 228af0a4174698b33be5ca5d1e87aac917e8d222f06594c7c69fcc541d0aba773012b791729c3e0669335147b62ce72259baf3ac0c9ededa3ef7c76752fbebe1
 DIST jobserver-0.1.13.crate 19329 BLAKE2B 0c104f7807967ff738aa35a3876355bab8634cd474c9a7cf6d4586d8a22c20fa67a5d704a17b4206c138a5a0290ba0473014be115ebb6557d6848eeb3b349d3d SHA512 fd6c85c1fe3195305e3fa30f47a1971d2e9509161ad4c5e9b1c588e93dc093ac76e6d6830630fe6f182755715cbd1690c8beb5865df59c295d0496cc9f9047df
+DIST jobserver-0.1.17.crate 19563 BLAKE2B 369af1c6ea420f3be059e7dec5e59d3634dbe0c7bd30e2067bad0ab7702b1643841943f72d8d8624d9b9b208f7e7c1480d2d2dadbadbe52855a6c08316ee1298 SHA512 14578203a000efe2cd88e9de96af216b5aec50f02aa2f33a884119d2edbad02626c05eae6f203ef92032f7d6f9ca58f427a368f843bd379e9e35b585d04fa161
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
 DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST libc-0.2.45.crate 349425 BLAKE2B ded7a699266fb8c8003181dbbb0a8ed9fb27613951b72d538e05bf1d262810dac7edb47560d06989d0d24a9cfac18f22744efed44d12452fa41ba68cb4b8e4cc SHA512 8188400f2f9fabd7c1e0dd1172032eb25bde2702019aec4e3e0c8b936209347baea347ff8d85fee3e93031df0741d32faed151c2b553151e95ae8321bb653381
 DIST libc-0.2.48.crate 353045 BLAKE2B 707f0311abe07e9a5bb9a1d2597d5a25f837dff783dff827f0c9e224b9ef0c915bc1f7f76a4a0afce5faa5bfe7896bbf1d22e645aed0cdd0e1197dcb45e495df SHA512 3ca3482cbdf8a031c6dfbc063537cee95b1735f8224baaad562f29279554ffd17999bb02c5ca54b25c845f63e70868b76d5d4123dcfa65d86d6e466527f4ce99
 DIST libc-0.2.49.crate 375486 BLAKE2B 38c6f83279d9ab9460b95296c8f4640d671ffd8e425c11338b0fb8360947f9e57fc8d0e4a6101d4d4b24ded14f90995f6c756d6bd260b775743c5be1ab76b598 SHA512 2a337c4574a226c600593ae7c78b7aa8da34881e0002872a362f34fc10e8b667d9425bbce8a39486c605f35676e43dc02717e2da68300da98e4e3728fb7056a1
 DIST libc-0.2.51.crate 397323 BLAKE2B 51306c2ab8eed6de1fabd4d59b7618ee74d8d699eaec776d21fa5df20c63cdd743a50ace3a37334b282e3050dd718faa9f95d359abd2495a2bb8de0384738b15 SHA512 d05693e7106e1887d94b23ddff5692111c2164e7ce59d9c60995af2a49fcf03ea8723e837370867c1177315aecdf25be82bf723c5e798ada66f5cc7886c22857
+DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
 DIST libgit2-sys-0.7.11.crate 1176919 BLAKE2B 9793a5131c805f8474c17d336514c480203938f51fcdb3d4e09bfc609e6599027a05436660077a526ddedbcab3c587a411fd9ec8d7dd921fb352ebb61e52eb1d SHA512 361aa7d75a029209f59c799e2f091f6ab8c0ba6a4677932537eea8e0198a36a2382327e8c5db98a2980f47b6a4baf07708720f128734081ac58e30d8721c3435
+DIST libgit2-sys-0.8.2.crate 1518058 BLAKE2B 87db8f941cdfe1efc774db8ea248b75f7b3067a9cddd61b5f31950c2d400420047f9e45d53c9cc2bb381ac40d6d50da9015f23731bf146ccbabec5ecdf75f4a5 SHA512 540a9c3bca1ef8c034fa27e272ac42500542b95c1f2610063741defb14990b81b991377c81bd35f56379a03980f80a1a47000315b9ca8b09cb92f2174302af04
 DIST libnghttp2-sys-0.1.1.crate 2225580 BLAKE2B 05e0d61759122a98270a0da5a4d1bfd4ba740d6287ab75fd3491fb88f0e995209fd8718230364fe79d19d2129443fc23120d1904b12d5db832d4619ef4ee1e06 SHA512 68cbcef54c9b274050b1ef50b57b7256cc7dab36a89cd2a6bf698ecd27f02e644dcc8d2b16c61cf111dd35e09ad62c07c7069873e5cfc85273a661da34ffc989
+DIST libnghttp2-sys-0.1.2.crate 2307177 BLAKE2B a76feb5a820f143691a954cf6d62938522408bca4c8c4bd346e4e4b25b43f1e26490a75acbb06971ec15dc1bb61efbc2f7ec95877d236facb99bc1006ea18147 SHA512 d82a0f5bed2dd43cbeb8c12b7fd0a7015bf99139ef1fbc9ed6b27bfcc72f3cb21b726cbd5083fede5cfee0d6a29c3e09b22240fde11c3d9b121342720897065e
 DIST libssh2-sys-0.2.11.crate 458377 BLAKE2B b9fa613a518ec21e5b90ef75ce0a4171406feb3be64accdc83b3d5924010d4b94eb95d1698addb44ca6756afd5663461506e3831035b745637741a35719b464f SHA512 4fee372cf5d546e6471177127041313291c7f1aa21777b1e9f0c6027052938fe4c6193b6925815b64248faf9086ea04014b6cdc0420135ca99403016700c15da
+DIST libssh2-sys-0.2.12.crate 468388 BLAKE2B 83010257061fc04ac461aefde945583e94970715e8edca3e8346c085d6a8ebbff61e0fedad9b39d6d848fd0a19caebbb1e20d648537a4d0c8622962911d5caef SHA512 85503ce61fc7ceb5aef619091089b075d19f54c65315c41fa8b24d8a2dafb5ad99709e3ea7d014cf274d1af254ce8a1ce40b815df2aed1f218ca5832dfb2dfc5
 DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde
 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.1.2.crate 19520 BLAKE2B 4a8409fa4e019ab5cdbfc2787eeebacbbcfd21415d1ea6a3796ef18434ddfad0f63f6df3027eea5d286e08eda892e21cae66e3f25ffee9d6a2a3327b841e5377 SHA512 ba3bad3b911fdd767b6c770209e93dfc367c6228117a5d85bfa95d70ec66df9842f3cf788ac560d1255415dba49028187542000b9a71fbe79ec51a386afda38f
 DIST memchr-2.1.3.crate 20069 BLAKE2B 6afd95538abae42fdb22b82964b64657555734f2505e12c650f844b91d60a3f6f61277065e15289b6e6b7ef8ae5345674ce7465ce2320822e13734949ddcd49c SHA512 95fca57233f023191da0c0abf4835c63ca38404b05c2021e1fcb910068c29321e0b89660088e1be432ed8aea2c4d53f14587e08dba0b258892f2e608606b3b57
 DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
 DIST miniz-sys-0.1.11.crate 78188 BLAKE2B ad37f662e5f7d5eb49a49d197fbb0abb1516a9c044ae3db12d93bbf41e70cc7bc55f78f354aa3f77626005ef9c6186db4008f32e198422daf5c97fc0d8302722 SHA512 58f8c9cf01f8a5819f53fce02246172acacf89becd05c8eea32a06fb4b3911ad3b595fbffdaad5d0ca4af4dbc4e2d41c83e2fe82bc12c33b035360e83d17e901
+DIST miniz-sys-0.1.12.crate 78209 BLAKE2B bd6aea3b23382b754a926e8f6f4ba4b1684ea86987100c16556d0567278297e6e5bcfed2ca8a114831f75814692f38ae147f6c1951d218cd5ddfd81231fde86c SHA512 e00ab08d024806ffe68f8d9d0404bf83e62c58d04398bd8b0f8993a6c60a38fcc3a50189cef7a699ad7a93682d9f2353a31f5596d62a72c5f6560d12cf0c0a02
 DIST miniz_oxide-0.2.0.crate 49387 BLAKE2B 2d41698d8dd4861991bbf66c853fdc163c63d4aae86e72383fb89d32ad714d7114c485c2f3da749ad382c4aec1c8dad74679c87603d92ae7b02348c05c48b9a2 SHA512 479aefdd98b5e7518053a81c4c2e0c86be1998158b6aca8467338b1593f282471e88f25168af0853a44448e46cdb68face063a449604e929e4f5ef9695df1464
 DIST miniz_oxide-0.2.1.crate 49241 BLAKE2B 769137bf1f3dc38cf3103e3ffcac8f6d04b95223fc4e404283088a68c6a3e6373c7199445dd7e53c8f89d5716ddeccf64208913a06b8c8636740cfe1c964505f SHA512 8f3cc13b919c6dca6c4601ccc66e0102fce505ad4082e1eaaa6b132182b9cecd5e564752ba3c62b8e9db9c353f46623afbd6415119b342c746c3b72e214ed5d9
+DIST miniz_oxide-0.3.2.crate 54536 BLAKE2B c804e4a261ef2444ae539ced683af5d0358baf625d7e8a16979b7ae2f10549d08ed97cd1d3ccc2ab4b96867326775b769b451e5dbac168cc9494be627eda9e6d SHA512 ea5eb9236a8797892f0f4bdda07c37cb8a6e48cd2fa8e81e2a07c13961675688307f77533e79cda65a72312451ff46b31cf167507456e4186e2b19a86cf14b95
 DIST miniz_oxide_c_api-0.2.0.crate 166923 BLAKE2B ff226f5fc3c0a40a462ccb642dc1fbd2a418f6f5f1866fbb9ed2ddb249c1f3bbeccd4dbc7b6d73918d664341a4ca130ffba8ed4b2dcaf9dfffdf37cbbd4da2ee SHA512 9c557372aeadfc916dbcd9237d54817732ce1b8a5f87afa62f0e5bf95e8512099a9a96b322852f39b44472b94d0d638af6405a2832c4c9d67f3dcaa7300f0055
 DIST miniz_oxide_c_api-0.2.1.crate 163410 BLAKE2B 003013ab9bb9013f17577ff729aef09265384baa0d1e1521a11a7515c6f7dedac5963d5999f45538ab0bc1e065ae0c9d73ed63fa8b71286803e3380491fb00ee SHA512 2347504ac3a45e502ace4192dee292ac656771dd9dc6557f66648b94e97e77cf7ba763b99ab9b81de053cd33756a7dd5d3ed5d2741ec88c2164729071823a9cc
 DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
 DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
+DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
 DIST num_cpus-1.9.0.crate 10599 BLAKE2B 2dafafa67a4f187d148019c690c609c01743dbb0a8df77fc2771ae08d288b12a20550d9d582218900e3caf291e0e83e1bacd3b76ae46e6e65b94d5a642235c7e SHA512 8e51f266dfa1b9837f677d41a7edafe3768a9a0fea552ff5e63ca52874d1bf174b7fab018b1a6c130cc33259d0ff81e31d3933a376535f63c28d6da206d05c02
 DIST opener-0.3.2.crate 14077 BLAKE2B 975f837863d54cd6a6c41c49d72e1b8225df60a25feca675a8fcd32e06f3a577ed0523b68ef37f6557d07aa355a72f91b136189ab269a0cadeee4cc9508408cb SHA512 21efe732971b929f46e343d54ad73f18a68bca95c941bd3be0a39a53f568872b9bebf41aab35ee4c9863595ac616ab3a305330279bf7d9a20ad9ccb13e6b01ee
+DIST opener-0.4.0.crate 10223 BLAKE2B 77cbcc9e4dcec081a33a43ce21d8f9085ffa3d5b2a130400bf0df90f09528128edeb46ee40b5e2e2e8099c371ab9c05642ef44dd4ae6260983e36b1c33daecda SHA512 f4fa1bd951a9cbf37a0d91ae66cc4835920518262fcc655d4312b40ffbcbef57cfb9b52767ad9393ebe316a1d62a602814a31b03cd010f7d17eedb7d81a43da9
 DIST openssl-0.10.15.crate 167961 BLAKE2B 64dac45c9274dcfb9610204593d9932e8b6261e2b0bde0d69a1ef7fb06111b8469b187e1e7f380a39176cb66766a2d7065201072eba793f748def707b93a1c94 SHA512 fc9a0d57848012d0937efc677cf2beda8182cdce2a01e22a00d6aeefe9ac98704608c22a152465ff2ca9f62668af4d25982fb67b90aff98a90be12192fb60b42
 DIST openssl-0.10.16.crate 168681 BLAKE2B 6622e4f76531369337e8380447780d5e6eaef7b16b1cf04a58fe0a6dab195f27e4213ed921c999f72df7139b02ab268e9726594cbd10a570d697439a5f683824 SHA512 dff4e72f3da5bdc2b82012ec942f2725adecf2b62c42f9101436ebc8c3a38a2fed92ff421dbf02654371fa70e3345ca950159187cfe2ca5fdcb6a858197443ab
 DIST openssl-0.10.19.crate 171279 BLAKE2B e6c637a2b04eb5c4bfa18aa8f866f8580296fbfa86327842ee712519230f6a3cc2f2fda2e5b01bc73125d288260f7635c825d61b0883236be5773f972b757911 SHA512 a904196d7e8a0925e4c2d2d0a1606f49c24831451095a939f674246afbfe046be2208d65acc75dd555d9cb8969054c65c1d7c7393b0f53a0b22de02768427883
 DIST openssl-0.10.20.crate 178977 BLAKE2B 6db17ff510662ef0a5e6d89b8b300b19f5b434bdeb1bc94260b926d8045345dd2019f3bbf7e29d0597e0c2de023b43a4b11498ff50408fb29a280bbccfcfd213 SHA512 958265ca7309cff11d67b08eb5400c3b0c296c9e6d96c4477b2b5bdcb7fe8f4fc8699594dfdb921952ee5c78e0bc25b64b4e218a27a03b3a63afb99bc8b1701c
+DIST openssl-0.10.24.crate 182149 BLAKE2B 048d0c86c718b856cd2cb9a3ec0ab4074603439b23d17ec6511a5b1f37c8a6804157cfa1129fe14842559eab705029642f6aabe78a84b4ad3c13bfe9ed812c2b SHA512 2127ff5f9b8feb3b567362ea9988a125f39e524432c629481e5ab27f08e2bec20147fb14bfa2d10cecf357fef5f6d6447e8d045f157bac7c1a4e0175903e19ec
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-sys-0.9.39.crate 43147 BLAKE2B 0e32347bbbc21c24d8b756f3a7b837d8c6b4cd5bb04e605c5633bedf07de8fc54e1de49bd020296289680c7179f5bf1180ec7d6a17e971779023f151c4feca81 SHA512 f22bffd75a95a60358bdc1296f4d5dbe5f193b27f0de3f391e9a72e663881678b71a7f11145b2a0a4649273cb383f21a1bf86ed26dd9781869403b4036d76426
 DIST openssl-sys-0.9.40.crate 43360 BLAKE2B facfff126f92ad9be7f72b1beb8d6f30b69481494a71553daa6186fd16b861ddfa2b8a67a99d2dadf52cbf9712220c94e447aec37308b97b16caef31d92536db SHA512 6bd4eceaaa84a759bb6c250dde05241235e426a84382471c56618d6890d869c7fa56ec70c22ecf0435f5d83d7fc8509b68e0f9ff041a5d42ea4472d8769ba166
 DIST openssl-sys-0.9.42.crate 43618 BLAKE2B ff3998ab80e9ed117f5facad2ea0250aaddf7c9a0048a551d2a32d20e851cefa706c4e04ccf7b35ec890557ecd3cdd422827d6c596ea1f3dd916a3eb92e017b9 SHA512 6201194e4a75eff661e419310fe021d7ff423cc8779ee5839d17ca272ba6ebc019b3b6b8e477c06f41560d5ac944313ad0ab9635b3612abb0b1a17b5ddf0d2cf
 DIST openssl-sys-0.9.43.crate 43849 BLAKE2B 51dd4664dbb174c5022df6f3ec811f6585a409c842a931f0d5713d0353dc19e82896798e590f50e7397ccf3847a48f6288d911907c9ae2807bf507d3006b7b12 SHA512 2b780a7b1078fc63a4ecfb8dbba117ee452da360ad472c171f2422018edd13eae12d18ba9a3f0c21dabec177b8ffff2abf7411f0d1848de478ca9ba497636100
+DIST openssl-sys-0.9.49.crate 44767 BLAKE2B 613926e3f88379061c570917d24dfe5bb18af33ad339af5d76a498f3d9c1ed73362bcae34d1e95142ca747a74a2896303f33d34532f0cbc6ac39588522ce0466 SHA512 814febad99cc74eb5fee60d58d685b2c956893db8f3f4994a6f5226261c8dc8ab569067959aec2aaf3fc684eaef6654f102a1f82a215e42b4a087c357693b6a4
 DIST ordermap-0.3.5.crate 35246 BLAKE2B a663aced769ea6bebedf21b95e98756796b9640d89e1cde828f7af32921cd7354dc7dc232fed40f4c65d54ab3e472200e07a057cfe634002d1371c9f93003e20 SHA512 4413319af191656c82c6f4b185840486d2021ab4a91e412e5472329af928a6519690734613f9616c285c6a4c967a4c718483583e0a5d4b16bd98b01f3d226ddd
 DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
 DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
 DIST parking_lot_core-0.3.1.crate 26635 BLAKE2B c0da77758b3b4a1a5b7982f1304e3cd74b4345bfe4ab1e9dccfcaee828e1024419fc20c6069efad2ee2dcad0180350d240ae689a5b700e4b47a0b3b3808b6539 SHA512 3cca0091e839cb0b63dd17f989c1d3d196e9706b4adb227f9308cd2b43b68806dfdf0b7ea098592cdc520bff249ddcadf23d0c0a7c23eda179ac11594c26e127
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST petgraph-0.4.13.crate 111936 BLAKE2B 426d865c16930715a2207f778ff108370cee0ff8929d49b00d5497e4fb28cc62c2fe34704b75f55fea416339be6c7417545a23b085d33af74b0ec31378edf2b0 SHA512 670753503b9ee5eb28b73e9ad6367f5cc97064182ed82d691ab95e3948b1d879aec9c74eabad11c232f40cb18d2629e1bdfedb3f0d444d65526a2bd7e69bb60b
 DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
+DIST pkg-config-0.3.16.crate 14429 BLAKE2B f850910fd54891c39bb4187c5ea49997e0628858d7c1f579cea719b8a2c47beb907b3f6e72056c8d8eb037314f4c5a129280504a7c1e8c676fae48241ee6dfdd SHA512 13431f3f8cda05615c91be2fcb8eb2fba085b46df70c5dce773748ffc15f0b48a45858aa69c37c173ce6353b028851f94f03ded58649c641e66a1c1a65b60572
+DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
+DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
 DIST proc-macro2-0.4.24.crate 30970 BLAKE2B d6b0a5fe633c5773e6d8b4bc2c9f32c66f8072f85ff48bf449fd3d8ada87e639ee730f8bd3d3170acd1528806698bcf1c329c57f102cd79833f96e2fd1bb7e0e SHA512 57ae6a761fcc14f22277df025db6b09f1173035e1496d1c4906d9af9231c19f0b93750abf36e4013ae82799069869047a7e3f1b3e095344e55c603fe5a462d03
 DIST proc-macro2-0.4.26.crate 33854 BLAKE2B 833db134470a8f12342248c514b08463836ea22eec90162ba96364686e593e3048fe16de669316d88ed5f44b27f948613cf98f4952d49f6b5f37f2da51584c2d SHA512 e35ce0e0a05559417475abc402ef88e6214d7f27ee6cff35577077c5334ec7c6dd5d1d8099f25617391cd4fd2f54838a16ae74039ea6f99ea1d2f0ef58dec010
 DIST proc-macro2-0.4.27.crate 34098 BLAKE2B ecec94ab4c79dbdfc77731054e3c370c2ae330baa3502efba34d2f900ba9ddcc5d89373adb06a465fa10c9bda061f7b3040c5f20fcf1b1accaba177632b6edb2 SHA512 b1ec1f59355c122022ac93f7ac03ddcc092b8712321f4ad74bf346a0dbea06c31cc695b1edfb735010620ab5eac5c62d3bde423c8458691edd0336127462359c
+DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST proc-macro2-1.0.4.crate 35217 BLAKE2B 5d807f6dcc4ba372d76ca3227b2ed6c6710ebf78c3c4e6ad8bf6020717a262861d9b4017c27e338addba240ff568fbf4510b0c6cbc06bf66a4f38db746e63f91 SHA512 e81800f46b8f0805d10a614848603dbee19ad24339c67986496597fcfd501c528ec4eec081e166b38283b3e7d64a0c2bd972280407ad30e388610b2b81594f80
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
 DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
 DIST quote-0.6.12.crate 17541 BLAKE2B 0d09f5075358c8c7cee6503c55ad489a2ed4efa31dd0bb47c77a01b7bcb3ab4319cdcedaf5799cd25738c8f6a9f6256f91e509b60eb18ba99664693efbe45afc SHA512 5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798
+DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
+DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
 DIST rand-0.6.1.crate 126613 BLAKE2B e7779ba6b13aa58edc3632f250787d35ad486185d3307d17528b12bb6d2adf6eef8aa91c5f51f021fb8e037d4ab1fb64fa364ec093fae0a5bd79095d51e06791 SHA512 dab500d25d538d28bac5b9b60e3b262f64e9d0581c5c17f165890497f7cb459603b815e8a43451610e75d8f5390aa41aad57dcb532307c479ebb99f475f4d4a4
 DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
+DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
 DIST rand_chacha-0.1.0.crate 11637 BLAKE2B 423f7e835d9c69f49f991ef2ad00c40c8af929935de531821ef32054b39bed54991709e04b352a9f429c7c49f17548084f703353df3a768f1f31a655111b8ebd SHA512 b911dea149eeb859e532d17074a4db8527da2d048b6f59b0d58fdbb51dfe3e839092e1c614e748f471a7381d28605e994ef8783643bb419eedb2c4e04f3dd0a3
 DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
+DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
 DIST rand_core-0.2.2.crate 15450 BLAKE2B 407d86fff0cefa6786f4132a032c52d0c81291e3f1ad7f3de6a4b58f12cb744535d14d1be44244c3a21a4c562b8c48c1de5e096786d0f7da817bf4242b0fa310 SHA512 fc06e20d22751c55cf869707b527a55709c48d04d498b4301b4d629e4fde2e2ad0d9009734ad20f64f188f55b2e4d5f0ed8a81b7e681a8a0890a4900d63a0bde
 DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
 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_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
 DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
 DIST rand_jitter-0.1.1.crate 18226 BLAKE2B 351d16c41d16b543dc8b4785cd6b8f5040f7c1e2370fb61537331373a0a4eaff6aaa34b3a68ba55f1d9ff408f7f4f0c6e614b6eab87b0e6ebef751585826706e SHA512 b1b72536883acfb97cc2797c1a3371a4ff466e454b61ea0a14ef1ecc81b423139d046a3bbac227d83cc71de4b398eef79e037d78a52d8b5c5a4eba1ae3b92c65
 DIST rand_jitter-0.1.3.crate 18341 BLAKE2B 6bc99b148765ca0ad7ce1d457eaf4c039e825a7178fea200eded79a7897aa407ba39d9c8ab1693f28511fbf6def1bc9594e29ffe108555d3e1a3f709abb802e6 SHA512 a70bb59677bc82b4f0b6549d8907b1cde2e1529435866b9161cbbef28ae79f7edaa4067fc6498800267f944d853940670bdd093d437ca8cc84eb2b0ea6dcd551
@@ -177,31 +238,42 @@ DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613
 DIST redox_syscall-0.1.44.crate 15254 BLAKE2B bf2ed8addf2dccdc4c2dcad2e3079f01788db01a839a9a99ec73389a1fc6e8d8e3aab61e4b3aaeeeaf76b451f5847c963ec71ba3e48d93474c0a9423d331c541 SHA512 c3f7225837be18775c50535d18888ca7ced5c2e577891c67eee34409b583ad685389d806f7aa24cefe6fc1a2b6dc47fef2a8e482f6c77a32240de7889ee1fda2
 DIST redox_syscall-0.1.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5a198ea3d9ad25752a4113ff1b54738ce820ace81f19b2f5de276509d52b6a69e709681fd006b132aa662e832e0f4df SHA512 cb84fc899f22b3c302654a959ce16a99518e8c39b8192634a0f3665dd052bbc6c4dd485ff66916dc20bbf8d494f59c1c761254bdbce6b184864c83325f6917e8
 DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
 DIST regex-1.1.2.crate 241143 BLAKE2B de5e00f4c23dbb00ffdad4548c7ecba6de24fba996034e966122b2d79142f0cab35d9a8edd5a9f6a6fa223bce36b07160492c11d844aa4582277d0d1b24de9d0 SHA512 84d4bc302daf92c71354c53565f55bc931b1a1d9f6a3ca11d1959ba9d6fc9a8cdb6d47ecad2e9edab451574a5159bbb4fe82f344513c56f63f42510cb76b1d16
 DIST regex-1.1.5.crate 243275 BLAKE2B a410be7f109298749f3e660af6a71fdaa08ae57d9dac7e7c67830a1a126f5d8ee5dc1c33b65a7a2210ca8838a3a8e978fcbca430f1edbccfc1910009e9d55a00 SHA512 19bf5616b9ea4161e007e6c690dfd51fa930bba58e8b52256000cbbba637e1690ecbed6ce9d65803ee369c37a8cba498bd9001f3b5a08b3b76cd23ea1b50f9a8
+DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
 DIST regex-syntax-0.6.4.crate 272048 BLAKE2B 921cb35d306d796baeb9e3f2fd243bd6c90e92ff175cb9be23e12b1a0f19f51a40075aaf66a56e32fe9b1f08eb30b2a1f47469127061542c96b4f68733780b9a SHA512 7a199c43668f7d660a28a1324ce1951cd6ec299cd98edbfde3b6a6d172e9f1a52135457673b432a0318163a5c23e541abca58607623a310f15fbefeafb50ee3b
 DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
 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 remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST rustc-demangle-0.1.13.crate 11726 BLAKE2B cd97c38228174133532b0ddd31c0a57afc4a4061b5b40162a5ad222723862986a276a60a3917518420a125c7440c41b48a60f75497866c141e0c8787ae7a85a6 SHA512 3266d49f90301d814dde06ed9a2d0ed2a45e6f35cee0dcbb21aff213ba011f808d54ddd45c0f489ff3be06df1e6de0a0dec462a59ce2233edd1143d60b99314b
+DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
 DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
 DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustfix-0.4.4.crate 12698 BLAKE2B 06128ef65155657cc127e19bd6aea8e5a652f510ad0a290e7ab4578371f333f2bf4d53f5061b0273afb396e443887e43d65c4771ff53a32dcf234fecbeb7c05c SHA512 f20866fbc1f98095abd9c2a78d1b8580640eb59396806426b30271d376c3c0f3ead3d01880370d34065b0c6e5c3fbbcf1007d60139d8e5a55c6e7c78cef865e0
 DIST rustfix-0.4.5.crate 12730 BLAKE2B d72a95e684835ce8e951c5e872bfcd347cfded637069a3c4f8662d28c65b6f5d7920a743fbb057a9c148079827f6ec96dc048d105980b4f2ffe6b7d638367beb SHA512 8ee5566dd5ddbf5f88543324a7caccb36f47e9c754a658d9e52b8ff966e8b1de9892dbcfb8d8c70c660758315cf21718e9b81b32b27faf4a978b3b144f19310b
+DIST rustfix-0.4.6.crate 13488 BLAKE2B e2b2f54d4420966f4bf0b6c7cb8ee96ec1a4847295bdfd00a88a2f7f6bc00542e471fc6abb2dfb6fe1949ad0c2b9a5ae1911232a47f670de1792637c2dddb44c SHA512 76927c924025bcecd885a71e5f8802e6f44700afceac4acc67e0caa3e594ed6445879d92088cd4d01f8f1e00d8e09cdee9e2274a3a83ade9db24f0a67d04949d
 DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
+DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
 DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
+DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
 DIST schannel-0.1.14.crate 38833 BLAKE2B 8825f6325f65c5aa4031a2260c4c54ad2a65634d2ce349bf6c31fc10a76f539dfe58d4de1e04fe6e48e885fabf5f720f5b4e4625f4a511e96c7cfe9837c901fa SHA512 550623a87f01c3c6181dad44d44397f172aa07c1b262a78d6eb38ca0676d68bcb8f231970c4eac87e93286225e17acae09551b07128c43b576ea77caae18c0b7
 DIST schannel-0.1.15.crate 38901 BLAKE2B 23cbec1c786cca66e70cf3e238840258101a3f023edfcaef0cb66ad62a8d436e88e1f26a08d0eb544b5efec2b21e79ad9fcf84b521bbbfccfcca8fe040fe3ea2 SHA512 9c6f3cf370b76b8fd37cd26a5dfd686b532c30d47ef477548fa6994195dcfa053edcc2e8a395736768d5815b9f18db175be2e9d099767dd4ff4d9a8a3157675b
+DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
+DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
 DIST serde-1.0.82.crate 71666 BLAKE2B 443f39840e8f88ad9a8d6c094ad6db759258a448ce2ee7c1036a4cdf446de522f960543f2a712d5d944dd8ede699b05eeb25a9f50cd128cbd3b7ec600185119a SHA512 287a11c84c8c2df98cdcb45916779f0ccca932f7901374dde7981ab16a8aa98a3cd79a698f9d126bac64269fe4def9b85b19bc2d200c2f302e916b87bf029ced
 DIST serde-1.0.85.crate 70965 BLAKE2B f6260c01d93f59542211ada91e38c77bdf0e493bf946bf33055e712aae55534c6343ed40d0d178b1f3de70172a80b482696398be4484f6d5a0c1d60099267e2e SHA512 695b6698b45f399dbba9ece3f79d3da973736260f9410cb9cdc149473d3f864cacdf5c851f1b73aae5cc33aae2949423520cfa4caf96cb3231d111238b7c7419
 DIST serde-1.0.89.crate 71395 BLAKE2B 6fc88c889a12ce4bee3dc96aefd80e18e21d52c11b840ec9f6562b300f386d3b6d83632006d5d70e52a3693c3ad4af5ee55f1b6869cb402305cd0c46ff565140 SHA512 e01f30208b7dce831890bfa37a38a6e2177c35f423fa02021d32c1209ae00a3e8f836deb12cc26c4343a4a10b87286d780ebb8eca83bd4191d1023318c15e745
 DIST serde-1.0.90.crate 71415 BLAKE2B 7793a7d5227ecfa4645c9ce6cd22e0d9c76b216012bc4028e4f940938e1e4921c337cdd27deaa3ccb54df9fe57bee7ffc35f2c2d69c98a6b8e0964d7831af60f SHA512 6ad37dc002a7b8db9e38590f70a9dc26a93a82a1f6d9414fc2a45dd2f57b974a947c1a4c350c970f69199de08d5a94cb6ba5b53c0cc7efa817e3442957638a5d
+DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
 DIST serde_derive-1.0.82.crate 47403 BLAKE2B 91634aff2026dcf90240a83b2955d02a286db6db9a91514645f5fb5d2e6ac860ed6f7f7b8b7526688ce3bbdc6feb46692a49b0388deadae014575418cb18cf82 SHA512 bb00e82c7768b59a01f8df31fc425476ac595186ba658c69f33ef5b7b9d419e891989e178daecb517d27a59639b8dc47a91be7d01f5a52c177aaa151c647ef5d
 DIST serde_derive-1.0.85.crate 48580 BLAKE2B 5d76f4397d7c04e69840a240270755e3ff4e1119f0ed46b68ba7b45789190330f1b79480e6955fe52bf3bb7e52eb71f711c8aaa6222e2788c3f191abe872e129 SHA512 719e8f7687c7ef3e8266eb2436e755c7fb013de6d8e6859676cce079f7044d9eb1d073ea00fec6c1be86998ab9ab8357aa70d866e3e3158176f031615be058e7
 DIST serde_derive-1.0.89.crate 48599 BLAKE2B 938134e97381bb4da5296a383a1bfb0fd9055c9e712a4121a39189849cf08f73b32eb5053c9f94b44ad4a62632d2b898d524013278c578ef569a862676daee0b SHA512 9c6e54b86eea33c8f4cfb27924f95e811b940ad0c9ba934c61691d728eaab3a31835a5c7ddf8b15d67786bd6b6d7f008079c453f89dc05b57f6412c9b1432d65
@@ -210,64 +282,91 @@ DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49
 DIST serde_json-1.0.33.crate 69738 BLAKE2B 72b396a31b156164c6f300d03a52f501dfc385e55f0abc7b2faf3c83ac361c595a1991e4342bf0e014970713ebf353d24a2233aa3941921e4546bd9779ada8e0 SHA512 5864c5922bed9f6c34db2163a14374fde73653f323ee69622f15510572cb88e8a645b4153ddb1e12e64bbf0e60f37895bb68982df68ac68a1a66c83df6cda2e0
 DIST serde_json-1.0.37.crate 68709 BLAKE2B e72f8fb0677430dca0037a7b067c36848a60cfdcbf7338e7e46cc10652b1e54ddc5764bd3b60f27f5cc99d8c6b1fd3661fbc75499f6ae46f9a4af9f60e61c961 SHA512 8808dd4ab1c4a85103956057dd7c1193376d81dc2a6bb98848b2c516f8c0b4267a401737281727ad903c9461d74a0e172ebcc57afa32f97124c17c26b6d00b48
 DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
+DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
 DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
 DIST sized-chunks-0.1.1.crate 18703 BLAKE2B 3c1ccfbd8fee5a7119d50027be025f4f28a4c0f5d29b56e8e6a9f4ef6689e5db6673c8eab21c17df30c9d53265c1c5559df2e3db92edacdab6ef213548fb7365 SHA512 e8705c1e397ad4cf4e6d6ee9bd551a1169810ffccee77f80db92099f50fa5425effaf2eb3984ad5531536638f1136e2cd633fedd45ee9c6825a38e5a4873ca97
 DIST sized-chunks-0.1.2.crate 19577 BLAKE2B 5d34b536991f5d3508e6a1138e11bd060116d857e857f23450bc55daf3716e82f61b552e193878b0f2913fa6c7095d7a2177fa27a43bda6a324ee0d26a4fafcd SHA512 5cdba2c6966d3abb9d32da74f732f6ba9f86ca21b911a293cd293b1816efd3c3452e820224d8e056eb2152c864c396ad5fa08840f2969b1870a60ff0b7d7f773
+DIST sized-chunks-0.3.1.crate 36682 BLAKE2B 31aa7282bb2522489d35e91d511bd0eb71bd52cb32acc2f196096e31d4966a68f2278e769c54bf2674d5ac71330af823e82c1d30b061c260adb9c623c3a9b6d8 SHA512 123fbf8b61e9114f29eacf01f9766ab9d5f1608a8948007524128439800e9a04664f3fed2dcd72582198de14a409c3edffaa05878102d8d85da676339ac0a7f1
+DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
 DIST smallvec-0.6.7.crate 21450 BLAKE2B 35201ac343c2029d9ced9de0361d1ae9046913abc3701c5f6a000008eb7aabfdcb6a05b63368989f4f182b7f0ab89956d7d211a0760432887f2be975be9ce0e9 SHA512 2f3e45b27d8a1e02ff856e9690d982a8c785eef797f0e33beb8a832b6de5038d5ca3d285f49d67bbcf9fb2cb4de278dc33f2e77c615ecd333da014f56c8aec1e
 DIST smallvec-0.6.8.crate 21448 BLAKE2B 0491237d8bb9d9c89355c6f6538bd962d3eb56ecb6a670a0d94032c4705d34c629b930d9465fef34efc8b4463f5c88b6b849f75306a143d7aca9574da32c9bcf SHA512 0eddd68498a20bb124fd7bf00700c98ca00a58ddfb4e6116aed0d7647b898760c9b46593c96b16bffb86541dd37f04559b75110fb3b520b1b91ad6429250250b
 DIST smallvec-0.6.9.crate 21548 BLAKE2B 465f70349baa54a3b0ec1b21e732fc6b79362c866e24cb15acd09c753c4e4469a9f085859b5cc33c5a24849d64554dd64d6c66410c221c4c4bb6f3fae4b55dd9 SHA512 2bfd96b6c07a740b77c9d3221604e108bb730770970e7428a2a38d29711dff16eea08251e826d2d511d13a887c3256ec3a689e3c481ddb9029f47452fb2877e2
+DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
 DIST socket2-0.3.8.crate 30379 BLAKE2B ab805dbd3bf53e6ee59e117129b064e31a2bd92f3baf472af1975dd67fc97149fafc480fba4f29c0b7e2fe8d8f101c09d2cc5bc7c5d635418277ff7c3a883a42 SHA512 b543633e3acf6e8fe661f0162375619841346d5f1e51eb622e045712153e2d331bf32c90bd9a8c0cd7e84034f5d2827433788b54b3342f3eaacb537013f86a87
 DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
+DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.2.14.crate 25517 BLAKE2B 7d7321b9abdb5bdf322c8170ea5bf8b8c3a995d9d8f6c50e5831f7ffa6c187ea11f0c8c2ee582b1b294b8eba2b09f37df708be157fefdbcc1008fd8a8c56e1f7 SHA512 785eeda171c384be44ce7780f6205eec7d5544867ee75f375cd7e23c799fa3e837308d4b41431380ca9fa2b8842d87a17066a81b3f498ad3f4c66c51284e5853
 DIST structopt-0.2.15.crate 25564 BLAKE2B 12226dd3ce4a2510af47a3cbd07b0b44051403fe871e7678d56035c3efe4caa44a12135203bc50a991f410ef19e469debfa97aab53bf5cd2e3ad582549452e25 SHA512 b9428ab6cf47d4f768422e100ced57bf38c4e32adf4adbd00b03575e0dfa8130162f45a76ea45a3156d149ec908121acec3c5011526c43c693653313814e6cc2
+DIST structopt-0.3.2.crate 41040 BLAKE2B ccedf5b333e5f637af2bef9223b2d6b757488d7a0355b0ba98e7849090e7bfd051f7553a5e4e155f3f779d8eac70381497bbbcf5a509b342353341d012fe973b SHA512 53ca59035b9cc28716e4e0cf461fea1b82e94073ceba43531c9f295d65823c2490b82837b30a0ddb3f0f55d17bfe92e1efa93a8471468904c3bb8ba7663f0124
 DIST structopt-derive-0.2.14.crate 12411 BLAKE2B b29493467688d812113c595a8d6d8999976a4099dd43fbe09714496ba4c0c1fed4df9e081165c68195a6b57c973b7b528fa38935a7a4b457e2aeac969324711c SHA512 224ee21f11b9dd07754c8e6464cb14d25e56866e2a0c65ece46affb6dc905fe6f8268814999438dbceebabb475d4966ec2d0b3beb8418c9bd48a9e7a9eeeea55
 DIST structopt-derive-0.2.15.crate 12486 BLAKE2B ff51fe828dff32c402b23c1e07014dc2e92159731f35d571fff972abd6648dea88321b94eab4bb0ee451b783c6701bedab245c711526bd6ff4dd1d9117cc4772 SHA512 1fdba3e9144b6c3fa82b5591760451e59d1a48c361fb5060947d87bce06e71c102163227841920b50295c3713b4a9944664ed5042db328756c145cda69f9150b
+DIST structopt-derive-0.3.2.crate 16146 BLAKE2B 57c0ff2358b2f95bb9f036eafc9e5f5dee1c25b51953ad132b4fcffad32ff0db8166fac401cd758ecb1af0a4dcd8bb7f8b91f57627fae5092c11f0b676200cc0 SHA512 701d919016924cf7815ae009fc253e88866b0b66145ac2cbfb81d98e35deccf2f76aa7324ece31f88fe60f5c095e7e175cd7c042c3970b4596c299fd4ace3a96
 DIST syn-0.15.22.crate 146349 BLAKE2B 161ac0586b2ecf50b635cbf881820b1a28cbf3d52bdd5872eca7517eea6fcd4af321c8dab7f05dfc8d449a2744708143d082ffeeced934a25886a812e0ceff2c SHA512 78721f2925edbd0b3b0e3377833e7621ba66251fb92631f0295bbeaf15110a6ade2ffb89f1dfad847ac1cbb608f8d281459450b95940205a0058ed41e8ceaf0a
 DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
 DIST syn-0.15.27.crate 145339 BLAKE2B 8e1c2be778ab47209ff3aac74ef9d61a386f1aec0d533c2e939b8472e1a3099aa9f8fb0e86d9a47249dbe59c328637488ae01ee9a27143bc1d0209c42f83d7f7 SHA512 eafd57f24e8250ca376fb39866ae19e9f871bf3ff33a866a7b6f66f60ddac24820ecb36c8459d0135f08a4f214a6f7bc379fbd494fd35cc803d6d92d73cb15c7
 DIST syn-0.15.30.crate 146358 BLAKE2B ba89a0e56259ba567e98a711478a3be4293417633e32939e62a6f2a14eb34247bf1540c210b11a470b0e7c34d2ff3c2d725e91609d052289955a3070863f792f SHA512 53924d112f7ed2e63b157b307ff7d8da2b4b6e39f70c789966e0f46180546dc92dfd0d511865567f660c295242c3888b51296b7bfaf397dca8933b07783904a9
+DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
+DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
 DIST synstructure-0.10.1.crate 17836 BLAKE2B d80745963f581c02a3b9587d45586e2098632a4c21de22547ae97531bbc4f30a1b02989306999c67584c507a5b07978a48f65ad5e00ff55f39e8e0bb4fdbfa8e SHA512 5830eea0eab15c7ed737bfa14c7bbfc73f28af6964ce3148542066fb9760a80dbba82fd9a55078426346ba757e0aaba9addecadb1d0f75eac4f029a6e4c7cc19
+DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
 DIST tar-0.4.20.crate 45525 BLAKE2B 43e29895b6c22b919ce1178ec763fedbf6565d88156630507099da7def5b61352aa0b988265c39d235dcf791098ae8c4a05405a1dd22a1cc0f32221c583871ff SHA512 0786f88e54f88ad99131450e55d5840832dac11d7a7f7d9a2e8bb69695ea2e98a568bf263a3ea5af08013c9da2b768a36698391cb52f9c8b84cdee5ae98bc13a
 DIST tar-0.4.21.crate 45986 BLAKE2B 6b72db6a70c5c39ca36bcc6616b56d68fc4f0ce70e7e50c3d18fd9aad1d1863b51e4540b36ce74c5472217d38e34632e5f6fe0843acf7486731e07b4f9102d32 SHA512 602a6fdda02efa463a81d5a9e5d4dbb9dca399caf7bf8bf387f0b5d9d49e1f2df246449f246341cc741bbfded467ad8eb6266254d7141d14532dcfcf70b8e966
 DIST tar-0.4.22.crate 46179 BLAKE2B 6b981ea7860318e638629473ef16ac2672d1faa6110b9dc913d19d953a6e8634b564afec4e21522a039db97a54e4b3cf995ad5c4d584b312a2b08e33e2bf9465 SHA512 e7eb38be29d728990eef7e08bc912b4b11d19568e30f12b809201c0ce1b4d2a94d04be23ab1d8026515134ad526a638151a4e49c445c8de45fb86f03b8e5bc02
+DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
 DIST tempfile-3.0.5.crate 23272 BLAKE2B 17cdc6f157fd246441f66fc46c7fbac8d3718144c69405577f9cfdf14333366330d75e62e033a7c91c2dfbb43700d5e59b96d6b011a26e95afb2f3996809cddc SHA512 f1055454383996de7a79a08f31c85b0d957f277e297a70d85b2faeb6a85e4c12348ca8ba7cae44ec1398d6d02b2d725dbd4eda68a064db66594024b407c6e306
 DIST tempfile-3.0.7.crate 23922 BLAKE2B ea7207d7a5c893751fedca320dc0b08c01de041eed2baf39c1e63f744b55ba3a823890d60fff504c1018950ff9e564eb17cc086f7c519279293570ef2e470751 SHA512 b6fb6a1f4f0f5483255f9672114fa6adf13edd4bfe8f7fbe6c4225a36ccab5b58fc5f5510c50e70746e2697f2cf503b20682e5b44cef0b65b7ffac4ee39529e8
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
 DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
+DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
 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 toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
+DIST toml-0.5.3.crate 51654 BLAKE2B ba0b8af941edb4557bc06a24351420ef89619ab9115b85e3f6eb5eb327dc08496d02023a5e375e3546fe763db11f201fc576804eb291d423702ab81f7b7854ef SHA512 f3798afe9cbededee2c5d0cc2cd45a9a5b09004bc4d6f0e2863aa56a3aa377e9eb8fc2e4c557fe448afbec77bea5bb6953fe6ff59cb83389351ea207bd912458
 DIST typenum-1.10.0.crate 30009 BLAKE2B ea68f463c2edd2cd7ace126571a88cead26ea37beb8a13ebc00eb033d9a6e9d7060bebcdb208830cea4944a2b2eae16e7ed7a60f0b9270868559292bf99df6c7 SHA512 9ff611df79e312b8ab32522007981220213f2beddd959118a855d08b94b7a7d35d38378694c8667c2d6aa324933307a47a4072a89cacf7e594537794385b9449
+DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
 DIST unicode-normalization-0.1.7.crate 330545 BLAKE2B abffe09db26d75c7ff8d09a485c0966e3a6ff1192b5edbbf4fd1e6915bbc9214242d6ae9d99dccf304c0d75b61006b4edbcd680d7823cdd47b8ed5a7075ef685 SHA512 4b4d3737244b1425ef8000318316decf8e167d3c92524e92bdd3c34798cf6fd1388ba7651da67d565f07d4640e9881145334fbcdfb8f20c33873d6e40ef3630e
 DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
 DIST unicode-segmentation-1.2.1.crate 68223 BLAKE2B 935c15d99571fc7fd597c2af9cee9333ccb1f19153fe7c8a835dce4f8cf13bd69e424d9e42b0a056b7035a9122bb5169cfbb96239aa2b3839e317aa495559e70 SHA512 431da71eb9056902c51a5ab53d239c8cf6448dc2f87be727628cb40a4808f5700f427936a9da4ef41935156896d9e0234b9de80aaae342b839e95c9a80d053b3
+DIST unicode-segmentation-1.3.0.crate 90567 BLAKE2B 2bfce62b981b6b8d41be760f0663c3301f974fa9c975e7859c6cac6778cecafa2ee5dbe2e4368959b4fc2f0dee3d93cdab236dde593665b76740d07009051cb2 SHA512 6f32a36c8c69e80b3aacfcf68cde088a34b88587e20de6e49a14b24941caa51a0031623941ef05e6d36e5c99f50472c9bb26d670b5396749bae8373ae4bc7d4c
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
+DIST url-2.1.0.crate 64776 BLAKE2B aefc8cd2be90818c757312c354a0bd39ae08a52fb7d5a2a4552ffac3488a4bbc60c3f502ea5cd861aefbab02b0748e4bf35c49592b8fba4377cc17207c666d0c SHA512 1736f512039771b4a365df84937f039e1a0a3c90b827614af47403934ccc4af60077ae13ab585bfb1dc5bd88222edfc890b4ac2ab31872adca2e31bdf5ae45c3
 DIST url_serde-0.2.0.crate 3525 BLAKE2B 3beadf5f536b091ea54f8a1cf31553f2c9c51719a1d586ceed396363d26f1441c12a23bf8017cad4daca62a57b4f5b55b0b5d5577b4c61c1854f16a3d4554247 SHA512 9abf777f8ac1f369e8db826e35fd09a2a5f1685560027740a8388ce1c60de92da79b4d1b938f9bd082363396f5b7a742811feaf298b269b2f5e9465650ee827f
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
+DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
 DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
+DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
 DIST walkdir-2.2.7.crate 23507 BLAKE2B 8c26d7970724f7fe2fb6b38f2d25ee4ffeacf115466c019c7fe082e9be1a3c3a0e076f248b53fca5f82234350e5f3d0521d8f7eef5463a372796e2485309dec0 SHA512 bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c
+DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
+DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 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
+DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 EBUILD cargo-tree-0.23.0.ebuild 3215 BLAKE2B 053d6c2175b37f8dc3eb2fde333e0e687ac2772f2689a2e59900c5eca34c41d1a8d1798cf3e11a12bee7c74fd0c8bd75bfd52ca409e5bb636e7c9479c88fcc02 SHA512 4affbdcd74ac1ec015ce32ac87eef35c4c26903eac69682aa16804e1b7637cdeda7fa54f09256da22fc25a27bc5d7c0ed8c674cc4650ca14bd5eb8ebf89e870a
 EBUILD cargo-tree-0.24.0.ebuild 3041 BLAKE2B ba7383585015a44da1fbfa68ab9da4e7743478b053a4629e9bfda41889d21788f285fd3310a14404d29530c519469201820ef35cf794f395197c6b73dbd13657 SHA512 154a5711bd335553fb9a5afa9c21505291bec02fdebc4161d9a35affa472b0d2ca5705e514fc26ccb8489d41d6befe9292a6fa6616ef72cc02971d104c718dc8
 EBUILD cargo-tree-0.25.0.ebuild 3065 BLAKE2B 20e1f06efdab4996287df6e8d53ee87563b0e6d8787b5dcca0dce70fe91816df96a6970754de420857d0dd1d5b211c428db5b85abfb520fc4f8746e8075b875b SHA512 c36a1e5fe8fe33c83acb29e53c2b1f19aba66687cf964729e48eccc91c206be6e56f4917601dc60329a85bb143a404c89a20ecc4db4fd35e5e9e77886761dc35
 EBUILD cargo-tree-0.26.0.ebuild 3121 BLAKE2B 55f968ca7da4609b5d93c69d193b89e2ad928f63f2824d5b5bf420f48df9d824a673d507313602b67d9db51b4818df08da5d1f9053ff34eb13f79edeba6af544 SHA512 19fac437bdd1d2724e06536fd64e8628da93ee313f2c860c13660e5600961167e468b715d047ffa1c022d606755640b240273f78c9169f29795d70aba3fa7e77
+EBUILD cargo-tree-0.27.0.ebuild 3138 BLAKE2B 1fd8b30f6ec8bcbcc84bbfb7686825f2f9abba4a1660d842a744e868f2699d0e1121619b5c1db8361f68044a1e36173d3816653984e2e4d5b1c1e19db5aec814 SHA512 06335383189cfb26b4b00fe36113075ae988cfdd11994dcf130e407cb4fa9a6b94f9470311a3946017079e61b80e4a35b48e0869d69d9aff9f6159ecb5f1d833
 MISC metadata.xml 335 BLAKE2B 458848de5f95f88465b613bc3d2b692c4a8638ae42dda2b98ab6801ec695f92db223d1c115b6021f07822c62bcf98987ffe976f48bb8c3d9c74f35673d810962 SHA512 d7fee3ca27c5b91888e5dcf5d02e453cfa3dd7d8ca72fc2060d052e74990c2311a71bcf60b7ee3ee02cf21229611769e388925d7ef5acf8597dededd6b35f918
diff --git a/dev-util/cargo-tree/cargo-tree-0.27.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.27.0.ebuild
new file mode 100644
index 000000000000..e0917ba37b57
--- /dev/null
+++ b/dev-util/cargo-tree/cargo-tree-0.27.0.ebuild
@@ -0,0 +1,188 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.4
+aho-corasick-0.7.6
+ansi_term-0.11.0
+atty-0.2.13
+autocfg-0.1.6
+backtrace-0.3.38
+backtrace-sys-0.1.31
+bitflags-1.2.0
+bstr-0.2.8
+byteorder-1.3.2
+bytes-0.4.12
+bytesize-1.0.0
+c2-chacha-0.2.2
+cargo-0.39.0
+cargo-tree-0.27.0
+cc-1.0.45
+cfg-if-0.1.10
+clap-2.33.0
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.6.4
+core-foundation-sys-0.6.2
+crates-io-0.27.0
+crc32fast-1.2.0
+crossbeam-channel-0.3.9
+crossbeam-utils-0.6.6
+crypto-hash-0.3.4
+curl-0.4.24
+curl-sys-0.4.21
+env_logger-0.6.2
+env_logger-0.7.0
+failure-0.1.5
+failure_derive-0.1.5
+filetime-0.2.7
+fixedbitset-0.1.9
+flate2-1.0.11
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fs2-0.4.3
+fwdansi-1.0.1
+getrandom-0.1.12
+git2-0.9.2
+git2-curl-0.10.1
+glob-0.3.0
+globset-0.4.4
+heck-0.3.1
+hex-0.3.2
+home-0.3.4
+http-0.1.18
+humantime-1.3.0
+idna-0.1.5
+idna-0.2.0
+ignore-0.4.10
+im-rc-13.0.0
+iovec-0.1.2
+itoa-0.4.4
+jobserver-0.1.17
+lazy_static-1.4.0
+lazycell-1.2.1
+libc-0.2.62
+libgit2-sys-0.8.2
+libnghttp2-sys-0.1.2
+libssh2-sys-0.2.12
+libz-sys-1.0.25
+log-0.4.8
+matches-0.1.8
+memchr-2.2.1
+miniz-sys-0.1.12
+miniz_oxide-0.3.2
+miow-0.3.3
+num_cpus-1.10.1
+opener-0.4.0
+openssl-0.10.24
+openssl-probe-0.1.2
+openssl-sys-0.9.49
+ordermap-0.3.5
+percent-encoding-1.0.1
+percent-encoding-2.1.0
+petgraph-0.4.13
+pkg-config-0.3.16
+ppv-lite86-0.2.5
+proc-macro-error-0.2.6
+proc-macro2-0.4.30
+proc-macro2-1.0.4
+quick-error-1.2.2
+quote-0.6.13
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+regex-1.3.1
+regex-syntax-0.6.12
+remove_dir_all-0.5.2
+rustc-demangle-0.1.16
+rustc-workspace-hack-1.0.0
+rustc_version-0.2.3
+rustfix-0.4.6
+ryu-1.0.0
+same-file-1.0.5
+schannel-0.1.16
+scopeguard-0.3.3
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.101
+serde_derive-1.0.101
+serde_ignored-0.0.4
+serde_json-1.0.40
+shell-escape-0.1.4
+sized-chunks-0.3.1
+smallvec-0.6.10
+socket2-0.3.11
+strip-ansi-escapes-0.1.0
+strsim-0.8.0
+structopt-0.3.2
+structopt-derive-0.3.2
+syn-0.15.44
+syn-1.0.5
+synstructure-0.10.2
+tar-0.4.26
+tempfile-3.1.0
+termcolor-1.0.5
+textwrap-0.11.0
+thread_local-0.3.6
+toml-0.5.3
+typenum-1.11.2
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-segmentation-1.3.0
+unicode-width-0.1.6
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+url-1.7.2
+url-2.1.0
+url_serde-0.2.0
+utf8parse-0.1.1
+vcpkg-0.2.7
+vec_map-0.8.1
+vte-0.3.3
+walkdir-2.2.9
+wasi-0.7.0
+winapi-0.2.8
+winapi-0.3.8
+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.2
+"
+
+inherit cargo
+
+DESCRIPTION="Cargo subcommand that visualizes crate dependency graph in a tree-like format"
+HOMEPAGE="https://github.com/sfackler/cargo-tree"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 Boost-1.0 MIT MPL-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+	dev-util/cmake
+	>=virtual/rust-1.37
+"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}
+	net-libs/libssh2
+	net-libs/http-parser:=
+	net-misc/curl[ssl]
+"
+
+src_install(){
+	cargo_src_install --path=.
+	einstalldocs
+}
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index a6806f3479c7..00b16e549156 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,8 +1,10 @@
 DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
 DIST catalyst-3.0.6.tar.bz2 873468 BLAKE2B 146228e6a8eca293a93ab50661b1a3852fe587036d2d2ff9fde132ccb1f0642cbdd4332a13f912927ef8e7c5d8dea5bb738aa3327b559e18c7d31308a289a7fc SHA512 01de8405f48c698366cbb675e75ecbe6cfb5a7236d5b5a0f1f9bc6200b07c728fca41925b34177019b207d8ef2c1b688306a37b1571a7fd91138d31e81758bce
 DIST catalyst-3.0.7.tar.bz2 873526 BLAKE2B e056c2ac7589e2423a984c8a089faef87af24d401d4b2c2c4c3752b0af290e42df1fd1f5fd3dad5586fd96b23ecdfa90482f913b2be4181727048cf8fdef8d43 SHA512 403d33c10324e4bfd7c7c2f9a63bc41823230b0450e3e153fb051e8efb18263f1d7f260a11d8acdfa052efa8d41cb2ba4570e65d68c41e342d83477c755e68ab
+DIST catalyst-3.0.8.tar.bz2 873610 BLAKE2B af6fca5dd8dea377795d1b50b942773b0cb8383e1727ba547f1511f126ad4f1494d64ca3d4b3e479664de366e8ed2f8ad8c09c206bbd213d6f95aa51ae56ea8c SHA512 b00a31d9af9b3c1d220080eb6068c924f6ca9f4d574f4805f2b833e61e0fdb79290ec6f5b190c0c7501e015068eb756ede6aea7a959d2e22cef8a055968b7203
 EBUILD catalyst-3.0.5.ebuild 1885 BLAKE2B 293ea4371c2eb33f45bd40bb5984dea50e29f18c085f0e14411745f3bf2b8792e6f0bcee8889fb1f159d8d122adb8a417ae2891332bdce014750e04730f5efd5 SHA512 7308a22ba955fdadfebd6db46a3dba8e6980b1592969189bf03d3a01d4812a150c74589c190af27ede0102c5f65939b34fecea2b71badc5350a9693971b14fec
 EBUILD catalyst-3.0.6.ebuild 1896 BLAKE2B 560f65b5e87a7833741c3abcb624434dbd4e064983459e68a798dd49e6df83daf86615932759c2bf6bb35f023b3740a1c835bea99f165f5c3c797c69e0800494 SHA512 ff4952be8a36d496708da49e7dcbf9bf8bd2ed054203ec890be82aae23131fdb05dd69975e6fe97cc414c788321f412d4c392da3c8fded1e21c9b2cfd7ec9c06
 EBUILD catalyst-3.0.7.ebuild 1897 BLAKE2B 141dfa371702236ee38e03e6ded540789c5634145212e94136c262c669310c623de6561da7e149289de380b7a955a6622a10a973c77fe35227aa6e23796cc6e3 SHA512 d0f293dc7eb1a408f29f492128fd182277d6204ab0b17ebe2643093c912f039487df2c1846ff330c0d0228255c9eac40121122e278b1c8bfc79820854b5aea92
+EBUILD catalyst-3.0.8.ebuild 1885 BLAKE2B 293ea4371c2eb33f45bd40bb5984dea50e29f18c085f0e14411745f3bf2b8792e6f0bcee8889fb1f159d8d122adb8a417ae2891332bdce014750e04730f5efd5 SHA512 7308a22ba955fdadfebd6db46a3dba8e6980b1592969189bf03d3a01d4812a150c74589c190af27ede0102c5f65939b34fecea2b71badc5350a9693971b14fec
 EBUILD catalyst-9999.ebuild 1897 BLAKE2B 141dfa371702236ee38e03e6ded540789c5634145212e94136c262c669310c623de6561da7e149289de380b7a955a6622a10a973c77fe35227aa6e23796cc6e3 SHA512 d0f293dc7eb1a408f29f492128fd182277d6204ab0b17ebe2643093c912f039487df2c1846ff330c0d0228255c9eac40121122e278b1c8bfc79820854b5aea92
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.8.ebuild b/dev-util/catalyst/catalyst-3.0.8.ebuild
new file mode 100644
index 000000000000..7da190c26fef
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+fi
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	iso? ( virtual/cdrtools )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index ed7335d7c505..be05672509ab 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -10,7 +10,9 @@ AUX sitedir.patch 884 BLAKE2B ba051cbd046971d3b6327755b0de83c03b3a441a3e47e7d791
 AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913
 DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
 DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45
-EBUILD catkin-0.7.14.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
-EBUILD catkin-0.7.17.ebuild 3135 BLAKE2B 0b1b959e28e610973e36d4942ef9fa04ee9997b5c2f98e5dc217bced73ef336da1a30fc093fccaa57805fcfd132aca4461cd9f9da583a0eb183badeb13eb6b06 SHA512 a871bfa69c8b764b76c82b39f765d10027ebc48d400bc005e86171b39637f57201ad4c6d2597c2e725aca422a7d0c9877b97bcdfa43713ab2c81989ac5168b9f
-EBUILD catkin-9999.ebuild 3135 BLAKE2B 0b1b959e28e610973e36d4942ef9fa04ee9997b5c2f98e5dc217bced73ef336da1a30fc093fccaa57805fcfd132aca4461cd9f9da583a0eb183badeb13eb6b06 SHA512 a871bfa69c8b764b76c82b39f765d10027ebc48d400bc005e86171b39637f57201ad4c6d2597c2e725aca422a7d0c9877b97bcdfa43713ab2c81989ac5168b9f
+DIST catkin-0.7.20.tar.gz 215244 BLAKE2B 06755e87f43d1e97138a6696af05dfd9b9434adcca9d4269c7b93b363b25ac9e8b198a980d7607b6b317f546b7637103dc251213087201ff56c1f12c86892edb SHA512 7258f0d548a92d846c9ad195d5e28a567d3c1b4cd1caabffd58c3fabee66cec8ce3612d3095e6437ac201b4d37fddf8f850775e809ebb7eaaeb99328afaedfc6
+EBUILD catkin-0.7.14.ebuild 3152 BLAKE2B 19e1b075039ce5947cb38f98f832550d5fc9defbe8b2ea95932425118d91276a18f7aafa24930dec713a83623c2e8dcca14948b7aebe453bdebb35fd7b1312ce SHA512 7bb2cb76ddc8ec6abbbf55db504556728f476de99ffe0c3b57bf48ae59bdbf65153fb261958f2a0d55e07ddd6faa16f61464a493f6e81d788110939981973e09
+EBUILD catkin-0.7.17.ebuild 3155 BLAKE2B e799b361e20a268586473032ca470ddf3cd619dca02057c989e1b8346e5122a1cf11770f46ce9144dcf1f3e47df0d9f9c88fb65e5279597e348345b069a50347 SHA512 0adc464937e66fae2c222e4b551c0bffb43321b072f1d764dde49a99198991e6d8ef39918d7c0dd54395b5b464c8fbd1046fe518c77c0972ad9b305d4ea32a6c
+EBUILD catkin-0.7.20.ebuild 3162 BLAKE2B 89003c2b89cf1a9dbf5cc82682d5f0edc1c6f2fffb9679a47fb74e9e398c28517c5badf8c11ca622a1e18d4d22e8fe254dc666aab839dbd2bb93b4a16339678f SHA512 e14f475b54921e1702c4d9b4ca13c2fc6cbc4dd4bf10c070f0b451994f00dfee836ac852dcb80232824f38c89c70a0e5325c71143829299a42925f5db761f424
+EBUILD catkin-9999.ebuild 3155 BLAKE2B e799b361e20a268586473032ca470ddf3cd619dca02057c989e1b8346e5122a1cf11770f46ce9144dcf1f3e47df0d9f9c88fb65e5279597e348345b069a50347 SHA512 0adc464937e66fae2c222e4b551c0bffb43321b072f1d764dde49a99198991e6d8ef39918d7c0dd54395b5b464c8fbd1046fe518c77c0972ad9b305d4ea32a6c
 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.7.14.ebuild b/dev-util/catkin/catkin-0.7.14.ebuild
index cef4fa0eb0e8..74a1aa7e9e01 100644
--- a/dev-util/catkin/catkin-0.7.14.ebuild
+++ b/dev-util/catkin/catkin-0.7.14.ebuild
@@ -26,6 +26,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -94,7 +95,7 @@ catkin_src_install_internal() {
 	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
 		dodir /usr/bin
 		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
 		done
 		touch "${T}/.catkin_python_symlinks_generated"
 	fi
diff --git a/dev-util/catkin/catkin-0.7.17.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild
index 84cbac41ee4e..061b05be08af 100644
--- a/dev-util/catkin/catkin-0.7.17.ebuild
+++ b/dev-util/catkin/catkin-0.7.17.ebuild
@@ -26,6 +26,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -94,7 +95,7 @@ catkin_src_install_internal() {
 	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
 		dodir /usr/bin
 		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
 		done
 		touch "${T}/.catkin_python_symlinks_generated"
 	fi
diff --git a/dev-util/catkin/catkin-0.7.20.ebuild b/dev-util/catkin/catkin-0.7.20.ebuild
new file mode 100644
index 000000000000..92350f4085ab
--- /dev/null
+++ b/dev-util/catkin/catkin-0.7.20.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/catkin"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+
+inherit ${SCM} cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
+HOMEPAGE="http://wiki.ros.org/catkin"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/empy[${PYTHON_USEDEP}]
+	dev-util/cmake
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/distutils.patch"
+	"${FILESDIR}/catkin_prefix_path.patch"
+	"${FILESDIR}/gnuinstalldirs.patch"
+	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
+	"${FILESDIR}/package_xml.patch"
+	"${FILESDIR}/etc.patch"
+	"${FILESDIR}/sitedir.patch"
+)
+
+src_prepare() {
+	# fix libdir
+	sed -i \
+		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
+		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
+		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
+		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
+		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
+		cmake/*.cmake || die
+	cmake-utils_src_prepare
+}
+
+catkin_src_configure_internal() {
+	local sitedir="$(python_get_sitedir)"
+	mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+	)
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	export PYTHONPATH="${S}/python"
+	local mycmakeargs=(
+		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
+		)
+	python_foreach_impl catkin_src_configure_internal
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	unset PYTHON_SCRIPTDIR
+	python_foreach_impl cmake-utils_src_test
+}
+
+catkin_src_install_internal() {
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_install
+	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
+		dodir /usr/bin
+		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
+		done
+		touch "${T}/.catkin_python_symlinks_generated"
+	fi
+}
+
+src_install() {
+	python_foreach_impl catkin_src_install_internal
+
+	doenvd "${FILESDIR}/40catkin"
+
+	# needed to be considered as a workspace
+	touch "${ED}/usr/.catkin"
+}
+
+pkg_postinst() {
+	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
+	ewarn "installation path for package.xml files on Gentoo."
+	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
+	ewarn "packages that have it installed in the old location:"
+	ewarn "		emerge -1O /usr/share/*/package.xml"
+	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
+}
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 84cbac41ee4e..061b05be08af 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -26,6 +26,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -94,7 +95,7 @@ catkin_src_install_internal() {
 	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
 		dodir /usr/bin
 		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
-			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
 		done
 		touch "${T}/.catkin_python_symlinks_generated"
 	fi
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 62f65c929acc..cc89f9d16d26 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -2,6 +2,8 @@ DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST autocfg-0.1.4.crate 10937 BLAKE2B 272fc9d216749941cb73d37d5233d1df4bde5abcf9a6e75ed928ee6493e9011922a06551dac1f6b1d0c34dce587c6ce1442ea62e88457c0cecf985e7a3d5e47e SHA512 811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST cbindgen-0.10.1.crate 135719 BLAKE2B dd972e1151d5ff3933affd584fb5c608cdd1f7fe87ebbf0f506b68c398ef0106e2df6812637c6492e8054f6abd70486f868356b5ef58e61a4c6217a350ae9f95 SHA512 e3871c113cbdac50e71f6c2f611562a90a2417cc485c47812388bdee7970f4487d0f2875b3133bb73db05baf85d324f95cba1dd71c321e90b8d8b5b933fced34
+DIST cbindgen-0.11.1.crate 137331 BLAKE2B b2e917ac4e075227a1cf15f8512dce27483f082cb646086d0ef9004ca9d51db27dc630f20d9e8f5488330251e45d7dcf1e987b7e2b965d224156cad4a6866537 SHA512 ff746cd4485bf92b6e1d8973635b9da722d0ae786c455885af36c4842e8770341c670d68efebd87f60f30f4c3160786b9ef576c8e05eb61aaa1e5ac871e75357
 DIST cbindgen-0.9.1.crate 129676 BLAKE2B 12315522938e941c4a53033f276f6065d6e19ba7cab3ce8aabb17b2ae5fe0c7231e51be33828434d6ca039d79c9414fe8d310a12b07ef1c544ed9b5d8cee74c6 SHA512 0e32563db42363dc82e8aca2f36bdafcdf0ec9156e7238937295c9369d306c2bfa590ea7a9afd61d8b915fc383bb7af8bbb78cde71f6ab30b0c576262c74232b
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
@@ -43,5 +45,7 @@ DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64
 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-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+EBUILD cbindgen-0.10.1.ebuild 1074 BLAKE2B 95a4b8523ea1cdd768748dc48c19adb90bd292a68bd50a048b72150c1acffb7f9c6d2d969b0a54723e6a8217470b1d53b2c3dc7d721f78abcbb2e2ea334a53a8 SHA512 4c68f75bc70e83453ab28ada4173620726f371b5ce7270a3a0c4f4d4a972917357f99d9681d5c8a2ccaa38a397f2afb95769ff0ecb9502cad8c1cd7044e2943d
+EBUILD cbindgen-0.11.1.ebuild 1074 BLAKE2B c22644da1dd512496f5add9e851f33a5ce44596b53df5cd3a1a9b671d425e2e3a8378cdfe52d916cd0a6201bfa091d3625c1880e70d341d3e2d73dc1dea19c34 SHA512 9b87a1a981fe1189fa7c1ab9f321e7077c2ea882e516ed91e07e4cc83472c72ee6d99b999ec10cece51d2d34ad20949800d01435641b7b348d4a1f1a32a0de6e
 EBUILD cbindgen-0.9.1.ebuild 1070 BLAKE2B f1879c89e9a4741ba710caf8ca7c7e2ce9de4e94e726e499e9c7d1965c417a68d77c964937c56f388ad7b8ab441079c34d7d59a5363db9538b90b5dd90524121 SHA512 942913685d536a6cdd615caeac8ecabddf28715856ee846154535bd4f1492b491ac64120aba92c478f753140d37b21f0716c8f898a802576e0a30df790070143
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.10.1.ebuild b/dev-util/cbindgen/cbindgen-0.10.1.ebuild
new file mode 100644
index 000000000000..617ea736cf1d
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.10.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.11
+autocfg-0.1.4
+bitflags-1.1.0
+cbindgen-0.10.1
+cfg-if-0.1.9
+clap-2.33.0
+cloudabi-0.0.3
+fuchsia-cprng-0.1.1
+itoa-0.4.4
+libc-0.2.58
+log-0.4.6
+numtoa-0.1.0
+proc-macro2-1.0.0
+quote-1.0.0
+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.4
+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
+remove_dir_all-0.5.2
+ryu-0.2.8
+serde-1.0.93
+serde_derive-1.0.99
+serde_json-1.0.39
+strsim-0.8.0
+syn-1.0.1
+tempfile-3.0.8
+termion-1.5.3
+textwrap-0.11.0
+toml-0.5.1
+unicode-width-0.1.5
+unicode-xid-0.2.0
+vec_map-0.8.1
+winapi-0.3.7
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for generating C bindings to Rust code"
+HOMEPAGE="https://github.com/eqrion/cbindgen/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
diff --git a/dev-util/cbindgen/cbindgen-0.11.1.ebuild b/dev-util/cbindgen/cbindgen-0.11.1.ebuild
new file mode 100644
index 000000000000..4b21800a1560
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.11.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.11
+autocfg-0.1.4
+bitflags-1.1.0
+cbindgen-0.11.1
+cfg-if-0.1.9
+clap-2.33.0
+cloudabi-0.0.3
+fuchsia-cprng-0.1.1
+itoa-0.4.4
+libc-0.2.58
+log-0.4.6
+numtoa-0.1.0
+proc-macro2-1.0.0
+quote-1.0.0
+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.4
+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
+remove_dir_all-0.5.2
+ryu-0.2.8
+serde-1.0.93
+serde_derive-1.0.99
+serde_json-1.0.39
+strsim-0.8.0
+syn-1.0.1
+tempfile-3.0.8
+termion-1.5.3
+textwrap-0.11.0
+toml-0.5.1
+unicode-width-0.1.5
+unicode-xid-0.2.0
+vec_map-0.8.1
+winapi-0.3.7
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for generating C bindings to Rust code"
+HOMEPAGE="https://github.com/eqrion/cbindgen/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 29f18da8b773..8c2bd22ca4d0 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,4 +1,3 @@
-AUX ccache-3.3-size-on-disk.patch 559 BLAKE2B ef3c24c4094153e2ed2b071f42d83c86352bad696bfca2b59357973be83afbb5dd9fe7f0df25604808db59b97a193815b8b31f5f07819c1da0f7776aea36e6aa SHA512 09341435cbcafe38ba641ea4507091bf5e7b4ad38922d5ca0f7750637d65fbef64504312eb5e0ca1551371da64d76acf2d5461a59cb04d23d812e4050772253f
 AUX ccache-3.4-size-on-disk.patch 567 BLAKE2B 8ac22301eabf54922f69d135ad99a8ad9ac83df956af274bd088909ae973af18c476b408f126ad59e60c69fc1ed02f90b0021074a24ca47f804f539063303dd3 SHA512 9e8eba9926fd8e8b90572365729388bf1bfdadae9cab8b739a614de10759bf69d709075fd92c77d1945e45cc4f6c3865c694a2129d7c30f0b14f2324b4df2133
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-3.6-disable-sized-cleanup.patch 834 BLAKE2B a8f6ef6fc900c7cff9ae68a25f997c8e5b2cf1e98392047837efd07c91ede129dbbca2d6aa1a2532d149675f658220aa251b0fe066597f862aa2c44ec30fbda3 SHA512 3d0ab124e119b1757fd272a3585aee14e83c092459411d300fef198ca16483ec9149baedb54a9a8333b5a24a34506da550afcdf4e10ae2657c01164244e1519d
@@ -6,7 +5,9 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
 DIST ccache-3.7.4.tar.xz 351576 BLAKE2B fa2a9c051ff3f9c0550c6301e8d6c9e0eb7ac68687a30a6e8c1ee794ecd6b62925fdc940d493a9fb22d9094c5f2a0f3b2788c6291430ca532661ea6ddef45456 SHA512 cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146
 DIST ccache-3.7.5.tar.xz 352440 BLAKE2B 6761d7a1a8c8086081fa46d50db1dce719856910da6324c9863a3f3731fdb0f5153e0d93a5c575074d1993650623e4e4b02d83dd3b656a31cb9be04ad6b58efa SHA512 d66eb9d923c3e4663242a034860bd198175e08274a295b6d5d94e6cd69fe32afa3fb8c228d64d5c5dda025e6f97d0aef0586ce4dbd66e8ce3a23093331f1841f
+DIST ccache-3.7.6.tar.xz 352692 BLAKE2B 97f6c3ea119b7f1f4fdab1dc88ac34a23bd8f893a1e399dd9f934b345ea27999b3750be6b474caf2bcaea77eb9281f99623312aa55dc5b5ffb7cf5e670b173f4 SHA512 c92a699b9761bbbde1666a9bc2718070a5beb24f7054d91226790c7903fe2e26a02d0782822bc811aaffcd88df3cd3e011a19061eb69569ed7140765cef8d6ba
 EBUILD ccache-3.7.2.ebuild 2124 BLAKE2B c61c9962801505c448c7e3a547f229414962f166d5d15637f454ab78b7947484f0b55ea08bab7514eeca2b7e1b7c3b8e946a106ad5a25c3d6fef613cab3443e6 SHA512 cea7f8af0eaf881926aafb8a7c12c359eb51a226b4e29ec20c37f233d09dd0bceb0ef27b7dd0354289c2b6b0e3b5ce70e46530a6abbe4c4f1882a4a0879386cd
 EBUILD ccache-3.7.4.ebuild 2196 BLAKE2B be9b00c6fd13b5619dc65103a0da6bb4086b9132b2d76345a3887a2b90c21e48dd77c6f92688d6c272749d19572eb2499e68e542b2ed6d1cae87d3d4bc0ee678 SHA512 9dc9b015dd8b5e91e5ba7a1b9888c39f3f408c35b34615ddc5111a09d781d7d91fe8c017a8cbdd589b4dce95711f4d9a06c93c50444b7070103a82e751d1066e
 EBUILD ccache-3.7.5.ebuild 2207 BLAKE2B 00f468b17f0531f0ae2d3130027c0b8a9851ab2650076e708c9125f2a83af90301748a37005373b080d09931fa0de6ebd1eb8f1a95231fbf11c6f1d50286640e SHA512 e40eedd3ccf2f031902360d43b0d86a51140195acb5c19dad1e70f52aeab75759270d43263b0d60631be9b5475c72015d025a8e5dfe94d3c81f47faf90dddda3
+EBUILD ccache-3.7.6.ebuild 2207 BLAKE2B 00f468b17f0531f0ae2d3130027c0b8a9851ab2650076e708c9125f2a83af90301748a37005373b080d09931fa0de6ebd1eb8f1a95231fbf11c6f1d50286640e SHA512 e40eedd3ccf2f031902360d43b0d86a51140195acb5c19dad1e70f52aeab75759270d43263b0d60631be9b5475c72015d025a8e5dfe94d3c81f47faf90dddda3
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.6.ebuild b/dev-util/ccache/ccache-3.7.6.ebuild
new file mode 100644
index 000000000000..998d395a3b2d
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+# clang-specific tests use it to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+="
+	test? ( dev-libs/elfutils )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+)
+
+src_prepare() {
+	default
+
+	# make sure we always use system zlib
+	rm -rf src/zlib || die
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake check V=1
+}
+
+src_install() {
+	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+	default
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<'/usr/lib/ccache/bin'
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before
+'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
deleted file mode 100644
index 277e9a6469a0..000000000000
--- a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/456178
-https://github.com/ccache/ccache/issues/442
-
-stick to the size of files on disk rather than their byte size.
-this func is only used for stats management, so this should be safe.
-
---- a/util.c
-+++ b/util.c
-@@ -845,12 +845,7 @@ file_size(struct stat *st)
- #ifdef _WIN32
- 	return (st->st_size + 1023) & ~1023;
- #else
--	size_t size = st->st_blocks * 512;
--	if ((size_t)st->st_size > size) {
--		// Probably a broken stat() call...
--		size = (st->st_size + 1023) & ~1023;
--	}
--	return size;
-+	return st->st_blocks * 512;
- #endif
- }
- 
diff --git a/dev-util/cccc/Manifest b/dev-util/cccc/Manifest
index c412bafe0f5e..da89ff634ec8 100644
--- a/dev-util/cccc/Manifest
+++ b/dev-util/cccc/Manifest
@@ -1,5 +1,5 @@
 AUX cccc-MFC-dialect.opt 560 BLAKE2B 65000ebbc99b306318aa2da34031879b7393649573b8509bc12ed6174d59208ea2a06e1af8d98eefb3d142d51e9b98bc9e2a058e8f8f3a68b17f76bb4dfcf6b2 SHA512 e37ded34821690e0b07e4e3da502bccdb5760a38a9f1fbacb6cec4de143cc9c0160684d9a41ce0c3ff8e2a7716889824594d6f8d374a631dbb0de91ccec53903
 AUX cccc-c_dialect.patch 2048 BLAKE2B d97bd8430fe1357779ebf221607ea724485cf5bf572c86f4adcb85ea6d29c41bfeeb562534bccd1787241c024951941921fe6936541c5ea1f72ea923e9612d12 SHA512 5fadc49a0da8ca51b74dd92e673b413b506c8b06dfeabb7da0e2ddf24e7766d58ebbcc00d018677f4b0ff77d10df8b974ff1afd4100c33152e8cad0538b61789
 DIST cccc-3.1.5.tar.gz 662760 BLAKE2B 57817ef9a44f002c017245d7dd3b1ef97fec59b59bce465d5e5e1cc12409b5602cfd8bf7ee938e526af9bcc11398639900d26848aa4f8c7f623669159de17117 SHA512 61544669a75ff7bd99c6ff5bb1e6ec163f2a09f4538493fe60e8f9f95eab7ba19ad6d39b6717ae010a223b8efe48c497a4feb8ead218e350ee2ab91b9c52c969
-EBUILD cccc-3.1.5-r1.ebuild 1589 BLAKE2B d884aa93f5f3ac2c971b65362b2ca1d35a51d316df45488f63dd2bb3e58fe79332c8bbb836350fd19915417b4c45c3eed158fe078f43df31db37efe00a4d20ab SHA512 1e47c296d5c116b4bdc642e6484e493086d0b35c3498ad0dda5d5245930b4c3b1b783d65628f3a93260b4df99ea469d10653929a1481aa1ec77ec8a0587dde0e
+EBUILD cccc-3.1.5-r1.ebuild 1519 BLAKE2B fc637824cbff2a1f56db46ce6ea9684f2598dafbbb7c191b8dbfc20779d7945994224b48ee9e886954257960508643e6a8fecc1481f64698b2f515629f49d399 SHA512 04f323a0041d54b968082cc85f4ee2cd14741662015546258f02eee85d4bd4ab772996256d397575a94cd75972246fbd88ea6e93099134e7794ae0750da9fb39
 MISC metadata.xml 694 BLAKE2B d8992216f3b05e4382fa843df2a71673946c1e81ef7325fef7ad39fa073c092cc86b1cd993582b40b230adb6902a406c30a7b9a00d557e7f2aafcf4e940e51cb SHA512 442e37fb776949e1f59ca7074ba1219e77e7e1be0003c5cace090342823227fca6a9a10ef607d133245985c717811005293bf2044fdb0bacfe2e114eea3ec2ad
diff --git a/dev-util/cccc/cccc-3.1.5-r1.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild
index a26523720d4b..856607a6df29 100644
--- a/dev-util/cccc/cccc-3.1.5-r1.ebuild
+++ b/dev-util/cccc/cccc-3.1.5-r1.ebuild
@@ -59,12 +59,12 @@ src_install() {
 
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/html
-		doins cccc/*.html || die "html docs failed"
+		doins cccc/*.html
 		if use apidoc ; then
 			insinto /usr/share/doc/${PF}/html/api
-			doins -r doxygen/html/* || die "dox failed"
+			doins -r doxygen/html/*
 			insinto /usr/share/doc/${PF}/html/metrics
-			doins ccccout/* || die "metrics failed"
+			doins ccccout/*
 		fi
 	fi
 }
diff --git a/dev-util/cflow/Manifest b/dev-util/cflow/Manifest
index 62c9ae78c342..2c159880547a 100644
--- a/dev-util/cflow/Manifest
+++ b/dev-util/cflow/Manifest
@@ -2,4 +2,4 @@ AUX 50cflow-gentoo.el 177 BLAKE2B d43229ed9ebeea653f91ceadd84f641eff4bf1168cf6e9
 AUX cflow-1.4-info-direntry.patch 356 BLAKE2B 5edd13456dc90461927c0b2ecbb7c66987ef935e54d7d89010bdddac6193a9eee852fde601543149a3aeef1fc5e3447d43d2e076673e9ebd3b6e5bb978477008 SHA512 6bcfd0ec801b3c487d817d2fd1a0f030a1e3fccffb03f5343eb335c807fd763a8c00d8f98654ce3f8574e756a9c1d5769da71b9fb70acee0ecdace6395a3a624
 DIST cflow-1.6.tar.bz2 836405 BLAKE2B 6cfbfa9f4bb503616cb0bf465e70d9951eb52e65addff16ef2a1ee79b1a115e46ac4747510dd1edf5ec1d96c29540152a6fb2227715cef9e19acbb895f5cda2e SHA512 eb26695b479205ea391623d78ee537cac084a168a52c2bf4f2e4206d7a3f813e6e3f92684903673af905172c3b1df3f8ab1ccb7986bd61ed53feee34fb3fd7c6
 EBUILD cflow-1.6.ebuild 1044 BLAKE2B 992ad3f48621273d2d536bbe2333b47457bae8bfb302dc6f5e47a6b0e538b2778fc621aa15b1473320244f0ed4cdb46432ad10a21fa0a3bbe48743dfd0aa4a0c SHA512 f11c1c2c380a5e169084dfaec75646544149e29b4d969b1de2731ad749df389c666851904edaba93ae8954c1bd7ef067f76518b3e14755c90c0c15b1631dd02b
-MISC metadata.xml 588 BLAKE2B a5466656ce4c3a761b64b1ade2fef0363065450ddc10d590a0f52f5b8fd4df057cdc99a84c056925bdfcbabbb63ed2eb4e646d04b0adde4378adac56c290757f SHA512 cc702fd85f1e907a364f9e79e4b183bd4ff2317750bf917acbef7d326abded9c1adbd66bd21a46df7b394e9d4990c8c056c7173a4fa758217519f3def7c789a2
+MISC metadata.xml 536 BLAKE2B 69d3347338a5a927ff0df99de6fadf6de6fffe265f46cf8465eb8d973c98de19b05f678ae82281e78a806d2db779bc89045216c655487e7c016e153de6f0421a SHA512 411020d631cff076d887c1a8be507e7dc323b5bd585f7383db0f8a62fdbd41dc704e5d38cfb6ab27a83e3333b43804512046a462526151f3b4669d8a44546749
diff --git a/dev-util/cflow/metadata.xml b/dev-util/cflow/metadata.xml
index 8e343daf6159..a42aabce3ab6 100644
--- a/dev-util/cflow/metadata.xml
+++ b/dev-util/cflow/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		GNU cflow analyzes a collection of C source files and prints a graph,
 		charting control flow within the program.
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index e10b231938cc..bf30c2b4ed0d 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,6 +1,6 @@
 DIST cgdb-0.6.8.tar.gz 435115 BLAKE2B 31efcd8740dc0a0354c8d655cd7b77b18b25842dc39d1de42a92917305879394b425d7a7b0e555b368fc6a67f535fe9244c3fedeec9105c3622ace313b24c8c8 SHA512 ef3d94820bb5a37a8d7fbac48c8d144e0ac73c4f5a9d25bea33f2c4390080bb2dbdc5e7e21a5ef8a4980515cc48d80f140f7cf1f90eebac3f8bf1cc6168585ea
 DIST cgdb-0.7.0.tar.gz 319980 BLAKE2B bfc62f9214f6726e5df081119e85ccdeaea9a2310a9bb7a1746525ab998ea94ec1181efd3a1986ec0d33103c2f2b888e4d93c4ddaa4a996db4e47b0173c3b67c SHA512 83aeb919e96cd0981d8fe5cdd257df3e8d8bfbceea720ea66c1773b28c9f0ecb0e303e0585206c55242bc4438d505e328d43b4991c6ddc4e4202e048558c30d9
-EBUILD cgdb-0.6.8.ebuild 868 BLAKE2B 17d5b2d6d2fae2c79f647ac66417c31374d1d0a986fca95c889a90bd335c15d71ae45e76228af746fed4719818c78ea3ed24ca43a83bd1783fb040728dd1b4de SHA512 443556df6c778ce5eb6b18817e64d4d469d772493f5da1a26344266852255a82416e4212690921b0c2bfe2e335b25ed50d43741c6f8b8c5342960739b882562c
-EBUILD cgdb-0.7.0-r1.ebuild 1324 BLAKE2B 163953065b2feb745414cc6a36b0e46b7269f75dd750d4efbed6d8045c23d43cdc998e3bf4325313a11483d8b9045c48a058350b8c0283a7737f46b9eb5a195b SHA512 d10c7a58b3288b7120d5ce210f979bff96c336ad681f8762951fa513cf4f848540885a028af817ce8e501f7309a9796694d2b8723bd09e1251ba36e571ed30f5
-EBUILD cgdb-9999.ebuild 1324 BLAKE2B 163953065b2feb745414cc6a36b0e46b7269f75dd750d4efbed6d8045c23d43cdc998e3bf4325313a11483d8b9045c48a058350b8c0283a7737f46b9eb5a195b SHA512 d10c7a58b3288b7120d5ce210f979bff96c336ad681f8762951fa513cf4f848540885a028af817ce8e501f7309a9796694d2b8723bd09e1251ba36e571ed30f5
+EBUILD cgdb-0.6.8.ebuild 892 BLAKE2B ef7e3c4ec0ff5128fd4dec999ffcd69e664ef16c568cc1855480db95ba082f59520da9761243cb6fef5945d30e28e7788b05b1bc92774242fca4034a054d2df5 SHA512 7e1b93b4b28beba45f71231a7065e9c8280dd93093477095c2a353cebf98323cc4dcd5ab4a59aeefddc4fde2f34ab9abe0c9d2c2a63473afd8ac71401fd4eb39
+EBUILD cgdb-0.7.0-r1.ebuild 1348 BLAKE2B 370d58da127c77a5f3055aa2787d92e090e400fd5c0a65131d75432ff1643e7a429e2698fe25396dc909b817e3e30f41ebfcbfa335f1f0397fbbe331dcdd47bf SHA512 1b8823bb18b364bf8be2e51c096be21c4e4358b08738645a88f3ca064ae0a96dc0a8d3c789d75cc4e42ae1147de5f42dc03dac5bd07e4fcc2334ca9c540be196
+EBUILD cgdb-9999.ebuild 1348 BLAKE2B 370d58da127c77a5f3055aa2787d92e090e400fd5c0a65131d75432ff1643e7a429e2698fe25396dc909b817e3e30f41ebfcbfa335f1f0397fbbe331dcdd47bf SHA512 1b8823bb18b364bf8be2e51c096be21c4e4358b08738645a88f3ca064ae0a96dc0a8d3c789d75cc4e42ae1147de5f42dc03dac5bd07e4fcc2334ca9c540be196
 MISC metadata.xml 490 BLAKE2B 9eaa4ae0475e04d725f775f49d5bf57d7d0a00b53cfa1c0e67868d0127121f640ac304aef1c8d0c120666c03e815ab928b217800b2bf92e1bcbec9ed81a3519f SHA512 77ac0f28241716628619178ae93599276f8fd6051b7f00c5ef7fdfcd0a651cdd465dfde6de052156c8407d6a162a2a21199260001e06dd80e6eec8200bc11097
diff --git a/dev-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild
index bc82ce66ea22..ddd55558fcbd 100644
--- a/dev-util/cgdb/cgdb-0.6.8.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.8.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
@@ -19,6 +19,7 @@ HOMEPAGE="http://cgdb.github.io/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMONDEPEND="
 	sys-libs/ncurses:0=
diff --git a/dev-util/cgdb/cgdb-0.7.0-r1.ebuild b/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
index 846d5c8597bd..5a8f52e6edac 100644
--- a/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.0-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=7
@@ -19,6 +19,7 @@ HOMEPAGE="http://cgdb.github.io/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-libs/ncurses:0=
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index 846d5c8597bd..5a8f52e6edac 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.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=7
@@ -19,6 +19,7 @@ HOMEPAGE="http://cgdb.github.io/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	sys-libs/ncurses:0=
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 84a8fcf8a54c..3c5333e3a007 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2019.2.4.tar.gz 495317026 BLAKE2B 24e2dfbd9253b1b2bf70f8259ee09c6439d5623c12c78a7af60a9bdf00cdb48c7d2967150b5dca98c588b91573f2928288dbb57416b6fe397e3f7ea4b4d7bc23 SHA512 fbac7c3f6ea8b7f38031ad9a46dfd918683d66c317cca954d5f0f3b729040e23ac2ac1ea611bd6eff4c41ea3f03816ec95c4786475ab6f49dcf9b3d612d6c067
-EBUILD clion-2019.2.4.ebuild 2203 BLAKE2B 279893c2e510655704089a220241d03445e09f58625e8a2650aa80a210fbe3d5902806d12ed75c58b65b078b22a51388abf66761e7779cae93372de3f569b49a SHA512 67786d2f16055693e41b80d48cad734b19f852bd9b68690d923c1a26384fefa9b92873769fd6881bc4f5e13a6b90271423213c54cb37fa3d35a1c5bcebff64de
+DIST clion-2019.3.tar.gz 499054562 BLAKE2B 5655d39a573915431d296e5cc0a0aee1e0aaa95878e885b578a961b53b001ff8327338cf7e8e9a6eb71d758336cb8d71f7b21d94b4aa72504cc8f73df274dee6 SHA512 9d16ae4e2219d5cecb165934a8c378df2125ae6b14f924d04cad6776b985e19ea1957d1fb15e1c75d078eac56b47eaed2dfed02efedbf0d5ff649bab519ecc1c
+EBUILD clion-2019.3.ebuild 2157 BLAKE2B 61cd0f6a6b4fef3bfefc5f1bdf6519de01ad330d671952d84c4c5227b320bed5a233ba5c8bd6c5bc89c48ae7084b16443f2ebd41e2c7664e87ec1709b599fb76 SHA512 f87202235ccf691733d08ddd347b82b942c517630415a75f7ba47632dbaadc3db98f4624b8a849353aa45fca1023c8a5a3a91b596981bce6820e6433db864fc2
 MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871
diff --git a/dev-util/clion/clion-2019.2.4.ebuild b/dev-util/clion/clion-2019.3.ebuild
index fbe93d313de5..e207a118618f 100644
--- a/dev-util/clion/clion-2019.2.4.ebuild
+++ b/dev-util/clion/clion-2019.3.ebuild
@@ -39,7 +39,6 @@ src_prepare() {
 	)
 
 	use amd64 || remove_me+=( bin/fsnotifier64 lib/pty4j-native/linux/x86_64)
-	use arm || remove_me+=( bin/fsnotifier-arm )
 	use x86 || remove_me+=( bin/fsnotifier lib/pty4j-native/linux/x86)
 
 	use custom-jdk || remove_me+=( jbr )
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index b4d8f199fdc6..46eaf3d767ce 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -9,6 +9,7 @@ AUX cmake-3.14.0_rc1-FindBLAS.patch 1247 BLAKE2B ca3b9e1515569b1dcf4692480233aa1
 AUX cmake-3.14.0_rc1-FindLAPACK.patch 1798 BLAKE2B f372fd920abaf85ab3106385d45e193c2c0fba1ca9fb5c14cf53bdee9a29602b7db0078676c90f65f3f3eccddfbb1f6b9964d26f90aef38cbc0c197a4b243ac5 SHA512 dcc970561f54d862f2124512bfc28ab25e66b1fa5e6a7a6138faae7f1e3a4136320ad4d4942153ac9505035b74f3e8442dddb62af6fb1486fcfec08fcf3e3743
 AUX cmake-3.14.0_rc3-prefix-dirs.patch 4688 BLAKE2B ec197f40246ff9b47f6515cec92f0ef497de2e96756cd7c12ea3fe7c71d5e2220c637210f663194c63e72924d89dbce7afe92fed01bca8947bdd76af6f5365b0 SHA512 9da6be335e5615b2e14fdcccbadd50a0e2df6e19476818358216501b657350c73fa6bdc1dcaedec1fa50e3e18e39544e2d2815d6f54dd5b4aa5860bdf35e8d52
 AUX cmake-3.15.0_rc2-FindBLAS.patch 1233 BLAKE2B 165307b41f7ebaa094e80adbab336ab10c48841a3c0b0e14b1277f847f624b421448cfc5e45a20e80f71f14ee7986ce756bc5b3d8e6b41b4a741611151d7f446 SHA512 2d46d95e69fd8eeaf8df198243269d87b83b87b6ade1d5f80d69ed78627a54ce05718596eaf43c7851fd4e010e526fa38350efeb2d92cbaf260e7789da0a2b6a
+AUX cmake-3.16.0_rc4-darwin-bundle.patch 1388 BLAKE2B bcb6c3d8e4f64ccc3e6ebf9ae906960075b3fb1f432925e07a711ac27321023033013e7a2e1d0ffc60dd464b775fa2537a49c73089861a2ce8f6316ddaa3d03e SHA512 7e0f598fe1cbb2c44b345091c102fb42ebff510ea7eeccdbe1fe0d65251127d823c37f2d37b073305679ed86fd48923566f1d62a7c9fb55df475d48891b4b861
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
@@ -18,11 +19,13 @@ DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee
 DIST cmake-3.14.7.tar.gz 8861587 BLAKE2B c1aa136fde8cd22592f15318a8ad7c37ef6e8895df3e097362077e8e1bf2125ba8f1a431a11ec40e7ab0d9e818452460f516aafac46cef4cc3b184bea12dbb09 SHA512 2f0e37cab2bde521452a30fffebf24429cea8a68c675f6970b0ea46dae5743fb80c0fe1d3ad174d226d968ac0760ecd33710232740a9b4b2f071df9e648cfec4
 DIST cmake-3.15.4.tar.gz 9270648 BLAKE2B b1c46ce76a549c78caa5c95be38fdbdcca685b1fade0a1687971d3b1cbb10953ec62b12401f67c389b096c87a6fa895ff339e1646e449472df76660b76e7d1ed SHA512 4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650
 DIST cmake-3.15.5.tar.gz 9271925 BLAKE2B 9e30227600542edb4dc3dbafc1874db718816270d045fafe140037b8eb39e5d066d1ccd5b2f6c817babfa43a0e3ff7c5d58d243b97f616ec504cafc428872b67 SHA512 c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6
-DIST cmake-3.16.0-rc3.tar.gz 9102878 BLAKE2B af0a74ec617804c0a8680f0325274927dbcea5aa375223dccd3ce43f6b6c77ef0c456b89bb4f5e4e22e856f7dd9f3e1dead62d2b029749e2252e2a9898647283 SHA512 137faa9c4b90ec23b95660b12310f5a11374c461b9149fb93e5ce8ed319d453f10e12ff5a3c9df2cfc3408998bdeddf4ffb3d3b62702575a740ddd5b650905a4
+DIST cmake-3.16.0.tar.gz 9107654 BLAKE2B 51cdc85d9e8a005ea93b214163edc120c7d64296499fc3e649838225e614bd76fde6dd07f2bfba037d056864cef5bd3c0b66d1a901e6233cffcb1f4edeb8dee1 SHA512 edbe16745cb82dc85f387ccdff37f3a89aa670a0e3b7dae53c3762c1cc44be1fa647156000a4ddcaac66822e3e537434ce2918da72a1ad208fa5378947ecec0d
+DIST cmake-3.16.1.tar.gz 9106878 BLAKE2B f652290f7fcd7d4315d8d0311b021e359ca07c8f62f4f1fb4e67c38407487829320d0b8b9bbf005e241b0d4210bc8ccff091fcda8fe27654dc2217ce19f4dc05 SHA512 62a8c651b1c73648420611bed3e6911da10cc5ac9131f72ef76047cb5f6e78279dc2848044279f537d9c28bb1cfa36c53bb31d00b43fa80c83f6272a1a93f4a0
 EBUILD cmake-3.13.5.ebuild 6193 BLAKE2B a1e0034672cce72bf6d7cd3c777143c70f22fc6ab7952a47107b58a45124c05ccafb4285a7a7626789327b46c0947db22cce3b7ad58ba97b56bd70acb706ea09 SHA512 55014b5288ba9a8265dfebe63e46b8dcae7c1c49c298990b04577e5c0b0f81a91f471f3c4da800ce30210edeabead5dfe80e72f88961a5f70e013335a7c8cbf5
-EBUILD cmake-3.14.6.ebuild 6220 BLAKE2B 85ad1940ec047b3d370cc2e9cf05bbf8c0aab108cec4e767872038ec562fbd1b18e1ae96f42ba74a43e8b11999c6eb870ce08ebdfc47a2a9b566d4d6b9363ef0 SHA512 63e0932812432530823e50292a71d19fa7c4483cb032a14578cbf5795977d09ed276c44192d3965b881f0f4b7f91a8edb1b31d65159c08a62c2aa94b6cc9461d
-EBUILD cmake-3.14.7.ebuild 6231 BLAKE2B 8259dea7e638d21f3c33a0427830ccb21ccac271585f90b14039c5a41164cbe8e9364c29daa3f8a3abd94cc0837157543bdc08c38b74b4833a7844de3eeeb9b0 SHA512 c18e2cbaeecd74a28241b475cc1ccf6a943e59be9b7dcbe990a8fd0c0200a2e67eb9fb3ee912cbd0cb91e2895dfdd8d3e04cc4231c3942ff9553c13331da8f66
-EBUILD cmake-3.15.4.ebuild 6231 BLAKE2B 2eb1b6cd2ee3856a485f1e1669a9f18969faeb4434269448ae0b307da69afe6d31f6665e0819e448e8d03c4c56aa095b2b828eadaa54dfb875a4f771d543c73d SHA512 e867ee946c492230f354570023f7d4530b462adbe0e70340e4ea91f9269ab5f1b278ddfc05912504c418ae79b457e8f8c5862d92ae8fdaee96f1e56375fb435e
-EBUILD cmake-3.15.5.ebuild 6231 BLAKE2B 2eb1b6cd2ee3856a485f1e1669a9f18969faeb4434269448ae0b307da69afe6d31f6665e0819e448e8d03c4c56aa095b2b828eadaa54dfb875a4f771d543c73d SHA512 e867ee946c492230f354570023f7d4530b462adbe0e70340e4ea91f9269ab5f1b278ddfc05912504c418ae79b457e8f8c5862d92ae8fdaee96f1e56375fb435e
-EBUILD cmake-3.16.0_rc3.ebuild 6258 BLAKE2B 2cca51250f50ab699ed8dc17c463e3c9dcda042d6d047eeb5c81c98e3129050e88dae1c8f8ad4fe86e11e8ac42d916b00841e7546f4f2403e2aa298da762619a SHA512 f806c749c63e7bbba4832b536f7be5b56303d4627bdac8d8a31ae0c6af28d2f879524ee166aea40d13c3972806e354be3e4bfeab791f2b9ec7291986c83040b3
+EBUILD cmake-3.14.6.ebuild 6247 BLAKE2B 005bf0f0e06fedc0262eed215ec2762e3d6bffcf61e5784edf205f9679bcd0cba8d35a7153acbebab0a7ad132d5c81023d6efa779139f4e05d19eb7ac306e091 SHA512 89909af16d07abb6e14139d593d73f3a149b62645d81d72f8809e25798928e0af1e919ea0fd81704d7d75e84522535900c1f93cbce9530209dc063bc43f9ffa0
+EBUILD cmake-3.14.7.ebuild 6258 BLAKE2B e45854cd53265f7742ddadf4ce9de785a7b45f1fb667df955fa8826829e8fdd4439956f77fce92046aa3c8c6bb68d751b68e7cb64de3c1bfbb29953ad3988013 SHA512 833d395daafed0455ee7e44c9d10bbf3d3e10ec9c49a6fa2d06970135463666bacf394785b594dd2b538b8272655dc2ae673eb93016dbbdfc1afac7e9f0552c5
+EBUILD cmake-3.15.4.ebuild 6258 BLAKE2B 2cca51250f50ab699ed8dc17c463e3c9dcda042d6d047eeb5c81c98e3129050e88dae1c8f8ad4fe86e11e8ac42d916b00841e7546f4f2403e2aa298da762619a SHA512 f806c749c63e7bbba4832b536f7be5b56303d4627bdac8d8a31ae0c6af28d2f879524ee166aea40d13c3972806e354be3e4bfeab791f2b9ec7291986c83040b3
+EBUILD cmake-3.15.5.ebuild 6258 BLAKE2B 2cca51250f50ab699ed8dc17c463e3c9dcda042d6d047eeb5c81c98e3129050e88dae1c8f8ad4fe86e11e8ac42d916b00841e7546f4f2403e2aa298da762619a SHA512 f806c749c63e7bbba4832b536f7be5b56303d4627bdac8d8a31ae0c6af28d2f879524ee166aea40d13c3972806e354be3e4bfeab791f2b9ec7291986c83040b3
+EBUILD cmake-3.16.0.ebuild 6286 BLAKE2B eff12e59b982421a7021ec569594ec077b8db04a5e2ebf0dc06521a1d8ad5d411ad92ebc31f0ffb04f4416375e82ff79c956d07c34db8983e348a78918c19ddf SHA512 e64bfe2be7fe54c6bd97db548587560e8620b00c0c0a316c9e0fad05474c928599cb9589d104fda82a50adbe6d0ac6d092153236b4f9c97f19f500254d342c9a
+EBUILD cmake-3.16.1.ebuild 6286 BLAKE2B eff12e59b982421a7021ec569594ec077b8db04a5e2ebf0dc06521a1d8ad5d411ad92ebc31f0ffb04f4416375e82ff79c956d07c34db8983e348a78918c19ddf SHA512 e64bfe2be7fe54c6bd97db548587560e8620b00c0c0a316c9e0fad05474c928599cb9589d104fda82a50adbe6d0ac6d092153236b4f9c97f19f500254d342c9a
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index c615e9c4e108..1e43d54469ec 100644
--- a/dev-util/cmake/cmake-3.14.6.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
@@ -18,6 +18,7 @@ SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
diff --git a/dev-util/cmake/cmake-3.14.7.ebuild b/dev-util/cmake/cmake-3.14.7.ebuild
index a257b9298462..98ca83720f9b 100644
--- a/dev-util/cmake/cmake-3.14.7.ebuild
+++ b/dev-util/cmake/cmake-3.14.7.ebuild
@@ -18,6 +18,7 @@ SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
diff --git a/dev-util/cmake/cmake-3.15.4.ebuild b/dev-util/cmake/cmake-3.15.4.ebuild
index 8379ddfb9330..d9456163e0ef 100644
--- a/dev-util/cmake/cmake-3.15.4.ebuild
+++ b/dev-util/cmake/cmake-3.15.4.ebuild
@@ -18,6 +18,7 @@ SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
diff --git a/dev-util/cmake/cmake-3.15.5.ebuild b/dev-util/cmake/cmake-3.15.5.ebuild
index 8379ddfb9330..d9456163e0ef 100644
--- a/dev-util/cmake/cmake-3.15.5.ebuild
+++ b/dev-util/cmake/cmake-3.15.5.ebuild
@@ -18,6 +18,7 @@ SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
diff --git a/dev-util/cmake/cmake-3.16.0_rc3.ebuild b/dev-util/cmake/cmake-3.16.0.ebuild
index d9456163e0ef..cc262fc75882 100644
--- a/dev-util/cmake/cmake-3.16.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.16.0.ebuild
@@ -51,7 +51,7 @@ SITEFILE="50${PN}-gentoo.el"
 
 PATCHES=(
 	# prefix
-	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
 	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
 	# Next patch requires new work from prefix people
 	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
@@ -127,7 +127,7 @@ cmake_src_test() {
 		-j "$(makeopts_jobs)" \
 		--test-load "$(makeopts_loadavg)" \
 		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
 		|| die "Tests failed"
 
 	popd > /dev/null
diff --git a/dev-util/cmake/cmake-3.16.1.ebuild b/dev-util/cmake/cmake-3.16.1.ebuild
new file mode 100644
index 000000000000..cc262fc75882
--- /dev/null
+++ b/dev-util/cmake/cmake-3.16.1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-crypt/rhash
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	# Next patch requires new work from prefix people
+	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
+	if [[ $? -eq 0 ]] ; then
+		par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_preinst() {
+	use qt5 && xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use qt5 && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use qt5 && xdg_pkg_postrm
+}
diff --git a/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch
new file mode 100644
index 000000000000..5aac1be55da6
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch
@@ -0,0 +1,41 @@
+From ce929588adf61ee24bb6850f4b9a58cc7ea224c7 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 19 Nov 2019 12:28:53 +0100
+Subject: [PATCH] Don't use .so for modules on darwin/macos. Use .bundle
+ instead.
+
+Patch by Heiko Przybyl
+
+Forward-ported from 2.8.10 to 3.4.0-rc1
+Forward-ported from 3.4.0-rc1 to 3.16.0-rc4
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Modules/Platform/Darwin.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
+index 1482d76ae6..6a432963b6 100644
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -43,7 +43,7 @@ endif()
+ set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+ set(CMAKE_SHARED_MODULE_PREFIX "lib")
+-set(CMAKE_SHARED_MODULE_SUFFIX ".so")
++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
+ set(CMAKE_MODULE_EXISTS 1)
+ set(CMAKE_DL_LIBS "")
+ 
+@@ -67,7 +67,7 @@ foreach(lang C CXX OBJC OBJCXX)
+ endforeach()
+ 
+ set(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
+-set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a")
++set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a")
+ 
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
+-- 
+2.24.0
+
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index 728c93314506..9959fe7e856c 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -1,5 +1,5 @@
 DIST cmdtest-0.32.tar.gz 48945 BLAKE2B 64c09a0f7dd66644d8ce785d633af2cc62ce0cba1a636cf18e650fdf0268987ad647509e17ed2c614b48164f9e9fbd6dcb64d6fa0a47ec6dcf24d82b69732857 SHA512 1d6d49f63067cd0343b0123eaa84326042a6382abccb624015ab5517809a11ad149f75fc48cdea87b608d4b8778903fe1a9e68b7942a45a6498bdf7e3dbe3216
 DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2daabc5af51faa6cafea1ca10dbf5137aa74ad9780156ff13f16e4c22fe5dba43401e22c6c2a7cabbd39d4139f4f515 SHA512 cbdebe175f09a99218d8ce0f2d1e49019f70b7f3ba112e2650e5a58e36a6f1d1b641c9aed5212e12023e956f999ef9cdba27aea7af9211f35a41874147a402af
 EBUILD cmdtest-0.30.ebuild 730 BLAKE2B 78a1bf7c8efcce4e7bf3ed269edb4480194aeb922297be6c28f0715bafbcc017da729a34198be13926de2383bce19ddd5b0a00db397ff39b977ee59c62412845 SHA512 91f157ec5fe7c2bd1c6c211423c1596fb8cd281d44acd6654606b12d577e278f2366beed7f413db7b340f42e05ff3b1792c8bf8299aec1f8217e39a6c07036a3
-EBUILD cmdtest-0.32.ebuild 719 BLAKE2B 1ccec7123871cec54aa519000d31054f6954f3c3342c0a66f447b026368067a5d768a8717831402b27cdc63100e14b8ac023710a33162da391a03efab2f21fa6 SHA512 a77722935edbd5bff02908f6a588cd22d27e1dbd6f135e8ad62a996fe7ddd14f547b76835112a33d6db68498a1b561f0a5901dc33116172c63fab56ca2c8aafc
+EBUILD cmdtest-0.32.ebuild 709 BLAKE2B 57f62d8d73308a65f39c75f14e256bbff8eb400b427c9b495e71eaff8d6af494140ffd38355a39e51cfbc2c484c6384c776286abf10e620ca3aacc85a7762a07 SHA512 968a22f1465f3ac367a4f360b7a6fa78a3c37bf0c9a14903f261cf6349aa95adb553d0a33e730dd2c360d6002ab7d4fd618ef80848dbcac43fba0335e14805bc
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cmdtest/cmdtest-0.32.ebuild b/dev-util/cmdtest/cmdtest-0.32.ebuild
index 4d98e4868f45..830d69c66302 100644
--- a/dev-util/cmdtest/cmdtest-0.32.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 DEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index e6958373da24..94eab3e879eb 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,3 +1,3 @@
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
-EBUILD cmocka-1.1.5.ebuild 1055 BLAKE2B 8a597b4a1b02871ba9095e9243064cb666e207728331aa4fefd4e7ca7a425d602e65452e01ead67e264d9bee28ea4ae4f853b69d5cf5acdb0b3e6cabf89da273 SHA512 996d173ee9f8776e06f6ee926b631c709acf5ee41b85c50852e571bc98812ec7fb7a1b608f9d80412c4f4dc48a028e17de1ae92894d3c39cae376e7bcb5fcad7
-MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
+EBUILD cmocka-1.1.5.ebuild 1082 BLAKE2B eadab061651126a8fd3b7d7ead56ed37fd19ab9fbfb996a7b2a6b33e447169e2129b7ef35f4ab45b8d2cef8543bc18722888fdf78165edd98a1babef344e521a SHA512 488cd981eed55f5240981a3eb63d6b86ef45ce1528c41ab24b04a734845c8e90f1ed315b445171a652e56e92a4112b597f1f90f1002bdeb3cb9db5f61842f101
+MISC metadata.xml 259 BLAKE2B 3044f05d4962d450917bbf89d1e3d1f97146baaa2eaa09f3318909ac3b23095296b4ab60ea7009752d7210838912803240c61e0a13e8d0f228096c08de64d9c8 SHA512 68f65bd895ef024776c04553356a38903f55b2976923374cdc3b89455f6c4adad0f2be4f3eb0d12c43c08e2feee2abe9b83e2e8af0d27901b4cda32e9d821d41
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 9fac25f3f3b1..eecc4f26cc8c 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	doc? ( app-doc/doxygen[dot] )
diff --git a/dev-util/cmocka/metadata.xml b/dev-util/cmocka/metadata.xml
index b659c1627a38..b1435fc3cec1 100644
--- a/dev-util/cmocka/metadata.xml
+++ b/dev-util/cmocka/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-        <email>creffett@gentoo.org</email>
-        <name>Chris Reffett</name>
-</maintainer>
 <maintainer type="project">
         <email>kde@gentoo.org</email>
         <name>Gentoo KDE Project</name>
diff --git a/dev-util/cmt/Manifest b/dev-util/cmt/Manifest
index f9f2b12180c9..d2a0e7d3e292 100644
--- a/dev-util/cmt/Manifest
+++ b/dev-util/cmt/Manifest
@@ -1,4 +1,6 @@
 AUX 80cmt-mode-gentoo.el 207 BLAKE2B dd882d2b5eafca38bb300bac4848792357943c954bcc3825bf5e1e0818d0bd0f12bf975a20dbe78e45bedad9dc6a1d122534b4e51ef8083bab828a0a241a9bc9 SHA512 a4006264cde07d84ab9171f48fa2d18c3c6e3fe3025acd55707d94f96dac9573e22e45196d784d9aa04f904fe0d3ee99e63f3a2aded00ee7d76a305728c1ae8d
 DIST CMTv1r26.tar.gz 2194291 BLAKE2B 9c45cc5440fd8698c06343a1c5c0f26b9047c885bb93678cf15ec42b15951d055d45511b221642c756c447709e7ace480fff4ad88f8185ee5390f227d4f2ded8 SHA512 412366dbf4aaef9f092f9472792e314c6d8f3e0360ddfa6d135e2bea9a167b627ddc78ad5a2d4f5139b4835abb68c06166abf3204bf5ba3969089923782e817e
+DIST CMTv1r26p20160527.tar.gz 2221004 BLAKE2B f9a57fcba7982e9d2f4c04f0c7f8f541a4b16a1555b95d0bad98cc1cd0cc5df7cbf7a6be37442c849451a78770749040ec001f16a53340e0cd3bcb68c3f6aa2d SHA512 36b3f020973d2ec518c25c589fdd981abd594cc8f7651c6636d72d5f6fed3fe6c8ba6128690533a9ab748abfbdc9b47d1b2289c99686031a8cc7fe9a43b68a6e
 EBUILD cmt-1.26.ebuild 2035 BLAKE2B d77f5b74e6e35019e28454712b4b4398959468ab433948fe98c16385a024e491cdb37ad49ff9d04aec798da954e75a8862875a5402a90bf82a31dd7c3f8b1b5d SHA512 e16d9e2d7da3ba148fa4e5ca7d1578ab4eba13b3953c851d06341cc188285e6d434b2b8a6fe8483916fed9ecf6eeaae0311fd30e9b891d3bcd782b979d80e2c0
-MISC metadata.xml 633 BLAKE2B 299f7f5b12cd6bd3b48cc753ef35ecae60140e8d38110becc5670c9fc6b555aaa22015d6895bded49353e19c8b1bc09e22997d13736a0089033c9ccbae0cede3 SHA512 e0e6c39d85e7a9f567561d76522a4e2b985f19969a686638717debee62ad7c94c0b2ae8fd1949c3e51d550c589de4fbfae793f8f4568e18a2ec1c9750c0fa7d7
+EBUILD cmt-1.26_p20160527.ebuild 1973 BLAKE2B 22fe31cbf51c2c94b80d2e3e3f0cfa3538769a62348b0ff3e6a84c3fb400965a7ba3c1214505727294d0a6d1ec06bf7ff4a4bb232328e7efbfaf1a5f1f767b2a SHA512 9fb0f8f17c0db75530c3b86f1c8f710743f9f7eee164edcbfd20b0a8757e1c3846950919c9b7c0f6f0830737a800aad55995fb40b002195cbe1157c7045d5326
+MISC metadata.xml 687 BLAKE2B c1a03a9fb7b5f7c5351989695ed4b0c1b5fa95bf1c199200eb381a3dcab98bc47b14ed1c1f97a60d611c0e8560a306f1df2ce2da9797177d80241dae9c15efd8 SHA512 0aac30eaf12f8776e11ec850f1286c3ee6ea1927f6d7ba11fd6d6cd134e9eb6ab3b363e5af970f9c1b9217a9901b5f7fbcb77b28ac8162adcd8b0c8f3788cab3
diff --git a/dev-util/cmt/cmt-1.26_p20160527.ebuild b/dev-util/cmt/cmt-1.26_p20160527.ebuild
new file mode 100644
index 000000000000..71772dec6211
--- /dev/null
+++ b/dev-util/cmt/cmt-1.26_p20160527.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils elisp-common multilib toolchain-funcs
+
+CMT_PV=v$(ver_rs 1 r 2 "")
+
+DESCRIPTION="Cross platform configuration management environment"
+HOMEPAGE="http://www.cmtsite.net/"
+SRC_URI="http://www.cmtsite.net/${CMT_PV}/CMT${CMT_PV}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emacs java doc"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}
+	java? ( virtual/jdk )"
+
+S="${WORKDIR}/CMT/${CMT_PV}"
+
+src_configure() {
+	cd "${S}"/mgr || die
+	./INSTALL || die
+	source setup.sh
+}
+
+src_compile() {
+	cd "${S}"/mgr || die
+	emake \
+		cpp="$(tc-getCXX)" \
+		cppflags="${CXXFLAGS}" \
+		cpplink="$(tc-getCXX) ${LDFLAGS}"
+
+	sed -i -e "s:${WORKDIR}:${EPREFIX}/usr/$(get_libdir):g" setup.*sh || die
+	cd "${S}" || die
+	mv src/demo . || die
+	rm ${CMTBIN}/*.o || die
+
+	use emacs && elisp-compile doc/cmt-mode.el
+}
+
+src_install() {
+	CMTDIR=/usr/$(get_libdir)/CMT/${CMT_PV}
+	dodir ${CMTDIR}
+	cp -pPR mgr src ${CMTBIN} "${ED}"/${CMTDIR} || die
+	dodir /usr/bin
+	dosym ${CMTDIR}/${CMTBIN}/cmt.exe /usr/bin/cmt
+
+	cat > 99cmt <<-EOF
+		 CMTROOT="${EROOT%/}${CMTDIR}"
+		 CMTBIN="$(uname)-$(uname -m | sed -e 's# ##g')"
+		 CMTCONFIG="$(${CMTROOT}/mgr/cmt_system.sh)"
+	EOF
+	if use java; then
+		cp -pPR java "${ED}"/${CMTDIR}
+		echo "#!${EPREFIX}/bin/sh" > jcmt
+		echo "java cmt_parser" >> jcmt
+		dobin jcmt
+		echo "CLASSPATH=\"${CMTDIR}/java/cmt.jar\"" >> 99cmt
+	fi
+
+	doenvd 99cmt
+	dodoc ChangeLog doc/*.txt doc/{ChangeLog,ReleaseNotes}.html
+
+	if use doc; then
+		emake -C mgr gendoc
+		insinto /usr/share/doc/${PF}
+		doins -r doc/{CMTDoc,CMTFAQ}.{html,pdf} doc/Images
+		doins -r demo
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} doc/cmt-mode.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}"/80cmt-mode-gentoo.el || die
+	fi
+}
+
+pkg_postinst () {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cmt/metadata.xml b/dev-util/cmt/metadata.xml
index 0f9287ff41d9..f4702aff8668 100644
--- a/dev-util/cmt/metadata.xml
+++ b/dev-util/cmt/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>heroxbd@gentoo.org</email>
+  </maintainer>
   <longdescription lang="en">
   CMT is a configuration management environment, based on some
   management conventions and comprises several shell-based
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index d707982e8713..49cadb38ba1e 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -1,6 +1,8 @@
 AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
 DIST coccinelle-1.0.5.tgz 5660596 BLAKE2B 9707e4773d165718b973e004e3359608428d8405d560d7013da66e2b1f0205f003ae0905c02a4f13c9725b39dc94710e5ccbc6b5b11ace66d7e87c3a303363c5 SHA512 0fee450554abc40feac9e745a252c1679f8016c82f04236e642e32e129618a950bb9657f1c447d62543289e95bbd4b1a8b0c6030373025c32a37068f82d30678
 DIST coccinelle-1.0.6.tgz 6684278 BLAKE2B b5b390488e818ce05c364f27782bd1c4dc63657a01c7564764d64faea8ff302c8409bb2ef172ce7ab7c2e00ae1a6f2c3bea76a1148eaf5a977f897d39a9fb23c SHA512 b667762ddf5ad30b126e93572cd8a8b3ffc21a790cd9d6df586e421c5db0a8d049af9587c6e5cb8f7a13f2c090ab2a9cca59ecba69069f9d3fe67b6f75dfe539
-EBUILD coccinelle-1.0.5.ebuild 2502 BLAKE2B 497c1c18a0e7a43185d2c9bc0ad261035e92b2fced0ca1219121aca1f8bbb188e041b9a0b1fe2d4f457268dcb664836ce347a92ea1a473f6922c43ad8399c50a SHA512 263c21c8829b259eda468cc94d1734cf0b9f24b259a70f0732226fd0fc5740e60534937e661810ca5c355be9d52a7a7c196908c3b3dab33cdf0e5d3e241857b9
-EBUILD coccinelle-1.0.6.ebuild 2510 BLAKE2B 0abd80374f80c8a963821c235d62d3f082ab8ed3873fe9ca3fb703f100db24bd3c852ca3c17326042e6e04fefa2c8228480d2830d600e5cfbb201b39d0ad9141 SHA512 bfefe6e28eeac5dd282c1a7ec65d6b9df8b14b4843ea4a85574f03e724cda8cd87e5ffda28a612486a841dc4387568d22e9506e2505374f63f5f6d13f8b32258
-MISC metadata.xml 245 BLAKE2B c68c7955a5435c284156875457d29684d1cf51160052aed21a27ddb02547e8c6c8b07a1732bca5a03815e9d080c4e7aa63407161cc651e993452b11c7fb209cb SHA512 d39bd1064bd876d0d1b68d1b84c86f1a2fc2bfd6cf52e7adb9fa6904c13bf09fce9761607d48e55b806fbf0af351c7cf1ad3f158c7f5571868702876960e6b29
+DIST coccinelle-1.0.8.tar.gz 2670961 BLAKE2B 0a11d325f8e39a76111bb9b14afb5dc6c1de07b94fce7904b6be021b17a9346f1b2e09550e6de221280fa9ff57e6e4a41b2e733189e16cc3a460065844015901 SHA512 496b1632c92cc026fbe28f784f56d4cd78f89a8ccd28dc7db1069c0c6b2b239675a10da305e37ed2a03c605668ecd3399aeed522f12ec3fbbf3ca07277ab7bce
+EBUILD coccinelle-1.0.5.ebuild 2520 BLAKE2B 21cb2b17924095a0bb34801e54e875acc1d5ecfc4a44ebe5d9c3839d987531d61393aaeea42413e367dd146e6287f66f18e309ec8b466f8de7d154f2d950f77d SHA512 8d9bdf6cac91445949df576c86ebb5008c4701c89d8f79e31289353d4d587386dd1ac3a0a089406d630585e98f685b9cd968023ee96441283547f9c72bb461b3
+EBUILD coccinelle-1.0.6.ebuild 2528 BLAKE2B 9918cee1c9c44938a4b40368ad83fef14e48864d6d74fcfa41f2e0943ce2acbf636177cd795ad36c4e229e2b4bab474e3d352e2526acc6203fc3b27ed54e3042 SHA512 7ba4005a4753c72059fb82d1b10f1c03d82bb56fbdc82b3c227986b3f87dfddc168fed3e7206740184f3e3fba2664d8635b558f0b9fde78b5ac4dda371555ac3
+EBUILD coccinelle-1.0.8.ebuild 2542 BLAKE2B 760cc934166f8fac65a5e172e9c71d2c5cab85ce3fbb3cffc10ab590a5c24e1e1e2a7bf395eac3abd5bff337ba57ab049ce9e41e5d7ea102ddc47134c1de1179 SHA512 e8a3d8090981eeed3b4b56c5260815934be39801d55e98e27871587aebfc3ded34292254252a7131e12a62fb7bcbe6aec12d3a3c4e5a2d9415e78458f8285a70
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/coccinelle/coccinelle-1.0.5.ebuild b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
index 598e875c240b..cc744143db9d 100644
--- a/dev-util/coccinelle/coccinelle-1.0.5.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
@@ -42,7 +42,7 @@ DEPEND="${CDEPEND}
 
 DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
 
-RESTRICT=strip
+RESTRICT="strip !test? ( test )"
 S=${WORKDIR}/${MY_P}
 
 SITEFILE=50coccinelle-gentoo.el
diff --git a/dev-util/coccinelle/coccinelle-1.0.6.ebuild b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
index 2ccd550333b9..18640ff2a4fb 100644
--- a/dev-util/coccinelle/coccinelle-1.0.6.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
@@ -42,7 +42,7 @@ DEPEND="${CDEPEND}
 
 DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
 
-RESTRICT=strip
+RESTRICT="strip !test? ( test )"
 S=${WORKDIR}/${MY_P}
 
 SITEFILE=50coccinelle-gentoo.el
diff --git a/dev-util/coccinelle/coccinelle-1.0.8.ebuild b/dev-util/coccinelle/coccinelle-1.0.8.ebuild
new file mode 100644
index 000000000000..a25a3d05e8f4
--- /dev/null
+++ b/dev-util/coccinelle/coccinelle-1.0.8.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib eutils python-single-r1 bash-completion-r1 elisp-common
+
+DESCRIPTION="Program matching and transformation engine"
+HOMEPAGE="http://coccinelle.lip6.fr/"
+SRC_URI="https://github.com/coccinelle/coccinelle/archive/1.0.8.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# ocaml enables ocaml scripting (uses findlib)
+CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/sexplib:=[ocamlopt(+)?]
+	dev-ml/menhir:=[ocamlopt?]
+	dev-ml/camlp4:=[ocamlopt?]
+	dev-ml/parmap:=[ocamlopt?]
+	emacs? ( virtual/emacs )
+	ocaml? ( dev-ml/findlib:= )
+	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )
+	python? ( ${PYTHON_DEPS} )"
+
+RDEPEND="${CDEPEND}
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+
+# dev-texlive/texlive-fontsextra contains 'ifsym.sty'
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsextra
+	)"
+
+DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
+
+RESTRICT="strip !test? ( test )"
+
+SITEFILE=50coccinelle-gentoo.el
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	if use python ; then
+		# fix python install location
+		sed -e "s:\$(LIBDIR)/python:$(python_get_sitedir):" \
+			-i Makefile || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable python) \
+		$(use_enable ocaml) \
+		$(use_enable pcre) \
+		$(use_enable pcre pcre-syntax) \
+		$(use_enable ocamlopt opt)
+}
+
+src_compile() {
+	emake -j1
+
+	if use ocamlopt ; then
+		emake all.opt
+	else
+		emake TARGET_SPATCH=byte-only all-dev
+	fi
+
+	if use doc ; then
+		VARTEXFONTS="${T}"/fonts emake docs
+	fi
+
+	if use emacs ; then
+		elisp-compile editors/emacs/cocci.el || die
+	fi
+}
+
+src_test() {
+	emake check
+	use python && emake pycocci-check
+}
+
+src_install() {
+	default
+
+	use doc && dodoc docs/manual/*.pdf
+	newbashcomp scripts/spatch.bash_completion spatch
+
+	if use emacs ; then
+		elisp-install ${PN} editors/emacs/*
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	if use vim-syntax ; then
+		newdoc editors/vim/README README-vim
+		rm editors/vim/README || die
+		insinto /usr/share/vim/vimfiles
+		doins -r editors/vim/*
+	fi
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/coccinelle/metadata.xml b/dev-util/coccinelle/metadata.xml
index 5d11763c17ea..6f49eba8f496 100644
--- a/dev-util/coccinelle/metadata.xml
+++ b/dev-util/coccinelle/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="project">
-  <email>ml@gentoo.org</email>
-  <name>Gentoo ML Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/conf2struct/Manifest b/dev-util/conf2struct/Manifest
index 31774d185361..c6b52ec31361 100644
--- a/dev-util/conf2struct/Manifest
+++ b/dev-util/conf2struct/Manifest
@@ -1,4 +1,4 @@
 DIST conf2struct-1.0.tar.gz 57393 BLAKE2B 7de4be755ec764d96a321c68ca68b3156889e24f6894ba78b1c88cbeff84525331f1105040d61b1121ca01ece8d50a5aee2268eb73cde3ebbc8b62f679e2451b SHA512 31e8f350af740e79d97f4698dfec9b5e8a31a8a1cee30da0af753db26eda5b61379e9156e1cb492aef5068a4987d5e8202215323b83328e99705ae3ad3c09b81
-EBUILD conf2struct-1.0.ebuild 746 BLAKE2B 3dea47468f3f014786e4afc60197ef9f9d2bc6940a779031043f7d222acc160423b6bb9b72ef38cdec5651c77077ca8b6b15e0adbe09c0914fc9f2778cbabf05 SHA512 9cc596eb33f72f9983021252e335fef30e38db9cdf565c70adcaa8efee40e1b9fe0e4109a39a0c621d5c8a844906c18689fefbc9894f69bbc30544cf00c60d77
+EBUILD conf2struct-1.0.ebuild 751 BLAKE2B 4654f087e4773d888890d334ce8a4d12677cd9fe29c8eeef624373cc93c5f7fdf02b7519f095ef57ac3596e812f4713b8efa9d29157646294f7def475529b733 SHA512 093c67b92d56739abefdcf6a98ba80f2e2ad7c36b8b66c781388715dbde889ad0ca07b8d02533b049c397fb8a010781f8e69ae23217960c0e9cd212b34b8ce83
 EBUILD conf2struct-9999.ebuild 746 BLAKE2B 3dea47468f3f014786e4afc60197ef9f9d2bc6940a779031043f7d222acc160423b6bb9b72ef38cdec5651c77077ca8b6b15e0adbe09c0914fc9f2778cbabf05 SHA512 9cc596eb33f72f9983021252e335fef30e38db9cdf565c70adcaa8efee40e1b9fe0e4109a39a0c621d5c8a844906c18689fefbc9894f69bbc30544cf00c60d77
 MISC metadata.xml 334 BLAKE2B 8a441ec6c49f135a517821de0933e09c01861a135a0a16cad200acb2a695cb04bdc5d4d6ab076b95d7f547a8771984ee3cfca0c074ad1c41db3df5cee2876f60 SHA512 db25be9a745a1ebef49e8e477e24d715453cfe0bb698dc8e42ccf3ef8d8aac3cc9693e3f2873f28b3096016741bbf3c32841f025a06bcee61e9138ac2f6ee8b7
diff --git a/dev-util/conf2struct/conf2struct-1.0.ebuild b/dev-util/conf2struct/conf2struct-1.0.ebuild
index b853d93f1b86..f05ace485dcf 100644
--- a/dev-util/conf2struct/conf2struct-1.0.ebuild
+++ b/dev-util/conf2struct/conf2struct-1.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/yrutschle/conf2struct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 13a6d9dff99b..7527a455d671 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,3 +1,3 @@
 DIST cookiecutter-1.6.0.tar.gz 255579 BLAKE2B 68d50bc51cc0fa2f7fa84bf77933ad27b4dbdd9c06ed459c5aad8d604256c205bad5434b19b1b93ee95fdf5bf211124558994a9204a79cdfc1e433576a0e7fba SHA512 0a06ae8fe7aceeeb0bcb98b5981d743b2e2e5d5f121c2e0703bb76399b0433816beaddb64c92f28d50f1781737db25907a10ec7b59f6c02c17171cfb56fb12f4
-EBUILD cookiecutter-1.6.0.ebuild 1227 BLAKE2B d095531ed247e25bcc50cd764cefded189b06fb65b6bf002743e6301e44ae0017a2c4d2cceb5934452d1c02d014d8c017b403474e3e20c3ad60c47249137cbc6 SHA512 4e0965c10ea7bb29553e06be3ba30ee5d752f8a7f6f06491dc2b38c36099f58427fddbff419d1f840e867b8db17626feedf6c1d5ce3e0522997d67cdbbcf40c3
+EBUILD cookiecutter-1.6.0.ebuild 1254 BLAKE2B 2a3ac7f8d4069ffd588251ef4ff38cc84460f9b23282b5dc8948042d4f7869c6d36254d18d4e949bf69a825ebdfc1f55cafc8e19202ded441be1f05f1a15c3a3 SHA512 debf30f1bcd6c3b830a01d0a9278debf7ca9d018e8142d46a362236cb2daa80ba23e48d30b89aa4f0e4532bb0e3e33495b7a527de7628f1de4b98ca2737f60b0
 MISC metadata.xml 329 BLAKE2B 3030c112beee6c6e136abcd0390ad47553f874ba5ec6f5d19d87f84d5c9d930ac71d2219c064944601a09bce7c9b71ce1257d1664070f749f4447e2549521bee SHA512 4c36a71c316a8f5b946668fc160685a293c25a292917baad1345fdbafa5108166cf50343cd5fd3627447b5af5a1cf40848488eb0085708b0ca032ba7c44d4101
diff --git a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild b/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
index f1a0e34e7456..316e0d972785 100644
--- a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/future-0.15.2[${PYTHON_USEDEP}]
 	>=dev-python/binaryornot-0.2.0[${PYTHON_USEDEP}]
diff --git a/dev-util/cpputest/Manifest b/dev-util/cpputest/Manifest
index 0efb20f33d7d..8124bdc6ebb6 100644
--- a/dev-util/cpputest/Manifest
+++ b/dev-util/cpputest/Manifest
@@ -1,3 +1,3 @@
 DIST cpputest-3.8.tar.gz 2722956 BLAKE2B 1da16c06d242703462dcaf9c6c26eb875c2622bcce4113fd0b990805d06ee7401a6776d2f0451eda49e7914caa59a5665a92387684ffb6dbbe884cf0fe07bd86 SHA512 a9592bdc9ffab8b42026ef2010f504e7e37d77fc2f197f89d23f7c9285a101059a0ec66418b914db0383974616d31b26addd1938fb27f45c3e7d9496ed0a0fac
-EBUILD cpputest-3.8.ebuild 511 BLAKE2B 8b1f275c74baf9a59790f57cdfbcd1639724d9aca33c7ada61013025cc7a457ff21a5bb2b853e3e918f012143603221a09c4389b39fa0c56bc5b5c50e435c39b SHA512 c7fa74a40acf842fe0cdbbba04c07f74eb40803f4df874d331314832c0b634f790b587c453dc50eb4b2d09bf0497019a354c13615816b822b8bc55f299ea06c5
+EBUILD cpputest-3.8.ebuild 518 BLAKE2B 05d994d0fd596aeeacc5428e6d18d81b82359b56999ab4eb5efebcf9a63b93c5123786dff3c92d38be8c2814a1cee1d62ea49b3a739462965073acf514a2c43c SHA512 06430a214145dff4f5c89e0957fa1a891971f9e0ccd13bd66cf390be0830400ff3c459a8b88b27a20905bcf4af0ff7eead90ec9aff68c645f67f60a2a64bc270
 MISC metadata.xml 249 BLAKE2B 67563a054eb11e858f51664b12ef99626bb7facd85bf2b520d81f3d9cb3cbdfda23ea18f48099df41e6e696a6827d4b9ea87165d8296d74a94b4d07181f2ec9f SHA512 d80d51464fcbaca1ca6bafb02f89caf99c6cbcfbd5450bd3b8c7d62243aa88c89070349002adf95565571f114e5b90d1b7d605fa501a7e95565800987b9c0f8b
diff --git a/dev-util/cpputest/cpputest-3.8.ebuild b/dev-util/cpputest/cpputest-3.8.ebuild
index f76d8b2c9190..9db2be1512cc 100644
--- a/dev-util/cpputest/cpputest-3.8.ebuild
+++ b/dev-util/cpputest/cpputest-3.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cpuinfo-collection/Manifest b/dev-util/cpuinfo-collection/Manifest
index d7c1c39de18e..747a1830b18e 100644
--- a/dev-util/cpuinfo-collection/Manifest
+++ b/dev-util/cpuinfo-collection/Manifest
@@ -1,3 +1,3 @@
 DIST test_proc-14November2010.tar.gz 95697 BLAKE2B 476cf9784d3718ca27f030bc85ca1f526db43cc740ae77fb7cd4b45fad13ead8645ab9a17fec1216d54da8390e04205960c543cf4205f9f6677afe38dafd054c SHA512 2f3b80d9b705b76911487b7349300b45622a3a49b9a3c2036d96220738e7fd525114b2523cc589b03d0fdf85ca4d35c28076ff193d1eb620d71765919058fdc6
-EBUILD cpuinfo-collection-20101114.ebuild 554 BLAKE2B c73e63d49e25b0d12c52556d7363d72019d10fda2847f6e682ed8009a51ac18866be8a391382b810b9599be86fab88f93ec826c9022236dceccca908b1223ed8 SHA512 917f53439da6b0a879c351e00b69db2b40c3984f6ce66d8dbc4f32baf03e6c435aaf65d4de504b81b35c378046cb2ed5e7124b9da67450d1d086c779f16e9305
+EBUILD cpuinfo-collection-20101114.ebuild 547 BLAKE2B 9a2ac43f015a026b3bf2c8927bfff98dc7b942cb12196bd56b6f6a557a840c1b57bd8858632bcc9d407305beaef8d4fa4f862ce0097f1fceb28355110e086604 SHA512 8337fa55e57220667c71222d366d9c937d82661a189b23e4e377f0ff1286a986f562ccb089cc3add255a57ef7010d2816b25f1cc33bd292e89337f8184537c4f
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
index 56b58f428226..b2a1451e175e 100644
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
@@ -17,5 +17,5 @@ S=${WORKDIR}/${MY_P}
 
 src_install() {
 	insinto /usr/share/cpuinfo
-	doins -r * || die
+	doins -r *
 }
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
index e4e47e09060d..ff34de9a3f5a 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -1,11 +1,13 @@
+AUX creduce-2.11.0-link-libs.patch 321 BLAKE2B a36440580e526169001e2dcfa96718c8a3dc0706a2abec7cb97e4a939898c5bea4abe346c24b06e480208cb9082b12459b29b28e3d0c07de5bf2010ef2712ab0 SHA512 d10edcb946fac2635dfe4fbbdf01f324144761729ac47465f8f4e9ab3d6b0f2ae6584393607076ad04108988d13dab49c65fe3254e90c3966f3b2cae57049df0
 AUX creduce-2.8.0-link-libs.patch 1038 BLAKE2B d28b790141a898c72e2102d25cb14a48c1a4ed6e0902e413510932be66b224ec28caf23c7bb3741c07be0ee6e3efbcd4c7bb9cd774d4239eeaec84bcde652d9b SHA512 1ce357c17cebdc9f81692c545c020358d52bf542f5235c8a7c6ff3c1740b08089909204841eb1e93035c8f069d372656fba4026fa8ee848d837228a2b7f7e20e
 AUX creduce-llvm-7.patch 4046 BLAKE2B 013685de9ad7f364cfff647a6f6783615dcd2289af8ab602f4119401373b6422385e63e1c5aaeec65dd6e922fae945f44f29f18bfe02b581b0a12f129f83e0b9 SHA512 9a0cd0373fa8e0bd14907e5522b97c3c4cdb89a3350e38316edfa6a75dbc5bbe53756c4b605385b1feda5674bbf17d92b4d2e21c58b4a937bd2c61e76e322b0a
 DIST creduce-095c551a5f9ccaf2986edb836e7be9872d36c233.tar.gz 724597 BLAKE2B 9d7a57349b8e14599c795a27bdf2cb4536f5b41f02faf10263c3d883bf94efd83ce7483bbf72aee0c2fe00d8515490e5f5a9c8df575abe80e90231a4373c9318 SHA512 a317bae5e47ee85b4be401d8dae490bd0ba86640aff6e7b0e9d6fe14d1f87199b4e12edbfa3eddcb5341b926a753dae17131f5e571362849c01377eda00407fa
 DIST creduce-2.8.0.tar.gz 774668 BLAKE2B d799372d107c0cb45e9ed95f82c29634fd9de053c4eda1a2dfce8b2152ca84f7fff5e7b679e21e6dbe869d139e1cfd73963c02751ad30809a3470316ce10e077 SHA512 9d616dc421d0e932656ab0220ebfe1a4f20a08d46bf4ee004ef96a693ff37caeadf96c769262574a9789ac52c2bb4586e2b8602f7d44b627229b8eb45f5af0ea
+DIST creduce-2a4480eb6cb72b3d2d131b536c883cc6d41bdcaa.tar.gz 732121 BLAKE2B dad2cf8ec2453a6b210a5303480e7dabfd978b7d7a1326cbc1e4ca40fa7c4e7d18da5f9309ca5f392740bbf55a1c9863e389c9789fceff062a68e9bb9a79de9f SHA512 c598f5c998f0a02d57006e640f88b951cd33a24f24507d6671067842b81bb3fe37c2fccd040b6cedb6fd5857396213e4003ee5fbd3040058050bad67226dc27f
 DIST creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz 720872 BLAKE2B 031104f5e7ca3d3cfb41087f432ec0cf1b1c125171ffac31b6f3b0a9a4483b5ca8a667331aacae7f5acdaaf99e8b688bb62b332405c1266d2b114a4bdceca9cc SHA512 36cc12015d85acfa99f0d04440184517da1f766df7a804ee02719f1208f67aff4f4db7af4066817b17efdc89a6d2cf7ab62b0c622a611bc9b03a89b8d1b68d01
+EBUILD creduce-2.11.0_pre20191110.ebuild 925 BLAKE2B 1156aca1369dbd88eaac790196b357a2e7220e0e42da4e558273b3ef9d6e03d06583142f113c72cc8f5ef3c87011fb393f7d8f428cd6104b6c153fcd35c69803 SHA512 23376f7fb03b8cebe50cadc27503e302953e004b0dd643fbd5ece9f88f20ff7046650bfa54e7faec5e2170b1129eca363b87fc1c46d91c13383ff29f5d45495c
 EBUILD creduce-2.8.0.ebuild 814 BLAKE2B 2fa4ada35468979232ad1fe3fc6624d09df764454188933dea519ac1adac1cbec5c839ddcc71fbe569c80b74ef5cba199bc912c88ae090cbbaf68ee3983a4dee SHA512 0ade02bd6ba2c664940bb5971e71d973132ca6708cd887daad785b911b2b0e0523a7316c23bac612c75b5475b52df670a1a7714be6faf36a63ff8dda2d5acb2f
 EBUILD creduce-2.8.0_pre20180411-r1.ebuild 935 BLAKE2B 7aa0a8ca0800a216918a65bf00fa6926f2210d688b2e6385e4a6147f9b913d365971923dff7a2df8d1da442ebebc9c6befb4e243175ceaab29572d0ed57411e4 SHA512 403502450479f91306f97d3462a5f5b300a71d5d618e8bc735189031c0a630cfecdc86d568b712fc2e50e8feeb504be4ebd58bbe84698e363d174a9e900a5a7c
-EBUILD creduce-2.8.0_pre20180411.ebuild 886 BLAKE2B 0e7f8cfab414f998d5b8a3872c14d680b6848f17107a77cf00738f3b3a4961289862a44571888c125db3dc3bd9a7805a5a72ca4641abdc3f7e79cf353f8f6544 SHA512 500c0b3462147f872fab9a1b27266a848adb2cabc39a40c591bc057176a78c23b785da6e37acbbd5a6c3bf8efd30ec3e3faec39bee9c1c9b7044d16edeecdb34
 EBUILD creduce-2.9.0_pre20190414-r1.ebuild 924 BLAKE2B 03291f4301e3904c44f37da65ebe48feb79d563289b1c9ba272999aabb911c989d2e9e96c2b6b967b4fb23883519bb6f6f8c134a0a1e7393e16a4a0ffe531e13 SHA512 f0e0a51f61e51c64646a85ffd8dd0c043d00d65cf709cce33cc4cf70ffb959a1499a146b65edddb83c204c16f031786b2482db502d9bb83ce9bbb657e6e55f48
 EBUILD creduce-9999.ebuild 786 BLAKE2B df04cfbb91ecd736b40dc5ee770cfa7b30f954d4f485d5986b08a35989df66642a4b7f25ce2bb4d1e681a6663d55d19113f6cf29584f341006a55d0ec75bf88a SHA512 f7aeb50d2e68f25e5ff45fa008f2c29bb540b567d5ee00172563992b8d8b5895bfd29bb78b42a58eaa14e6f7a0dc0ec30007b648f2198eb362c0e3ca447e7461
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild b/dev-util/creduce/creduce-2.11.0_pre20191110.ebuild
index b3bc269e1c6e..ade291feb317 100644
--- a/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
+++ b/dev-util/creduce/creduce-2.11.0_pre20191110.ebuild
@@ -6,18 +6,18 @@ EAPI="6"
 : ${CMAKE_MAKEFILE_GENERATOR=ninja}
 inherit cmake-utils llvm
 
-EGIT_COMMIT="48e622ba74bc35c5a81299d3a34b9b14038d6a70"
-
+EGIT_COMMIT="2a4480eb6cb72b3d2d131b536c883cc6d41bdcaa"
 DESCRIPTION="C-Reduce - a plugin-based C program reducer"
 HOMEPAGE="https://embed.cs.utah.edu/creduce/"
 SRC_URI="https://github.com/csmith-project/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-LLVM_MAX_SLOT=6
+LLVM_MAX_SLOT=9
 
 COMMON_DEPEND="
 	>=dev-lang/perl-5.10.0
@@ -26,12 +26,13 @@ RDEPEND="${COMMON_DEPEND}
 	dev-perl/Exporter-Lite
 	dev-perl/File-Which
 	dev-perl/Getopt-Tabular
-	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU"
+	dev-perl/Regexp-Common"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/flex"
 
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+PATCHES=(
+	"${FILESDIR}"/creduce-2.11.0-link-libs.patch
+)
 
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
diff --git a/dev-util/creduce/files/creduce-2.11.0-link-libs.patch b/dev-util/creduce/files/creduce-2.11.0-link-libs.patch
new file mode 100644
index 000000000000..3518003760a6
--- /dev/null
+++ b/dev-util/creduce/files/creduce-2.11.0-link-libs.patch
@@ -0,0 +1,7 @@
+diff --git a/clang_delta/CMakeLists.txt b/clang_delta/CMakeLists.txt
+index a94ec0d..764af02 100644
+--- a/clang_delta/CMakeLists.txt
++++ b/clang_delta/CMakeLists.txt
+@@ -263 +263 @@ add_executable(clang_delta
+-target_link_libraries(clang_delta ${CLANG_LIBS})
++target_link_libraries(clang_delta ${CLANG_LIBS} ${LLVM_LIBS})
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 4f9a5b49942a..8c0ac9d5f28c 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -3,7 +3,6 @@ AUX cutter-1.6-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba657
 AUX cutter-1.7-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 AUX cutter-1.7.4-python3-config.patch 800 BLAKE2B 33618c26a6b98330fdeaf8cabf6ba6578b2c889d851b06aad0fa7dccf7872010452c0b3d2bd0c1952835cf2d20e05e767d154634e5f21f139eea4f7154950ec6 SHA512 f0e3e6874a3dbcf88176676135896830ed57830066205cf380d13d9c2ba1495af63adcfa4cf55e4e10256d30b95a09948e9f1bc519b4717f7ba5e55090415264
 AUX cutter-1.8.0-python3-config.patch 1133 BLAKE2B ec9af0be413e7ce04dbdffe68e58e8aab5ba69e588d69aee85b93e13bacafebda27aa3eb4b0859e26b7043b1c8d56fd86353930278e624503cff770cfb052f0a SHA512 67a749d3763050b684740a7039150e675a72fd7f32395d7b00e393477be6a920f432e7ee75285a0035cbc110cb6fff7e15f41ac6ebb9f623245c6ab0c76b2202
-AUX cutter-1.9.0-python3-config.patch 1133 BLAKE2B ec9af0be413e7ce04dbdffe68e58e8aab5ba69e588d69aee85b93e13bacafebda27aa3eb4b0859e26b7043b1c8d56fd86353930278e624503cff770cfb052f0a SHA512 67a749d3763050b684740a7039150e675a72fd7f32395d7b00e393477be6a920f432e7ee75285a0035cbc110cb6fff7e15f41ac6ebb9f623245c6ab0c76b2202
 DIST cutter-1.0.tar.gz 614826 BLAKE2B 8f75343e57bf986d80dde3dc3ceb59675d28854744d8cc5fac783514e9c200595990d4860ee45db6544537d4f367df5b62a034e298bf273e44302edfa1647c84 SHA512 af6be59be7871d21d4f665e8ecb7f8224d99ccf7d62793e989ccd780ee521641c6ec0d941b46bb82770f5d44e5c0ef2efc29f9be303385e8e757e62a54bf53b1
 DIST cutter-1.4.tar.gz 1067162 BLAKE2B 2f7eceffcfb3c542695e03ec72de1c99451f8278e91f50abc2e87542efbd2cc73d5a52b0e5303b9cea751edf91bc71b63295edd5b32d1b2b9ed3a1443cfc92e7 SHA512 54caec67e57f2ff3908942c1ebd1e909c65204c6f31d0ec95e31f46e03364f309898006b93555ba81287c0d74faf407272226e5ec65b3148ecde8feec11ca3be
 DIST cutter-1.6.tar.gz 1083427 BLAKE2B d51b88f2b9dd2655ef58d7075086959ec3ed59ed4b21db81a792ee165deda523a4e59378c954d0f2aa5b0af25d67329ed2119c004edc402c9b593a3b230a6fd9 SHA512 83aaadfbaccdaa514606408868c050e22d0a80a749b98a9f6df929467a16e69b0d454b25ce1cf53e35ebbfb74e9b39e2bd390057488c9bb3992a442ca306c2f1
diff --git a/dev-util/cutter/files/cutter-1.9.0-python3-config.patch b/dev-util/cutter/files/cutter-1.9.0-python3-config.patch
deleted file mode 100644
index e2ab05564721..000000000000
--- a/dev-util/cutter/files/cutter-1.9.0-python3-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur cutter-1.8.0-orig/src/Cutter.pro cutter-1.8.0/src/Cutter.pro
---- cutter-1.8.0-orig/src/Cutter.pro	2019-03-27 12:14:42.436446303 -0400
-+++ cutter-1.8.0/src/Cutter.pro	2019-03-27 12:16:26.971448895 -0400
-@@ -118,10 +118,6 @@
- # Libraries
- include(lib_radare2.pri)
- 
--!win32 {
--    CONFIG += link_pkgconfig
--}
--
- CUTTER_ENABLE_PYTHON {
-     win32 {
-         PYTHON_EXECUTABLE = $$system("where python", lines)
-@@ -140,10 +136,13 @@
-             LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python
-             DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED
-         } else {
--            !packagesExist(python3) {
--                error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
-+            system(type python3-config) {
-+                LIBS += $$system(python3-config --libs)
-+                TMP = $$system(python3-config --includes)
-+                INCLUDEPATH += $$replace(TMP, "-I", "")
-+            } else {
-+                error("ERROR: Python 3 could not be found. Make sure it is available to python3-config.")
-             }
--            PKGCONFIG += python3
-         }
-     }
- 
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index fd7f44ef590b..782be8131692 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,3 +1,3 @@
 DIST d-feet-0.3.14.tar.xz 177064 BLAKE2B be1150cead543dab3daf1c8beae4047d3c32e60dbf9a73a50ef95fe62cbafbf6af9ab174c7f9128212b0d33aa111545b598c6aab6d359625c94f0029ca5f1a20 SHA512 1ea3bd2251693884592d375f1459681043b5185c341299dc28cbc8e4e05f3ff3a423c051b650806f6b930d8b89e0d751983ada7ad9a74b380f74f3205125b1b4
-EBUILD d-feet-0.3.14.ebuild 1042 BLAKE2B 0e24e26b8661c47987dc1765ac5e6b7c6caf7961f119ea29e41af307a8d76e74188d44b44372fbe45fc3c3ce71339ffd0f68b6a131406fe98d40490e975b2c4a SHA512 fe348cfc705e238a49852647785be482a10b88f90000e664be6a9795c32e1d8c04c11003780d992811957b9098207e2d8a5b72408e14dec92f13ed64c9a43131
+EBUILD d-feet-0.3.14.ebuild 1069 BLAKE2B 155c1a81e03abf0c16c534d88fe378a56b8697a0ac26fa96a634e1b04207d39d150fa4465b5627d56b3e84917de3813112e5fceeeb231bf331e902cd7a0daaac SHA512 25554d2fa41000ee7e205bc9bf1b3bfd9b7f80f5c254d48586c6616876e5705412d4be74c01517ae42347d2875cbe7a48325f598d28d053e898e0f9a25fc64d6
 MISC metadata.xml 251 BLAKE2B c20c56e3f057e8bba258876f96b8ef08720698ee3aea60b765a79b1ff134df44036e6a230e071bdac6e5350a3b494975859db42c9693cbf165627bfecc566efd SHA512 0f975a0edfae95b6d15e292492de323063860e21caa4cc1e0ad70509bc3d3ead872daa50c66817efc9a8820e565ab9126d11f20d5daddf5f86b2e96100a4b9b1
diff --git a/dev-util/d-feet/d-feet-0.3.14.ebuild b/dev-util/d-feet/d-feet-0.3.14.ebuild
index 5ec648d65c7c..08174ef46548 100644
--- a/dev-util/d-feet/d-feet-0.3.14.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.14.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 IUSE="test +X"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 1eee50ba27f7..bc4330169030 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,5 +1,3 @@
-DIST dbus-test-runner-15.04.0_p100.tar.xz 304760 BLAKE2B 0afe953376482276229ddf7a5f8e6b9a79c6ea6003f658b38f292099ec42d65b9c4a913f963bf013a2999066c4ad97bf7bc593074c1d393aa2d000d51d7f7f7b SHA512 4ff94fe022d69c0bc83b35fb14397fb59daa0b6a9ff9d7f0c93582bc5468ba6e495d4b95f9b4d8cb56f0b782d4582dc2cb67fc087aefa59295a3b40ecdbfa34d
 DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
-EBUILD dbus-test-runner-15.04.0_p100.ebuild 1072 BLAKE2B 73a7549bf47036e537d090918c501bf7da7884ed23f6a662b05407a70da22a7f98a6571cb680c6598d2ed6be28b0a4a15056b913256ec4009c12e2fdd96aa017 SHA512 77c5a806bf089f9659b1ec316fbbd90a08d70609dc427343923ab43d10e7d018164fda02adcd7a1ecda9f0baadf34e5fa4f9a71c2e1dc615b9feb866444d224d
-EBUILD dbus-test-runner-19.04.0.ebuild 1149 BLAKE2B 4e274fd843b698c2b30b836c170155e811d45aee4f6d9147cfa31a68a5eb006020d8a0e13cedc3a66b337199e73c84695d162af4896d861335a656693ed01eef SHA512 eed078ca42b583f09f9a22863acfc5c60406b7e041be7191529c95dc08998b3fccf618d0a2941a6a44e68d0a1891f3eeaf60c1459e4f3e27d45422bdd142006a
+EBUILD dbus-test-runner-19.04.0.ebuild 1171 BLAKE2B c3f4d3831f1ae23c292d6ec20a0bff50f19acb6381ff8073edcf10a863d4db9321cecedaaeab46aa812a2f4ba3d0bcda3cd425ce3c1cbc7297468eb10a7744c3 SHA512 d01e12bb399798ccfe778c6762add81d845b013f8b50ae92ab6ca81ca153f529233c9f8c62c2c6034d7a7fe0c6f3c307ca23ae3b07d844425c483b6b74c779ed
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
deleted file mode 100644
index 7b688bfa13db..000000000000
--- a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-inherit flag-o-matic python-single-r1
-
-DESCRIPTION="Run executables under a new DBus session for testing"
-HOMEPAGE="https://launchpad.net/dbus-test-runner"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/dbus-glib-0.98
-	>=dev-libs/glib-2.34:2
-	dev-python/dbusmock[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	dev-util/gdbus-codegen
-	dev-util/intltool
-"
-# now optional:
-#	test? ( dev-util/bustle )
-
-src_prepare() {
-	default
-
-	# bind to specific Python version (with dbusmock installed)
-	sed -i -e "s:python3:${EPYTHON}:" \
-		libdbustest/dbus-mock.c tests/test-libdbustest-mock.c || die
-}
-
-src_configure() {
-	append-flags -Wno-error
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
index ee88ee066e74..1ce3b43eece5 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0.ebuild
@@ -12,8 +12,9 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # now optional:
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest
index fcfed827af3a..95b45fc765c6 100644
--- a/dev-util/ddd/Manifest
+++ b/dev-util/ddd/Manifest
@@ -1,7 +1,9 @@
 AUX ddd-3.3.12-gcc44.patch 209 BLAKE2B ce05a8f213e505680297aa3de998efada5c4db48ea18fa3a5474b8aeb266fa85c582723ac3a9b52a7ece0ec7636782a1dc69d69ed073becb8dc834839e907715 SHA512 9373fee21d92b5661c659bcad0f9ce4bca25c86eba40d5d6e498f454cd56af225f290431bd79bfd98a6da5e49180ccb8fd37c144fb99e8b75c886c066e48b129
+AUX ddd-3.3.12-gcc9.patch 3409 BLAKE2B 752d4d8e36af49e4dcec6b79e3c3c0a0f8f55fcfba6fb882d3ba64a4016fc8d74a7eb32873be08194a865309e99b80a0d188d0456dd5dd770e7f280ed14172b1 SHA512 e148f6dcce1406d1ba2f5b83ff387c16bc914d6014077c465508085b9a595de539d7dc39b39a02e0db2e3e0b9704de748949767d31fb23657b40655b4052a580
 AUX ddd-3.3.12-gdb-disassembler-bug.patch 266 BLAKE2B a5658a1513adc116a81de7ec7bfb3eca4002043629a7b939970b8d902e1534d31df0ab8252a7dd2e5f998bc0df4d632bb5cb04662e81391b0e26e6a09809e35b SHA512 15ca238a9ac88c0736c861b962558f09be53f1bc85a5d46d6efb8d6c7ff6fc089b9f730dc0b691d65bbc40010cbd4d2cc4947f369d12271c214770114d533b14
 AUX ddd-3.3.12-man.patch 571 BLAKE2B 88f499833e47ae279beac8dbc4aadcfaa80e8c19f388b6dac3d724b284820472ca83ce81811df838e26d66d3bf1a558c9de8f51f22037b70cff3207f82104b40 SHA512 830115e517f754702892549d780003033e29fc0668824540cc63c3270e8445549896505a6584ccee104d94ffcf152bff679d946922f9d6fffc75d77abdbb8a59
+AUX ddd-3.3.12-parallel.patch 621 BLAKE2B 57446f5c7e797d7ddab5ed6aca01a5ffdc6af314bb797d96cfb357e214f1cf49153387635f9b585c53ebbcf7b06dcd6119b6bb2cbcaffa7d4382c4fbe9fdd181 SHA512 1157bec9212ffd4cbf86e8d36f68c80e9170091d09318effd800ce154f2b738e730db95e1e954c632dc25390e78cf88a9f1f3d14426df4069c0e5523f2dc6646
 AUX ddd-3.3.12-tinfo.patch 330 BLAKE2B f0e29f408f1e5e7fa40e386ab2a1f6786a9a14dc6722aef3fc8132558b624c233102b4290c0ba0e5d55b27aa4b25e6bcdd6fcd1b4ae237540621f3961e92bffc SHA512 a3cd3d59bdcce6c106d4488ec9a6c32d8baea49963f61e8e493a01131fd604664dca2e9e548852ff4c538c7123f5c1572bc54d6143340167fcdfa754002eb224
 DIST ddd-3.3.12.tar.gz 5687115 BLAKE2B 52c448eda46bfdc4f5720abda569a0c70f3680c3fdd543f6101c9af8c4c448496414c1c2a7be91590d9f14d0c8c2bb053a234d179bf900ca52df0ea8c2642131 SHA512 1249e4f5f25335f8f2c3616470f7a8f36262c00b8ac12b79f2b2806228de2831ebeb780fe09490e5e8b5b1ca108fe936ae70856f6a6ec02876fc75c7b4a7dbf3
-EBUILD ddd-3.3.12-r4.ebuild 2256 BLAKE2B 6fdae531b7aee21be37ca2c90c9e4042cbbb7388d42bedb5f198da4b7c4b2ec8793763eb4e24d50ea620dcf3e96be099cd50a550e0e49891bcae9f9c3eca1779 SHA512 a6614f1ad38fd3c479476f870b9c7ca09602d2592e5e2f9bff2005b441b0d88747ec5cad84268c0ef6670dc3ca5c1072f88d307a45dc3c807ddce629bf89981d
+EBUILD ddd-3.3.12-r4.ebuild 2335 BLAKE2B 92099e6daa39cbdeb0ce1d1ecb03f3c08e0085873c5c0106bf26fad4a1f9080cfe0436be99b78edcf2348f8a1d7b3cb79aee1a524e5d79ae060194a87a2d24b5 SHA512 f2d4b15fac0fccd3438b8ecaad982187860a6e8a3012fae004fe605c0c185173606d36120ca164c7cff8e89ca042c5397f75c5a4a6db11be34178dcc42474ff7
 MISC metadata.xml 658 BLAKE2B f2b35a9e08da89197aa56157e5d3c9adbc991d888cf798849bf7edf33fe6d9fd7dab16e0ea3068d20a836f85d133a570f3bbbcb9e57399c095292fa3390f59bb SHA512 8b304bbca5e836ff3032079f5dd2afea432b8f48e2c57575644adbefba0ddc4f64e3682f35f53c2804c27e950785ae8040f8704c05162acf302c6fb61b70c51d
diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild
index 4110ccf39cd6..2694f0cffacf 100644
--- a/dev-util/ddd/ddd-3.3.12-r4.ebuild
+++ b/dev-util/ddd/ddd-3.3.12-r4.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"
@@ -41,6 +41,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-gdb-disassembler-bug.patch"
 	"${FILESDIR}/${PN}-3.3.12-man.patch"
 	"${FILESDIR}/${PN}-3.3.12-tinfo.patch"
+	"${FILESDIR}/${PN}-3.3.12-gcc9.patch"
+	"${FILESDIR}/${PN}-3.3.12-parallel.patch"
 )
 
 DOCS=(
diff --git a/dev-util/ddd/files/ddd-3.3.12-gcc9.patch b/dev-util/ddd/files/ddd-3.3.12-gcc9.patch
new file mode 100644
index 000000000000..ce12a41c91d2
--- /dev/null
+++ b/dev-util/ddd/files/ddd-3.3.12-gcc9.patch
@@ -0,0 +1,93 @@
+diff -ruN -x '*.am' ddd-3.3.12/ddd/strclass.h my/ddd/strclass.h
+--- ddd-3.3.12/ddd/strclass.h	2009-02-11 18:25:06.000000000 +0100
++++ my/ddd/strclass.h	2019-11-22 22:00:49.000267420 +0100
+@@ -543,7 +543,6 @@
+     bool OK() const; 
+ };
+ 
+-
+ class string
+ {
+     friend class subString;
+@@ -811,9 +810,9 @@
+ 		     const regex& sep);
+ 
+     friend string common_prefix(const string& x, const string& y, 
+-				int startpos = 0);
++				int startpos);
+     friend string common_suffix(const string& x, const string& y, 
+-				int startpos = -1);
++				int startpos);
+     friend string replicate(char c, int n);
+     friend string replicate(const string& y, int n);
+     friend string join(const string *src, int n, const string& sep);
+@@ -864,8 +863,8 @@
+     friend std::istream& operator>>(std::istream& s, string& x);
+ 
+     friend int readline(std::istream& s, string& x, 
+-			char terminator = '\n',
+-			int discard_terminator = 1);
++			char terminator,
++			int discard_terminator);
+ 
+     // Status
+     unsigned int length() const;
+@@ -882,6 +881,58 @@
+     bool OK() const;
+ };
+ 
++inline void cat(const string&, const string&, string&);
++inline void cat(const string&, const subString&, string&);
++inline void cat(const string&, const constSubString&, string&);
++inline void cat(const string&, const char*, string&);
++inline void cat(const string&, char*, string&);
++inline void cat(const string&, char, string&);
++
++inline void cat(const subString&, const string&, string&);
++inline void cat(const subString&, const subString&, string&);
++inline void cat(const subString&, const char*, string&);
++inline void cat(const subString&, char*, string&);
++inline void cat(const subString&, char, string&);
++
++inline void cat(const char*, const string&, string&);
++inline void cat(const char*, const subString&, string&);
++inline void cat(const char*, const char*, string&);
++inline void cat(const char*, char*, string&);
++inline void cat(const char*, char, string&);
++
++inline void cat(char*, const string&, string&);
++inline void cat(char*, const subString&, string&);
++inline void cat(char*, const char*, string&);
++inline void cat(char*, char*, string&);
++inline void cat(char*, char, string&);
++
++inline void cat(char, const string&, string&);
++inline void cat(char, const subString&, string&);
++inline void cat(char, const char*, string&);
++inline void cat(char, char*, string&);
++inline void cat(char, char, string&);
++
++int split(const string& x, string *res, int maxn, 
++		     const string& sep);
++int split(const string& x, string *res, int maxn, 
++		     const regex& sep);
++
++string common_prefix(const string& x, const string& y, 
++				int startpos = 0);
++string common_suffix(const string& x, const string& y, 
++				int startpos = -1);
++string replicate(char c, int n);
++string replicate(const string& y, int n);
++string join(const string *src, int n, const string& sep);
++
++inline std::ostream& operator<<(std::ostream& s, const string& x);
++inline std::ostream& operator<<(std::ostream& s, const subString& x);
++std::istream& operator>>(std::istream& s, string& x);
++
++int readline(std::istream& s, string& x, 
++			char terminator = '\n',
++			int discard_terminator = 1);
++
+ // Inject names manually to accomodate argument-dependent name lookup (ADL)
+ // (aka Koenig lookup). The rule is that friend declarations are visible
+ // when found through ADL because an argument of the call happens to be
diff --git a/dev-util/ddd/files/ddd-3.3.12-parallel.patch b/dev-util/ddd/files/ddd-3.3.12-parallel.patch
new file mode 100644
index 000000000000..21624a2ab614
--- /dev/null
+++ b/dev-util/ddd/files/ddd-3.3.12-parallel.patch
@@ -0,0 +1,15 @@
+diff -ruN -x strclass.h ddd-3.3.12/ddd/Makefile.am my/ddd/Makefile.am
+--- ddd-3.3.12/ddd/Makefile.am	2009-02-11 18:25:07.000000000 +0100
++++ my/ddd/Makefile.am	2019-11-22 22:49:26.212765331 +0100
+@@ -580,9 +580,8 @@
+ 
+ # Make sure needed headers are built before trying to compile these files
+ # (Assume ddd.C is the first source file to be built.)
+-ddd.o: version.h host.h root.h
+-resources.o: Ddd.ad.h
+-show.o: build.h
++# MM: AND WHY WOULD YOU ASSUME THAT??
++BUILT_SOURCES = version.h host.h root.h Ddd.ad.h build.h
+ 
+ # -----------------------------------------------------------------------------
+ # Local Libraries.
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 466180c1b179..46238f374c44 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_12.6.1.tar.xz 501180 BLAKE2B 2d3382dc87eb8964dad81bcd03e15893c059a93ca4c39589cf9b41847840ee2c1ba25a73e6cf24b7e4da166e37f088b5e6e61a721f7504b7df44186ad044b944 SHA512 83f816abb522b13a98cfdc9dd2ad68c2f23a0d45b4acc55a2ce098066db2c83b52c47f2cc999da467634276a558d84960017247f0d23628fe4a35bd5ba0a2b88
 DIST debhelper_12.7.1.tar.xz 503768 BLAKE2B c61932be0c36df9cfa486eb61d1a4ac64af59c696fbe4e2ab21d85fe5031d659d25531a8650f235cc1a35d32a8b9bc2d67d7fbcd10401da09b2c7513849fa857 SHA512 4d15e45e47e1f6671f0b3b916b63197d394533e35d05c60719f85e945c47e71036a30fd952a33937d4151603a7b6100f41a0c6251b185c1ec3c78532f394c251
+DIST debhelper_12.7.2.tar.xz 511800 BLAKE2B e01bc5685c1e4803f2b1668973a6ee02c91dc6da0fd2c2ac1f1ddfce35531351ac38e8805667a23a4c63ea78403bf318957adad4c560771c58f4394fc691709c SHA512 b77b81a72d7c66f893fb6eae501c48fd80b49bdf19e691be74fdf8bcafd91a3f0d000c4ecd2aef80da18caaaa781eba9c8b37512ad260da708bc7b6ea3d7674d
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-12.6.1.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
-EBUILD debhelper-12.7.1.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
-EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
+EBUILD debhelper-12.7.1.ebuild 1534 BLAKE2B ed0daa11059dec73fd59525a40652eec26e3e3ce3501419b5acaf0785f39a130d05f43bead9c4fe565b8ba94e7a5a1c92a40e42654753d3db30329c84f256cb8 SHA512 c0b55b8dc50568b5cccabc80993a807c203d0401d282d349285ce1d12d06ba965bb4834ff22fbd37abd741db050f67173094b1bfc9a151fd9b28c82fbb0227b2
+EBUILD debhelper-12.7.2.ebuild 1534 BLAKE2B ed0daa11059dec73fd59525a40652eec26e3e3ce3501419b5acaf0785f39a130d05f43bead9c4fe565b8ba94e7a5a1c92a40e42654753d3db30329c84f256cb8 SHA512 c0b55b8dc50568b5cccabc80993a807c203d0401d282d349285ce1d12d06ba965bb4834ff22fbd37abd741db050f67173094b1bfc9a151fd9b28c82fbb0227b2
+EBUILD debhelper-9.20160814.ebuild 1532 BLAKE2B 6b9b3e12e88aad1ac2550ca77d2e35cb43f4a756f5501e1de8a6114da409ee9f58e5e5feb68b6ac2c3541745ed96d0a6e526b0cdf72f358b92fb2ea7661b93da SHA512 cbc6d7e14f396d1d1c877a68e05b70b390a3018adb106fffe0b76250dde578b782a35b6fb33f8aa6bb98c90aeed04536f85f7bde5bef217caf615fcf6bdce6dd
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-12.7.1.ebuild b/dev-util/debhelper/debhelper-12.7.1.ebuild
index e546013a4fd6..54960e54e86a 100644
--- a/dev-util/debhelper/debhelper-12.7.1.ebuild
+++ b/dev-util/debhelper/debhelper-12.7.1.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
 IUSE+=" ${DH_LANGS[@]/#/l10n_}"
 
diff --git a/dev-util/debhelper/debhelper-12.6.1.ebuild b/dev-util/debhelper/debhelper-12.7.2.ebuild
index e546013a4fd6..54960e54e86a 100644
--- a/dev-util/debhelper/debhelper-12.6.1.ebuild
+++ b/dev-util/debhelper/debhelper-12.7.2.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
 IUSE+=" ${DH_LANGS[@]/#/l10n_}"
 
diff --git a/dev-util/debhelper/debhelper-9.20160814.ebuild b/dev-util/debhelper/debhelper-9.20160814.ebuild
index 10f0449075ea..9da66079822e 100644
--- a/dev-util/debhelper/debhelper-9.20160814.ebuild
+++ b/dev-util/debhelper/debhelper-9.20160814.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
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 DH_LANGS=( de es fr )
 IUSE+=" ${DH_LANGS[@]/#/l10n_}"
 
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 4e2b563a579f..8c1714aa1971 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,6 +1,4 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
-DIST desktop-file-utils-0.23.tar.xz 132000 BLAKE2B 95273125dd8332db7438c3a4a7a5ecc4566d552c1fc9ff94a68fdf13f5fca74f943e02a10b1fb4417494f9fd44daa9f80c519215982cee8e082648027a010e7b SHA512 66a8ddfbb2be8edc14e16427e0dafa6fb1ef7491c816f19221fb5d5782e964cdcc3ae89807339f1c565af828aa83403cc56edeb2d03b3f93e013f3c5e9e6fe6a
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
-EBUILD desktop-file-utils-0.23.ebuild 1278 BLAKE2B 339f003d86658d055d84eea90216795c233a52709e11fa39441ffb6e635c8c3312395d4781a13e38b2d692f21e491481b249af542f6d5c0c8d893c9d168cd966 SHA512 c49bf596a2e77d4b7c1aba127834bcd8e73300d49478ecf5fcbaabee51b20b5c9b5711b8940b599526b50159cd15df1551307a559c55a4143de2cf52ca2c6ce1
-EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B e1913f2ef8fb7c69f949aa9d58edbc3038d1b9804f2dcadd245c7f74625e3eb1f98fb58d693c4cd87e7f59f5541c3fe84d3a57a2de16fa8f8f96683962c0018e SHA512 328e2ed90d83b6bd92c52701fdf469b5f8be5e4b7fef967cd5e203a36acc4ee2c9ff5e22d391cf68caa999978a37629a26f3b7b6cb2abc57be378d28a382da58
+EBUILD desktop-file-utils-0.24.ebuild 1276 BLAKE2B 323c5af708bd9e409c5505db430232f2038db06dcd55dcf066f20518eaa994158c4618dcba7c908342e83139befb9913b886836d7a8c67a47c1325747ebb9c5c SHA512 2e9cd8b796c3c63d7587b64d868663cb89abc27190b056d356b969ed9f93598c5538957d2a1bfdd3a44ad60f8f948c3a2692169dc7946fe05bc6a8e8bba2af9b
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
deleted file mode 100644
index ee934c0aec31..000000000000
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit elisp-common eutils
-
-DESCRIPTION="Command line utilities to work with desktop menu entries"
-HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils"
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="emacs"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-SITEFILE=50${PN}-gentoo.el
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-src_prepare() {
-	default
-	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
-}
-
-src_configure() {
-	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
-}
-
-src_compile() {
-	default
-	use emacs && elisp-compile misc/desktop-entry-mode.el
-}
-
-src_install() {
-	default
-	if use emacs; then
-		elisp-install ${PN} misc/*.el misc/*.elc || die
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
index 709be3da1778..24dc06c97027 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 1b946797c307..821964078a3b 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
-DIST dialog-1.3-20190808.tar.gz 537376 BLAKE2B 38c849ef12ae6c5fc703fe5f8d172c92ba9c6d498e163d622b5dfc7c638a7058fbca79ecfbf1f3e4f274fd53c6cce0d4ef0f67fc5efb8dc16b451064d609e214 SHA512 780cecaf68616723242426f9e78c772f81ec63f0761f67061c4fa06510ba9ca229c921ee15443b63c1581726751f79bf3e6d3b6b8148bbbb3a986043b6b82f86
 DIST dialog-1.3-20191110.tar.gz 540825 BLAKE2B 972d5b9d73c413274f09a590886838010feb55817ec94416dbf0da645824e92df9f7e02b9fbf22c226f2fa213876a6fa6de4f1af1ce94a93c53f22ede8d30926 SHA512 858a0cc095a4d52ce50bb77cc46a95ef64bcff1dc9526eb352b8d1d8884949186d1ea93af342eab8cf8a236efc9357bc5be2d1f1564a6f64536026bc1b894397
+DIST dialog-1.3-20191210.tar.gz 541569 BLAKE2B 358349c85afdbe9f1dc9c05b75337980c7ca3f7c6e9429314e8c24af722f696f12383b776828660441b5337c815fcf93b18076e0601e20dd940e0a8a304bb198 SHA512 4196287f26da2aab8376141a1442bccea52bcc6f7003042101df0c6a72aa3e25aa909d9fbcb937b047ab12a2e4349ec4b71b26f6e5cd4ba41cfd5665f732975d
 EBUILD dialog-1.3.20170131.ebuild 1255 BLAKE2B 831df9d13a2c298df0d1ce33df37e8afb19591cf414acd63ba69416fb8d64378ab5393f830700e4ac668866e15da8dcbd04f4a3f7195f4af6ed7ac59dc1e3e81 SHA512 7a0ffdd7014294752073462b59b1e0ff7fd0c4f3e35f7b92cadd434f623f7139b4f64d3438d8a7b4c4d37d470b6b788ac270d2101535e765746cc353a979e38f
-EBUILD dialog-1.3.20190808.ebuild 1254 BLAKE2B 4671e591866891cc9ca7e80433fd019c87487b8da40021c021090a046f4bef8fcdaac6fb95591395ecd02425c6da9fcf02560ed644f9a4cb3e4b1c860c8c82c6 SHA512 099f91e936ab8b5cdfebb43f6b54682a96cf43da25ecb08783cbd902f8ee71c307c9f31f6988127fc8a000858924192778b7d813f238dfe6036d345ddac3bf6b
 EBUILD dialog-1.3.20191110.ebuild 1230 BLAKE2B 0fb5f6b088617392e795d4743cb2a42ccedb5bf602cedb409e72fc33df6411e36e2885d63ab42e9fdcdc7f2c3b23f4a690126f9aac194ec0787fec459c9b44c1 SHA512 edd73cfbc608a1f7fe609c21bce4af53f63bbc0027e5ee700f0e32c3e899a6a2bab3bb74a1402fc4b4148b4e87616cb1c64c09d007ada7b1ab423bf9ff177196
+EBUILD dialog-1.3.20191210.ebuild 1230 BLAKE2B 0fb5f6b088617392e795d4743cb2a42ccedb5bf602cedb409e72fc33df6411e36e2885d63ab42e9fdcdc7f2c3b23f4a690126f9aac194ec0787fec459c9b44c1 SHA512 edd73cfbc608a1f7fe609c21bce4af53f63bbc0027e5ee700f0e32c3e899a6a2bab3bb74a1402fc4b4148b4e87616cb1c64c09d007ada7b1ab423bf9ff177196
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20190808.ebuild b/dev-util/dialog/dialog-1.3.20191210.ebuild
index 2177a5cb1e96..81549340ae07 100644
--- a/dev-util/dialog/dialog-1.3.20190808.ebuild
+++ b/dev-util/dialog/dialog-1.3.20191210.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils multilib versionator
+EAPI=7
 
-DIA_P="${PN}-$(replace_version_separator 2 '-')"
+DIA_P=${PN}-$(ver_cut 1-2)-$(ver_cut 3)
 DESCRIPTION="tool to display dialog boxes from a shell"
 HOMEPAGE="https://invisible-island.net/dialog/"
 SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
@@ -47,5 +46,5 @@ src_install() {
 
 	dodoc CHANGES README
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
index 7084b5128b3b..f8885b0cf95d 100644
--- a/dev-util/distro-info/Manifest
+++ b/dev-util/distro-info/Manifest
@@ -1,5 +1,5 @@
 DIST distro-info_0.14.tar.xz 26460 BLAKE2B eb34e31514f7acfd283ae9405132884ccae31b77d6cf7af3a8a341ac349d589cbd5d7828e763911fc490d6504edae4c90551b3d3cc3518eec1f47ab1dcc6ac60 SHA512 aa0055f21523e30fc7e9c94c92f87cbd05fc5d082ddc109d092e94dabafac7533ced984197797252eb698232b3d8f512b3c345ed6abef0ae074bf2770224955e
 DIST distro-info_0.22.tar.xz 29104 BLAKE2B 88eab833ea34de9e62f858e1fb9acfb94efb60114d2213b8bbb77a440c114dbac70a1707d1469113c1a98ea94d953ffa36480c132c294fd8e22b816a444b25e1 SHA512 b9d97e469b9173651c1816f39cc2315622b46f1579cbaba29c417a51417425e90a45283e83c7efee35db78621df08997f5395c8c1b0259f69e5cd91dee65793f
-EBUILD distro-info-0.14.ebuild 1915 BLAKE2B c9e3756cc5fddefb9323b86d37bec849dfb9009469001d8993280096115d33499a166999ee5ff2fed1c6002e8483638eb53fa7bcc17a81ac3d7b8faba60f7a64 SHA512 826420545318624a6d296944a2f51742e9151a0c49b9e9b69a969b8d63cf610fb45a142cb28bc3030e0398d8c11de0fbd065440153b0fbbeecaaba93c4543420
-EBUILD distro-info-0.22.ebuild 1949 BLAKE2B 0eb878daef459b89a2e048ba5bac2ae319eea1bb0bda08c68aed32abbb54a4dc8bd4e213cb14cad496fb00db5fe838369114d3743968123f0d7c6630765088ee SHA512 6d6825064119cb8a1f1fd476356fb7f44a8112858f57fbbd9d916bca91c1b9c7ce3cc0f18b8fcbf9e870537fa0d99c5a0ec19b376c5026e4afd932e539f9a5c9
+EBUILD distro-info-0.14.ebuild 1942 BLAKE2B 0380f71b8e2b429352ebf66b0f1437067a652bfbb03eaeb823a960df227b5dd9da322b8cd427e94c9a1d0de9c1878d89062bd5a01db861197ae150d491811d21 SHA512 9392836b2d10241ef19b7dee64135bee4e9579f29a53ca6ebe384e3bed214b1b29a3dd7bdf69607809953771d31a64593d7d99854ff43bfba6fa17be0cd5248e
+EBUILD distro-info-0.22.ebuild 1976 BLAKE2B eb03ca273aeadcb902909386fc24e43be9e68f646ccea5fcc6dabadd0b5d868af8103fa59ea2501a1f5e69ecd47b3e7be4738d432e9b1e42774c69c47e0317da SHA512 49bec6f2f9c9d9d6758e6aa70794c00575db1c513d659a26825b4446c6e41bbdf89d47f3999a1129ede11f8ef42ee6209e749bacd6a0da293a2741ba91de8566
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/distro-info/distro-info-0.14.ebuild b/dev-util/distro-info/distro-info-0.14.ebuild
index f8b1edfd3fd2..a360268d5bb6 100644
--- a/dev-util/distro-info/distro-info-0.14.ebuild
+++ b/dev-util/distro-info/distro-info-0.14.ebuild
@@ -16,6 +16,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="python test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/distro-info/distro-info-0.22.ebuild b/dev-util/distro-info/distro-info-0.22.ebuild
index 5eb8469e6df8..ab69bf260de2 100644
--- a/dev-util/distro-info/distro-info-0.22.ebuild
+++ b/dev-util/distro-info/distro-info-0.22.ebuild
@@ -16,6 +16,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="python test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index c4788b6f26ac..04a84e5cbfcd 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,13 +1,5 @@
 DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a99d14adc141243900fb4cd3d28bc87665bc6f466b31cd1e5561df31edd378049f0e38e28006206c3cf02ac0d5c21 SHA512 51eb538d5571b2e48722e4e4de6f9d6fc67375e55284f6bdec5c4c495a67e0808f9d158ba925849353bdff7903df2ecae7a073d88185fc607d45383f4f2f5c0d
-DIST drone-cli-1.0.8.tar.gz 2724807 BLAKE2B f8bdbd90687e59cf104d3506957616c13ddfae5e31bde0569eaa36644da40310fb24396cc49527b454478de7ef1e3cdcfa6b0b07c6b0f1b80fac9210ddd336e7 SHA512 67f7ab7c8b4d215564421470bd3894670b0b28fe8ffdcc9ed15be9081fcce380ad1ab791d463f09f441a28c17285f507b64fcd43104a369e0f8dbc39300ba91a
-DIST drone-cli-1.1.0.tar.gz 2725959 BLAKE2B 684d03de78c07fd3a901132734c0e8f9fef129f4443b9af33a1b2205168289e3bfb357faf21e5d5e63f6fae21d864a475575cb3d1f60a499b846963cde7814e0 SHA512 ba059250cf73982b662e5fb9f4570381ca4ff2618a759dc497f793e7bba7d7094cc28fb90390c61b642caab0ee5d33ddc1c5a25cea13c6aaea8e50ac24868927
-DIST drone-cli-1.1.1.tar.gz 2840804 BLAKE2B 393e4f0cabc30c322dd31b5d3c7bdd846a3960eaab532669020e55a7b83ca7884125a0c47c5a1540101b0ad6dbc3f147470e18164cbe4f79dbc93dc033081abe SHA512 bc75683a6aea1d11c22a635a4386c3c0ead17f15f0b59ebc692fa0a5a346e90b3e6d1b16bdc21f807c91080f3c969d254db2cefb07113b3e4b3409425eebacc3
-DIST drone-cli-1.1.3.tar.gz 2841895 BLAKE2B 8e44ed377064d7e08184f56457390caef7861bb1ab5512e4ec679cd6e9a0ca018311b2d8abe0df2323eaa9ceada89323517d5c934781093905121c3f6eb52123 SHA512 423c0907499119137fea014b4f6d51154f98b82f4fadf69852bbb0722ae29d9a8e62ff49aa19f92dfcaa676385acc03ef3fd2a51553369d607473dd29b1453cc
 DIST drone-cli-1.1.4.tar.gz 2843182 BLAKE2B 395501216d09f907897d3d5f7a64e93956786030a354365400e8ec73e2ecb361958f7f9468c3819a77908251450954c91db7369f803516ff2fbeb2050ad6efe7 SHA512 6a0df849f4086913137e36248925fea70e106b95225708bfd37b9a23199d4bed35c6fa18757311cfe23e8c8eef5d66acde207827a7220cec868ffe515539471f
 EBUILD drone-cli-0.8.6.ebuild 776 BLAKE2B 9981eebf320806719fb5eea97f679234a4b3c1972a7af8b529c26ea93232c444bd191f4be6911ed12b61c9df066edfe78944c2a37fa8a767374bdd3463449b53 SHA512 24cebe2e31938083b61b49d4d3357bd53e109d17a55e91a993bc902024625a4f9a6f4ada010264e8c76f01e92935f447d249a63b608c0a587d3ace08140e00d2
-EBUILD drone-cli-1.0.8.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
-EBUILD drone-cli-1.1.0.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
-EBUILD drone-cli-1.1.1.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
-EBUILD drone-cli-1.1.3.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
 EBUILD drone-cli-1.1.4.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
-MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
+MISC metadata.xml 328 BLAKE2B c17239362178a88bf5c7d3a268b0f91ffe89f00be35df57fc19fc0b08cb00374053c422d097b93b65ae05b3580a6e4c9b3fea63777e3a3892ab9eb3d22a8b90e SHA512 4a96b4fbecd4a36dd3e5d53e66aca7a75c8e4c4bdcf34bd2a2f36bdf09ca0bf38ceff6ab49454a4b9bbfb0849ae3d129c9b585feda80075f3c69e83a74639055
diff --git a/dev-util/drone-cli/drone-cli-1.0.8.ebuild b/dev-util/drone-cli/drone-cli-1.0.8.ebuild
deleted file mode 100644
index ca7f0b0fdc7f..000000000000
--- a/dev-util/drone-cli/drone-cli-1.0.8.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/drone-cli/drone-cli-1.1.0.ebuild b/dev-util/drone-cli/drone-cli-1.1.0.ebuild
deleted file mode 100644
index ca7f0b0fdc7f..000000000000
--- a/dev-util/drone-cli/drone-cli-1.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/drone-cli/drone-cli-1.1.1.ebuild b/dev-util/drone-cli/drone-cli-1.1.1.ebuild
deleted file mode 100644
index ca7f0b0fdc7f..000000000000
--- a/dev-util/drone-cli/drone-cli-1.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/drone-cli/drone-cli-1.1.3.ebuild b/dev-util/drone-cli/drone-cli-1.1.3.ebuild
deleted file mode 100644
index ca7f0b0fdc7f..000000000000
--- a/dev-util/drone-cli/drone-cli-1.1.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/drone-cli/metadata.xml b/dev-util/drone-cli/metadata.xml
index 0795718a1cc2..4acefc584105 100644
--- a/dev-util/drone-cli/metadata.xml
+++ b/dev-util/drone-cli/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">drone/drone-cli</remote-id>
diff --git a/dev-util/drone/Manifest b/dev-util/drone/Manifest
index 0e170c5d909f..ead225e4a51e 100644
--- a/dev-util/drone/Manifest
+++ b/dev-util/drone/Manifest
@@ -2,20 +2,9 @@ AUX drone-agent.confd 390 BLAKE2B 2d26f961515a3e2e33090b0d6e9fcb1435831df94fe998
 AUX drone-agent.initd 440 BLAKE2B 2ba0de82e2b952fcede927aa9d3f796ddc3d3268c6aeb16ba05661e721f6f8cb4900d8ea2655d44b195f7cf686e10830cb27b50000aa5ac1e7728218f48a332d SHA512 ad1571951a4d75e0a9e69da20958a70ef6558d2e15d4dc625d4004c28036643d1ec1756ccb4404860b385cb54ece2fd8d14b7a457d3696d8e7d3fbf0b1082a91
 AUX drone-server.confd 1238 BLAKE2B efa7a96761fb7f57ce2d34396dce7c3fafc12942e45603bd89334e16f99f81c35d9334a7db14de7f42bfcedca34577d0c60430cf8470c843cf736e77d1065e87 SHA512 bbe3944eca8d82afd3161f53d9359422b2fb8985e69facd781a81f1c55ec647e8647f0fffc284375dc091b15ab5d665669cd6a2818ff62f4afe255e0a22a21cc
 AUX drone-server.initd 455 BLAKE2B 73d173c4fb2c53826d6f0f9395a18dfc9802c01f23c28517ed784fc0713e342f6684b13995a8f4404f51b7504f7515c8a652621f6884b9e0fe36ae6b9ed1269e SHA512 969a7a1947c791bb8788b1fa4d36df1ead66c1312c8f4188970178ef7cbca3b9a108bce955a012285330155be15eb270a1675aee7d317c2cff4cb4554d461a38
-DIST drone-0.8.5.tar.gz 4766128 BLAKE2B 11c60896a8aced0aa6303ec049755192e473f742af45fcb6fe1509a3085cbdfd0c016e875a1822cedff9040abf08d238490430ac8f6b2136b31491207de1748a SHA512 a2be1082b6b923d432f4addaa12ec45a76f7edce0ac955c1d3eb812b3541c140919e6195bcee9ed218b92045a63b303759702ffb63831757177f44b2307be164
-DIST drone-0.8.6.tar.gz 4767466 BLAKE2B 708fbe2fb4e6a647e8fc370c39c71fdbdbd67abd28a18348985831c3bc8dee2880c64a2be01ce50c3dbe56d27ee89605ee2fef00e643a66c641a57f664867cf8 SHA512 2227bad9a0067e9c235c3a30677032b4b54488727e44c9caa6bd7dcd804338ed62d8f76879310499e7063d7e84d2b23a6b389f6a60a43f138ed2c83d8df07435
-DIST drone-0.8.7.tar.gz 4770079 BLAKE2B bc2a71c09fa7d1086899175bc7042e8bf57833088ec7d1edccf26385f4a6c16335d8ba56af471697c86d0e19a2ff838e69eaa9e082d64cb5b6029d7c84c6e425 SHA512 1451de48a9397b877a7ef668d15092ed1d0ee7c899bc025ff16fbbf9d78c2807d6989685a39bca03070f9b1188cd9ea23640dc2b7f2389d13228d178923dc7ed
 DIST drone-0.8.9.tar.gz 4767398 BLAKE2B 7c32f01a692e1a29e8b2e602a804bea3997efe01257f2fe5aa39f8d7f321f42f714b909a470f2ec7ee6d69bfdc2f06f75cb990e98769502b68725adc43ebd579 SHA512 97b773356bb770a8ca060e4696ba0d288a7204d0cffd966d1124a71ec1110981ac7cdce9ce4df04b8ce33faa745f853d59502b0bce5fc708435379924e3850ac
-DIST github.com-drone-drone-ui-4d60e46e3938c277e90de404cc6236530beaab3d.tar.gz 229886 BLAKE2B 3681f8fc5f380da3c7ab6dd5f34903f44fbe1ee5b309f5d1db25cd72347690249943814bd9e1ea3f4eaf04b14247bbf53e9a817dcfa5ad0e0bbc7d5d1585d2ea SHA512 4bd9909b82b31ed0b872d39da79fea161fdd1408d9da262b8a92c8cb884caf3dceb953ab522daaf8c96747cf4b22724e8e1d6234d80f2859a9ddd436fb513345
 DIST github.com-drone-drone-ui-e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz 230464 BLAKE2B 23641867938e85a716a8628209892861578d519e49b9e3aa70e08d9099b4628a744e5bb8bb3f622640ef1438eac50df21b5c32064328165c4aafc2496ca54361 SHA512 6f997ec14fa59859436ed995d52cce2105abab5aceca21c6740869c651078f1ffdcaff8b5a117d624d624cf47382f89824f7868dd8e8df3598d6e632db341212
-DIST github.com-golang-net-3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd.tar.gz 964447 BLAKE2B 8d912b7c34494e9f05fb1ee1ba11699c028ceaa138015b2139fbeec1cfc5784d48e4369ff32cba2f13ba0d1b987111633c0805dc5af45e918bf7c240360d22d4 SHA512 0605a3d42233cbb228e432520c2ef6c96cf6b4a0a59795bf0eca0f8251eb84120c9e3c4831a24308d2bb648984d2152b11e03e51bfb7e9adde7a3e8e34830054
-DIST github.com-golang-net-6078986fec03a1dcc236c34816c71b0e05018fda.tar.gz 940111 BLAKE2B f1b2a50d9aa73a7aa8f20cff17247c0b555fc14d64bd75dd320d8df8166d7ed0b29bfa15021f5f8251e6c3a1909217bc6e4ba3208f2bb010789a9449ef3a2296 SHA512 24d4d72a1a502c1f4f9523d85dde6070a1a47ea72860a00eb64812acf27cadd22ca4422575b1a58b1b55e1997e8fe959b645d8810e2c128ab09c73f9e81c5f72
 DIST github.com-golang-net-9b4f9f5ad5197c79fd623a3638e70d8b26cef344.tar.gz 968084 BLAKE2B d89bb8a09a497dd0adc2819e1c5e70b8c5bf4f3ff50bdb0b2f1293659cf6e01e8b97f4b8da310759d227371ec58b54749e41be02bce879b3bb6aa92dc08ab160 SHA512 894362dcc231ff03c9424d26eaa5260c1655c0add30df10ccbccafcc345bd40e127338703a776b9b8981f9869677b105771f349f5d4fff0da5b2c351af797821
-DIST github.com-golang-protobuf-93b26e6a70e37abb14f2f88194949312b0592a84.tar.gz 331818 BLAKE2B d00007a32b48ce04652edf7f7379f11dd381640ac2a22373a3b29bed54be050bb54dc35e0a76e095e0240a2e3b063aa35667d051c3933afc664dabbc94ee950e SHA512 2befd6db79c07c8f2c10a18364da51e4f292b26fdd7e42a7d533972c1289c91d1186c626177fda0fdea1982e9af06bf449d73d1be1a7239eb4dd926f8a2df920
 DIST github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz 332903 BLAKE2B b05fa3e3316bd6adbad623ab239795172ee70c38380873ee52a32c10f8f3e750c26b27fc43da4a290d82eda5723fd56063bffe01fdedb2d3a65bf5349abdb376 SHA512 80407835aef3553f655c35e89aa884038c90a3667460af1db60b069ae31e870efc59d6907743ee080d85e167c20d778440b9a6d19ff79f9055bc666c8314fe30
-DIST github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz 269725 BLAKE2B a62a3f96c49d77776103a9bece69b615e00d4140c9de8b42fb7edac979c8a8d172bd21062d3d6e24ae01dba10b320ff208ff8c6916da2d84118da448afc8caf7 SHA512 f64fa42e7ed9701860e16b1cdedc9f6b029630b6f534ee403ede1223c0c7542c731735995ea9763f093b56146776902b6633e5b1691b1f1dd4ab84dea0092099
-EBUILD drone-0.8.5.ebuild 1812 BLAKE2B d6eae0a8fd1522bcca6c7ad08e4305d6812f86bfe89d4ccf438bb1e2cef2eeb4e8a70b308ce5be7300ff2ab67df48f490dd5e995eee148d373ffa41c0dc479ce SHA512 077808dda006067faecd74149b1c7c01d08b32ce9cf96209e6d375c170b758309dcc6cf46e50a0a9ad94bef025c7ce1efcb348d5c04696114db5f06d48df1ec9
-EBUILD drone-0.8.6.ebuild 1812 BLAKE2B ea120485a659e5df726968281662c78acf84f104648244ee42d4919221e650b3a695dde6a8e5d8fdb82a10c14317b6bcae018d0c72c7c23bdaa7e7718875e35f SHA512 1e9ef7bfa863aa0b445fc5494ff43a097a81d52fa77cbdabf89e15495af8fd1016c57eaea7e83beaf5826b0bd6e3f4335205e0754f12aceb24cda94f8067c0dc
-EBUILD drone-0.8.7.ebuild 1809 BLAKE2B 8b0c91566f97633d96c3eefdf0f536890ba9748b9a871b7bed0c72793343e8fccc0657ff44607124effdb8b85ec498f69d466dded67212876638922f50d4042e SHA512 7648888b1089bc9372c53c84a507eeabf8e00a6c06e0e8088cb6d237307cb83d3f781f06d1e100d547a505ab9116adfb628cb1f51be78e0775b4ba6146e43f89
 EBUILD drone-0.8.9.ebuild 1809 BLAKE2B eb267d27e338c193b4649232750b9e871c4eb67bd3e4c793e31b34902b63b46896b187742701884793bdda3b2c8ab49f4ea9013356186725c6d1f942d954801e SHA512 07f35547e83859460abeb9a091bc1a71510194abe25a279f8ae0da9306e43e5a7c6b46bae0d83ec19e3ad991cff426e98e090720f19ac1df292ee26e77ca474a
-MISC metadata.xml 321 BLAKE2B 7e3819d8553451b8b4938040d4e25afd6a1b456c16ad7366b648274cb84a5a694f9a8d88f125023298d5e7e8f098de3c233d397cad44682813fca82329f55e5a SHA512 01b1dd14592873025099119b28c840eefa31d098e77de1e8e26ecc6894dad73778e4eb8d4df6232a2a444bc906057e8d7f853ecdc1f3091cdd27a43c19d8b950
+MISC metadata.xml 324 BLAKE2B 2f5dad4c234b0a91eeb7c488163b582cc880715f619b79afb24f561e5e6f61272490c7bc5d279de8cd1e9af323a2cf3b76291fabeec7a68d33861db3c7de6112 SHA512 8a0d7987468135f67e46b416446eb38150dea624513daddb3815b5bff5a19a0c73de4a61d09e637b8563eec2867e24473afb4712f37d4fe965b405380dc9aeef
diff --git a/dev-util/drone/drone-0.8.5.ebuild b/dev-util/drone/drone-0.8.5.ebuild
deleted file mode 100644
index acf6c6eba84f..000000000000
--- a/dev-util/drone/drone-0.8.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone"
-EGIT_COMMIT="81103a98208b0bfc76be5b07194f359fbc80183b"
-EGO_VENDOR=( "github.com/drone/drone-ui 4d60e46e3938c277e90de404cc6236530beaab3d"
-	"github.com/golang/protobuf e09c5db296004fbe3f74490e84dcd62c3c5ddb1b"
-	"golang.org/x/net 6078986fec03a1dcc236c34816c71b0e05018fda github.com/golang/net"
-	)
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
-HOMEPAGE="https://github.com/drone/drone"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata
-	dev-go/go-bindata-assetfs:="
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
-	GOPATH="${WORKDIR}/${P}" go build -v -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
-	popd || die
-}
-
-src_install() {
-	dobin src/release/drone-{agent,server}
-	dodoc src/github.com/drone/drone/README.md
-	keepdir /var/log/drone /var/lib/drone
-	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
-	newinitd "${FILESDIR}"/drone-server.initd drone-server
-	newconfd "${FILESDIR}"/drone-server.confd drone-server
-	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
-	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
-}
diff --git a/dev-util/drone/drone-0.8.6.ebuild b/dev-util/drone/drone-0.8.6.ebuild
deleted file mode 100644
index 4c2c80d9fb69..000000000000
--- a/dev-util/drone/drone-0.8.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone"
-EGIT_COMMIT="c48150767c2700d35dcc29b110a81c8b5969175e"
-EGO_VENDOR=( "github.com/drone/drone-ui e7597b5234814a2c2f2a7f489b631a76649c335a"
-	"github.com/golang/protobuf 93b26e6a70e37abb14f2f88194949312b0592a84"
-	"golang.org/x/net 3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd github.com/golang/net"
-	)
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
-HOMEPAGE="https://github.com/drone/drone"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata
-	dev-go/go-bindata-assetfs:="
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
-	GOPATH="${WORKDIR}/${P}" go build -v -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
-	popd || die
-}
-
-src_install() {
-	dobin src/release/drone-{agent,server}
-	dodoc src/github.com/drone/drone/README.md
-	keepdir /var/log/drone /var/lib/drone
-	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
-	newinitd "${FILESDIR}"/drone-server.initd drone-server
-	newconfd "${FILESDIR}"/drone-server.confd drone-server
-	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
-	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
-}
diff --git a/dev-util/drone/drone-0.8.7.ebuild b/dev-util/drone/drone-0.8.7.ebuild
deleted file mode 100644
index 1d22c76c9554..000000000000
--- a/dev-util/drone/drone-0.8.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone"
-EGIT_COMMIT="08739aaed9e95fad15fcefd5cdfe11d7ca66fcbf"
-EGO_VENDOR=( "github.com/drone/drone-ui e7597b5234814a2c2f2a7f489b631a76649c335a"
-	"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
-	"golang.org/x/net 9b4f9f5ad5197c79fd623a3638e70d8b26cef344 github.com/golang/net"
-	)
-
-inherit golang-build golang-vcs-snapshot user
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
-HOMEPAGE="https://github.com/drone/drone"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-go/go-bindata
-	dev-go/go-bindata-assetfs:="
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
-	GOPATH="${WORKDIR}/${P}" go build -v -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
-	popd || die
-}
-
-src_install() {
-	dobin src/release/drone-{agent,server}
-	dodoc src/github.com/drone/drone/README.md
-	keepdir /var/log/drone /var/lib/drone
-	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
-	newinitd "${FILESDIR}"/drone-server.initd drone-server
-	newconfd "${FILESDIR}"/drone-server.confd drone-server
-	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
-	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
-}
diff --git a/dev-util/drone/metadata.xml b/dev-util/drone/metadata.xml
index 5a7b39bbcff9..cdcaf7c178a5 100644
--- a/dev-util/drone/metadata.xml
+++ b/dev-util/drone/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">drone/drone</remote-id>
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index f92e55f5d591..9ddd6378a8b7 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -2,8 +2,8 @@ AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb0632
 DIST dwarves-1.12.tar.bz2 112400 BLAKE2B e71051041dfdbefc603dc041303de82e2e44c8b0f4f888577722466aaf7958cab7b04c15154faa8cbfcaa44fe60fc549e09b2fb68747cc3cdd08b8bce487cfdf SHA512 20644344e694253b79ede65e489696a319f10eaf424af81882414ae6efeaf34a82132321430d647916b78f97ef504907b3bd32919420f2cd14384910e283ff27
 DIST dwarves-1.13.tar.xz 222008 BLAKE2B db73f5c9a319a1a57ef37127350a9da117e3f5c89e199445393e3e312139ce8f88f46e6e5bbf302d708c0b075b1c2b2cd75dc7bc213ed144d1db792c55358220 SHA512 26485b183b4c7b608dd0392f9155dd570a14c86fdeafee232e44ad30f14a1357b408b61b0e8a31ea4bf976ed7fc44e7d5a4a3ccede9713c47265ad52c13dadf0
 DIST dwarves-1.15.tar.xz 222272 BLAKE2B a33d128ec899da0f0a1e2fc96703f0425fd1a2082675ddf886df55507b29b5fbad1a1cefd6b0a9002f50193b4c70f87a2eeacd50d94388776bb338fe678849e0 SHA512 29a8a15b7190480e79c2f423c7104d0fd275cd4c3df17518a1dd3c63cce1c528fad4b6f580baa397d9aa9323703009009e2d529939b12dd1af2c65cf7120b237
-EBUILD dwarves-1.12.ebuild 1038 BLAKE2B 9cb69f3108df21db6c39c359129df606083374ba7a9dff0b8338dcaf9ca96bc1b85be0c135d7c2e8b76a60e1b391ed6c4abcd9eeacfc75fc6eb8526f0a2dc803 SHA512 9ba86d1966a769c43202fa8152617e6af65a0f967433aedfe69461857607485c26d1d51fb8dc5c5b2e48a55d9c8d1c67c54d0d64f3b837a9438531e1d2ffe51e
-EBUILD dwarves-1.13.ebuild 1034 BLAKE2B da7070d039e312e088bdc3b17f946e75a087b11ccc6e23c09a4b7653e9e06b9d5f79722a7f28eee9004cca098a18d2b1990ce167ea8551affa9fd0e6b3e9edff SHA512 814470568799ebb37f19c0032523406d10a6847b7d3f262d0cb350f05453485b3fafd265e0887a568d111eb641654b65302093361cd0390c54a951356e96d3f7
-EBUILD dwarves-1.15.ebuild 937 BLAKE2B 9877aa830233e83570c0afa0e246fb62fe5f8d613180ddbef491c276a73213f06485f2e7715d004c7bf863c9b024b6d314d0cd2239050a9d2e296ec4b44431b6 SHA512 748b90feaa300de0d430d7334c09fd2a6fd57957e972bacd2fc5168a537e5eebba78dbe481854ee2af964214d44c4a6ec480a3c0153ca00233b043f38941529a
-EBUILD dwarves-9999.ebuild 832 BLAKE2B f23758209db4d06c28133170d0b9289a13230538d4c6127d6e3ab5ec618608d3278cabd7e26b8aa9b9657eef04d4081cc5098b568456ffaa31121cee01f3e9f1 SHA512 6203a3a161be5e1f01e909208ae1ed04b66a54d913bddd03c823c520f8556c3a196be050beb7d963cfb7ed4bf1603a9cfd936f3dbba6b0db01d613818136e0b9
+EBUILD dwarves-1.12.ebuild 1062 BLAKE2B 2e436733a3e3525194482c9f2d2d0327a51a1b6b49454dfce06769e01546eca86ff2f603e78fc0c4ebf1a000eacca8d0e86dd4b30db062ceee22303d75ca2422 SHA512 cbd4523e3135ad2d3b5336ecf970af7a7172f67e2b9a0f17919403d66f536a63654fd623ed37fbb200e2431c7af661181ce5270c4e61763fde7753991c1e9f68
+EBUILD dwarves-1.13.ebuild 1061 BLAKE2B 729f6f13b1b030171888139074499c0841ebbfa9ec4b1605706c3a1defda1a18bc5a56c41c89221b0ef78b294f5f8dbfea19eaa06dc4f0680af8eeea853c8c52 SHA512 a7aa494a88ac6f476d5001c2dfba81d1c372b3b4baaf2bc3a677cda395776b2f8c3eae60f151ece20a62e9d68a3922340ead94ce66f4bab0e181c741ef86e5a6
+EBUILD dwarves-1.15.ebuild 964 BLAKE2B 4cf5b6c4c76940c3c86e83e70bced706fa192811f2dc20f354faf418ca444ec8dd5cee02251c3e137a714f64bbc5e3d4f116e10d95fb59ccc1032178c572c0f0 SHA512 2060b58bef02713bb93df2f62dc0f5bec63559d936b1626a1001016c01cee7c16e692a1c38442ee9bf075055387bec41853d64b2cd57aea75b3fdef59ee5bb2a
+EBUILD dwarves-9999.ebuild 856 BLAKE2B 72d49b4d7ef38a76d1da5e4445f3b2958015e35f14838a35cc9abfa1dd065f011f7f6aa3acc5f92b29144df6d53b5e9b8d8d8d4aada03081ba87f597b82387c6 SHA512 4529b4bcdef652fb4453e6a9a8e03a4508c5fe60f4bcfdba4a9b5bd5b2ff25393dcfb1cfff5e82409a48d70e9664004760cc9cb64d0628aae5e6348acd41db79
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.12.ebuild b/dev-util/dwarves/dwarves-1.12.ebuild
index 13d4797c399f..bcd44c849ea3 100644
--- a/dev-util/dwarves/dwarves-1.12.ebuild
+++ b/dev-util/dwarves/dwarves-1.12.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
@@ -17,6 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/elfutils-0.131
+	<=dev-libs/elfutils-0.177
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-util/dwarves/dwarves-1.13.ebuild b/dev-util/dwarves/dwarves-1.13.ebuild
index 5af51df1a8e6..cb99e78f1ffb 100644
--- a/dev-util/dwarves/dwarves-1.13.ebuild
+++ b/dev-util/dwarves/dwarves-1.13.ebuild
@@ -17,6 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/elfutils-0.131
+	<=dev-libs/elfutils-0.177
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-util/dwarves/dwarves-1.15.ebuild b/dev-util/dwarves/dwarves-1.15.ebuild
index c941fbf53474..d4a49fba59f5 100644
--- a/dev-util/dwarves/dwarves-1.15.ebuild
+++ b/dev-util/dwarves/dwarves-1.15.ebuild
@@ -17,6 +17,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/elfutils-0.131
+	<=dev-libs/elfutils-0.177
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-util/dwarves/dwarves-9999.ebuild b/dev-util/dwarves/dwarves-9999.ebuild
index ad35a947177e..75a15ff54a89 100644
--- a/dev-util/dwarves/dwarves-9999.ebuild
+++ b/dev-util/dwarves/dwarves-9999.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
@@ -19,6 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/elfutils-0.131
+	<=dev-libs/elfutils-0.177
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index a585e5f95493..9abf6c0107a0 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,6 +1,9 @@
-DIST edb-debugger-0.9.21.tgz 1042641 BLAKE2B 8f81e6629df3b74e7f670a35e7e92220f33732d34f01c56475b70cff4e6f479908b0fbfaf418625be8ca2fcb45ac9805f725e1e6eb7eb66a899d754446445e29 SHA512 de921fa866da7d83efad92797bebcac3544ba1ffd5b3a015865b9bd554e8bc2e43539a9e4648517aff37f7d2497fdc4e1f6dc63df5cb0663012662626b1964f7
+AUX edb-debugger-1.0.0-climits.patch 607 BLAKE2B eb1a58c250308ca84a145f0a1333314437b9d6fb8636db8a5f6f46c6627d464f566a1d629391d5475e62ace85ffb94c387efe084301744a3a7b43ff70a25c851 SHA512 812f33bb0ed0ee83a57179701bdf8e25d70e9de73aa6f6d5c36674e4f16a124926940ce584f08537b4553749996e7c7d346bc42a8803a51ba3bbbfc968262ecf
+AUX edb-debugger-1.0.0-man1.patch 814 BLAKE2B d4c9540e0ec31b3a18d36126f92ebf850d3ca9768e6ae3d5c92d1f712f2a6542b72fe6c50dd30033a380cded0500996554c78fc0255179ade6dafdea66ce9673 SHA512 20b777ca2dd249140895658c610f74d770c757a8327f73bed7754de11bb6c50faa6fcbc71fc12ead9857f22fbc5dc20e950d2f1b1308565c02cd32fca789fc97
 DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c112a1cf5fae6ac32a66a5535f2d4f60c00673c290bf14e63cf24ba2927071ee80e58c68d213b11fc55530f428fa4b SHA512 d15a3d167b90b70227f273c416eae56f7ad174daae608081364284021c7da7aecb6cb42f9c5bcd85f9df70f07cba213d8345ef9d62e8d13c79e7edede38a04a9
-EBUILD edb-debugger-0.9.21.ebuild 2064 BLAKE2B 5e72e1670db4ef64d840a0d41f0b961fdd63003d40b06c92f129e0f63a1f5e0e7a051219bef9eb0b2826c020a943bda6a952e6c4a1ed5dd5392197e0d0216385 SHA512 3057033e815a93d42558904216f22ffae56d0a3a8afa99c0b000060cd185ae52059f87ce904f5fa9c1149f37536a1b1b6c61c0ad72e6ad0980d637fd80fc640f
+DIST edb-debugger-1.1.0.tgz 1244028 BLAKE2B 87311a53f445acb28569952541269ef5ae83219468e18bc1603b6d85225b75fd00723593891e309ccf8c8c3e7a0828cd709444fe27f3328cf4386ed3e1245bea SHA512 5834cf091cd6d84ecc10cec277ec954b936dc61b0809d5f434ba4d604fae63c06ac10852f1a4ea81f150dea82645fa0861d8842eea227cbde681a895c465d744
 EBUILD edb-debugger-1.0.0-r2.ebuild 1090 BLAKE2B 5ff08750c0014efabd46d0531035f4c7761f5c2f3c111f317a938b942720e5b8f8c78eac555803ffd4af5db32991a48f1497c1029b6e847298651bb7c9fb1864 SHA512 cad7a47d3511372561eb62186b18272c4750f05f84fcffc01dff3f35ff3886f15d026add49dc785a1b03dcdf5594574610f3bbc967999ef5720e17d16a7cd55c
+EBUILD edb-debugger-1.0.0-r3.ebuild 1168 BLAKE2B af6bd89216181d5a7130bf0967483feac79fc5f63b0b446584405e61515fb89c13ada298bb6fd0e1a079e099c08ee0cdd31d657896496d282b9b01c391e6490e SHA512 b33c9ec836553ebca21238a27cba961480cac68a6981431c00bf2c7e18e19d17b712bf4ed7dde401947f4210be0a89f1cc9efb45a7761c29a0d483b7e108830f
+EBUILD edb-debugger-1.1.0.ebuild 1110 BLAKE2B 6eb994d8bb43c53ae568d88f313e4ce7a0d80d8608ec46dc14c69040d108e159df59080462f46dd2426d9dcc62f9011e84e77b7404149c194c760ab99ca64f94 SHA512 907ff2348a0a9f23822f97bc4a8f5374158a6ac13d6f2cef65ea4d0d5ef9aeb8681b67eb3c5f687401642adb2dd90b7893fae6ffaa8dae6bc374cb50ec314fa9
 EBUILD edb-debugger-9999.ebuild 922 BLAKE2B f2d5453d64c1608e64832bdcb30c1fb4c8f7af715f9b3b901c193c1149222b16e39361069b61599a47b5a184c884ccfae9575741b25da8d0fb6657fcfa9c88ec SHA512 48f54cc3d2c7b1a536cabfcbb279f846e5edee2fea578a9bc1e0f2eaf442428189c98ea3cc2b8ed184d2517bebc5bcb89d9b24aa4dd04c177a71b45d69b291ed
-MISC metadata.xml 625 BLAKE2B 892c86b51532607c2387d664df6d8d468f1dfe1de27475d4e528a63c04271daf586dd5be8c70e202a7dbadd7c36e9f8e9da970df1cc56ed0c8c9e36e0bd46805 SHA512 7e399f334c4462f200e10c482110de80940ad5f28b6965a227436b6e2122e574531745c3e4dd64f95490797ac537264cc93c96e5293d57fbd657939241b0fe4c
+MISC metadata.xml 580 BLAKE2B ca6847b4ec53715b5d408e36acf6753a8da4bfb7f8da771bab017daaa92c6b7d34e9100662e209626d49e9a45d1b0624015f46ef83aac0db1b23902521731aaf SHA512 75333f5eba045b2a70efd901680f80781291e85ee3498fb65e9ac8eabf6ba466525eb0f87093d1f173742b01e53d50a8bc874a2a83689c2ae62e90a7dbcbe077
diff --git a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild b/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
deleted file mode 100644
index e6f1a158575f..000000000000
--- a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
-HOMEPAGE="https://github.com/eteran/edb-debugger"
-
-LICENSE="GPL-2+"
-IUSE="graphviz legacy-mem-write pax_kernel"
-SLOT="0"
-
-SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/edb-debugger-${PV}"
-
-RDEPEND="
-	>=dev-libs/capstone-3.0
-	graphviz? ( media-gfx/graphviz )
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	"
-DEPEND="
-	dev-libs/boost
-	virtual/pkgconfig
-	${RDEPEND}"
-
-src_prepare() {
-	#Remove this in a future version; There won't be any edb48-logo.png
-	sed -i  '/edb48-logo/d' CMakeLists.txt || die
-
-	#Make the desktop's entries somewhat cuter
-	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
-	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_DISABLE_FIND_PACKAGE_GRAPHVIZ=$(usex !graphviz)
-		-DQT_VERSION=Qt5
-	)
-	if use pax_kernel || use legacy-mem-write; then
-		mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=Yes )
-	else
-		mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=No )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cd src/images/ || die
-	newicon "edb48-logo.png" "edb.png"
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use legacy-mem-write; then
-		ewarn "You really do not want to turn on legacy-mem-write unless you need it."
-		ewarn "Be sure to test without legacy-mem-write first and only enable if you actually need it."
-	else
-		ewarn
-		ewarn "If you notice that EDB doesn't work correctly, enable legacy-mem-write USE Flag"
-		ewarn "Please Report Bugs & Requests At: https://github.com/eteran/edb-debugger/issues"
-		ewarn
-	fi
-}
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
new file mode 100644
index 000000000000..c5dadbd7bf7f
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
+HOMEPAGE="https://github.com/eteran/edb-debugger"
+SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+
+RDEPEND="
+	dev-libs/capstone:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	graphviz? ( media-gfx/graphviz )
+"
+
+DEPEND="
+	dev-libs/boost
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-man1.patch
+	"${FILESDIR}"/${P}-climits.patch
+)
+
+src_prepare() {
+	#Make the desktop's entries somewhat better
+	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
+	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
+
+	if ! use graphviz; then
+		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+}
diff --git a/dev-util/edb-debugger/edb-debugger-1.1.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.1.0.ebuild
new file mode 100644
index 000000000000..5b720ad3e0d6
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
+HOMEPAGE="https://github.com/eteran/edb-debugger"
+SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+
+RDEPEND="
+	dev-libs/capstone:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	graphviz? ( media-gfx/graphviz )
+"
+
+DEPEND="
+	dev-libs/boost
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	#Make the desktop's entries somewhat better
+	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
+	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
+
+	if ! use graphviz; then
+		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+}
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
new file mode 100644
index 000000000000..929492ae670f
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/701112
+
+From f5e0bce1c1d33e11062fd61a3bbad52ee18e8a8b Mon Sep 17 00:00:00 2001
+From: Evan Teran <evan.teran@gmail.com>
+Date: Mon, 15 Jul 2019 14:44:25 -0400
+Subject: [PATCH] fix for issue #719
+
+---
+ src/ByteShiftArray.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/ByteShiftArray.cpp
++++ b/src/ByteShiftArray.cpp
+@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+ #include "ByteShiftArray.h"
++#include <climits>
+ 
+ //------------------------------------------------------------------------------
+ // Name: ByteShiftArray
+-- 
+2.24.0
+
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
new file mode 100644
index 000000000000..92625ac3701a
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/701080
+
+From c84c5a28adaacaeee65a20e1bd8a90762cbe843c Mon Sep 17 00:00:00 2001
+From: Ruslan Kabatsayev <b7.10110111@gmail.com>
+Date: Thu, 5 Jul 2018 23:45:03 +0300
+Subject: [PATCH] Fix installation path of the man page
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,6 +123,6 @@ endif()
+ add_subdirectory(src)
+ add_subdirectory(plugins)
+ 
+-install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR})
++install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ install (FILES ${CMAKE_SOURCE_DIR}/edb.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/)
+ install (FILES ${CMAKE_SOURCE_DIR}/src/images/edb.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/)
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
index d22e537d27af..6506dc772361 100644
--- a/dev-util/edb-debugger/metadata.xml
+++ b/dev-util/edb-debugger/metadata.xml
@@ -9,9 +9,11 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
 	<use>
-	<flag name="legacy-mem-write">Probe if writes to /proc/PID/mem are broken.</flag>
-	<flag name="jumbo-build">Experimental jumbo (also known as unity) build capability</flag>
-	<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
+		<flag name="jumbo-build">Experimental jumbo (also known as unity) build capability</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index 0a6d0f5ded95..cae532728efb 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -12,5 +12,5 @@ DIST electron-node-51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz 50344964 BLAK
 DIST electron-patches-26715595f4fe3658a73adb0d2fb338f62c79e492.tar.gz 115022 BLAKE2B 04f0982d9ac63068fd9e83f53341e43fec8f375d9591777dbcb6612213ecf0473be6d38883cdf0f99fe412f65b494d8765818260ecefd9e77dbd503d5459d9be SHA512 8d05f21d2ab4242cd896f58d1608ccee5ba3b65dae73cacb2261458e2f163e216176276d036cf8fe3375c06a94d08f7a04af79e92eb3d4312d975acd870103d8
 DIST electron-pdf-viewer-a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz 42117 BLAKE2B afd5ca8897ff70cc8d1d51855c6b1cfdf9a6e1ffb667c740f323ef9e4e11ed22ecac7e8c0447dbaa6488e4b11ba4e8606e654f792bb42d0b4c805e7d4a32aab4 SHA512 2db9c756ebff5148c6011775b2740671b7ab6693242400b417893eace648720c51e709bd108d766910f24b543b88c60fd292ba9aa8aa88bff1ea40d43961ad5b
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
-EBUILD electron-2.0.17-r2.ebuild 28904 BLAKE2B d96cd10bf8cccdc4666dbc8995b6eb2e385d10bb11c4c32078eac8c99df45bc83c13f92504c8c459d7ababdaf7cd86a37f060abbeceaf0c58948b423250665c7 SHA512 0781959662ed8d940e041259ccb8ad9fbd38ab418641c80a5f5a8db2a9afd70e6f2268d140dd0dad90de13d865e122a0e13b92fa0ff975ad4ebfbcbb10b4b490
+EBUILD electron-2.0.17-r2.ebuild 28921 BLAKE2B 4bb9577d604a2cc9f074a4ae46f643ba151fbd049384c662c2246543d96b745426f5a36920c1fde2af45216fc80c6d6bc4f95f011fe709ba4b7faee7a8add859 SHA512 e0fb2e9504baafb376f5fb5a16aa8126f33a7f0f752ef87e2887af5e59e49a0c45fe49b6805bbd5d6cf30bb336892f4fda24e427f4652990cca9c688483c02e7
 MISC metadata.xml 1187 BLAKE2B f248c347af37f080c18430b63ecae6c5c81e9cffa78dc83abf95a11727031bcb448fcf08667c058d09dd43d7e4ea85348f7512392c76f98cc00a3968897d8682 SHA512 51f6c09e9303148c4d0d5bd1630ca3d799df78fd8dbcc76f257ea0f177d2cc2691ae140f676b98fc334bc186b738a730bd75dcdda7054e549cc274d219055da3
diff --git a/dev-util/electron/electron-2.0.17-r2.ebuild b/dev-util/electron/electron-2.0.17-r2.ebuild
index d713ad9ac622..a286e7926afe 100644
--- a/dev-util/electron/electron-2.0.17-r2.ebuild
+++ b/dev-util/electron/electron-2.0.17-r2.ebuild
@@ -81,7 +81,8 @@ KEYWORDS="~amd64"
 IUSE="cups custom-cflags gconf gnome-keyring kerberos lto neon pic
 	+proprietary-codecs pulseaudio selinux +system-ffmpeg +system-libvpx
 	+system-ssl +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+	!test? ( test )"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index 69faf501937c..d4159551b943 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -5,6 +5,8 @@ AUX elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch 3246 BLAKE2B d8e476486df9ca8178a
 AUX respect-CFLAGS-LDFLAGS.patch 3237 BLAKE2B 084f594a98b7ad36edd87fbd0f841cb4858370d90f495df2bede43c0b0b87e41a775eed4dbef18f43152f75b3953dd8837f16ea3420a3943e71dc2b4a8dbe581 SHA512 85b1dd45111e7171701c4ef81e3aa23fbd5088c50cce890cf1d27c4de3560311f215bd43e3b0295e9c7917b07dca5c3431c2a705bbef80c0d90fd409ccebe664
 DIST ELFkickers-3.0a.tar.gz 100112 BLAKE2B 3fad92a6fd0cb285d8df2d529f95eccd7df8382925520989a3096354170535e02c890f5d5b4f6ae5a520750afe2477625371ee71f1bfc5d6b35d752749c7dc5a SHA512 c90a763e5b60069f9cb67fd5c114da753184ff466c3db1dd9a44e86de9408a4384a3ac00a8c67191ca9a6556fd0db11058542361e987710f9b5bedabaec2717c
 DIST ELFkickers-3.1.tar.gz 101406 BLAKE2B 8de2c27904909ede753b94cebe87789b27f02f98ce54342031330579a7ae021585117be4b61d8c7895c9c6a2c9b33f398cde9be1070ccbe24e51669db59bba73 SHA512 a0b1ba6cdb23b12f41b81cac1960b15cc2a4418cef48923900b668fa5132ce428bab16b1780698864fdf0c374762d57f471fc124d231f8de143be172c757000b
+DIST ELFkickers-3.1a.tar.gz 101709 BLAKE2B f4e32be84bb05d0f5823fb09d60596086d70f726312285ce847b79ed7f08eed936cf72a9eff92123c4fecee9e4748a83363a05075a29d04490bd02701d53bc59 SHA512 a3ec3c1d5062c67e0108a04ea9a7e9d88d1e5090af887544be756f3269a28950d1211908b74da287d82975dada4a6ea30686b5a3cffa203b9ebf835a5c13d408
 EBUILD elfkickers-3.0a.ebuild 854 BLAKE2B 87ea0954bad0072c614536e7204257f712386e7d781840ddd4915dcc3c59d5f2ca9a1388cde5f9beff5d219ddca655679f485df004d19cd5bdda4c708e1e2e14 SHA512 4e968c172e00596d9dff3759eaaa586fbb8433410e6e168cc0307d4ede8325d2a138e9c68409e1febe2af46e8985a0b94e98b869514c16f713a1cca29a6ddb0a
 EBUILD elfkickers-3.1.ebuild 860 BLAKE2B b0616b47b9e7835086343353751d34e1011f802e91baba0bf5764ae8eda2f9efdc0fe7c3f3a489fd86fbcda592deed853525b52b71e84cf18c15da33750422bc SHA512 3937a872c90386df5d2ba51762a51857fe05f8d08dab674415430f607eea501e886c0f9ade03b04d4ce5bc901af21c09152927b8a751701a3804b5924201cfbc
+EBUILD elfkickers-3.1a.ebuild 864 BLAKE2B c435d32fc2b1ef0b01dcfa26cd06e4f9193b749088795f5ee8150824c84072c5901151143cf0710b106e517d6f722156620572908476c0eed2ab9677d40c1264 SHA512 856e9004b25d17671887ae0ab0b2eefadec51a89044ac1da31c969cfe812fb39369ce9e2815ae9346e00d1a00a90528678ea6f6c49b0e6389e2adf9c4a7e4a5a
 MISC metadata.xml 657 BLAKE2B 81a73ead5e1fee87a15c34c14135154148a9bf3449d8d7160bc18427edab55caf7d1916943bc8bc0e42f402031d8753c5102f504e191904f21b37996de36d24a SHA512 4519d4c439e25c4c70dabe91740ea572f084f4756cbf471f346d4bf0c85226f7254fbc9744ba32bd168885b238950d01de99bcd1baa7f24939b94daba41750a7
diff --git a/dev-util/elfkickers/elfkickers-3.1a.ebuild b/dev-util/elfkickers/elfkickers-3.1a.ebuild
new file mode 100644
index 000000000000..a581ac986671
--- /dev/null
+++ b/dev-util/elfkickers/elfkickers-3.1a.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN=${PN/elf/ELF}-${PV}
+S=${WORKDIR}/${MY_PN}
+
+DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
+HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
+SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~mips sparc x86"
+IUSE="doc"
+
+DEPEND="app-misc/pax-utils"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-respect-CFLAGS-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-3.1-create-destdir-path.patch
+	"${FILESDIR}"/add-freebsd-elf-defs.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile \
+		|| die "sed failed"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) all
+}
diff --git a/dev-util/findbugs/Manifest b/dev-util/findbugs/Manifest
index 785a05e8b51a..fa635419923e 100644
--- a/dev-util/findbugs/Manifest
+++ b/dev-util/findbugs/Manifest
@@ -8,5 +8,5 @@ AUX launchers/fbwrap 41 BLAKE2B 38bcd17c0c11721d67356967f17e8afa0fdbac5d32a76fe4
 AUX launchers/findbugs 1298 BLAKE2B d91fe99d81ba8f9276ea9ec6d259ea86bc4e54757c0b059de4636a8f1d07bce4663f6e1921dc73f1c4c3ca95e4b2b90800d989e6c2b95fd6977849a2d37b2d1f SHA512 24ba47e65452e36f885a864ae645e58b3a773570bde12371026203d3ca2cd20c2538f4acccf1159b52d2b52d2be913d6ebad794b3f17ab99d4fc3baaa47d1d82
 AUX launchers/findbugs2 1290 BLAKE2B fcb57041f9da8c1baaf4dbbef4d11894c833ea3be0d61ffc400e59b92ec98b13017a0a299c0eca9014c15302437e8b14e924e069698bb90558eb87990ea542c8 SHA512 de0eec2986596e67654ef17771c397c30b064d99d8d78dc89bd61ae309c61233091d82ee56b1965005d2dbfd9afb466b3b98554e602df43ffbf72fec60e764ab
 DIST findbugs-3.0.1-source.zip 9625065 BLAKE2B 26c940ac0eaec16de89ffbbe26d16b0b5c2883a6131a8b3ce93b9a35014a42c221456f977e581d2f4f1b8d9333237c24ac6d5ad8fc2ba6bb018c333b6a09f4eb SHA512 d967769f2356f28b34d92c7451cf3e2ac004e667bfc3b049b5b10b1c19d7be2cfa0db132a77698d042300330f77a2bb5dd8c4baa0d67c37b7e5ae6da9e83a64f
-EBUILD findbugs-3.0.1.ebuild 2955 BLAKE2B f386a210ead373879c31e6ae8a642c7a3bc4a112f5a5997eeec2ca8c33a3887b77a2607184e45b0f63f2b597ba26708a50c98d665aca0fcee7ecb520dd1d3517 SHA512 c47b1f6a097d9a5d0dd74764bbf109d82c9d3069af9cae10ed6910c48e33545ed9421768268650c908aeaa0edc06e5b06afcf61d2af19d80d2b31b5362742b9c
+EBUILD findbugs-3.0.1.ebuild 2979 BLAKE2B 4b085183baf10c80908e20752e0e8dc970558bb789109bc78402a7d61bb63d5cb2d1175d7cfbb68c1b35414dfe6acc24dda7850f1d1909afeb50ad19d6dc54da SHA512 b2a2a19e33bcd1ab3490bc4fc7784d7ea8e6ac2252606dc683494dd42feb2f62a06b2be0e2ff5364b5580ab27b17633aac9dac484038381230823a38fb82e6fd
 MISC metadata.xml 1055 BLAKE2B 9a54e2835340933630434b6c15666a104d295ce364f027c3034a5261dc4d372ce905f8f1e4102e12c500616fdf12da2d90321b91d7b7309fb7927ef005039f51 SHA512 82e70de38547ae7e6005e773c0144a131e30737bce6c2768cca4f8264a884cc5166bdd018d1e9474bf5e81421ae61651ee9c2ec285f443fb704c67d1876da039
diff --git a/dev-util/findbugs/findbugs-3.0.1.ebuild b/dev-util/findbugs/findbugs-3.0.1.ebuild
index 2498e2e3a9e4..68be97749c1e 100644
--- a/dev-util/findbugs/findbugs-3.0.1.ebuild
+++ b/dev-util/findbugs/findbugs-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-java/ant-core:0
 	dev-java/apple-java-extensions-bin:0
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index b538fe939c42..5648c899cdc5 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1,5 +1,7 @@
 DIST gcovr-3.3.tar.gz 323226 BLAKE2B fe3d6ab4d24032f57ee17c3fc44b10e0b177aad01b072306a99abc7dbfee07b5f14ef34412d36938302bc279dffb2a25502981ba952339c1b4e896762defabb0 SHA512 e5046bc4e38c99691c3bcc58abdfbbe965c46d02c8c50dbf135bd5108bd9bba1fa450ab0b5e23157a178f7c1303ec9c285470e9be1a14274528e5d7051013a08
 DIST gcovr-4.1.tar.gz 193692 BLAKE2B 5536ecbf0636a3a75083d53e2dc239a48e6df740a037954a2aa2e837e764c0530c73fe32c66078efa4c3a6652f907ec15505c8efbac8a1d861031d34b05f4c74 SHA512 aab2a98421557ffe846f644725e5c6cee65afb0c22ca86ce8713516810bc91bd32caf4c5c18e2628f8f4444de6665478a6001cfce3841a8c394fc0b4309d83fb
+DIST gcovr-4.2.tar.gz 222847 BLAKE2B 44864c89b58b526c5afc293168c8af2c9082a99e92f2315485f10430fa5ff959046d189c018e0fa121ff4e9fc3685c13b737c112856c841966052d5fd6c9169a SHA512 bf9e22a58b8390eca391dc8f6ba58c4ca0765e66f18ac6f8d8f80609411df2bab74a846eb179a1aded81b7774fa8a8121bb2d586556aeaf43fd729205b0d0c72
 EBUILD gcovr-3.3.ebuild 444 BLAKE2B 663842a76fa5f38b74b7d0dbabdb1c23ffbe2047bc4f78e693a73d817d37737e60c85ced3488af2551ed7338b6034b96c8f20612531c5d949051c796e7954f24 SHA512 e6d6ceddf99dc975e3915779168c64592352b25265aac596cfa57c074cda5e35ca30e72a22a6a83c0dfc1f0eb3ad00b3f1de71e712e56ed09d99c6a8b9d9b362
 EBUILD gcovr-4.1.ebuild 802 BLAKE2B 30ad0d7860d54b1d3f5af200d8254058c734038953590c45e1be1274eff6acb4dd6a54d8cc340ded706c3698ca1b15b00d2ae072b2c5d77cff2fb5b105153c53 SHA512 6e14b13059c0a12328ab76e2e9f03db361a7e470ac07513191b2a3ee4e50b16b96ffdd1a7b3a4e2a322579a97ff9c13371a2649934527ac8a4fbfef1bbe50139
+EBUILD gcovr-4.2.ebuild 996 BLAKE2B 53f882b56f9331455752015983cd414c67183f3fecbe9e2c8546c689528f218bde33e49f16bdbf4fa039b8a726ac9820ad8e63185faeb489d022f2d7e70994b8 SHA512 fb3aec0a5d2d548ece4f2eff3391ba2004829cd068430dd76f69b095a610fd6512c66d273f44ba80291070a25ca460ed88ce001debc4973bd043ab7bccf8cb2b
 MISC metadata.xml 404 BLAKE2B 0c1ac87d95e969877abd8993c95d6b723d0faaf645093cc01c3c88dbadce84a218a12d4f799a1e95535d67fcdc5725b02d95cc8b53408af04a1c81382bf223c8 SHA512 472f35c3e963a0eb02f8ede9f996bad20a6b67f364c5b2f40b37b90d552dbc1414af5c01862cd4ed7586a6e02cc10a408134cca6eb994f0b897f2fdef3a2054a
diff --git a/dev-util/gcovr/gcovr-4.2.ebuild b/dev-util/gcovr/gcovr-4.2.ebuild
new file mode 100644
index 000000000000..5b264d4b384b
--- /dev/null
+++ b/dev-util/gcovr/gcovr-4.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="A Python script for summarizing gcov data"
+HOMEPAGE="https://github.com/gcovr/gcovr"
+SRC_URI="https://github.com/gcovr/gcovr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/PyUtilib[${PYTHON_USEDEP}]
+		virtual/python-typing[${PYTHON_USEDEP}]
+	)
+"
+
+# tests fail on gcc newer than 5.8
+# https://github.com/gcovr/gcovr/issues/206
+RESTRICT="test"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+
+	local -x PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib"
+
+	pytest -vv gcovr || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 01cdecdd4863..78e9945a3f55 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -4,6 +4,6 @@ DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b4
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 EBUILD gdbus-codegen-2.58.3.ebuild 2100 BLAKE2B f3612833b3d9207aff1929876ead74021bb1aec3742d079cba20ff2ce696144b89746f287e862dc99728de8bce3932b0f6905c04f4073dd9b4ae861b10a38c9a SHA512 62e1c60a23d9bd0136f6bfb1d70edacbd3c8bf7ebf12a3af8686483286e34e51be38b247555a32e403269adc430d97805c0b2278836184633cdacd28680c9686
-EBUILD gdbus-codegen-2.60.6.ebuild 2023 BLAKE2B 483690e8bc49ee4b5700e0311170c091e5b65b73bd4afadd04db2669cae4af17400a67c5c0bf132c2a5010ab29a13a9fa01ddf2255b3336146f703aa9678bbe1 SHA512 113f0739890015b52977da8d02595708ee444b54439d34b8bbbcbe487596787f769208889ac73070776c0766a040e35de677b682afce707abd4ca4a11031b5ef
-EBUILD gdbus-codegen-2.60.7.ebuild 2032 BLAKE2B 466670a91938b1148560486120374cb90e8d1c0a271ba87626cac27e9ed5ba1870eac2504f0c054d66eac1853426c4dd91cb86735725dea60b70f07f21392e72 SHA512 5ae0a20a96311794179a3ffbd43d15261085d522bfa73a336ebfb92202795a3cf82ae771bd41c7efd09285211507c655f2efa15aaac08b338c3cab396285aa84
+EBUILD gdbus-codegen-2.60.6.ebuild 2022 BLAKE2B 458f0e8494b24cb079600faf3ebb268f24016a51ccb5c35c003207ef7f75b72994ad9a85d42715ffaa728024deefb8a4052e06c759f9aea236c6ac596bb7a362 SHA512 e54f246ee7ee7d25a2c71b7a649bbfb8433a53a309ea124204cd4220829b1303a09241d32febb34f85d43b316b378e2afabea671f4f75eb9c91587333057d5b2
+EBUILD gdbus-codegen-2.60.7.ebuild 2024 BLAKE2B 93f4e61db70b2c15189b6b86e32e7653af8a7313484ac1060849439916f460f71937d56636585ba22bc96f46055c39ead84a7e106a6b535b2df64dee065bbdd5 SHA512 0d9edcbe2f83fc25bd90555b3f2828006933af58805483d03b6a20ca569a9fea8b9c916753f57fec088909925aae8bf166f4caf7a792784d8b9ced88ee2d4a4e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
index 9a2ffb6630c1..518f0b5f3f9a 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
index e7deb95baca5..3dc3906c183d 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 4b78ec80e2c0..113d241e0eba 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -3,7 +3,7 @@ DIST geany-plugins-1.34.tar.gz 4640059 BLAKE2B f6a2e001db42e348c129b503fd969f142
 DIST geany-plugins-1.35.tar.gz 4656963 BLAKE2B c7c96c7bbd1d17083f75a90eaa741277626db8aeb693cb78d3fcca57136923c58eba1755cc55263d431ff7a992e22b365f91be5e424b4f02eb25299ae3d3cd93 SHA512 9fedb4237096d939919fa40c39a7d19debb19211260a2797b5566c555052dcd8bf9a31a694d057f1dcded794bc75883d0007f8dd9427e3d899434fbf0e8a8e9f
 DIST geany-plugins-1.36.tar.gz 4693634 BLAKE2B a7c319a77cb92a55a0a53063ab75d9375f7d2a0e419eb3e0acd063b8fda4b4d9798c103ce53b80090c73bd86804c58f815aaf8d0eecc0d7fbf7ad1c8470cb9b5 SHA512 b3e58b42432d17c27289fa20d10b833a2d7f5d8c72b51abe5b1ebdabcb952b18e0984b15ef6ac9753102d839f3174f28798269e1e94bf032bdaa189e98d72b2d
 EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
-EBUILD geany-plugins-1.34.ebuild 3354 BLAKE2B e33f1e116cb417bf67bb56ae1abc50d0c8b2ca5ffd8b5d5742ee7da694df13609164af3287585035e00e374fdce0c3c4fed99aeca4a5b7d8388a54d97e693b49 SHA512 4076e2f23e030932d937dbdfc5fba307d19b052cc0e936611051fe26d8efb70929ace9741b401c9576cd912792aa4163ba9a981da0a35e852c414ff67921101e
+EBUILD geany-plugins-1.34.ebuild 3351 BLAKE2B 6305a706635fa9bc5d335122e5e826568e6ea859039c34ca43eacbd6eb0bceef9cb409ebf953d0fddf1b7b04d1fe8169f74e0149bd7480c114f8de58efbbc529 SHA512 4f754dbf432a71bba156ef9de134a7acbb2d3f8b2efbf7bd6611ee748f6deaf70d0a1f29901d831be1aa762819fb68c233b410119b6d979e17f3a6797d44254c
 EBUILD geany-plugins-1.35.ebuild 3318 BLAKE2B fa8b8919b8fafdb570e6dcc0fd951b5051fba7f3f02afd02f1fef4798edbba2f44e9e26df59569d877123f3cd4e2125ee6a91b0573001bf73a1f317393a07849 SHA512 8556d21fc5f1130c3ba4f98d1300232a1638c9874548b4787bc139997e07009f316d8ca682f01efbf185e72c8c838b28ce33b00f24c2f23d603cf82e5aadd21c
 EBUILD geany-plugins-1.36.ebuild 3383 BLAKE2B f81233e98fcdb8e00b2a99152b9c7241d270dfc00db71578361916fc7256173063c683597413262ed4b3cc5c9ce024d9b58d362f5fe193e1dd6146ebbc49c644 SHA512 40bf5d9dfa2ba2608a8279f904f760718108af3798e1cf060d3b659b31a7c5e590f8fc5945114628180db17375cb29814e43ffc58fd6d484a6c5902c316fd58e
 MISC metadata.xml 1647 BLAKE2B b46873a3918b3506a6331aecf522f78467c4ab88e3d9f1b3caa300afbb83986f377d193ed2da43246eacb3ea104396989569f3e8ea663ee766c580d6b96abac5 SHA512 0030c7fb50c9ed0da05c34ef122762c86a5b9f8345403e80cd2cdff0447a62980608ca7ee484520eb097907bc6d9dfe4b390b0d4888775e3b4125d3ccd198d94
diff --git a/dev-util/geany-plugins/geany-plugins-1.34.ebuild b/dev-util/geany-plugins/geany-plugins-1.34.ebuild
index 52235149aefe..4fa6c180c122 100644
--- a/dev-util/geany-plugins/geany-plugins-1.34.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.34.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86"
 
 IUSE="+gtk3 ctags debugger enchant git gpg gtkspell lua markdown multiterm nls pretty-printer python scope soup"
 REQUIRED_USE="
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 9712aca56bae..a84b5491cbcd 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -3,7 +3,7 @@ DIST geany-1.34.1.tar.bz2 4474211 BLAKE2B 25c9b3f752b0b19582120ea342d8029f811040
 DIST geany-1.35.tar.bz2 4593705 BLAKE2B 1d411da04a82987abccb33385d3b50025078b68dc2cc4accfb7822000a786b97f613a35864fde2389d0525b9547972d0e56699b75aae40686f0ad7e6e2beb4a6 SHA512 9ae2f168b1b5e9fa9029a32f5d1e9b591e50ea4e79041760524a4389572400c6f8f56f1fd6973299f152f9fd653cf3d52ca50136f0bbdbc15d3395bcf7388ccf
 DIST geany-1.36.tar.bz2 4644521 BLAKE2B 80eeceee31a49e9728a358904ad40e353d3407a22492340e6aa9a82091d32fa004f4494d3ae027732174e7cf7f6fae620b511680e06e58c5b71dd259125900c4 SHA512 15005772b64e8321d7fa8552363df425eb25e9d7b0760c561c8fb3f34d7acae2bf25da8e04fda38a2a1b64cc31ff613b7ff2786d432ff014050c138c7473c810
 EBUILD geany-1.30.1.ebuild 1562 BLAKE2B c2df6ed87dc009a743022b751c01dacbf9d71a13ab365f5d880d959a61501feb91a7584d2e0e99fb30d2ddf6d7813879b43e378da5762b2917658ee41e859faa SHA512 ea58946bbe21fafc79acb47599a12fbdd5c8d069b5f78292570ac9b9ac0088f08db8d5a3f4c0a019678f185c117702464b39f553b2d97744457c439dd0a1fc39
-EBUILD geany-1.34.1.ebuild 1751 BLAKE2B ec272871621dd59d71a33da420ecfe60930c642b16f0d224405fb7cf80bee2b12012f25da2152383abd0f6fb56f682c8f65f7d176d330eebbf17d84f47073ce2 SHA512 e4782ad4dd2235aca5379f2c92f09c523a74a20ff1ad3767673b10a3ee8d3526e9f51a7fb32bb27b6d2997d81c522bd491bdd79f464fdc35e270afb2d5605afa
+EBUILD geany-1.34.1.ebuild 1748 BLAKE2B 79893b09f3c38fdebdcb797a8dcea0ff2cc21d57198dd3d2e26a55d5d77d115ffd1d7b8ffff48f3329079a68fdc9712ac8996134b9b401997bd976a81bb11125 SHA512 07ab7fc7d60d56f3c09e4261e2c387d29a83245ebd4c26e294dd6e0b0442f959a3b9aa5f254d49db9b885a0895aa3ac292db334dedfcf321eca2f43831043310
 EBUILD geany-1.35.ebuild 1716 BLAKE2B fdd725de6e6346cc85fc021f289bc717b5d1a665b260a42c64e9fe9e31a2821242fc19e83f1fa69bc63f84fa468e8957aff2fc584bf94c168dc52fb74dc09961 SHA512 476b8e0d3083da8677dcf63453ed369a6a3f40ee83847873d06f238549d6a50ee5e1a4c00cfa8649661cdfb2f30de70d7e6b563d455a713cef8aba75c90fd643
 EBUILD geany-1.36.ebuild 1728 BLAKE2B c45634623adc46c21598b59812a3cc5ffe20dd2edb5a19a766bbc57c96a9fa197076c4be5ce6b3263b3f6b64f9cf73161e0ad660058e6610501b3c188bf6bd1d SHA512 d96e54bf3236d66f7bf1883739be215a532078975c2ba1b395335448f3fdb9feb379d98dcccd28343f08e69b42701805284ed434f27a7b4afba91b913af71ead
 EBUILD geany-9999.ebuild 1716 BLAKE2B fdd725de6e6346cc85fc021f289bc717b5d1a665b260a42c64e9fe9e31a2821242fc19e83f1fa69bc63f84fa468e8957aff2fc584bf94c168dc52fb74dc09961 SHA512 476b8e0d3083da8677dcf63453ed369a6a3f40ee83847873d06f238549d6a50ee5e1a4c00cfa8649661cdfb2f30de70d7e6b563d455a713cef8aba75c90fd643
diff --git a/dev-util/geany/geany-1.34.1.ebuild b/dev-util/geany/geany-1.34.1.ebuild
index 7b58fc075ade..cbdab1bb2a5b 100644
--- a/dev-util/geany/geany-1.34.1.ebuild
+++ b/dev-util/geany/geany-1.34.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/geany/geany.git"
 else
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
diff --git a/dev-util/gertty/Manifest b/dev-util/gertty/Manifest
index 9c02a455f937..b7331720cf0b 100644
--- a/dev-util/gertty/Manifest
+++ b/dev-util/gertty/Manifest
@@ -2,9 +2,9 @@ DIST gertty-1.3.2.tar.gz 92553 BLAKE2B 2e6771fcf044a8a46e91dbc6f34869be528e0aa4d
 DIST gertty-1.4.0.tar.gz 115581 BLAKE2B af1a4ceac5b1e189305463e91d8d79246ccf16d5109b5100c0f928af42c39632d2c4b904c5586428c31d5d12985baf8ed2507c743364d6b26a4a02967b59dfc3 SHA512 9abba6271d3ec95938f07ab4ee76f0b539a7ce7f0bbf9c08509fe9516c14f99ccb7b439d29a30bff6dca99bf39788dc803cd8aed3cc03b531678225fa41102d9
 DIST gertty-1.5.0.tar.gz 119784 BLAKE2B bc563c10009c372de5a702b4ab33d9b6b26a898486fc5a1d840f298b50a779c36467ccf6600b6f29b61d3c15b1cc0bbfe960d0d6a1a71d3f8b8f75dc392ab0dc SHA512 bc47817a3ba9ccce298ee1a646cb43f8a57e9a57a40d898859836b3171abd0cf3c682a5f5811cf3d987a17dbf00dd6706a5dbc5a6a35f1d5ff3a217c68187cda
 DIST gertty-1.6.0.tar.gz 122570 BLAKE2B 8c3628f9b0b56aaff30f183a1ab0d852b8ee487927833f41b8aa61f94f8d14eaf3a8d515d5edcb3fa7dd18ca36f42a977d12790c52d6c629a720b4f29252b030 SHA512 0fe5224f5b4b06910bba0d19453ea0f273f6ea0688b9aa092e11f929b71801581f6d7cead1d64c00912ee3363b98d4b36e903fa992a7ce36f190a4f3c09375d2
-EBUILD gertty-1.3.2.ebuild 1196 BLAKE2B 55789b9a9b1480e7386592bd2e2d5db8c093af11d2508134152fbb09d3a5cc31173caf4ac1905c32e2f6863716cecf42f0a38bb7cfe3d87327a652340964a518 SHA512 ef6de7a0c5469d8d3ccf8838f1d709dc924cc10036832e5bcbe4da50784a1352859b755144fb6c67aab5d6c17bbe61f439734fc577d098b8d3596526e4c6827f
-EBUILD gertty-1.4.0.ebuild 1196 BLAKE2B 55789b9a9b1480e7386592bd2e2d5db8c093af11d2508134152fbb09d3a5cc31173caf4ac1905c32e2f6863716cecf42f0a38bb7cfe3d87327a652340964a518 SHA512 ef6de7a0c5469d8d3ccf8838f1d709dc924cc10036832e5bcbe4da50784a1352859b755144fb6c67aab5d6c17bbe61f439734fc577d098b8d3596526e4c6827f
-EBUILD gertty-1.5.0.ebuild 1155 BLAKE2B f57a4ee9fc24baed0b445aa867b4273745e910cb0fbaa615a7b9aa25f3b15cf286c8b3aa2c2fdff79d1e443900d943ae266427dd1e15ffaac5b5eb27511cd1d4 SHA512 1952c3bbd940575f1218cbf6980012669228ec1642a9d13fd9af4f02742d1dc7b37ec673af515dbef010a8335bd8249db9583339e40a1b03b653a865c354ff9c
-EBUILD gertty-1.6.0.ebuild 1350 BLAKE2B 77213b6db583c228bc2538e96f13dfa3eb2987cf5614b8a0adba2516c4926bf67ba159e81c6edb343ae48f67a5d97f4fb770e4432342c80234e74788f6c5593c SHA512 3f45679c9d7d0eb4910b5a5b58ae8f7a962c1715cf478a6779f30f8862aa86c456faa843e38e7ab2b0ad4edd140ad10430beebf6d7e42a354bf2fd79559b9abf
-EBUILD gertty-9999.ebuild 1350 BLAKE2B 77213b6db583c228bc2538e96f13dfa3eb2987cf5614b8a0adba2516c4926bf67ba159e81c6edb343ae48f67a5d97f4fb770e4432342c80234e74788f6c5593c SHA512 3f45679c9d7d0eb4910b5a5b58ae8f7a962c1715cf478a6779f30f8862aa86c456faa843e38e7ab2b0ad4edd140ad10430beebf6d7e42a354bf2fd79559b9abf
+EBUILD gertty-1.3.2.ebuild 1184 BLAKE2B 48f8160f6338b34dbad5c2228d135ad49a79aceb425f5354652a2ba53020d130041fb520a0fd7d38d798676f4ee82dcc473f3e9cd683db844291953ee1e39fe7 SHA512 2d35411a43a565a508003308969523e16135a1a1921ef9cd899e3be15fa499812e745a4f8ebc426a0de2b72a0557f560e16576733ff7f849d6333411a1e87ec4
+EBUILD gertty-1.4.0.ebuild 1184 BLAKE2B 48f8160f6338b34dbad5c2228d135ad49a79aceb425f5354652a2ba53020d130041fb520a0fd7d38d798676f4ee82dcc473f3e9cd683db844291953ee1e39fe7 SHA512 2d35411a43a565a508003308969523e16135a1a1921ef9cd899e3be15fa499812e745a4f8ebc426a0de2b72a0557f560e16576733ff7f849d6333411a1e87ec4
+EBUILD gertty-1.5.0.ebuild 1143 BLAKE2B 8f9ce2a24661819ff8e8c13ef08357345022e2dc5b155a92b82289156217459aae4ef01fe475e7f7124dd7787b08edce76d7ac0fd1c019ef9041231f711aaaa8 SHA512 289f5c5084789dbef83163d6cbee2f28da25ec2127cab48244a43c7cb4d8e7fe496772edd4ba497a8780898499b217eeefc1d9c527e4de15bde3ef0e11b9d677
+EBUILD gertty-1.6.0.ebuild 1341 BLAKE2B 87d2e7d8dc354f7db1e534f9aa2df29faa71058c148e0e9ef8763ed9589a529cec203aa4a8de967521b9307ea13157030603a60b9c71c6df04760fecb9d1f87e SHA512 1df1bbef697b21b6e28185fec9137b9433bf8ec6aead22dbfcd993b4d30df127bba18cfb8f4a906ec1992e051d81591c8d68bac8de897b2b3cac4bb9dfb9cd55
+EBUILD gertty-9999.ebuild 1341 BLAKE2B 87d2e7d8dc354f7db1e534f9aa2df29faa71058c148e0e9ef8763ed9589a529cec203aa4a8de967521b9307ea13157030603a60b9c71c6df04760fecb9d1f87e SHA512 1df1bbef697b21b6e28185fec9137b9433bf8ec6aead22dbfcd993b4d30df127bba18cfb8f4a906ec1992e051d81591c8d68bac8de897b2b3cac4bb9dfb9cd55
 MISC metadata.xml 500 BLAKE2B 0310d985bd0b3824fcf1522d04cbb253fcb3507b96a75073e0e37481cdc7aaf03da638a592bb1470d17e758f2fbcbd6c60d046a7f7ffa18d3c8a6aced2daa76b SHA512 8a39f2a1e526fa077354eacf6a318b4cb11b7a1ec37f2928578bfb13f7d509226a30c0b2b94e6da070e602e54e02fbce0b2129f9421db1f6981eed1e781493f3
diff --git a/dev-util/gertty/gertty-1.3.2.ebuild b/dev-util/gertty/gertty-1.3.2.ebuild
index 4ed475d08fb0..f9e1d0c8dd6c 100644
--- a/dev-util/gertty/gertty-1.3.2.ebuild
+++ b/dev-util/gertty/gertty-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ HOMEPAGE="https://pypi.org/project/gertty/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE=""
diff --git a/dev-util/gertty/gertty-1.4.0.ebuild b/dev-util/gertty/gertty-1.4.0.ebuild
index 4ed475d08fb0..f9e1d0c8dd6c 100644
--- a/dev-util/gertty/gertty-1.4.0.ebuild
+++ b/dev-util/gertty/gertty-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,6 @@ HOMEPAGE="https://pypi.org/project/gertty/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE=""
diff --git a/dev-util/gertty/gertty-1.5.0.ebuild b/dev-util/gertty/gertty-1.5.0.ebuild
index dabb69045cdd..37e28a61bc87 100644
--- a/dev-util/gertty/gertty-1.5.0.ebuild
+++ b/dev-util/gertty/gertty-1.5.0.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
@@ -11,7 +11,6 @@ HOMEPAGE="https://pypi.org/project/gertty/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE=""
diff --git a/dev-util/gertty/gertty-1.6.0.ebuild b/dev-util/gertty/gertty-1.6.0.ebuild
index 1987101fe4e3..1b48983961aa 100644
--- a/dev-util/gertty/gertty-1.6.0.ebuild
+++ b/dev-util/gertty/gertty-1.6.0.ebuild
@@ -19,7 +19,6 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-SLOT="0"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
index 1987101fe4e3..1b48983961aa 100644
--- a/dev-util/gertty/gertty-9999.ebuild
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -19,7 +19,6 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-SLOT="0"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index cae9c9f2f3f1..13b3eb797410 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -2,6 +2,6 @@ DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b4
 DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
 EBUILD glib-utils-2.58.3.ebuild 2385 BLAKE2B 8e384416b6e2119c4dca9b43a72a5778127f9d705306a27c9e09b38c35c742c129a46b574c8f6c0b173f95ac48ab3274a5d538c4ce7c2f51b3491a89a891d914 SHA512 a5debf07931401ec1c20e103d919f62e8d80d3225b1a75dc30eb1542d74ddddbb6e3ceb18887a47f1c19947e392c12824e357f7b478e7503fafc481f4a74dcb7
-EBUILD glib-utils-2.60.6.ebuild 2398 BLAKE2B 3feec9ae0648cff7599c3b26849025e55594e2c7fb922674527d0c3d71454df8ebe0f01138d276d38014512e526201c3201541ae9116acf87f0ab51ec6ebb8cc SHA512 d93c774a609c8fcb709cd8f2a5c0897f82b1eb9e9f488ea4ad0da3cc893ad58f131d9a3af0ea1fa7d7d08acf8c69fc468ea619665f6d3853a088a5f668df374f
-EBUILD glib-utils-2.60.7.ebuild 2407 BLAKE2B 47935f8d05d09331248cc0d8aa267a81c769a8b2f8eb735e2be681f0cfb7c5b8363a28a0c5463d27b107d16a4b3f3a780521fcbad2d2453daf7f1cf20ae8590d SHA512 7160a802dd7f3c27045a291175bb2e379c802c49ae6cf4932f19d7509a35f0d214809e2cd478ab92c8af67b8f063e8ef929af049ce0dfd4c34bd53054a7ecc27
+EBUILD glib-utils-2.60.6.ebuild 2397 BLAKE2B e5e44ad3301db39c360ec0ac32d4e0329c48ef648c12e5548dc04c9ebd119045d31c6661ec358fdc0adfdafc9dcb1d41b372459bdc71791b025569750cd7f327 SHA512 b38881d8a9864651233bf7c6f51784100b5cede6bd492efce9ed7c0ebd63eec758f6a028c6707636f6abea819f6347f1af0540b181850eaf9b88e6d7dc8e27a1
+EBUILD glib-utils-2.60.7.ebuild 2399 BLAKE2B 10967dcd8a4b15a37fe97abb699c085c40c9e5173bb601db33c9a0d15249c518a59093fa4866352a81e9a90ba7dafd25389cbf92cb7c70a87a3cbb1bfc5e4088 SHA512 8bcb67f678cfafbc7b10c5106f7639a30f9ffb99a738b9c747ca6e4add3a7b6169b255bbb53bbc6c16597ffe0d7b8d55aefe649ba807253de802c4f53141df72
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.60.6.ebuild b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
index 60315e256a4d..d848e41b7ef3 100644
--- a/dev-util/glib-utils/glib-utils-2.60.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.60.7.ebuild b/dev-util/glib-utils/glib-utils-2.60.7.ebuild
index bdeaa203d4f1..61791724709d 100644
--- a/dev-util/glib-utils/glib-utils-2.60.7.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.7.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 5225cc11b87f..b574b1c4553b 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,9 +1,9 @@
 AUX glslang-7.12.3353_pre20191027-fix-relative-includes.patch 663 BLAKE2B 4d0e8efd9152610b16813d45251a83b8b685c07d3491c6bc1a1c2656ecabde2eed8840a53712bfd9aa9e6f047f332f56ead1e3c0d8185a81c4de0eb286f5d048 SHA512 db8bf5424aca0eb215db3059665eb7e6ffbbab029979de9f5b574e577274f6d0ca8a27acde10bd53769561eaae2996ec6da1a4916b2c39e82f343c33b120915f
+AUX glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 4974 BLAKE2B 9bb7807618a2dd6c322244557bf93809c21631be064bde4fc659724c45cb27d3e615fecde8692658edc1e3d229b4daadfa2b51732ebddb5d49f85abdb3af5399 SHA512 a07654d40172d6669d3ee3c3685463dbd58cc163ce726a20db18237ab710044b011e511defc8828f7ccd8b4fc128bb38f75669686085f7572ce8cc98887266d3
 DIST glslang-7.11.3114_pre20190415.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612f45d3c24b67a4497dc229bbaecdad8d2109ae17e5545a12dac04b42bf8102b8d2b3ca6919168d238da7c496a5713ece83a664101f8 SHA512 d75e5a7ceea305bacf489696c14a17209e9793ebc3efbacda8cc26b23fd7ff6c5d2b1b3348df108be6e9249862454e0584772f09f702d47374923c4cde491192
 DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
-DIST glslang-7.9.2888.tar.gz 2370459 BLAKE2B 9dc5550dce1fd718a8050cec81ad94195b19cc36cc4321fe5def48051dd66de4f9c651b6c34a7363701b52afba9f8c6cd4c2264f38416bc911fd2dcdf5a88ca4 SHA512 9a067a5006596bf61cd20f09173e2d22db37a10413bba1b1bb6e5ad3ecf46701786977961e2da8bfa32b19ccb2cc0a04d765f65ae01b80148e9b3f52dbfa8737
 EBUILD glslang-7.11.3114_pre20190415-r1.ebuild 556 BLAKE2B 77fea586cb6202d0c9ae2edbd398bfec0f5b8aff7db0bf405e8954be09cdc82cf393a1d0da6ecd67dd7c7e4448c89b6bf9e6504d85561f604336d750e2d0919a SHA512 c0994b38b8984c98ded133636e2c2d3d0502e7581f799b39e11487aeb52f26b7cdf57cb0a2923135493b81eafd21f2c7bdf8bbc32a164486318c3a72fd8e06f1
 EBUILD glslang-7.12.3353_pre20191027-r1.ebuild 760 BLAKE2B 69e0f48308884297c6e8098ce44679167b645350bd939b38ec69d0756069e5995f9eade2d3ae9a26a2e6b82ca8b3d81fb4631cd4dfcab1c41d7569231e93f92f SHA512 1f4452c0c9a918a82b0464bf43beb35a1106c39a0c022bd966b79b4fdd49141ceb013cb41dd02b69d9eb2471ae5b6933f50e0f79c3680949e0644b55997a0138
-EBUILD glslang-7.9.2888.ebuild 500 BLAKE2B 024680e8b2825053fa6a451db25f29ba89e3722f17efbf656122e6374316254799432a911afbf0e444e7a287097dce7901887771e870c0a1e0851439fe0a0c53 SHA512 2cec8ba89e087df453109f240c3b29deaf01c791ef59b167637521cae5a06c18a24f54ba79781ac862c18e793ba2dbb91fc24f14f0b5b86ff219ee7564bca610
+EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 843 BLAKE2B 57d3c4089d9d826f8e36971772ce425abc163fd1fd5a8237c11c2bbd9892fe2df1b79ade6d47c405d21940fb25be147060cc038f16910b73e81b393d1570d09c SHA512 6e87e371e322f31156e453bb7783ec6003a2fee504799bddb8a0c55d120db7a70808bbd0a579b4f536afd77c879ab84ea4835f9491d57af05cbee6cae2f74d92
 EBUILD glslang-9999.ebuild 617 BLAKE2B 30fd7c4245a34d125051b5f41cfe2aa37ba9fa3c921b464f5a6dca09af90a6dfffd13c0dc1551c0da2c56875842c08a2189243e4bd8009ec032d7b5d690d05fc SHA512 6b36df67fd05adc8e89af5da2775ccdd69b6c999b9c9f65808e3660e6d2eb089e52a841bf522d3647aeba7b617af0fcd08cc76b9c53f6d00e6de7e597f9fde9e
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch b/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
new file mode 100644
index 000000000000..8838a97809d4
--- /dev/null
+++ b/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
@@ -0,0 +1,105 @@
+diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
+index af4ab587..e0096743 100644
+--- a/OGLCompilersDLL/CMakeLists.txt
++++ b/OGLCompilersDLL/CMakeLists.txt
+@@ -11,5 +11,5 @@ endif(WIN32)
+ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OGLCompiler EXPORT OGLCompilerTargets
+             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-	install(EXPORT OGLCompilerTargets DESTINATION lib/cmake)
++	install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
+index e25ec0a1..364f04cc 100644
+--- a/SPIRV/CMakeLists.txt
++++ b/SPIRV/CMakeLists.txt
+@@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL)
+                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif()
+ 	
+-	install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
+-	install(EXPORT SPIRVTargets DESTINATION lib/cmake)
++	install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
++	install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ 
+     install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
+index 0878965c..d9d71d1a 100644
+--- a/StandAlone/CMakeLists.txt
++++ b/StandAlone/CMakeLists.txt
+@@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS spirv-remap EXPORT spirv-remapTargets
+             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 	
+-	install(EXPORT glslangValidatorTargets DESTINATION lib/cmake)
+-	install(EXPORT spirv-remapTargets DESTINATION lib/cmake)
++	install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
++	install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+             
+     if(BUILD_SHARED_LIBS)
+         install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
+                 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-		install(EXPORT glslang-default-resource-limitsTargets DESTINATION lib/cmake)
++		install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+     endif()
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index 42df1d1e..446cabb9 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL)
+         install(TARGETS glslang EXPORT glslangTargets
+                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif()
+-	install(EXPORT glslangTargets DESTINATION lib/cmake)
++	install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+ 
+ if(ENABLE_GLSLANG_INSTALL)
+diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
+index 91fb45a7..9994314f 100644
+--- a/glslang/OSDependent/Unix/CMakeLists.txt
++++ b/glslang/OSDependent/Unix/CMakeLists.txt
+@@ -22,5 +22,5 @@ endif()
+ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OSDependent EXPORT OSDependentTargets
+             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-	install(EXPORT OSDependentTargets DESTINATION lib/cmake)
++	install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
+index f6bd4e9d..c050ef61 100644
+--- a/glslang/OSDependent/Windows/CMakeLists.txt
++++ b/glslang/OSDependent/Windows/CMakeLists.txt
+@@ -17,5 +17,5 @@ endif(WIN32)
+ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OSDependent EXPORT OSDependentTargets
+             ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-	install(EXPORT OSDependentTargets DESTINATION lib/cmake)
++	install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
+diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
+index 77d217f1..aadf9a54 100644
+--- a/gtests/CMakeLists.txt
++++ b/gtests/CMakeLists.txt
+@@ -33,7 +33,7 @@ if(BUILD_TESTING)
+         if(ENABLE_GLSLANG_INSTALL)
+             install(TARGETS glslangtests EXPORT glslangtestsTargets
+                     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+-			install(EXPORT glslangtestsTargets DESTINATION lib/cmake)
++			install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+         endif(ENABLE_GLSLANG_INSTALL)
+ 
+         set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test")
+diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
+index 44f9d6a2..ae0d4d4e 100644
+--- a/hlsl/CMakeLists.txt
++++ b/hlsl/CMakeLists.txt
+@@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL)
+         install(TARGETS HLSL EXPORT HLSLTargets
+                 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif()
+-	install(EXPORT HLSLTargets DESTINATION lib/cmake)
++	install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+ endif(ENABLE_GLSLANG_INSTALL)
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
new file mode 100644
index 000000000000..d0fcd6b8e021
--- /dev/null
+++ b/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python{3_6,3_7})
+
+inherit cmake-multilib cmake-utils python-any-r1
+
+SNAPSHOT_COMMIT="b131630e7c749a5dc19faa458024260c71fb170f"
+SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
+
+LICENSE="BSD"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-relative-includes.patch"
+	"${FILESDIR}/${PN}-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch"
+	)
+
+RDEPEND="!<media-libs/shaderc-2019-r1"
+BDEPEND="${PYTHON_DEPS}"
+
+# Bug 698850
+RESTRICT="test"
diff --git a/dev-util/glslang/glslang-7.9.2888.ebuild b/dev-util/glslang/glslang-7.9.2888.ebuild
deleted file mode 100644
index c91c892519df..000000000000
--- a/dev-util/glslang/glslang-7.9.2888.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib cmake-utils vcs-snapshot
-
-SNAPSHOT_COMMIT="7.9.2888"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
-
-LICENSE="BSD"
-SLOT="0"
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 0e3c6c079073..acf7da47bc6f 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-builder-3.30.3.tar.xz 9486164 BLAKE2B b983fd71b1bab31386ab8f4c3a6ff57b33afd2da5aff5e41e7d1cba388a9b6998a0f799c0843bde95f8ce0456fe46457d0c0c46622d59eeb7729d2e8868898f7 SHA512 468605dbd2bd712a76c333a974bb19ca889dfe8493c2e85101641034f3e2c8eba2c0ee2f98ad01f3466f0f42946f05790763ccfaf786d73da192d64360eec47f
-EBUILD gnome-builder-3.30.3.ebuild 7023 BLAKE2B 05db28a2795efd75dd4d74d2b8184d58822392d1b35278e7640a623a4be018bd24e7744fb7af09ffbec4fd2c3509b1fd6c3239b97cbca565b7b847828f66cdf8 SHA512 203fd715e2e45cc00f51bfa8bc0cd6b58dc11d68c797604b687afd6aeb9ccab06f5aaae52c50213c3d695d4ccedde56a23b82e15e39004b2f7377a96eef48b33
+EBUILD gnome-builder-3.30.3.ebuild 7050 BLAKE2B 842399d42dc8bf8798a397394ea68df7b3561b8028381aa55c623959aead2a5adf51dcd6e54b062985b6b3de9a0574af04b99a10954efc46567817672eb0271e SHA512 0178e854811b08f62b09d36cf4bad4e20818d4238b1fe86942cc05b7cebe26edb7f7a1f99cef3f3920d58fbcb53d7c46369516f5184b3d7107eac035184f3464
 MISC metadata.xml 1114 BLAKE2B 34d8dba8d48edca606ec56c996b93a6e47736e5d92aa20b71bf8f2a4c46cda82d3023b4c253357c7126e91ece1d12d9043cd020a2de2a5390ee984f97be4e552 SHA512 1882f56d3f5f88db34f37559f4f64bcab0f01e9496c4316358229e5662347f66ad2eb987571df8596b12a4170cf9ba5a2a41d39d82f1687d21753b1c5716c2a5
diff --git a/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild b/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
index 3c798d9af8bb..98dd96660821 100644
--- a/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
@@ -17,6 +17,7 @@ LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="clang +devhelp doc +git gtk-doc sysprof test vala webkit"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 29f9f60a0b8c..495c028fd6ec 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,3 @@
-DIST goland-2019.1.2.tar.gz 312490907 BLAKE2B 9cc0abdb9d86b1bd9cdf67e3e65548bce229d3575a62ed153435585d0d82489b193cc775341e194107cc09e4e6e2ee84f4639259c998a7191b765edb6f5695ee SHA512 fb5c597634cc2a84f2abaeae9d0a31e332ba0123d44a5cbbf1587e05cd8da0358794ab80bb873d3395385aeb87d1d92ca4dd7e606523a621fab16aeec85aaeda
-EBUILD goland-2019.1.2.ebuild 1063 BLAKE2B f4014580858fb07afe158c8d3b129b99cfbf2f6b05ffa64c59f0e893d52646f193d6f06bab01c138f3557548119e870afe4c296a61ae32c5c907d904062ce599 SHA512 540b767ec045af21d59915000952758356265d1bc7d8812fbeb5885c30de5403b88a6fde921e9b37eb61ee35104f4eb59aea1f4f0ca10cefcc2f70b6ecb76fa5
+DIST goland-2019.3.tar.gz 360367644 BLAKE2B d11756d3e077491d361a65dfaad019b68fdfeb8fa14e187f0d5cd5329f5789869b7254305820115cd3e32b55c63c560f1d5524810f1270e8a0a0831f9f12bd73 SHA512 d066292160e0927928a9a96feba6d8040687172df202ea8a22c714492262bf0936993704a16cea3d4111044a1d0d9963e9ffa7de08baab46366de9b0ab442709
+EBUILD goland-2019.3-r1.ebuild 2324 BLAKE2B ad312e4abe6c3cc7a855f12dc9d16dd6d83253b626fe8674e9bd14fb2a85e0eb3d9dc32139808baae3c094f7158dc85ca113e23703413119a00043bac3259b3b SHA512 4ad3c32d29b19c47b87f9626c875c9e57608f22bbc555274d81b94a9df60506b94ba6748bc0266ba37c0b3fa3bb50ee34eb628f300ac0dc656fe71b96acf1ad8
 MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/dev-util/goland/goland-2019.1.2.ebuild b/dev-util/goland/goland-2019.1.2.ebuild
deleted file mode 100644
index 28875598ec42..000000000000
--- a/dev-util/goland/goland-2019.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-SLOT=0
-
-SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
-DESCRIPTION="Golang IDE by JetBrains"
-HOMEPAGE="http://www.jetbrains.com/go"
-
-KEYWORDS="~amd64"
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${P}/*"
-
-S=${WORKDIR}/GoLand-${PV}
-
-RDEPEND="dev-lang/go"
-
-src_prepare() {
-	default
-	if ! use arm; then
-		rm -rf bin/fsnotifier-arm || die
-	fi
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/goland/goland-2019.3-r1.ebuild b/dev-util/goland/goland-2019.3-r1.ebuild
new file mode 100644
index 000000000000..de6131bb420c
--- /dev/null
+++ b/dev-util/goland/goland-2019.3-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+SLOT=0
+
+SRC_URI="https://download.jetbrains.com/go/${P}.tar.gz"
+DESCRIPTION="Golang IDE by JetBrains"
+HOMEPAGE="https://www.jetbrains.com/go"
+
+# JetBrains supports officially only x86_64 even though some 32bit binaries are
+# provided. See https://www.jetbrains.com/go/download/#section=linux
+KEYWORDS="~amd64"
+
+LICENSE="|| ( JetBrains-business JetBrains-classroom JetBrains-educational JetBrains-individual )
+	Apache-2.0
+	BSD
+	CC0-1.0
+	CDDL
+	CDDL-1.1
+	EPL-1.0
+	GPL-2
+	GPL-2-with-classpath-exception
+	ISC
+	LGPL-2.1
+	LGPL-3
+	MIT
+	MPL-1.1
+	OFL
+	ZLIB
+"
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="opt/${P}/*"
+
+S="${WORKDIR}/GoLand-${PV}"
+
+RDEPEND="
+	virtual/jdk
+	dev-lang/go
+"
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier64}
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+			# This is a new installation, so:
+			echo
+			elog "It is strongly recommended to increase the inotify watch limit"
+			elog "to at least 524288. You can achieve this e.g. by calling"
+			elog "echo \"fs.inotify.max_user_watches = 524288\" > /etc/sysctl.d/30-idea-inotify-watches.conf"
+			elog "and reloading with \"sysctl --system\" (and restarting the IDE)."
+			elog "For details see:"
+			elog "    https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit"
+	fi
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt "2019.3-r1"; then
+			# This revbump requires user interaction.
+			echo
+			ewarn "Previous versions configured fs.inotify.max_user_watches without user interaction."
+			ewarn "Since version 2019.3-r1 you need to do so manually, e.g. by calling"
+			ewarn "echo \"fs.inotify.max_user_watches = 524288\" > /etc/sysctl.d/30-idea-inotify-watches.conf"
+			ewarn "and reloading with \"sysctl --system\" (and restarting the IDE)."
+			ewarn "For details see:"
+			ewarn "    https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit"
+
+			# Show this ewarn only once
+			break
+		fi
+	done
+}
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 37dd5210b8a8..5f997a045eac 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,5 +1,5 @@
 DIST gperftools-2.6.2.tar.gz 911744 BLAKE2B e5798a2f0f2973f02bccabb2550a9df54319e505fc715795cd836ced631b29bfd8e6f8ddf3c7f6dceb0f166523bb0fa55564b1cbc896c8cd8cfd475263c07c39 SHA512 20c3460f806c6425d54e8d1020f15bc8940aacd7bf1367b03a116fb873bbd6c1e1fbb75df1d0ca341eaec813552fec394327175115ea8442a4b7a1ef17f0df2f
 DIST gperftools-2.7.tar.gz 916919 BLAKE2B c48882df45415110c1ec39298e84ec9384f6a82851d95e92435649d2b253b9fb8e29664b474e45881599abf3781731c47ead0b6c454c33be9a207a6a2401a97c SHA512 9aa39689bc18603123204f024ab6dc96099b70a3d304e31ef0cc1e9893cc77bd14ee6eb420e597d40e81e487a2a45e77cf1965873646d056fd4b7bee22a4b0bb
-EBUILD google-perftools-2.6.2.ebuild 2303 BLAKE2B fb9f08f296cd95edd01b3bbd0eb3642877ee9e8083f52b5e5dd82b91e03b59707acc6b92843d8ec2c78e1c8f58664da94fd75bb37507a8a9db8936b2100eab48 SHA512 35b0cbc3e106fcb4154717651a5a141603b04eb65def57b5533ae08163b0ae571d20787c95a66911b30861f55e67b4fd29ba019556cc4cc781ac373d91cf8fe5
-EBUILD google-perftools-2.7.ebuild 2343 BLAKE2B 2ac1afb7bb9dc3c678aaa17fa41f4c74d49bf9e8cb672583ba3351dd2472012c416ce01376741af484f13c968f59f5e85645d3ea7aa7c8a415f3d425ea7d2ac0 SHA512 f5d85886fff58bee279bd60d924c02aba6d861d2f36860e884cde0323cef8c99f2fcac8d1116a95602ae8178a2594f85738bb31ef96f4e7be98cd49bff61a7fa
+EBUILD google-perftools-2.6.2.ebuild 2327 BLAKE2B 8732f6b11b70863c41d4e14208289d90e51aaeb01a57865ab94247039dc39b974c9910bca52848087074a8de14e11181c4fd42655176b25c24f3b25f44b3ffca SHA512 6a9946cc7b7429949cf9027820bb16f584c2f6237d1bb4c31b1028f39ef152a4c65975c22d423cf6e475066f9ca107a3b8c363446c8c030dc5f369156037930d
+EBUILD google-perftools-2.7.ebuild 2370 BLAKE2B bbd08a3e0267f8f12d4753065c9377cc4e2b13b8069fd4741aa334fc91c446dc1e3107f00843c66ec6fae755ba7ef664a201ee1125be975cd862d5c24faabc06 SHA512 75ce9a01994ceb9f01d6a5cb26d24e2eb5b03e4dbea2307d20fb956186de3ff790151e6888a9b3e9b4b32de2c5b0c322f2f05c3353df13aa002a730cc456f704
 MISC metadata.xml 921 BLAKE2B 71a3db16b3a5a561ee677caf593ff5c45c01bf1cd449da8782e430ffce02b8661c4a011643192f12329ce164ce0148ee206bef85bf55503aae1161067b8e88ca SHA512 e8198e40382ece3675dd43a1878af9cf189d492bc79f246547423b37426981ab2ab624c6d69bc7d57e8a7bdb1f8f4eee32efb1b7d70ecac159dc2a939e480efb
diff --git a/dev-util/google-perftools/google-perftools-2.6.2.ebuild b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
index f330adcf4e2b..7f9bcb09f7e5 100644
--- a/dev-util/google-perftools/google-perftools-2.6.2.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.6.2.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
@@ -19,6 +19,7 @@ SLOT="0/4"
 # AIX ppc/ppc64
 KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="largepages +debug minimal optimisememory test static-libs"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-libs/libunwind"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/google-perftools/google-perftools-2.7.ebuild b/dev-util/google-perftools/google-perftools-2.7.ebuild
index b28f8923d384..4dff6288dc5c 100644
--- a/dev-util/google-perftools/google-perftools-2.7.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7.ebuild
@@ -20,6 +20,7 @@ SLOT="0/4"
 KEYWORDS="-* ~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="largepages +debug minimal optimisememory test static-libs"
+RESTRICT="!test? ( test )"
 
 DEPEND="sys-libs/libunwind"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index 02d3ccd0265e..feba071ed2d3 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,3 +1,5 @@
 DIST gource-0.49.tar.gz 874349 BLAKE2B b7d24f415944921deb7df33be4e9918291f5df6dd4813bf98727894e0192b881a583a1dacec2d6e8f2d1a0d6b644bc3b735ef8d7c0b7882d77bcd80913fe08c5 SHA512 cb3482dd06cf38bd775f2ac4b8f3bee78e480dd51e37527024df6e59d6e613290297d65e167a21364aa6251eff78a50ecc8a5fd3772a6e9a4ad22ca21b4b615e
+DIST gource-0.51.tar.gz 882783 BLAKE2B 86a95a55ef9e1ec50e19a4859163d7cdc2733b7c55a68e4d2db493e4c6587682b900b2c73525131972da4dde9fc4d9fa41ba728bdc56fd46fc6a559cb4d837f0 SHA512 f29326ffb2aa6f645fb941e08e41f0cbf8dd894d5a4d607b782caeb12a24e6446198027060b880e0ad14a36efbed19023620dd8c890cfc0c027fc90ac2d5be24
 EBUILD gource-0.49.ebuild 1067 BLAKE2B 239950d5088a2a7d8901b60b1b5514a27aae8b4065a1ed6db44d123236bc1bccdf200ed6d3371b331702cf49032aeb162e201d29febc3d552f991034e45efad3 SHA512 f8511d169bb3db902d7bd9f0aa4c0a33cae3d92123a234d516b0ce03044217cdd846241bc979151c683282c9f457eaeb5daf011d283592114135e2a117a5e8f4
+EBUILD gource-0.51.ebuild 1075 BLAKE2B ce94c79fa5fdfabd9a15febdc0582a45ee960b4ee080f218eb49102a887775b87ab22c8b5e994b6ff980e6168fb9beedf71e8487dc12891160ec66c84ed225ac SHA512 6d51fbe38fe6d807c48fd760f8b59ed3cefb286a9c56b5e08ee3b948bb9ba82aa5591be2f25237c4473acf5304fd215dd0e2c268c9f1177b911a4592dc8f58b5
 MISC metadata.xml 353 BLAKE2B 86c28b45e78dacf7183e323130cd947f36f88278cbfca6d5e50d52268f309394d934836ca6a150af8297a153025c1be7756ba7cbc5ac7088bf2fff763f3b85d9 SHA512 d203593d1819671dc81ede02a2c7fdfc81f69b9d66a6587fd096ea89ca3274adba144f06244792f2044f8c8bfc788fbebbc6eca20a7cd9b5da18f3c1fb392729
diff --git a/dev-util/gource/gource-0.51.ebuild b/dev-util/gource/gource-0.51.ebuild
new file mode 100644
index 000000000000..a1e9aa52d6f9
--- /dev/null
+++ b/dev-util/gource/gource-0.51.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="A software version control visualization tool"
+HOMEPAGE="https://gource.io/"
+SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.46:=[threads(+)]
+	>=media-libs/glew-1.5:0=
+	>=media-libs/libpng-1.2:0=
+	media-libs/libsdl2[video,opengl,X]
+	media-libs/sdl2-image[jpeg,png]
+	dev-libs/libpcre:3
+	dev-libs/tinyxml
+	media-libs/freetype:2
+	media-libs/mesa[X(+)]
+	virtual/glu:0
+"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/freefont
+"
+DEPEND="${COMMON_DEPEND}
+	>=media-libs/glm-0.9.3
+"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README ChangeLog THANKS )
+
+src_configure() {
+	# fix bug #386525
+	# this enables gource to be compiled against dev-libs/tinyxml[stl]
+	if has_version dev-libs/tinyxml[stl]; then
+		append-cppflags -DTIXML_USE_STL;
+	fi
+
+	econf \
+		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
+		--with-tinyxml
+}
diff --git a/dev-util/gprof2dot/Manifest b/dev-util/gprof2dot/Manifest
index 756aafff44cf..31197b1aa584 100644
--- a/dev-util/gprof2dot/Manifest
+++ b/dev-util/gprof2dot/Manifest
@@ -2,7 +2,9 @@ AUX gprof2dot-0_p20130517-py3-xrange.patch 431 BLAKE2B 634ad067782bc67ee0dfe89af
 DIST gprof2dot-0_p20130517.tar.xz 1080464 BLAKE2B 49fdcc79bc91505cc1d2b8233099766c0b305af145e8f668011429743777b965084baa713664d9fe0c0d17d2ee741b13101c5162baf07c609d1b0b7dd04de6c5 SHA512 1907cb889d1776723ca944d588fa4185afdeee11cc85ec40c03832568d91612bab708160c69036fc45fef05bca62c5bc8f6ef19cbb45c6bfd1952dda94c54a4b
 DIST gprof2dot-2016.10.13.tar.gz 22264 BLAKE2B 612cdaf8491e40223cf856104e49554675f2f83f8fc4ca9932f5b36167408ea51c2020c7c958a014b25010002230b0a6e4d5c70d6791fc445182fc61a9ff7eab SHA512 0568f1afb4e5c9da9e6c3c58d9a3613c90110c338c573e2c088a99f1db4d076a287d1209a132b86334a01404701d6ca0d9b0553e7ce850278956ea79acc2c388
 DIST gprof2dot-2017.9.19.tar.gz 23558 BLAKE2B 3de2a0e7c9731987a1382df9d67badcb19514983fa83af432bb83b5e59762c12fe865af9cb7778ccd37015992384e87b71b53211c33555039ee3f7dffc4e7c9c SHA512 652b38c6cbee47795d866a539e69ff4b2e67e221c8c082c6ecf480a15c24fe6d77e80b7daa5d24e76d27a4ff90836f80e716cb4d51d48d41aea5f661e3ac3598
-EBUILD gprof2dot-2013.05.17.ebuild 1111 BLAKE2B 8501c23d7f826dd4d6badd3423be2eaab70b16ec3da3ecd3308a522feff9556fca77e367a951c9abac450e7c1f262dddbdc5e0516d9666a60c343247a85fb3d8 SHA512 7d9ed71acf649e541c5aa2bf56e2afebdb2774deab4018dd43480074f5fef83daca4664b805b24b089b8c45fa053b021fe1321a2b7e1e31ca8557aa7b140bc79
+DIST gprof2dot-2019.11.30.tar.gz 31388 BLAKE2B 1781f59e5daa8315d3fd9defb6e28290272c4ddca01312e9af4acac494f3c7b29a437e3411b0bbb218f2eedbb2acf83d4dfa9c1d47f20b2eedc0fd607f1e4a02 SHA512 06fa8feed23e21d7827bbac19c887f65b9ca6a0cfd5b54c4da373ca33ecf0f11835b961dd1c2237ac2bf9764a8122d3ed9c7f9981c127a14ae74a733fc1275b1
+EBUILD gprof2dot-2013.05.17.ebuild 1090 BLAKE2B 57235d83e957dcbfc624ab42386e21084fca2945ec44b8e82e4eb5c567d9c98322b1cb515cea3215911f43ab1aef2a2eed3b35f3f8b092d731b33c39bcf5e015 SHA512 563f4bee8a617e53a82d08f3da289fde731c64a894b416b938864bf297dc190708b4a3560926cb36c9fe556939013d37c9e86b6f3b3eade6f908abaebc5edf83
 EBUILD gprof2dot-2016.10.13.ebuild 496 BLAKE2B 8429f3b0720f8f9a794d782a36076a1313eee3d1339ea5be401cfafcabe7dc5be22d8248d36eeb41b24b065e472e01285e58759096cd5eac2c1c2a6b9c72ce50 SHA512 2c1088eead2bef1e2f13037bf4272cdc2f75148d893a2be95fa2ad6ca6ca9b2451e541edf43ee4eb778a4ec6684ce02859b616c1453c49b7bff28c0c0b9d0764
 EBUILD gprof2dot-2017.09.19.ebuild 559 BLAKE2B 27f1b372d7328f7eef7db430fb021eeec0ce15631e31f99f77e1fb091989c386f68217479bd25325c5241f056637e61dbb59908a4b60ade75223edf135340078 SHA512 da5394975d35c0bd9729b0ca6a521ef9e9313479f04682516d60ef189af9960548f645430834ed33e7fbdeef4cbd3fab5c7462f4127203e87ba3d1817d25899c
+EBUILD gprof2dot-2019.11.30.ebuild 563 BLAKE2B 904e8804001f70055adaf41b33f0c07ed9c1d7d5d8bd654f72fa42666a93deb27f6cc326c8173faf8e0ea853c9db0c888a70277a66e4f36dc629ec4cc1876705 SHA512 0ca8043ad0a074facdd9c402f165b549bd8f0c221391951165569f964f9cad760b5173f47a064db9c8563581a49266472a4dd33d5a9c7c44707fb2cb723796c2
 MISC metadata.xml 333 BLAKE2B d1735f6673a0258eadd2d185548fba581c8613d4c8709e388bab630e81d9e835aa1fac22495b400a8db3e9895ba655e273657bd9329c9a9a8022c5bd7ada2f3e SHA512 503d8f740b27ef37b79be92c4652c60f49087634451e0d418da990c7b1f9c911aca461f2578e66e3e09f7db0588e57e304949a04b279fe782ead8222e1324a28
diff --git a/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild b/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
index 0dfc78249914..b9aea7e30d80 100644
--- a/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
@@ -36,19 +36,19 @@ _make_call_script() {
 	Main().main()
 	EOF
 
-	fperms a+x "$1" || die
+	fperms a+x "$1"
 }
 
 src_install() {
 	abi_specific_install() {
 		local sitedir="$(python_get_sitedir)"
 		insinto ${sitedir#"${EPREFIX}"}
-		doins ${PN}.py || die
+		doins ${PN}.py
 		python_optimize || die
 	}
 	python_foreach_impl abi_specific_install
 
-	dodir /usr/bin || die
+	dodir /usr/bin
 	_make_call_script /usr/bin/${PN} || die
 	python_replicate_script "${ED}"/usr/bin/${PN} || die
 }
diff --git a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
new file mode 100644
index 000000000000..58ba74769baa
--- /dev/null
+++ b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} )
+PYTHON_REQ_USE='xml'
+
+inherit distutils-r1
+
+MY_PV=${PV//.0/.}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Converts profiling output to dot graphs"
+HOMEPAGE="https://github.com/jrfonseca/gprof2dot"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index f7b62c85cd11..cb6441f8e621 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,7 +1,7 @@
 DIST gtk-update-icon-cache-3.24.11.tar.bz2 91127 BLAKE2B 048e42e680e1d7b3697f6609205327c1aeded4cbde03350acc7c907bd781c4ded0c749d0375fb20919e5c3ccb45927dbc6fd7c521d59ddaf6b8c4c7b86a0b06c SHA512 40d8f415fcbfec2d7ba4bec94c92d16b40e5bb62ac3a31db1c3f05939336073e8dc376cc450b3649bc06b2ebbf7cf080f3139e5251a7b0707d306e23337b977d
 DIST gtk-update-icon-cache-3.24.3.tar.xz 372612 BLAKE2B 6087334fdca3aa7f93b1b6c5a7195ede2376ec80d2618809f924f9b612de46a8d3e95f0a90030deb939f27949458f9ec72b11600c2bf8b1ae6089284324f2c9d SHA512 0e47977567314abc64419440cc0f276525286fb65acbfe7fff21d6cf548fbc072865f8a2ed18e3114508a7e8fa696453c26e1ad53e638ee11dab57b4a6cf75a5
 DIST gtk-update-icon-cache-3.24.8.tar.bz2 91113 BLAKE2B 4a930d001a9718b14089962a6c368c9073afa7163217ec2a5f35ab6bcab593490d20944321a2980baef42e13eee43b26a3dee35c8327c8aaa984e5c36611600f SHA512 20ffc1a3570cc4de045a698e51e5b5bc214a78f9b1f730a1930e07df78d965d883262c6776bdcd68b6b39f309d75678531daa6975c0cfc9ecd9070b26b89b4b1
-EBUILD gtk-update-icon-cache-3.24.11.ebuild 907 BLAKE2B b9225d29c0da51cb7a133b610593009e450c07b634afe00250b19547f5c68988750628d52b3fb7ab8a7a5461b1a00deb8203b9a774e389a1ad0f6e786dc1dc7a SHA512 90cabc4894dc621a90f0a56688a004d418645904de51140e356a57d9979c84cf0d589723b9fb014b902620c871a6022ab58e4549d6e331e74adc3eb428d7ec2d
+EBUILD gtk-update-icon-cache-3.24.11.ebuild 899 BLAKE2B 2bd4705b22967e6bf6b73d077246fc81324925a5cfb1fc38aadd54dc35fc709c2e9718eaec506c814bdc567beea4353ed923a2b343f90ee1ad71d382b8cc98e3 SHA512 1fa307a7ddb984611583dd324e856b7380c7e54b3648c97e5b62975d858b9ac1e29e8e6a3ce5031d3e49d401ebb9b29ef423335e9d17d2129e6f63e05ae9b108
 EBUILD gtk-update-icon-cache-3.24.3.ebuild 930 BLAKE2B 3b422880ebd4197c036dcdee21d314774b7bce024de26d8d1c2676d74a4cb8d77c8715ae57408846ee531d6d80f10649cc82fdfd2aefd9bdc587a11e1b8f7b51 SHA512 78357dbded017674d0efccdbd0e66d9061ec94c137941e845d5dab2ac5a8eba04f2cb49acf5768c5247502cf97a27a1c1854a03c755dc62d0a4ab958fe3d1b14
 EBUILD gtk-update-icon-cache-3.24.8.ebuild 897 BLAKE2B 7496c44a758b438a6a0a9a056ba4d25e7288f1fb4cf6bbe73bd57649d98e367bc5a2521a09545f3a06d29514ad4829ea42cf9fa68bb84f239ef0fbbe76b49c9e SHA512 7dcdefc69273747abfbb6083013d28623ba8ff78ebe08ad19bd04fe106539eb695bdbdab31b72d6afd867b91df5d16a26a76a9753b309b94da3027012d557528
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
index 7b3b5619d047..51a162cee66b 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.11.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/hfstospell/Manifest b/dev-util/hfstospell/Manifest
index 073ee8117e24..59c33314f745 100644
--- a/dev-util/hfstospell/Manifest
+++ b/dev-util/hfstospell/Manifest
@@ -1,3 +1,3 @@
 DIST hfstospell-0.5.1.tar.gz 152056 BLAKE2B fa589908312bd4a4b40b88b221ee5f6bdc281d6151984a87b237372b0141157db87b3494e357d74a17f0ee137fd5ce35ec8caddb12d5bffe15930a74345cd3ee SHA512 bd8ffdd3ee822da2a57a3405b139ec1e635dc8bb293dbd9abd05912b8929df29633304e64b97522e4590a3907ddfa3aefec3e4da5ab709b9be1857cc2ecd2018
-EBUILD hfstospell-0.5.1.ebuild 589 BLAKE2B 442221f168f9c7378130bc5e23a795246cfbe4504cd9af4e008bc82349bbf403d52c3ff590eea374fa8c0b937674fa5e0a2ca195d194c6260c902a19d446a802 SHA512 d98f860d6f9a5a11c1d6caa34ab19c065f4b1a841c76fb61cdcdbcfb53940ad9da0ce07ba89a9b2c7c13ff7d1b5e6ebc54f35aa95db033b5972173c55a7fdb78
+EBUILD hfstospell-0.5.1.ebuild 587 BLAKE2B e85e3adb9a33c8123772005515498f2f61672e655b4fba4b38201d99588981102f24be389390a6cf80c0bf8fc7de1c15c82ea2a7c2391fd3803195d104096703 SHA512 bccd2ef9d8457aac8d7e24c702250ec3fc2fa80f84074cb30492a35d009723f76ce50c540e663b80b8681eee5c2871f2a1f586d256a24f789c0ab3fc723b6e42
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-util/hfstospell/hfstospell-0.5.1.ebuild b/dev-util/hfstospell/hfstospell-0.5.1.ebuild
index 7aac0223c0d7..84452334ab9f 100644
--- a/dev-util/hfstospell/hfstospell-0.5.1.ebuild
+++ b/dev-util/hfstospell/hfstospell-0.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/libarchive
 	dev-cpp/libxmlpp:2.6
diff --git a/dev-util/hxtools/Manifest b/dev-util/hxtools/Manifest
index f324402fd779..2fb2c39ca763 100644
--- a/dev-util/hxtools/Manifest
+++ b/dev-util/hxtools/Manifest
@@ -1,3 +1,5 @@
 DIST hxtools-20180301.tar.xz 301516 BLAKE2B 6b768e316de6d9b724cdca5beef1ec14e3482aaf1aa34abc138861782266eac32565cdf7713cc65d3863fb1b3463a21446165ecc7df4f39c4fed168d8efdd3df SHA512 10b6a59367a9d5127116a81ae46c4c0f10dd4cecd60ff78b2dfeb2a304c7a34112df2355b9f939558c8e27d0e255e2df6277da9cc558d4368bcbe4d7130d5326
+DIST hxtools-20190428.tar.xz 219012 BLAKE2B a1c2cc48eadb6d2c9016803469a87a18e447705f463f3a059dd9e501a228eaa20355ce1ce36d2c9988c1fb1ff64727ce6e4c0e098b24a88ca591649df36375bf SHA512 268da9c5c09830affe35052769ed2bee2fc4e8f7de3b9ad5eda7a8865ccac88bc1392a6c83b7d4c5faab2b07d7c77c6e77808a8c184bd3e530288c577b5de567
 EBUILD hxtools-20180301.ebuild 802 BLAKE2B a35cb67d8dacdb559df4dafed8ce2ebfa2482030fe5e513a0802ccec0b0192d92bda8a09dc0ecf7dbce5dee39463a92667fa67183a773f0572ffc9f16d4746a9 SHA512 d86fd5d656bf6646c2469f2d83c39370943dba1bced7ecabaa5629be4a0ce4a6b8c6a0958af2480543b00b18d9237c42d3106ed76e2a607e92afffecefdc4029
+EBUILD hxtools-20190428.ebuild 955 BLAKE2B 77a212351dcf16bd147079ac25a9c5e7352984eb1740aff1a305bf18c2b51463c869ad7499d2b21c6e8366a72af20a21ca9528a89633f46170ba9c7850d3b62c SHA512 53c886f9ef0f978d90ad057464ede04f2a6db0d1edcdecee31036fc8661b61130385ff434400d666ddbc5461fb65c40dc91e50e3cc61df9356efbe278b11c72d
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/hxtools/hxtools-20190428.ebuild b/dev-util/hxtools/hxtools-20190428.ebuild
new file mode 100644
index 000000000000..0d8b5bfff864
--- /dev/null
+++ b/dev-util/hxtools/hxtools-20190428.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A collection of tools and scripts"
+HOMEPAGE="http://inai.de/projects/hxtools/"
+SRC_URI="http://jftp.inai.de/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/pciutils-3
+	>=sys-apps/util-linux-2.19
+	>=sys-libs/libhx-3.12.1
+	dev-lang/perl
+	sys-libs/libcap
+	x11-libs/libxcb:0=
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	default
+
+	# man2html is provided by man
+	rm -r "${ED}"/usr/bin/man2html || die 
+	rm -r "${ED}"/usr/share/man/man1/man2html* || die
+
+	# Don't collide with dev-util/cwdiff
+	mv "${ED}"/usr/bin/cwdiff "${ED}"/usr/bin/cwdiff.hx || die
+	mv "${ED}"/usr/share/man/man1/cwdiff.1 "${ED}"/usr/share/man/man1/cwdiff.hx.1 || die
+
+	# Gentoo doesn't have /usr/share/kbd:
+	mv "${ED}"/usr/share/kbd/* "${ED}"/usr/share/ || die
+	gzip "${ED}"/usr/share/consolefonts/*fnt || die
+}
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index d384a45cd394..dc1d89e6eb1b 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,14 +1,6 @@
-DIST ideaIC-183.4588.61.tar.gz 541751086 BLAKE2B 51a5a4dae10d8fd00a0c239f87af3d53b86ffa50f7f9c4f1554265b349d866d60a8994a96f184cc9993fafe12de3dbfa77e3931626436a5f3d3854710b52fb9e SHA512 3e5956353fc0fabbe91b3a946e83b0b3229766a366fdf782c4c017acd7de5a86b3e0cc870a17abe2bdb8b090cb5c58b6c170555f60ba5e6a9a8198073545be87
-DIST ideaIC-183.5153.38.tar.gz 541754349 BLAKE2B 541054736db09c8f0106d5588b224d3033ec21a1e2b566fbc95300fafd39acae5c7f6755082bdb189c5619ed5375ea9fc3e777440d30523a84f864be29e5ad85 SHA512 0bb213da8bffda7d63fa29905d01ee36c3839249dd6e2a58b3941e4317a01bd9315e8bf639f088657938c8197eb2f05fc34fb3e0c49f8c243043cb03f8443f0f
-DIST ideaIC-183.5429.30.tar.gz 460232784 BLAKE2B 53cd69f5e8927b31a34b23f9e86e0974152cd6282eb4597aa173c06895e1b431360b18c76442094fb9f544bc29f925397242d42943b51840156f8b332e0d5357 SHA512 36c5151410c15e4530af1da5ccfb981ca4fba00577b26fb76fd3470bc3818f2b08b4545ca7ab2979dc87f144712f864811cf73336cf5ff98cb5f63c0e61e1a9c
-DIST ideaIC-191.6183.87.tar.gz 496360045 BLAKE2B 12164308d161c9ac5249baa0e2ec6ec88b96e9e37e25fa1befa5660142a530b40c5fa7bbbac6a6fbea0297de7ba6bcb557b139ea213f5fd75342ec0e12956ee9 SHA512 3c56a265f74c80e15b88a6121d1c462b6a3e394893c0ab522b2935af29e5c830245d9038208bc5358285714969ffd192e1e8c52bd5ac8e5b0425b8a5a1224c7b
+DIST ideaIC-193.5233.102.tar.gz 551536829 BLAKE2B 9dac3f24235ab7bc10d440a43bd431b4823d8545a7d7e62c00a296540f007bac916199dacbd2906b4334b9759ce9beb7679abf3a3f672c17a83bf055614e7ce1 SHA512 fb8e3085c98529a746c7660b5ae685c4bf569177206f6bef74db2c14973f8527f8258819776edc2b5e15ac253c8450d82c6d4b7f374ffeedd7554988b6da3c67
 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
-DIST jbrx-8u202-linux-i586-b1483.24.tar.gz 80740809 BLAKE2B cc420ac646120c7060a3a7697e2a0f1d8a6f9702b1c2d2730f339e7aed405ccf4bb31d4be389686f57066f6add5e8279912e54fd341873ad2c2d1f5292b4d14f SHA512 90280f8a36fa8f20448c27d344de85ae06412f0b1fc717b77b5fbdcc0a3486e0def510e4ef0aedc1eb210b1e3541b0e37f805821731a285c6e78eb87ad083f2d
 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
-DIST jbrx-8u202-linux-x64-b1483.24.tar.gz 81829687 BLAKE2B b716ca394a1315d8d6c6ebd57fd35cc37db6429380681c6d5e7d05b4a00036c1aca46820b0a17b824c8742e7ba924b4342eedf08999370c7a9fd2675f99d45a3 SHA512 08db0eb7fc2b5ae734120f276f96f21fe9e6c2bcb84a833fe5a1a8bb3b9b1205c3de06e1c1ad94e220c26f092061d5ec99470619240630f7722d1d64d21ace97
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
-EBUILD idea-community-2018.3.1.183.4588.61-r1.ebuild 1881 BLAKE2B 00ede33b80b65b56cf716c76236590e470a24ada2ce6ac6350c09c3e7bcf8f478b79e671fa000e8bcd35b280b1fd25914017cba43e50cdeaa9a1e1b81aaa03dd SHA512 69b217495ba22e12ed6cb5bb753ae0d7357c8eb7311f1faf511c7fb9c5cd07b6cd6baab51d957e44c926f8a1010860010d1913655fa6cd6fec1767aaa00d5e26
-EBUILD idea-community-2018.3.3.183.5153.38.ebuild 1874 BLAKE2B 4934885f97219f27dcce193cbf7a59c2e48f7eb4921f57d048e6c595823c48b7a99ba832612cc3f32044366e6dcf3a21d20e82a95da7d1ca556b89ac0e6947ee SHA512 884d0ceccf5a93568d9eb5af2f5115d7c8c882d4515e69686336a91d0bd0a6fb5393f1a3845b91189130beb6b9ca45ba7ae4f171a3075bd0efb35b4aa892b47d
-EBUILD idea-community-2018.3.4.183.5429.30.ebuild 2395 BLAKE2B c46ebc58e686e62feead0e2162e4b85abdc0520a4581c493f3fb8abe69161e57ff8f69995b9a2bc614002970f099b68a3a148bcf7c85e9c9d299e38b22a632b3 SHA512 a57dd578c417b4e3eff42990862d7bc18daa758895bfecd44b3a5d8d4c9da831967d93c18eb59a61ac7aab1e674008f9e8c37048c65e7b6eb9f2f5641d008caa
-EBUILD idea-community-2019.1.191.6183.87.ebuild 3476 BLAKE2B 9af13d948308491cd3bd35b0e27c60e6261a7a1e7b3e64eff183efc4ad5ce97bf1e5b610f287b679b97b18262cc4765cb0879b70fd683cac92bed6a8c6f47a15 SHA512 fc0358a3f22700f0886e3135a16b971a3c64c355fb4c1524e5bd4f789f4c7f94472e89a95b08fd776caeb2c5571f56be43cf05751e4ef6b43e751ad6fda7bf1a
-MISC metadata.xml 713 BLAKE2B 075c4c3b48a6437c675adabf03346fe90793053182f7d1b8f7b0d6a8fbefb68f01f64feb3fe69e0e42efbc2ae593a088f3e7a5b285de6d07b7bf117a2e9f379e SHA512 7c039238a56e7499d06a02599a300b45fc87cb24f884042a2a223ae4b0bca1e5590428ff4d930b43af4c997f8ad002bedc16ca8de40dc953499822ee6015208f
+EBUILD idea-community-2019.3.193.5233.102.ebuild 3630 BLAKE2B efa17ac54f0365ded9fa819d29f7b56e7fcd9eb663bfbde0fd3d49c8953e904636105caf5fd60183222f98ea6de591b774cb002909cfc0ef8fe102fd82940fe5 SHA512 9cad41636775c535260e53534d29cb9e8d7269333f8c176e678c6ebe9e6a19f1cf90912bc43dcb9274941fc34de311a57d4e240f3ca1b64c8337bc34dfb35fde
+MISC metadata.xml 758 BLAKE2B 2009b0e669ca0b3cdaee71ac45bf1bbddf940ae8130b0b5c275fa825781dd71aa1c522307ee44cbcf75dde0796f6f2f77a7f4226917e5da52020cde563f4951b SHA512 9a2dfb6862b8f49de5680af6a8ee703c0e6687b5cd312cf304a60547075ee9e1f888516e2172ff54172f89524bf5bdc33d53848b6fbdb708bbea320b804de591
diff --git a/dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild b/dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild
deleted file mode 100644
index bfb9c749e703..000000000000
--- a/dev-util/idea-community/idea-community-2018.3.1.183.4588.61-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator
-
-SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0
-	custom-jdk? ( GPL-2 )"
-IUSE="-custom-jdk"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-	fi
-	if ! use custom-jdk; then
-		if [[ -d jre64 ]]; then
-			rm -r jre64 || die
-		fi
-	fi
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
-	if use custom-jdk; then
-		if [[ -d jre64 ]]; then
-		fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-community/idea-community-2018.3.3.183.5153.38.ebuild b/dev-util/idea-community/idea-community-2018.3.3.183.5153.38.ebuild
deleted file mode 100644
index 3811dacddc7e..000000000000
--- a/dev-util/idea-community/idea-community-2018.3.3.183.5153.38.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 4-6)"
-MY_PV="$(ver_cut 1-3)"
-MY_PN="idea"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0
-	custom-jdk? ( GPL-2 )"
-IUSE="-custom-jdk"
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-	fi
-	if ! use custom-jdk; then
-		if [[ -d jre64 ]]; then
-			rm -r jre64 || die
-		fi
-	fi
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
-	if use custom-jdk; then
-		if [[ -d jre64 ]]; then
-		fperms 755 "${dir}"/jre64//bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-community/idea-community-2018.3.4.183.5429.30.ebuild b/dev-util/idea-community/idea-community-2018.3.4.183.5429.30.ebuild
deleted file mode 100644
index 2f0a755fa416..000000000000
--- a/dev-util/idea-community/idea-community-2018.3.4.183.5429.30.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 4-6)"
-MY_PV="$(ver_cut 1-3)"
-MY_PN="idea"
-JRE_BASE="8u202"
-JRE_VER="1483.24"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
-	custom-jdk? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-			amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0
-	custom-jdk? ( GPL-2 )"
-IUSE="-custom-jdk"
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*"
-S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-src_prepare() {
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-	if use custom-jdk; then
-			mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-	fi
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-	fi
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-	if use custom-jdk; then
-		if [[ -d ${JRE_DIR} ]]; then
-		fperms 755 "${dir}"/"${JRE_DIR}"/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/idea-community/idea-community-2019.1.191.6183.87.ebuild b/dev-util/idea-community/idea-community-2019.3.193.5233.102.ebuild
index 5d9d1f8af941..9fc7ccc54b82 100644
--- a/dev-util/idea-community/idea-community-2019.1.191.6183.87.ebuild
+++ b/dev-util/idea-community/idea-community-2019.3.193.5233.102.ebuild
@@ -8,9 +8,9 @@ SLOT="0"
 PV_STRING="$(ver_cut 3-6)"
 MY_PV="$(ver_cut 1-2)"
 MY_PN="idea"
-#Using the most recent Jetbrains Runtime binaries available at the time of writing
-#As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) arn't
-#Available seperately
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
+# available separately
 JRE11_BASE="11_0_2"
 JRE11_VER="164"
 JRE_BASE="8u202"
@@ -26,18 +26,20 @@ else
 	# upstream stable
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
-	   jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
+		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
 		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-	 jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
+		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
 HOMEPAGE="https://www.jetbrains.com/idea"
 
-LICENSE="Apache-2.0
-	jbr8? ( GPL-2 )
-	jbr11? ( GPL-2 )
-	"
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
+	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
 #Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
 #either (or neither) bundled
 #Defaulting to jbr8 to match upstream
@@ -72,9 +74,6 @@ src_prepare() {
 	if use jbr8; then
 			mv "${WORKDIR}/jre" ./"${JRE_DIR}"
 	fi
-	if ! use arm; then
-		rm bin/fsnotifier-arm || die
-	fi
 	eapply_user
 }
 
diff --git a/dev-util/idea-community/metadata.xml b/dev-util/idea-community/metadata.xml
index 5ca8720092a6..7800e5a02c1c 100644
--- a/dev-util/idea-community/metadata.xml
+++ b/dev-util/idea-community/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>alicef@gentoo.org</email>
-	<name>Ferrazzi Alice</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer type="person">
+		<email>alicef@gentoo.org</email>
+		<name>Ferrazzi Alice</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mpagano@gentoo.org</email>
+		<name>Mike Pagano</name>
+	</maintainer>
+	<longdescription lang="en">
 	Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
-</longdescription>
-<use>
-	<flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
-	<flag name="jbr8">Install and use the Java 8 based version of JetBrains Runtime.</flag>
-	<flag name="jbr11">Install and use the Java 11 based version of JetBrains Runtime.</flag>
-</use>
+	</longdescription>
+	<use>
+		<flag name="jbr8">Install and use the Java 8 based version of JetBrains Runtime.</flag>
+		<flag name="jbr11">Install and use the Java 11 based version of JetBrains Runtime.</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index 473c131dfadc..843d5d450d7b 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,4 +1,4 @@
 AUX 1.1.2-python-3.patch 4553 BLAKE2B bc16393f3c7071017255e8f188456e77d89a2ab2d605d6d99882aef4c65c7e5270a9348cf278a98d5ff7527423e899feffbb93b00f12a8c6e9a7b131acb86eba SHA512 fa5065572eb7fdbf38e3d7785ae92bddaeae8eadd9dbd006f5691c8647087df7529015750b66ea7618dd3306fcda80083c8dc2d2f019787137095db5b2c1a4d7
 DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
 EBUILD imediff2-1.1.2-r5.ebuild 795 BLAKE2B 3c6f2482c2f857f7f2a7573cae424a6734bce8dfe040fb1f703e53f16ca2d8fa4e0ca10ba3d940354f24c1239ba08121a22a4f82e2e381001572438fe089c245 SHA512 e0620c658dbc04bb965e78763ec0865a8197368406f4bb155a283d45f1eeab8781548cc216c53cd6e3c9f3b508e1a19dca4fec2161d427b545e09358a3b16067
-MISC metadata.xml 357 BLAKE2B fd7b99a53b06a9ed310039486dd9c631d70ae5af05b47b42009e92b6134e52ee13e520066b8170f70b000a8eca1ca6c3c670478e393a4e36f3fe6c21187f090e SHA512 2c36e9355ac79bb027b25c63e0487299cfdf226217ea891349c4665107f6e7fb2931e56386ff1d88f16ad9e573041fc94658f61e8658d234b04bfa49c5fe902b
+MISC metadata.xml 246 BLAKE2B 464fa3d4dae2c15dd040a7580e6324ebe6cd2fa1d37a746ce991ec34484621fe6d3ae2362ea7696bde10cd6c466e1c8e0fd1fdcc161de4a502970e9e2841faa4 SHA512 30ecd86dc0fd1e0c83b4401da36f040346046e260e53c9ce77336869a2442d6b432863b031f61aa2209e58e43d172ef471c6fae5ef19a4c9e2a653e60e96c73a
diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
index b01015a7e56c..7782eaa2297f 100644
--- a/dev-util/imediff2/metadata.xml
+++ b/dev-util/imediff2/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index b47afec885fe..6e1235e4d041 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,8 +1,6 @@
-DIST include-what-you-use-6.0.src.tar.gz 440406 BLAKE2B 485a61dd4f72c158ad9c798c8121d7af9134d79b94c9c30c14674a62007e9fc05acc7e2341cc3282288611beb9138768bf11cd2d73efed372adab83e90b268db SHA512 2bf2593dba252d870074125f976a237e901e969323969f2c8fb030e8376bb230f1d5c2baecc8cd8fad7099e83589c7666c44cd178d2094f6e883cace1e53ad90
 DIST include-what-you-use-7.0.src.tar.gz 541840 BLAKE2B bf20a5598f02f03e5f714582653b8062eab6e414967ef2374c28bb6c1cdce8f73f80e3b2f4953fd943587ce17dc657cf6ab2a9db4208a59030d432f6a40532e5 SHA512 50d186b2e09c3595cc2dc7513e5db74da0038987158c2c45ef4279c67c50de621ca6499b07894ee203f25566aafaddde4b05840946f921678499d2efc131575a
 DIST include-what-you-use-8.0.src.tar.gz 545788 BLAKE2B 7b70d951b7ab2d62a8a6168ebf86dc76fd406159155dd93a509b8c39953506166ac18da3028be8dc7edfbb39eb96613b0e344067154dd8614fe7c63ad3ef04c6 SHA512 e75e91ce198b1ec446ed34afcf9fdbcb0534c5edc5346e4884f0f589c73512d778c428aa71c1b109d45a45543a952438610ab21e32ef1f03ff1a014823ed8425
 DIST include-what-you-use-9.0.src.tar.gz 589377 BLAKE2B b695354787070948d81e3e80b07bbe47a84b5609262df2220b6a62e6d648865b17e060951819f45956c6ca858977614d6e0401640509599b391a1165521b20de SHA512 f2d6ba05121a9968da9e42e8ac66f83ca0f35bfbe7cb1d616e2c6479cf2833c4668cb86e46a04ffcd5e77f10a575da9eeee5272c7609b5afad555d79cb640fb4
-EBUILD include-what-you-use-6.0.ebuild 1319 BLAKE2B f3304e57585cc3e52ea9181fee7214eca19620e239b5009927a967649c8f66288c7044320721755820e54d8ddcc547d15a01b1f894800715340b183042b4e4be SHA512 e511f24c4b09caa070d390e3d9ba6bbe72cdd5cf5157ccbe64836efef525a937923ff42180c1ad5b3f741a495b4a35f7260d642b6d6b625fead0b92f681cde58
 EBUILD include-what-you-use-7.0.ebuild 1216 BLAKE2B c8ee0c61209225b05b50625799b786e6e115576e383d50ebc3fab065e96310019c97dbf371ec683f4cd10382d4e88eebcf114b843736ae1d0e9a3113b0512d52 SHA512 03e2042d26614945f25d4e0f86efb733f51f5e0130b3d44de0fe2d85d00b4f290daa9f9bdff3d0c3af1888d5e1c0e32567112f0c1ca0e1d328f178d16fa0cd05
 EBUILD include-what-you-use-8.0.ebuild 1216 BLAKE2B 09b50d9d452f36bb3d044e42af3952f2612813251209875404847cf4f0d065991b7eef3a31577a876a769263680c9559beba838a2cce97f00876dc17e03d2d48 SHA512 173540c5ca5c145bb3764a9c13fc601e7121be7039a1ec45f0bd9dd6aa91b70a998939b10628024f679b69e267242bd989baba97d9fffd547d800f73a1a78300
 EBUILD include-what-you-use-9.0.ebuild 1216 BLAKE2B 6e2dd4fd83e5264cfecb4506cde27765c4be796f5011f577d35a0a28d5ce146eb11424772cd7d93dd3057e5e1f337b453f30918faf27e470948072fd218ba38b SHA512 e01fd3c8b42d9b20d6fa6cdd70e7aa576d504d6230c9be0237180706a95d42efa8f400e9109f7ddf93892f794f7c0cc406e2f7a8285710f2f6c0914adea60421
diff --git a/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild
deleted file mode 100644
index 9872f8989089..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit cmake-utils flag-o-matic llvm python-single-r1
-
-DESCRIPTION="Find unused include directives in C/C++ programs"
-HOMEPAGE="https://include-what-you-use.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LLVM_MAX_SLOT=6
-
-RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}-clang_${PV}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
-		-DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
-
-		# Note [llvm install path]
-		# Unfortunately all binaries using clang driver
-		# have to reside at the same path depth as
-		# 'clang' binary itself. See bug #625972
-		# Thus as a hack we install it to the same directory
-		# as llvm/clang itself.
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPYTHON}" run_iwyu_tests.py
-}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index c23926f49108..b3053416db75 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,4 +1,6 @@
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.11.tar.gz 5720630 BLAKE2B 1539de7aec3d0c357159a5be6c446ee4e3c98857fb666ab09ceefdb9ae93b430bc164de2f17848f25aeef1a95ce2066441aa0584354c14ed06fbb9179a17ba58 SHA512 2b4b43b152014329e2d9dcba1a5b832fb8c641a3bd004345ddc8d36a237bc15f112ef007894b5adbe175bf08584093adcee655b5e61a9da81d6956974e03248f
-EBUILD intel-graphics-compiler-1.0.11-r1.ebuild 875 BLAKE2B 197981d2f6605e23d85f45cf804e3772c54561f1b6813c3593db7f025b89d370390034c195e5a91af4e9c218ddafecb51b77c77afb8bf23deaef0e7fa8c9dfdd SHA512 b6f6cb8d65aab2eda3822add23647126d0e9e39f5f291640beed4c22dbfbb4df63821319feacb6cf917e7334a1e30e74de01eb49d6e643857de93895553e7119
+DIST intel-graphics-compiler-1.0.2878.tar.gz 5920418 BLAKE2B 99522118d08183836c6e62f80c98b2cc716dd22d7dc82d05841e87e42f10025508c6254cebe2f886da8454cc4cc4b3a9ee06ce5a3bc04246c88f499f63f8f1ae SHA512 3b6dc9b945fddb3d0bc716f4598c4dacb6431c342b580c90f7e9ff8682bdcbde410a960adbfd9e67601d121adc70d2cf23de01bc99c1d0cb86d14b4db77afde5
+DIST intel-graphics-compiler-1.0.2990.tar.gz 5930890 BLAKE2B 038761e74dde52de53eed511a74a39d9b4c69a510ef289d2941b859aea018d6776b5179d2be006b12d3245ffe43a06bfacd9d03ee2d227c2ba2ea39805bf40d2 SHA512 65287348e98f09096418afa02262ad6ce07dd918aa040ac1fb49f7176545c0a6449e68c5e74a11c41641d90495edc7be8e24b32e68d798df906ea3b16e675827
+EBUILD intel-graphics-compiler-1.0.2878.ebuild 875 BLAKE2B 197981d2f6605e23d85f45cf804e3772c54561f1b6813c3593db7f025b89d370390034c195e5a91af4e9c218ddafecb51b77c77afb8bf23deaef0e7fa8c9dfdd SHA512 b6f6cb8d65aab2eda3822add23647126d0e9e39f5f291640beed4c22dbfbb4df63821319feacb6cf917e7334a1e30e74de01eb49d6e643857de93895553e7119
+EBUILD intel-graphics-compiler-1.0.2990.ebuild 875 BLAKE2B 197981d2f6605e23d85f45cf804e3772c54561f1b6813c3593db7f025b89d370390034c195e5a91af4e9c218ddafecb51b77c77afb8bf23deaef0e7fa8c9dfdd SHA512 b6f6cb8d65aab2eda3822add23647126d0e9e39f5f291640beed4c22dbfbb4df63821319feacb6cf917e7334a1e30e74de01eb49d6e643857de93895553e7119
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2878.ebuild
index 03d09a9af2dd..03d09a9af2dd 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11-r1.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2878.ebuild
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2990.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2990.ebuild
new file mode 100644
index 000000000000..03d09a9af2dd
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.2990.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib llvm
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
+	>=dev-libs/opencl-clang-8.0.1:8=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+LLVM_MAX_SLOT=8
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+)
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)
+		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+		-DIGC_PREFERRED_LLVM_VERSION=8
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index 21d5c5a2c45b..c56d3d339322 100644
--- a/dev-util/itstool/Manifest
+++ b/dev-util/itstool/Manifest
@@ -1,5 +1,5 @@
 DIST itstool-2.0.2.tar.bz2 96748 BLAKE2B 7eb8f52c233878a35c01b7eea51c46f9700e9de827d38df41bb3ea78ca4ef284ab59c423aaf9876fceef023cb9d13d2d50c9ab57caff9e5fad217363412cf472 SHA512 b7915c4d463fe5969e282029c2080730c78e18d2d5878da53c6a370f471056b51a7b3f3c08417b801212ba674f55548a112a12a9d81634f60d1e52a8a47a4aa2
 DIST itstool-2.0.6.tar.bz2 103067 BLAKE2B 72d3254cb88ef9d02f9b3509a46c2208e98bf6327f139e5d29b99cc6d80651bd41ea3bfb78e48e23cf7c217770cd8c6c74b00946ad9d2608a92925e43457edf0 SHA512 51058bdcb208f6fb84810f71f9bf67e42b00bf157a9756be45f060849c0aff36f695f4403404193720d4446818fa77de61fa94eed9e8789d26c07a2926072eb7
 EBUILD itstool-2.0.2.ebuild 836 BLAKE2B 9c83e097e2e201d434041502e38919c9eb55164d6b5e0f55ec6a32335d9bec181847c2ba65618e32b8ffae4f01b230b188ae44ab88d282f8ae83dae594359997 SHA512 347daaa09aef5501f3f5fa34b3127608b8d09135f0b12c5d47c2d714480063701225656892ec10ca4ee6a8213f71151becb790bc74f1e359e3b5c0595034e47d
-EBUILD itstool-2.0.6.ebuild 889 BLAKE2B 6596b2c339869388a0405ce7e9f775d98c39550e760c4dd29a66362f933170837ce69193ecba99816c61fcf0b3721136abadf0cb655eb580171b22b6fbcd6f06 SHA512 a4c791bf921ca895b5fd23a34705b7c153c013cf40abcfef4307ba069d85c72d47c4092c8cb65be21faadb209efd7a91f176173e10d245275e5e370acf74a05a
+EBUILD itstool-2.0.6.ebuild 891 BLAKE2B fe9b64b01460fde23f7e1da54692d5e4e10ad476b8da4c60bffcd14d7b475e912496bf932fed15847cedd5c54942e704736031d694bcbfa15a196c392c02e242 SHA512 f7731d0da1c30b3f61f07705c7ef58c81eefeadbdd6f4fd4a61b46a0b61b95e738967ef976ddc290afad34f4fb5fdfb6c33350244b8fd08fcc76023bcd6eb88b
 MISC metadata.xml 525 BLAKE2B a7e426bd9dd273bed10ad74315547eb758df04ceb7ee6ef66f643ba23e60ad8b9c80aa344688e4af7a16fd699a500cf7ceb9d24eb94a930eebf1637e09919a5f SHA512 ad9928fa0359257e3418c0fb6bba6c416fc4505911f35e97377ef7c1426e228b34312fc3156e98f3657974f1156ee2bdc58bbb4b51903bb40b10c97b0714b39b
diff --git a/dev-util/itstool/itstool-2.0.6.ebuild b/dev-util/itstool/itstool-2.0.6.ebuild
index 0cd59f921282..4ccd4663ede4 100644
--- a/dev-util/itstool/itstool-2.0.6.ebuild
+++ b/dev-util/itstool/itstool-2.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit python-single-r1
diff --git a/dev-util/japi-compliance-checker/Manifest b/dev-util/japi-compliance-checker/Manifest
index 545ef69e938c..3f3fea75c196 100644
--- a/dev-util/japi-compliance-checker/Manifest
+++ b/dev-util/japi-compliance-checker/Manifest
@@ -1,4 +1,4 @@
 DIST japi-compliance-checker-2.4.tar.gz 80249 BLAKE2B fe3eca473d5c7a25ca8e4afb104e498b4c71cf0a0280ca4f5c98c1ea742883de0c883053359e4211e0e2781542b85a92f42ffd48db76d27e15eeb868bc80c3a9 SHA512 53ec4d67478627cc08bd98f76b3d6600e29e71752863c38ba717c7e40432081f32933cd0a68c51dbbd3179bcbbfb7d356996038d4068299a6e2ad2f4e2ff1913
-EBUILD japi-compliance-checker-2.4.ebuild 555 BLAKE2B 55b6de1d9796c5c5ab47245128ba3ef5bec0fac627cc02e28c4e62f9fed7a3de110a00d4eb6e9ea128b20e049e2935928295dc0f5b973f2da0e38c310192f7b7 SHA512 323f3f172064eb995fa18d92e1030a5c0ff25b490a12decdbe0526cd50e0bfcc485bc462a7d2fbf5d45ce0fb9973e0861352a8070e64a3b63c5778a1ae749f9c
+EBUILD japi-compliance-checker-2.4.ebuild 554 BLAKE2B dc44e2890c8b04eda68247cb3517ec8f54e15b175efaff8889afc8fdf62df621122a1e1143b638cdd2c724ba120db486b5c6536210937c21b20fbc773e385354 SHA512 72763d0c4a9d0e16fa61a75e6d1002ba7169ea378f57da77d23f3363badf3f605e2e8183eeb554039719711c73dda6f8b375e7cd6c26ef32f1eb393c58d52d61
 EBUILD japi-compliance-checker-9999.ebuild 557 BLAKE2B 3036673a42db22c19f02eee9fed557d74f0bde8dc54204f808f701d5d4fc4293d9fd9f6ac2d4fb9e36e05ddfb58be2e6f6deabcba6f35721f039bb93c74bc1a6 SHA512 36f27964ea2cc3466409df0111895596904fa31b62fc63feec9a8a4b318c812540a642950471a10b8f9f0904f0bf959f20aa88b8b401c0ffd8d6035877ddfcc5
 MISC metadata.xml 363 BLAKE2B 7dd162522e60033c2014dfe0c628d802c503f64aa1340ed80b56b968e423fbfd61c404e5da1dcec7f70f61995a760608201242dedcaa0122b679bc8e1047b20a SHA512 341d151d67d28ffe0f6dee2b8bff016b4d50b19c1bad166d3b816b947322602483b47a165644a25e54cce0a349b497a945b241b6dcc74be784b1377ecf22846a
diff --git a/dev-util/japi-compliance-checker/japi-compliance-checker-2.4.ebuild b/dev-util/japi-compliance-checker/japi-compliance-checker-2.4.ebuild
index c2ef8ddb652d..28e118718f1a 100644
--- a/dev-util/japi-compliance-checker/japi-compliance-checker-2.4.ebuild
+++ b/dev-util/japi-compliance-checker/japi-compliance-checker-2.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND=">=dev-lang/perl-5"
 RDEPEND="${DEPEND}
diff --git a/dev-util/jconfig/Manifest b/dev-util/jconfig/Manifest
index 66a9370a1c8c..7d9ee8c533a4 100644
--- a/dev-util/jconfig/Manifest
+++ b/dev-util/jconfig/Manifest
@@ -1,3 +1,3 @@
 DIST jconfig-src-v2.9.tar.gz 1202738 BLAKE2B 09e5f869ee671028e5044988a9a27af4d6eddb919fa777cb2b08980e33670359b43a87669f28cf59f421af4381df468bb49f52b3829000d4dbddf60bbf6342d4 SHA512 fb3c171f8204bd41d7b0183707b6f524dbf27d8c82335cce5f9b4070b77ea1c86345692e533f1a6d64e0334e0bfc88f4cc47828aea6b4b56058197122c675b2c
-EBUILD jconfig-2.9.ebuild 837 BLAKE2B 39b86cb08f7b11eab95c8545a6f0cd51e6a0f9a4af0431340e52b5f0124bee2a25752405ffce0b07a2ea6813eff50f9c5820b03bd10a0802e82ba4bdb668a172 SHA512 51d7c53b0df4eace209202dbd172259b4f210bc41eeea081828885fd1fa6aaa439b73adc702f74b08fde3609298ec4f46e84c54851513834a4bae55f772c1891
+EBUILD jconfig-2.9.ebuild 830 BLAKE2B 42a4c4cda2bdf0cc3c4ad2b7a0998a596a97ede10eee54db87f4e9d16d4b2b2590d200e5f86eddc97b588ccbb47eec53519e85cd2fe5839fe61e00b6d22caf5f SHA512 8f5ceeac67c4b94994270cc1e59fe70f2e606d3daab5af98d8dff926dfe3727d6457ec926fa8025fc4704b16dc52353b7f5840fbea79e4d9ee9c85f56c029500
 MISC metadata.xml 313 BLAKE2B 35d3e65273f55e25c70550785fc394e3e5df5de19e450db23d40253c2384cf67e23ce9431b34d51d34c604b0d60c8926289ce409d80ed81352e6f10abe496e99 SHA512 a763cadd5e639466f136912e6a1abad023e53576ccbfc5b6b82b9ce5e7f7b173000d51d0991332dd52bff2fc0ee77963ce2e77b58c3f9ecf9701344ee4c5f2ae
diff --git a/dev-util/jconfig/jconfig-2.9.ebuild b/dev-util/jconfig/jconfig-2.9.ebuild
index 723f36264573..c5be45f93782 100644
--- a/dev-util/jconfig/jconfig-2.9.ebuild
+++ b/dev-util/jconfig/jconfig-2.9.ebuild
@@ -39,7 +39,7 @@ JAVA_ANT_ENCODING="ISO-8859-1"
 src_install() {
 	java-pkg_dojar dist/jconfig.jar
 
-	dodoc README || die
+	dodoc README
 
 	use doc && java-pkg_dojavadoc javadoc
 	use source && java-pkg_dosrc src/*
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 4be4e61f9f35..abe679e6d8c7 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -5,8 +5,12 @@ AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 DIST jenkins-bin-2.190.1.war 78245883 BLAKE2B 6c80eaebc6fe34e2c889c78a34dfc3e105a9bd9b92d79d8a9cfe76bfdf66a851afca2a5a2b7373b437deed663fde3cfeac1646f317a9c052d2d09d01d82aeccb SHA512 db27957452b5e57666a1bbce43547e8cfd8f95cc557b43e5162a033779f0cd68d8fd1fc880b563000927f3a71e79385f583d18c21ad06575b192e4d8e47a8c8d
 DIST jenkins-bin-2.190.2.war 78243424 BLAKE2B 7a6bd4cf1c070ce3a09fb84b3dbe7e87f474f4254dd4b4fcffdd7dedf7d4c2ba91d8783e7273214aaaa39bfeb02da721e4d539cba76312c21b523a9bf336a964 SHA512 b1f59ef10dfdfda06bedbf9a40a9e83e159b44b2b5574cba4d62547294386224f64d856490fd4477fb3300a4119d17fc284819719218dfcf32d3dc20ce468847
+DIST jenkins-bin-2.190.3.war 78247363 BLAKE2B 99d4c13236b4b4f7308c7993033d1e5f9dd2fd9926febf52ffdacea595fecaba0d0eb8962761d8a6f983eaf9738f8be1ba4df785bb2fe6b613ac8cadcc618e23 SHA512 4ffa2ce3be4d55f0df8021026115d9ce8f1d0f4faa16eaf9f327ce17105f61731730c2a0124fb9af5d8c16c8fee9200f9b785b23856896e292a19f5404a9d2c2
 DIST jenkins-bin-2.197.war 78309466 BLAKE2B c3d34c6fc40a82148eafa978c8787375ece6522d0d936b42f0296ee13cd084669bfa31975c0ad27816bdd4c1266cb066c0909774199a1373661a7ec524c06e91 SHA512 3b6a00dee5aeb8a94c8f75323c2469b54fe96d90bf8371898e41dc5bdecaa472f112bff1466481c66c9c7a07b22cbe799a08e45ac486d68fd5bdc7c20d43d722
+DIST jenkins-bin-2.205.war 62738246 BLAKE2B de350469e3a6e0d93f6d05c38f7669ce630f01a0284db83a0ba002e15ef712b4dddca6dcac804ab45c898f5c73cdac99bfe9b9bb99f6534c1446d8f4545660ec SHA512 1c0b12cdf7dadaba8d81ede769f76b059c7869732610353658cc928dd8c4943f8cf8beb15498a0dd4e064688cfdb7f88faaa9165c6da97c20d5e99080a12f413
 EBUILD jenkins-bin-2.190.1.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.190.2.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
+EBUILD jenkins-bin-2.190.3.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.197.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.205.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.190.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.190.3.ebuild
new file mode 100644
index 000000000000..323b88955105
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.190.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.205.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.205.ebuild
new file mode 100644
index 000000000000..7d232cbccacd
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.205.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jfrog-cli/Manifest b/dev-util/jfrog-cli/Manifest
new file mode 100644
index 000000000000..f07248517bc6
--- /dev/null
+++ b/dev-util/jfrog-cli/Manifest
@@ -0,0 +1,47 @@
+DIST github.com-VividCortex-ewma-v1.1.1.tar.gz 6042 BLAKE2B 03a1a3b89113adb1a99133aade2b30847f201cfa18d7de1fecff036dab397865293e4faa7edf66b7a6e5a9221989da6daa64e0a77a4ad7c26f7a9a2283aae13c SHA512 cbeb946dc6ca9a16631b3df900754d7b85ca6863b1be596612780fcd1907f4f8c301460b3a5aac97578948a591efcf2e64b574517c2652e09dcebb14076c6395
+DIST github.com-buger-jsonparser-6acdf747ae99cad92d1e8134606008acaca71844.tar.gz 47610 BLAKE2B 447c04edd86fe6dfed8ccaa9d607653e8dcceb6ec802ce889e4cd21a131085565ab553dbb25af2c0bf9130535b8373d262aab7cc19b6b9c72d2394ea4d13e9c4 SHA512 a429445c72498c9a92870c3936ab1fe220f9a6e3f5d5a98379d37d0b7dc8b3296f4bb09f94ff8b55c989d579f795ab1f5d51a6da04fae788563d3e927573c6e2
+DIST github.com-chzyer-readline-2972be24d48e78746da79ba8e24e8b488c9880de.tar.gz 36832 BLAKE2B a66fdb5126e9a9f7dfd52360d0a26916764a96df95b1d995ea1a83aac26227e16d3a2c3a419746c8ad03ba5bef4724a6abadf0ee3fdd84f347d595b9db88b6e1 SHA512 fb84020d5519cd0c5c2c06df598122e1bad3a31ed6b545aae66547e43d48d3da04a75799db9ca8957af1bd47ce2c1542440287c6722e0ab2c27b23ea9631e09a
+DIST github.com-codegangsta-cli-v1.20.0.tar.gz 58397 BLAKE2B 0f623bff26139e57f29a2939c70ad8ba0c8daaf3721cc6f4d061fc88209102b1ece790dc0772f5fad66649f1129836482feee20def3dc0d63e728020664016ec SHA512 0a47a47121e25bceb6ebdf10a55ab3bc7531214284b1669fe20237c3ac938c7cd154ebc408759202d936688350e27e47d14f6a6b0793271c10534f2e90bd1fb5
+DIST github.com-danwakefield-fnmatch-cbb64ac3d964b81592e64f957ad53df015803288.tar.gz 4952 BLAKE2B 92a7cfe2f3c07bdf2c61b445e35531150869dc181138d3438d7173ee38130d411a0de770ba40958471ea61d9aebe8881b51eb0ca9340deced89fd94df267e299 SHA512 5904008003ac80d34581dd1d33130fef27c6a523196aafef1231a2e63c5296cd30f8c3c517090b6b4c7ebb6a57d24bb0bff10cc40876e3fa1c9e74b65bc13154
+DIST github.com-denormal-go-gitignore-ae8ad1d07817b3d3b49cabb21559a3f493a357a3.tar.gz 34507 BLAKE2B da9d86e081a876e11fd65c349a7c0961b8512a1d619fea5a17a8cc0a11f8ceea9d709767d84917d277272b25d14facd29ec47b6227ae504509b30b0f11e6f7c0 SHA512 81f81581c9e7a99326d541ecd63196342a9894ef228a64e9879e30d3b77d72b13793b917dbb5b599aa2f005ad638fc36ecdef8eeaef8957141965b83ccb5ec37
+DIST github.com-dsnet-compress-cc9eb1d7ad760af14e8f918698f745e80377af4f.tar.gz 9961936 BLAKE2B f54928e43f3d861671a80a0ff332e65804468fcad453708c0719d728ee7b360f3ed67c7bcb40d2d689e75c72e81bb346f4cb85ade902e9bb4a095b292e4dd34f SHA512 4d991bc8d1c34f792eb28b0fcfa0b6cfd054592170ef8e088aa80e9d1910d07e7855aae9f199f647ac5c3f05ef11f04352349734e4498314e11d5887e6032424
+DIST github.com-emirpasic-gods-v1.12.0.tar.gz 76825 BLAKE2B 55afe6d6834341dadfc9a159a20b4154665babfb4484440d25c1e67dd01e2e459f692932da12ffa8fe94ce4afe07c5501f45677bca6c5f3c287ef1144f9f9c44 SHA512 7dd24708aaf5d45f9a3b945d337291f3292fef2ade9fd479326bdfa27b359043c2ff2c0e257151707b2f23ee7e104abc4604a2dac81bf91e526723b29b360830
+DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf
+DIST github.com-go-warnings-warnings-v0.1.2.tar.gz 3769 BLAKE2B 8947385b0db67df1e36566bd7dc683520f14107a51b55d9d1a8be7418e4beb1fa4cb665aa5f07114f61194803ba330a101aa0a8b7e6c9e2b393c82495774b612 SHA512 7dd67fcdcd6d6b10969df3a739229ea058cabfe189c53e41a39a2a2fe00f4b4e7e16b8de3cccc34320cbbaf82c54fdf0444445d8eac88d96ee69e2132044def0
+DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
+DIST github.com-golang-crypto-a29dc8fdc73485234dbef99ebedb95d2eced08de.tar.gz 1680188 BLAKE2B c5b875d0863630d7242f61f74d14fbcfc20dab9d735d8b21b539c453f3d5e207ae3f6a11332647c9daebbf09a5d71b7af7f7e578c9dbdfc519d5880b8a8046bf SHA512 83408ccbd632f879cc57baf50c5377c571f2ea71460feed79eea24690d311b2b0d26928d74d1062b667217bbfb082ba016fb3f0eb9abaf7ec014f9d423a4011d
+DIST github.com-golang-net-eb5bcb51f2a31c7d5141d810b70815c05d9c9146.tar.gz 977441 BLAKE2B c4e3fada087341595861671b8c0d1b23a53296852d335fb4acb7f6cf6c72a4fcaa56027bedf3582a48c26aac3102ab5f146ab983c42642fe6b72a0d344ad1be7 SHA512 af5b53755d68d85313fa0c1438e4df98b077e4f4c1035b7772932593ee9ed9750108aa93be2453df723f7f008053d9f892ce565e8a9c65883f6c519c4a6cb8fe
+DIST github.com-golang-snappy-2e65f85255dbc3072edf28d6b5b8efc472979f5a.tar.gz 62611 BLAKE2B 70e476136c4ab621c38e1335a61673fba0fa085dbfadef480b75d06b1d6759abda7db2566938a9af1112302217af87f015fa9be2c28c1e9a80288158ac28cf18 SHA512 3f0be750c0e40266a4c621c5bbcf4fccf574350a6d1bef00ed9c64492767ef77073a17401115c5dee30e61570cc50ff433c17a3fa9c0bec7b3d2a7b9db4483f0
+DIST github.com-golang-sys-d89cdac9e8725f2aefce25fcbfef41134c9ad412.tar.gz 1385928 BLAKE2B 32e2a2ccfd26fb12d10a460ef8149cfce5ab9b32a2d2cf5b89338c0be917cf7601841446f8647eb5f211b6ecfb6a1c41601c28f38514297f670e621e3405b228 SHA512 d26325e31a3c5a1a767f22a36cb6e6008f55b0fd3eb10a8fec39907e7aabd83be702b2a6fb66d07b7cbd1881a50c037b0c1f78d1f55bd3f01aafee9cd9274df1
+DIST github.com-golang-text-v0.3.0.tar.gz 6102619 BLAKE2B c92e68014a8c157d76741c02acd708771d66bd3dda5b19285f5aa3e073e0fe3fccb9054744d35ea62b681ae4421bb7489238d6868f9314fb26f88e002287abe8 SHA512 bd60dfaa7d9dbfca171a3ba40b51f5663c01257cf3b12b618d35689a97ab2212d316d5716ff09681bf40b099f7e20a0e0df8cfc065699cb6a07ad1dc2e2bc189
+DIST github.com-hashicorp-hcl-v1.0.0.tar.gz 70658 BLAKE2B f28dbe8171ce4fa94f57e8bfa8ffe7e16e57147a6a4525a8b5d31d3a47e817e056a85bdb8b91d56be202db27a29f37496f73014d1d97c5d55ce07b89f7ff6848 SHA512 044e3ba2a44a1abd9c851d4ec1f5c541663f8cd7f705c46c6ae2c377fae6df6315a6596c42f391e8239b61f0f0f6caed8d4156f8875cbddfbc7bcb78eaeb466f
+DIST github.com-jbenet-go-context-d14ea06fba99483203c19d92cfcd13ebe73135f4.tar.gz 5944 BLAKE2B 18d2ec9cb208cb7844d3ffd23a64183e08d75b89bb979a0cddefc197b5db16cd9199bcd1c631bbcb607e9c009223952ad67f5c52315de358ab1a718fe5c1307d SHA512 ead2e583dd98d27fe657536b0b52296510b88dbe9a3ec4befb965a4ef0174cc3cb65b750c7004c1df21a861de66659a70426a570eb23ff05773516fc3f60ae6b
+DIST github.com-jfrog-gocmd-v0.1.11.tar.gz 25233 BLAKE2B b99bcf6c389db032cf5cfc92b9574191cf7a6b61e2daf71e113e7bd9e470f03708978180a92c71ee2220fa0e716a25cf2bb9bfa7397dd2fb3f6145a694a6c8bd SHA512 c35dff26d45c1c78976abea5feb3668b7e4075f2677f5da2821a5656957baaf422fea4435af9ce5ad25f48ef70bcade65cc9f8db3c8c131fe8c9cba7eef2b201
+DIST github.com-jfrog-gofrog-v1.0.5.tar.gz 14874 BLAKE2B bdc239836193c57e2beddd628e544b67e170c608c41d4b11b1ac7b2350882f75745f07d91c009d37ae81c8c0d9cdf1ee62eaab18f194cb2f035d00ad1fee89c2 SHA512 b40fe05c3a9141d4a92550c6864405550087518e72092e9a131de663a2b4e4f865baa1261d2a8040c16b30b24444d05afa96322baa06462ffd4b54d8d756e9d4
+DIST github.com-jfrog-jfrog-client-go-v0.5.8.tar.gz 114406 BLAKE2B 7f166db9e6fe77750f6a8dae80498a1d42fde8923dcee2d44a1e45cfa65845bf72bd84afaf4a6653d4b02ed6658c82b64d2b425c5f3afdcdeb16bb40e5d927bb SHA512 66ecc30e4ecf1d52082712c3ff9f3ddac4d342ae0e0c54eb9eec9934382c75c2dc865d0c6942ca79303cfb0b7cd864887e1dd9df2c08eabf60a408ed7cb2d89d
+DIST github.com-kevinburke-ssh_config-81db2a75821ed34e682567d48be488a1c3121088.tar.gz 17183 BLAKE2B 5cf35076a2ca09ae3c06e7f9d1601c5239b634028456e8e96f6b3bcc8d2c638e6bd31ae5bd57081fa58e59221e1c8f085fc62ccfb818f5702abed1b3a804ee67 SHA512 20f05ad15c6d4265b94d94caad2dc056b618e3ef16290b17da8253e0be97cbe70c7d9f498f26ace86a9bcdfa87b8e85679b39ee7b2959bc3f2b6931164618253
+DIST github.com-magiconair-properties-v1.8.0.tar.gz 29504 BLAKE2B 667b8e60ed2ff538a84f199e43c75d37998d6fcb2e9c3cd6b3e069ba9950d45b4cd775797879467ef86b701391078582be2100fe32fbfc4c794f728fb7f38527 SHA512 9790debc8def1a7eae5a1e530ca68e53e562e622b374752f69e40aa508a88b58b95e15a503a8314e7d4f71a42411d1ba462687184c2b251eb41b5ee3f12ce95d
+DIST github.com-mattn-go-shellwords-v1.0.3.tar.gz 3276 BLAKE2B 37422e11e71992e032d4dcfcdd8146c7867cf6f995185b2a405f0c9ccb5723a25b3420c092312c2643a87ab6d10037523b672ad8b8870ba2db8bc5c49a1e9902 SHA512 ca6616b72b5fd5a632285e748844acddc9082dcb5d52c6f6d9580acc392a45ff4e28c4e22346198288ff3feeccc6aa141346c9656d6755e8b330f36a47d6a0f2
+DIST github.com-mholt-archiver-v2.1.0.tar.gz 21655 BLAKE2B 7f306ce7ef63911e6cbdbc2ab106c00a4f8adf98141ff0466716902806dca5ec1479445010f41fdde03ec3deb109d0dd25506bce0e2742ac40a8218b13f6d4a8 SHA512 d78c806cd0e3d93249f4dc0d7745381831dea8df4607a1958f30f7ba8c2a7f7cae2d6627ad941db0824a7246a25f2f3dec0b6becaaf0ae37785a4e0c1fc9a8e1
+DIST github.com-mitchellh-go-homedir-v1.0.0.tar.gz 3247 BLAKE2B d30f3646703d1a9dd723e8fe5452884a3c5b2bb586ab2f215bbff3cb0fcaafd4c7bc8de3a63f6cfa6de90e6f48b250fde01a695fae9ec3b12c4979970f15cd47 SHA512 f908d9e7c65f04303a3b341135afab59a87faac3e991cb03b232e155ee35c6bb319d16a25b09c4831bf4eb708a0600e673852a1aae1cfbb04ca23e4e12a44243
+DIST github.com-mitchellh-mapstructure-v1.0.0.tar.gz 18841 BLAKE2B b1ee258e1d1c68d0d555c2c36c6df92d9d2b7695150e48f391978e1f2c2d1907a40ce6aac7a5e3e14974a0659426979712ce5c3ab9f7169106e36a48f8701e8a SHA512 a95d34b74823e7a9a368c60f95a5ee8e1032c0b6bd6b002559a5e048e405c9ca54f8751a58f2c5a3a9f9e005575f9a17ad14723dc10b85974102df5d59b0da16
+DIST github.com-nwaples-rardecode-e06696f847aeda6f39a8f0b7cdff193b7690aef6.tar.gz 34165 BLAKE2B 4890f0b2656ed1fa21e718c1c97fcb01610b32b1f941a810b2eb7d6642afdadc08ac0d8670f77a6af9637c02643ebfddd57080a0bd2ff3385e56b88d2ca57b3a SHA512 f5f3b7022249f05993c9f5e91acf6e0d80052864bf12e195cffe395e14fd9e1b2a420c652cd96bb0fb38f2f815e06ee9c36ab3576c70a82ef2bea26fd6735926
+DIST github.com-pelletier-go-buffruneio-v0.2.0.tar.gz 3028 BLAKE2B 02ee24b98d814f663640283d5aee532da9d79d0627c741f419b101f86ff3233fc009673709f2f779f8cc1056403cdf4960b9f1d8fbe98b53642b6cc8b4e6efdc SHA512 2d1a4a81d376a1b0f5dd1302f917d106db7ac53e7d4c881ecaa1017edfa14928c975e15211ce157cd248a40eae8b70b737663c7454ff968a8ef797e9acd6ed17
+DIST github.com-pelletier-go-toml-v1.2.0.tar.gz 57496 BLAKE2B 48ffbd6b1b06df31b89ccda4d5aa7f8b23215a2532aab102612231dcdda3fcad4c277f15a56894e10bb94cb3c891f50e87ef9c0e6c7e1f3f840d14bd85634b25 SHA512 07791bbc0e578ab383776d715942cd4fa723e5fa6f9879676b6820166ca9b776651fd62a0584cbcc52d2ba87cecf18184734ce9b06fb5b490013eb8dff6fbb4d
+DIST github.com-pierrec-lz4-v2.0.5.tar.gz 3555216 BLAKE2B ddfd20be1af946c32721115f7c77161ed0bd897480b974e8a796eab1296049d54c580e2dd253217cc6d75fc4f90370d3c493a433823ba8ee4148435de173594e SHA512 139bab790fdd238ac943452af7aac4af74119dec4311f545bd85e349a450485556077dd4633f3d871a5bf0a6ddbf78d3588a2bc07643b06efe87406b52ac8b9a
+DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
+DIST github.com-sergi-go-diff-v1.0.0.tar.gz 41609 BLAKE2B d45904bd26757c0b81310debfecc35fc20de2bc28bba487324dfd348e9f53369dc40cdc5f25cf8d07f6d8462fae5f41df606b79f28b28bbc7fc53bd5af8469e1 SHA512 aed012908610c75dbf7141ee5652d6b1b21ebf6e6a72ed88cbe32213ad8ca6ccdbfe1d42815eb8cbd98276acf75306aef21b729237746d30e24ac6dbc36552b0
+DIST github.com-spf13-afero-v1.1.2.tar.gz 45309 BLAKE2B 0de6a204590f40cda8e80495bf57f55827aec4fb0fff58e0ae7d03b25d297edf530af4c8da94f11ad9bd25eb148fb72b083c75d513b8c4802e8d1a557386f101 SHA512 2ea3773346086d7f0e499653649ef9cbe71b5c0ea488b7650630f4262c13fa426522c9f9556ab127c7b8aa2aa97ff0b34cf3a9eba8b7c753ed200292a50a314e
+DIST github.com-spf13-cast-v1.2.0.tar.gz 9856 BLAKE2B 0d765d33ae72e7f9849decd8ef1b5ee38a891bdcb3aa0e3f8e52fc025bb73dd461b53967beca334c71c743d8ea33e17c842bcb48108108db6ecd6e05127c3a5e SHA512 9ccc59e67196a7b67b0fedc3165fbf0f991ec911d55b3f8a489cac4fcc26551af82ba4582a9f9913127b52ceffd496dc8b627d6e21385ab31bd99281c8da1689
+DIST github.com-spf13-jwalterweatherman-v1.0.0.tar.gz 6392 BLAKE2B 15ed225aa9eb6afca552a19a7ba22216454a27a29aa9f7ee39758100ff123afe8b10e06fce63bf2f4710fbdcbc5c680d3b4eef1cc3c8d363ce0a9f31ce8a34ca SHA512 13cc90c6f4a9fcdd29610773ada79fa2072223459c824b0f732ed3a6f4c61cb7a65c169f70007d3a08354f0a2e06b67e5257c4b0a0e1989fbc2309e69f7200cf
+DIST github.com-spf13-pflag-v1.0.2.tar.gz 44042 BLAKE2B 157fa6c2b1efa594abebd76ff03121050187974d62475b1aa66af325a2198ea64105655597703c37f25e22c4a07864d9fc31a6a29ba9233fdeefcceef400d5e5 SHA512 fd3cefd683329316eda4ec660193a970e38435515c16805190235e2c969c8d65a6f602fdc7c2f7cf3d9740c5a321ee5be5e8034bd6cd7c05c12722cf64d1e8ae
+DIST github.com-spf13-viper-v1.2.1.tar.gz 34467 BLAKE2B 5a675ab1e948b7bc3a6353ce15462749dac6513673a7bef413536df29bc0ede215b5135c6e7d2d552d639dedd7afa942ef876c625d30bf9fbac98f6b28a5c4d7 SHA512 077482e24a061fd72ed83e1dd07ed46ee9ee849712137d1d8fde3b1d6bc700d76db6f17c041b12b6b1291ae50af31777463b820fd7cbcc842fa6208fc7abf0b2
+DIST github.com-src-d-gcfg-v1.3.0.tar.gz 28527 BLAKE2B 84eb10416cb8ae67673d6407260c802d0057f92727f370371e6caf44eb4bca58190589aab60b143246839bfa0bc429defff7f4e109701fc158284c85c071b751 SHA512 487386bc6198ee3f9bffba647860f12e4f45e805a035176c394c03976f8381aacb0031b0a78ced390a8fe8ee64f6540bc2cc2a93e7c4b187d0b80bc08c512c78
+DIST github.com-src-d-go-billy-v4.3.0.tar.gz 27445 BLAKE2B 8672789e7230d5d92ab317a427d97af5890cbdf2e0ce066a59d18f317094122a631deb94669ef8d1b055e82c86a0f1abdf40d71bc0856ae995713ae35544e14e SHA512 6a9423476f8414dbddcbf1acb9ab7ae3b209283659df41d38502e21a17f9de4fda0fd87a4af5d3ae5847fc5557ec01828e6198e87421d51bea6498023809d8f8
+DIST github.com-src-d-go-git-v4.7.0.tar.gz 375873 BLAKE2B 0d010a8522ce858a812a16c43277eb8c0108139a6881cc1f60722cb361ff1280fc068fb4a12b7b4c7423a2308bd73b9cd05a7aac14b9a279ec2808fd327c199d SHA512 8c9c09437c9ce9ca449aeb856d4ee98030ba1253353163710f8e515f4d3ba65cb2f0f9255c901a85da86d6b1aec14d30071edb89b66dae115968e90c5ce44cc7
+DIST github.com-ulikunitz-xz-v0.5.4.tar.gz 477002 BLAKE2B f1805bf4aeec4492376d1c94f7b92d56c4096445d295c00e4db2e7d2b1170842f4bc64ec102ac6c146202a432ed0083948dc44cc443955cbf01981ad194017e2 SHA512 b9adad794a11ba6534cf31a722683995d517d55dbbb5510403538247931b88c00118b3d676b07c46d1e7c95805938240e4af88a428e41afc1c3d65b159820702
+DIST github.com-vbauerster-mpb-v4.7.0.tar.gz 53244 BLAKE2B 61945f6bc07015ab1f3bf2b202ed5e9af59fb52b090258802aa04bc97974c1d14a5c7e838dd381de5485285bd39623fe5faa7e1ec3273e587c09c7803c59be51 SHA512 ce35988092ab30ce6a5531024b976a9fff33024c5b3a066d885c7804c153c0846710e58a624184654cd5df5dd13712dcea5370d569bfe73834149828f3edce9e
+DIST github.com-xanzy-ssh-agent-v0.2.0.tar.gz 7273 BLAKE2B 5a73c92d4190e3f9c10754b4ddbd958a445e666c3e716b5465e8d667d1ce6b4e4421da6d00dd39bb214868fc72c0d85e11df13b54bd78a0f3759d815b42d8225 SHA512 7305f3db69ef1ed816d0884baf24c072af02afd5b5988cef7191ea3d3b80b23c282c412e8460856267ebc5cb8c6af2be357c7e680c417c99ed76b770fb198e70
+DIST jfrog-cli-1.30.4.tar.gz 305474 BLAKE2B 5b8666608640a366cc094c1f330456d9e97710ad8968f7c92dc0a8fa69745f7910533104257ce60957b51c1db10175dc57107625557789a5fd45c5f314899bc0 SHA512 3b7670ce138499630bfc9135e4d88e85fa1e65b871d5ee1b313dec388f229d00f228fcd350fa6156a5a0b64cbc8338753e4f94a237e54d6058f61b92e9629c30
+EBUILD jfrog-cli-1.30.4.ebuild 3312 BLAKE2B 061a9d784e01cb78bd91512f40e91ae57f4fa5e1a4282af01a972d53d356d8b02695262b0f2aa2ae549a775ab93cd7af6272284a73396102c8066acac3d797b0 SHA512 41b670bc76937927e77e6fec83e0e083f2bd55ab13562dde99c230c89a9bf543e603a3890813e0f873d1256952757671cf27c0f5f232f7513e712bc586b02901
+MISC metadata.xml 244 BLAKE2B 69bff1931d3487cac65b10ff2068c2ffeb68b772ca4ed4842f39d8c92403572314769f3babca3204dbf3ebec92d813821ab79ba7c78e8ca9d161149e4db88fba SHA512 ee1587876b1ab6b66fc7a7eaa9d6c1c8fa0389f885da6fd6dd88bfcea3d179f0dc36a5c8be70fefa35cfb16eb4f92f41c24a438e9db57580949a1e796b1b2d78
diff --git a/dev-util/jfrog-cli/jfrog-cli-1.30.4.ebuild b/dev-util/jfrog-cli/jfrog-cli-1.30.4.ebuild
new file mode 100644
index 000000000000..28256fb9766f
--- /dev/null
+++ b/dev-util/jfrog-cli/jfrog-cli-1.30.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+	"github.com/buger/jsonparser 6acdf747ae99cad92d1e8134606008acaca71844"
+	"github.com/chzyer/readline 2972be24d48e78746da79ba8e24e8b488c9880de"
+	"github.com/codegangsta/cli v1.20.0"
+	"github.com/danwakefield/fnmatch cbb64ac3d964b81592e64f957ad53df015803288"
+	"github.com/denormal/go-gitignore ae8ad1d07817b3d3b49cabb21559a3f493a357a3"
+	"github.com/dsnet/compress cc9eb1d7ad760af14e8f918698f745e80377af4f"
+	"github.com/emirpasic/gods v1.12.0"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/golang/snappy 2e65f85255dbc3072edf28d6b5b8efc472979f5a"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/jbenet/go-context d14ea06fba99483203c19d92cfcd13ebe73135f4"
+	"github.com/jfrog/gocmd v0.1.11"
+	"github.com/jfrog/gofrog v1.0.5"
+	"github.com/jfrog/jfrog-client-go v0.5.8"
+	"github.com/kevinburke/ssh_config 81db2a75821ed34e682567d48be488a1c3121088"
+	"github.com/magiconair/properties v1.8.0"
+	"github.com/mattn/go-shellwords v1.0.3"
+	"github.com/mholt/archiver v2.1.0"
+	"github.com/mitchellh/go-homedir v1.0.0"
+	"github.com/mitchellh/mapstructure v1.0.0"
+	"github.com/nwaples/rardecode e06696f847aeda6f39a8f0b7cdff193b7690aef6"
+	"github.com/pelletier/go-buffruneio v0.2.0"
+	"github.com/pelletier/go-toml v1.2.0"
+	"github.com/pierrec/lz4 v2.0.5"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/spf13/afero v1.1.2"
+	"github.com/spf13/cast v1.2.0"
+	"github.com/spf13/jwalterweatherman v1.0.0"
+	"github.com/spf13/pflag v1.0.2"
+	"github.com/spf13/viper v1.2.1"
+	"github.com/src-d/gcfg v1.3.0"
+	"github.com/ulikunitz/xz v0.5.4"
+	"github.com/vbauerster/mpb v4.7.0"
+	"github.com/VividCortex/ewma v1.1.1"
+	"github.com/xanzy/ssh-agent v0.2.0"
+	"golang.org/x/crypto a29dc8fdc73485234dbef99ebedb95d2eced08de github.com/golang/crypto"
+	"golang.org/x/net eb5bcb51f2a31c7d5141d810b70815c05d9c9146 github.com/golang/net"
+	"golang.org/x/sys d89cdac9e8725f2aefce25fcbfef41134c9ad412 github.com/golang/sys"
+	"golang.org/x/text v0.3.0 github.com/golang/text"
+	"gopkg.in/src-d/go-billy.v4 v4.3.0 github.com/src-d/go-billy"
+	"gopkg.in/src-d/go-git.v4 v4.7.0 github.com/src-d/go-git"
+	"gopkg.in/warnings.v0 v0.1.2 github.com/go-warnings/warnings"
+	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
+)
+
+inherit golang-vcs-snapshot
+
+EGO_PN=github.com/jfrog/jfrog-cli
+DESCRIPTION="Command line utility foroperations on container images and image repositories"
+HOMEPAGE="https://github.com/jfrog/jfrog-cli"
+
+SRC_URI="https://github.com/jfrog/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_prepare() {
+	default
+
+	#701188 go-module.eclass does not support versioned import paths.
+	rm go.mod || die
+	grep -rlZ 'github.com/vbauerster/mpb/v4' . | \
+		xargs -0 sed -i -e 's|github.com/vbauerster/mpb/v4|github.com/vbauerster/mpb|' || die
+	grep -rlZ 'github.com/jfrog/jfrog-cli-go' . | \
+		xargs -0 sed -i -e 's|github.com/jfrog/jfrog-cli-go|github.com/jfrog/jfrog-cli|' || die
+}
+
+src_compile() {
+	export GO111MODULE=off GOPATH=${WORKDIR}/${P}
+	export -n GOCACHE XDG_CACHE_HOME
+	./build.sh || die
+}
+
+src_install() {
+	dobin jfrog
+	einstalldocs
+}
diff --git a/dev-util/jfrog-cli/metadata.xml b/dev-util/jfrog-cli/metadata.xml
new file mode 100644
index 000000000000..9e1d47466c8d
--- /dev/null
+++ b/dev-util/jfrog-cli/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
index 10edb5a1b0db..1eca9f5ecb79 100644
--- a/dev-util/kdbg/Manifest
+++ b/dev-util/kdbg/Manifest
@@ -1,4 +1,4 @@
 AUX kdbg-3.0.0-no-png-install.patch 1801 BLAKE2B 69d1f3f589a4a0376149a9e601bc9d97723b04a5074eac15a5aeec10dba54f42b66b6e232e8b32b69d6d3c19062512f6cbed1323d3efaec538c847829b8f7149 SHA512 d1aa8518a56a0f46f0e7a13e9649f5fe26cdce162664d63911b387718d4d6416ce08dcba6d3d0bf831b473be906a8ec160c942e6e78bb58a05ca4cf85642f38a
 DIST kdbg-3.0.0.tar.gz 430150 BLAKE2B 62411f95f1d109d95647e83defc2f5a84f9f7d7dc715f5a2f84eb6ecd18c7e1d02da0d68bf5bc8bb37216f98edbac11c24286f03ffc2ab9ad9fc7203ccd498dd SHA512 6398a7bbb9c744a837dd73645b497ab00eeaca9a326d61b135dc9040c616b4a2bdc0cf1da59c101dc68a159e12bc3b4a994a9d1dbf33f7d152e5c3003abb498a
-EBUILD kdbg-3.0.0-r1.ebuild 989 BLAKE2B 69f68ed63de7fba3054839559953a743181f664d81d8dffa8bb6f331f6334ba39ea53d931c6c320b3e42d844e6bc4522640d2714361a72556107543efec409cc SHA512 b69f06370ca8c622babf21edc44df93f2e9bf21e2acbd9ddf8c1cb5fc35ae299ed95923e8f4b0131123d6c7be66f0861a2ff86fb140accfffa7890a8cce588c6
+EBUILD kdbg-3.0.0-r1.ebuild 1082 BLAKE2B 168fa7e739ce2a707538f46223e9d990993eef11bc185c82f75a9e938b1e2a918ddfaa76fec3cc02164ed6e3a4fe8dcf2e69486e23fb16f193a43206fcdc3a3e SHA512 d47e3b684649c578aeb95a71f5e3a3614331665a9caff63b803bd9fd79db934f10fc679e06ba485ab94ecd9a8472f2de6eabf1b96b91f505f997776ebf820989
 MISC metadata.xml 371 BLAKE2B fe7d9700b798150f83b58f44ae125090c0af51f6d6e81d7c5048828e75d9b95147a01c009b5bb195e6d6fbeb047dc019059802e3f60e02e59596f2f027c7ec4a SHA512 70d360d6ff4a809578a61351cdd5bdc42b6bc72eb6551ef8083595d941909f1c6ab91a4cb793f1161eaad3a65e0313e498bef0cc5e763a918d2e83c7352f7805
diff --git a/dev-util/kdbg/kdbg-3.0.0-r1.ebuild b/dev-util/kdbg/kdbg-3.0.0-r1.ebuild
index e8543c0a37c6..0315c3c7cf77 100644
--- a/dev-util/kdbg/kdbg-3.0.0-r1.ebuild
+++ b/dev-util/kdbg/kdbg-3.0.0-r1.ebuild
@@ -3,28 +3,31 @@
 
 EAPI=7
 
-KDE_HANDBOOK="true"
-inherit kde5
+ECM_HANDBOOK="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm
 
 DESCRIPTION="Graphical debugger interface"
 HOMEPAGE="http://www.kdbg.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
 	!dev-util/kdbg:4
@@ -34,10 +37,10 @@ RDEPEND="${DEPEND}
 PATCHES=( "${FILESDIR}/${P}-no-png-install.patch" )
 
 src_prepare() {
+	ecm_src_prepare
+
 	# allow documentation to be handled by eclass
 	mv kdbg/doc . || die
 	sed -i -e '/add_subdirectory(doc)/d' kdbg/CMakeLists.txt || die
 	echo "add_subdirectory ( doc ) " >> CMakeLists.txt || die
-
-	kde5_src_prepare
 }
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index aa0fb254b452..a50af6b26453 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,7 @@
 DIST kdev-php-5.4.2.tar.xz 1042248 BLAKE2B dbdbd12de37a3d37b96530a25db46daca7ad7c09854ba08417abe19f5136331091ef6ba977e2eca46b423ace167bea0082e71f57d9d9b41b2f9908856883f3c1 SHA512 c805431aa4efda12d15898dfe33d8c096e042fbf3077d377eb524c59b9da14c0930fbc2c456e5760452ca238b5269f360741998af0b429096ccd57fbe6575a0a
 DIST kdev-php-5.4.4.tar.xz 1042188 BLAKE2B 2124f0530d665abbc4eb6258c776afe42a42cba187c30b8ca6b6a8c9004a8b006e6c67a7762ebf47baa5dc0e7df3ebcae2e5caeee2519b5fbbe4003640583dd4 SHA512 597983ba7e1f56e7508ec2786661ecba0383243c3652b55c39fdda0831ce13e7cc559155e059674940f7dae88dc5c309f412e0877d376345a29fa556e5f8fd1b
+DIST kdev-php-5.4.5.tar.xz 1045544 BLAKE2B 3b003b24637493a49b8a4416510c324fe9b588a890b692de0414e2e3595c565a9c19018137ee85a97175f7f1d9c4d1b79b5fc7817cb8ebf7f0741e1c6a6851b1 SHA512 f6432671d46c197648049310a246baa1b7ac03582cef72006c31766ece7d3a42f28809e3ce1831d2fd66c7df524817b360e806d9f53c5954dac2cabf0ad14aeb
 EBUILD kdevelop-php-5.4.2.ebuild 1112 BLAKE2B 496b496d12beee31995121918ad861a9d3320ac220ed9f008c130a5e21efa2ee6b5c2d6a18a3ef0c2a282648a38e87cbe5f5acbd81393c58272bee8099d3b3e4 SHA512 3471c55d779081a6090ee90758c37f3e21c2b522947f7fa682892063789a27056e04ac5aa664b08705daddb5b54bba4bc3132d02bab31baa18e089c18b69f25a
 EBUILD kdevelop-php-5.4.4.ebuild 1239 BLAKE2B a68c6f2e804c934feddc2eb91786711387034edfb947eae4afe9a21f25b9bdd428b9a9a45d3e2a3037c50e9a801fc00d5e3c99ff444b4e73db6b621e27f70fe4 SHA512 e293d0258664e8eae4b6aa65134661d5f5f40319e626afbb495cd92826098fd65ee4d96b98cc7d7962b8d919b47a8f5363988a4b951b694dad8e75c0b0873208
+EBUILD kdevelop-php-5.4.5.ebuild 1239 BLAKE2B a68c6f2e804c934feddc2eb91786711387034edfb947eae4afe9a21f25b9bdd428b9a9a45d3e2a3037c50e9a801fc00d5e3c99ff444b4e73db6b621e27f70fe4 SHA512 e293d0258664e8eae4b6aa65134661d5f5f40319e626afbb495cd92826098fd65ee4d96b98cc7d7962b8d919b47a8f5363988a4b951b694dad8e75c0b0873208
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.5.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.5.ebuild
new file mode 100644
index 000000000000..0db9fdcfa08d
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.4.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_NAME="kdev-php"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+IUSE=""
+
+BDEPEND="
+	test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}"
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	ecm_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 04fdfe8d9c61..c8f5d59e30ba 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,7 @@
 DIST kdev-python-5.4.2.tar.xz 1074220 BLAKE2B c2c6c1bfc0ebf3d0950740f11dd881830a3d5d9e0b331fbb16f14995b2f49f3a86293189409f005c582b9c0ed9de4a92682c53ef0145cd3200310092792f022f SHA512 fef69a4afa9539e719d4808c272d1c34f4b56c33eba355f3bd0de87a6614912e30233ae7f48e9821acb9f25f2c3bd3776f4965f777fabdde21fe48d0b7baefc8
 DIST kdev-python-5.4.4.tar.xz 1072364 BLAKE2B ef79771b48e8944aa71eb25fee2b57ea922cfae49baec8eae2bdc8cb36cf4a9576199f3cf9cd3ed437ed20dc651c758e013671bfa7838b6ad207a40aa7a53fc8 SHA512 a52056233662c9ad57b3803feed2117a4a105d53d58e2c3977976d3f29183d83c7b58385aa7c9b124e1e027e8d1da80519ef2fd2344b49bed3b08fe78a9390fc
+DIST kdev-python-5.4.5.tar.xz 1072356 BLAKE2B 5ad613c5a32d1fd8661a007f96aac228aeaf0b6b3baa33d2234672e13e70b70adab40f78b914c6b4ce5592e3a90e7e12442c988cc577ac103ca3fc51c2dc6d74 SHA512 d21a4032304b742885718d52bc3ea36885f48ef3f778a1b36b2d75a007cd7a84941a764950d3b2510060809e5c56e541a6216faab723b9c6334331c2c39eb5a1
 EBUILD kdevelop-python-5.4.2.ebuild 1050 BLAKE2B 6381123492acb52a6ac14bd257c31e04d08d355a7c60aee2fa19ec8c2b8a01a75b9d77febc2e4c3b38d14fe5f3cde78d6350d6ff9b939e6edcd7340473528af6 SHA512 cc75784fde96ff5dac748f7f81aa4d6c0514b9112af7a89496e11999757d3e2aa05b9daa5844454a26e356d31021c5f4af2c511d161f6e6e99f75564a1c30f38
 EBUILD kdevelop-python-5.4.4.ebuild 1212 BLAKE2B c7cc1a7b524bac7d1fab7e87fd2db13c9f47656bd6440172cbdef210c392caa1e112209ec48d24e0a8546629d155f6df932ace3d86ea94fa1f9bf06582ac9df2 SHA512 0aedb2ffd9fda3e0ff844460f46d8f27a1293ac67fed92bf6753fd8f74685d2aa1a7724b74a0afb26f1a2af971984598ac147c05e7f5953bfa940f9150ac924c
+EBUILD kdevelop-python-5.4.5.ebuild 1214 BLAKE2B 24d73dc37c0d138dcc9bb8a371cc369688d19ba2606558354f9f26efec99f09fcd598133a1ee3dfb345c4e9452184d1cf86659aa3556f405c13a12a15364026e SHA512 4246fabc623df238d5b40d0e052fe6014d2546a0faa30fe39b4afff1ea87f3417e71548d94a6d4c4b67f56bb9a2bc530c0db7a73f255752ae0df294ef1601f37
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.5.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.5.ebuild
new file mode 100644
index 000000000000..5a4714ae5ddc
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}
+	dev-python/pycodestyle[${PYTHON_USEDEP}]
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index ad38ab4fbe46..8d068a02348b 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,7 @@
 DIST kdevelop-5.4.2.tar.xz 7006096 BLAKE2B 105f7377e960f6012e9e976a14475b67e15038cb376c6ec499ef33f17c59ff1e068866deafb24aa1392bf0a3c833cdffeac122262dd38dc45eeca8fea69f0df8 SHA512 de25d70f2e82f61ef95ce2c6289146c52c368e93a3d23b17a2b95d14e64b599b64af32c2de2501c236f2954d981709c168fecddb4dbcf5425014d6a6e938d53b
 DIST kdevelop-5.4.4.tar.xz 7011276 BLAKE2B c033f8990ed13a2eeb516965d0d7486901b7263410f6f2e7525bf12d1878355898306ff1e90fd1f4c847b9bea90e2c474aa1bbaeab5076a83b40e31a043ab51d SHA512 e2f2cf20b9be3be94344f38fd781be2c847c466adf2dad5504283770326e3dfe35902281cd4bf8cda2854449ea5f73f8026abd0c1811fd5b97e2fa3568585fcf
+DIST kdevelop-5.4.5.tar.xz 7011816 BLAKE2B d067b0b034014b2f3ef7e177b59bde7c86672e8718d6860c5945ad8c8df7531cb427bed1f96b8a8d470da5a51e32134c389df53386a5c4a635825e6892cb060d SHA512 9c795402e10fceda63d0847260018f73d0318ea23a8b67db5c369259b79906a0877f1c43cdaccd5d6a456fef6bc06157dddc99bddc0b742c686057690656d5f5
 EBUILD kdevelop-5.4.2.ebuild 3864 BLAKE2B fbba8860992a4f9835e3265f87158b596c900a46439b4e548dfca78d32f81efb27911e7b917ea91acc9d46d457af3808dfde351ef21694e4eb05cab59a930096 SHA512 825ef6759a5b84447102204e3882762d2cb0d3a3bd0e189b0eff56c65f416c628ae739d07919e08cc0bcc3c78c304a69c2fb422e5d8df339bf9aff65b35b151b
 EBUILD kdevelop-5.4.4.ebuild 4250 BLAKE2B 7cfca1f14d3364c3fac7190bdd108e6677d8a1523d4218ee6f55930e6b92b979b4c458b2133459ea89d46cecf0d4866020698b82712f23471d4df471a7bf7752 SHA512 5fd682331c0c878812d68bff913ebb8b1604fb18cb146740526f87086abd149280a0d21c6d5adfe4e3e55898eff35e759785ceb5e1b21a71b088e30c2d8be7b9
+EBUILD kdevelop-5.4.5.ebuild 4250 BLAKE2B 7cfca1f14d3364c3fac7190bdd108e6677d8a1523d4218ee6f55930e6b92b979b4c458b2133459ea89d46cecf0d4866020698b82712f23471d4df471a7bf7752 SHA512 5fd682331c0c878812d68bff913ebb8b1604fb18cb146740526f87086abd149280a0d21c6d5adfe4e3e55898eff35e759785ceb5e1b21a71b088e30c2d8be7b9
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.4.5.ebuild b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
new file mode 100644
index 000000000000..8467cba14272
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_APPS_MINIMAL=19.04.3
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5/54" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
+
+COMMON_DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=kde-apps/libkomparediff2-${KDE_APPS_MINIMAL}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qthelp-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/grantlee:5
+	>=dev-util/astyle-3.1:=
+	>=sys-devel/clang-3.8.0:=
+	gdbui? ( >=kde-plasma/libksysguard-5.16.5:5 )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		>=kde-frameworks/krunner-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+	!webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kapptemplate-${KDE_APPS_MINIMAL}:5
+	>=kde-apps/kio-extras-${KDE_APPS_MINIMAL}:5
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	dev-util/ninja
+	>=sys-devel/gdb-7.0[python]
+	reviewboard? ( >=kde-apps/ktp-accounts-kcm-${KDE_APPS_MINIMAL}:5 )
+	!dev-util/kdevelop-clang-tidy
+	!dev-util/kdevplatform
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake-utils_use_find_package plasma KF5Plasma)
+		$(cmake-utils_use_find_package hex OktetaKastenControllers)
+		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake-utils_use_find_package reviewboard KF5Purpose)
+		$(cmake-utils_use_find_package subversion SubversionLibrary)
+		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+	)
+
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if ! has_version "kde-apps/konsole" ; then
+		elog "For konsole view, please install kde-apps/konsole"
+	fi
+
+	if ! has_version "dev-util/cppcheck" ; then
+		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
+	fi
+
+	if ! has_version "dev-util/heaptrack[qt5]" ; then
+		elog "For heap memory profiling support, please install dev-util/heaptrack"
+	fi
+
+	if ! has_version "dev-util/clazy" ; then
+		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
+	fi
+}
diff --git a/dev-util/kdstatemachineeditor/Manifest b/dev-util/kdstatemachineeditor/Manifest
index 41c3d59c3a0c..e73ed91305ca 100644
--- a/dev-util/kdstatemachineeditor/Manifest
+++ b/dev-util/kdstatemachineeditor/Manifest
@@ -1,4 +1,4 @@
 DIST kdstatemachineeditor-1.2.4.tar.gz 222160 BLAKE2B c0194282b1f17c550454d16fb3790e6747c785b01f867aa115134a3f1298c7d0bdd522d07bdc26ab4353d62482a8602c1418dd8e480a6b5b5665b8dfe8ca1d93 SHA512 f1c076a8646a26d3a6629298523b02589fcf53fc8ac01d93928b1bc42179d3a26c7f90d595e2226e5cf3d54d90d143719e72854f3b756489f6d0b8643810675f
-EBUILD kdstatemachineeditor-1.2.4.ebuild 1058 BLAKE2B 195cedc4077bee3188d1b0f2c684770e7ad17d797388d8c2bd2e82dab5c51af9863d86e6f3ac665a5445bacee8607797cbc2cb5e694327c955568099eca73b6a SHA512 5f6661e71ebdf676480c94dc6f165ae34c68ea8c2fdac9394a00092e408af740cb6948cad223ad7fc807f708dea2fb293809759ab04c7b29d5799e216123d0bf
-EBUILD kdstatemachineeditor-9999.ebuild 1058 BLAKE2B 195cedc4077bee3188d1b0f2c684770e7ad17d797388d8c2bd2e82dab5c51af9863d86e6f3ac665a5445bacee8607797cbc2cb5e694327c955568099eca73b6a SHA512 5f6661e71ebdf676480c94dc6f165ae34c68ea8c2fdac9394a00092e408af740cb6948cad223ad7fc807f708dea2fb293809759ab04c7b29d5799e216123d0bf
+EBUILD kdstatemachineeditor-1.2.4.ebuild 1085 BLAKE2B c50819313349caaf69cfbdf49b3a52849043e5daee3c10b9fd7d50d9f6306e48af55170985496b605064ed284242b173d0ab42d9f1283e319d1f722a92912d91 SHA512 38d45cf2ad3237b770d6e13920d5b57f2e8d6b2b60d59e346ccbdfcb4ed7c9e84610df79c86bfcf1f8d888a3458a032dc4cc4d1c57e38eac022ae4e581cd31bc
+EBUILD kdstatemachineeditor-9999.ebuild 1085 BLAKE2B c50819313349caaf69cfbdf49b3a52849043e5daee3c10b9fd7d50d9f6306e48af55170985496b605064ed284242b173d0ab42d9f1283e319d1f722a92912d91 SHA512 38d45cf2ad3237b770d6e13920d5b57f2e8d6b2b60d59e346ccbdfcb4ed7c9e84610df79c86bfcf1f8d888a3458a032dc4cc4d1c57e38eac022ae4e581cd31bc
 MISC metadata.xml 361 BLAKE2B 679b7e05175ee00d4293a2e6fcc3a0215cc154cfe1bb6436267a4c6e4b4d9bf096b2bd934ce1e3c95458c3f957cf8263fa3f8e09cd9bcce8061e28e868e59dc5 SHA512 63eeeed36b35609aba151c2dcbe1e501355b3e56c0febd52f394a20b5a27871c6d69164b854a05769d3cd0eadf245f23ef4153fd8a2e9208dfb079381bbc0a41
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
index 5e4355d14c07..b8d2337eeb5e 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
@@ -18,6 +18,7 @@ fi
 
 LICENSE="GPL-2+"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
index 5e4355d14c07..b8d2337eeb5e 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
@@ -18,6 +18,7 @@ fi
 
 LICENSE="GPL-2+"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-util/kup/Manifest b/dev-util/kup/Manifest
index 5a314f45007e..f17258f9e8ff 100644
--- a/dev-util/kup/Manifest
+++ b/dev-util/kup/Manifest
@@ -1,3 +1,5 @@
 DIST kup-0.3.4.tar.gz 45996 BLAKE2B 37c4738df71491b3661dcb4f780f1b24a46c28bedca32669625dfd82e309b51ef72304d41ee8c695c99b761679fca9c6eaa1a4fcf00365f92a6c754029139d86 SHA512 fde61de2978f8ba76c4b89a84313aa8b8651cc2610b1512ba1d662fbd0675f269959dd66ef5e1e0ce216ba66e12f5735e58bb36f4ba1a14d90269da1a6fcee46
+DIST kup-0.3.6.tar.xz 41404 BLAKE2B 7c4187032b3d29ea06ddeaea813370e5a68fa94c9b85dbd92930651ad52ea103a98be26bae32b9120d136d3558b27c29323191aab36a895e4b040eb8fd83d12f SHA512 136cd179abb6b658050cd51f00a4cee2b9022b40ce17c9e50290fcdd2303de2ca21a64569b4af6a46db88959812200b3654fce06a0b3c081af0c89b5db2ded20
 EBUILD kup-0.3.4-r1.ebuild 534 BLAKE2B 26508353b231d6850ab355ee5e774cc9b5f3e77f666e6879a0a0bed8b5c10aa3220afc7e178e02561b5f03a717c94428a40d67a858f6f275d238872c330aff78 SHA512 d11e0e77ccfbf43b33c007482340efeac7fc35e7f666be2b3d935841dc9d42ce253cb2618caef4d162d4431be3a83333adee5466e2ddf4a62de71030b1913688
+EBUILD kup-0.3.6.ebuild 530 BLAKE2B 4cc2f35c73a83258e19f0a497afeaea9f1ce16cdb5a3b0874e3ae738c2cc100a0fefc3a0f29a6e5e8e4ff20df28f1e147629499cb32657ae5d09221d8ab42b79 SHA512 91232d0b07ba873a5f4636558cbed339e92d52984d9c8580a42eded063937a216af76d0c867156819b7afa7a8acd08f465cee022ad905bae0a9a96a455207993
 MISC metadata.xml 224 BLAKE2B a715d46de4f645f6060e89cf1da2da19fadc26cb5899b4bab2d73bb1b951d9bbb1f63b01fe4117e03645ce4a4a65cf61c890d7259f63922657b7e2deb38fc810 SHA512 50fd033081cbd709e8dbd3441700c8301309ccfbf81200ea387916a3e95d88b231748df77c3f6ec62207d02fc268d4841679374e06abee36bf196eeecfac64e5
diff --git a/dev-util/kup/kup-0.3.6.ebuild b/dev-util/kup/kup-0.3.6.ebuild
new file mode 100644
index 000000000000..4995d0b42b83
--- /dev/null
+++ b/dev-util/kup/kup-0.3.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="kernel.org uploader tool"
+HOMEPAGE="https://www.kernel.org/pub/software/network/kup"
+SRC_URI="https://www.kernel.org/pub/software/network/kup/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/BSD-Resource
+	dev-perl/Config-Simple"
+
+DOCS=( README )
+
+src_install() {
+	dobin "${PN}" "${PN}-server" gpg-sign-all
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 5e072597f538..3ae504e1bd21 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1,8 +1,9 @@
 AUX lcov-1.13-gcc-8.patch 3049 BLAKE2B ec0e22a61851ec2acbb0ac8909f1fc91d57d8dc2914583cf70cfbd7c08153c0c87a76d7f30e41f3660d4ecd9e76b3f06fb562865fc79474019f29c83602728c4 SHA512 f3598e28e98e97d3d1eec8ed4168996623cf920f94870cce4e731de2e1b0925a786dc8cbaf9d70379fc4e73f4f26f3a9405b2077c5246dcd66cc0eab25625b94
-AUX lcov-1.9-gcc-4.7.patch 1035 BLAKE2B d4ce8c505f1dd22f44feadf9f99bcf73fd5e461a714d3d40d5e8e222b5d427d947e42d4806252437ae4392ec3ee3d9521f85173044d493f7a4f81a35e042c5fd SHA512 c9d1a80ead5ed8de91fdac4ac3b7b8d8cbcf245f38276c91551a4f74942ff348947fbbd4b4a3fa171fd90ea240ffea8f4b162ca9eab2a929a7daa2eb0834f307
 DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
 DIST lcov-1.14.tar.gz 177359 BLAKE2B 17069d38bf607217b8ff59f573fc02badf56afe65965d2a359a14835af57e2b6c512bff06fac3dbf4e94cd35701216edb8026d333b2baa8772d0ef551de37af1 SHA512 2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc
+DIST lcov_1.14-2.debian.tar.xz 25740 BLAKE2B ca1a84ed98e0cdd13aae88f0f550cac84f00b3dbf6bd764abe0c7eee7b73c0796abbf20e76cb51707d0d644bb17ee7ad283abbfaa7456dc2a3ade5e12cfbaabc SHA512 10fdb1f82be8cc9aef3b92aa7ca18f2736e5130d8b6ef9703b9444cb88f75f475e8bc48c441ed5cf7e4d11f383c226fc711e8609ea11772b01f454bb6a5bd45a
 EBUILD lcov-1.13-r2.ebuild 863 BLAKE2B 225a3bc7d5ddd4cf45c145788cb42b28a77292080facee66a59677855cb14ef32986545adbd601e9240cc9732fe18514a6ad40b714ec99bbdcc04b163a870ccb SHA512 15c4ddbe6e88b6c41a31398a2684b4c5c74819a6030eade8c8735ad2959d2dd9bb58fac90957b17c3f57dc58898f56ce2901ac9e2239bb2e2ec6af04291c8332
 EBUILD lcov-1.14.ebuild 813 BLAKE2B ee220647f69ce9d789b296922ee6dc2324124aabc5e12f7d705787cbe69c21dc19fcb89804b19dc71645aba34b71d11116ff99fa137f2dc3b9d2674af3aa0e58 SHA512 4c7dc995012ba8b9f15b2b507e819a3da9da01b25a3f6b24544d36f1a46017e4fafef35b58795071043c473179ec0ef59fac769d3874e170b770d1de10c1674a
+EBUILD lcov-1.14_p2.ebuild 1396 BLAKE2B b159f23ae9b33d60365773141cd64833e2b8d70993b13d4361f73ee1d550ca371380f9f2b8df20b97cd95e269ca27bda01f2f4457ac21fab58d5597ceb3d7f6c SHA512 f234978b961b7bde29f36b73a4bc719ce63af4291fb58304ab846f053114ac3152835d401bcfe1cce67bb41e74aaae6e994f53627792c13f887597cfeb87a6e7
 EBUILD lcov-9999.ebuild 850 BLAKE2B fd1abd672df98cf8329ffbb0bd46a13477c0700ec6f63b33fddc1ab3b9d44d2e5a24c8aba47a90ff761bbb283fe28bff7d9a621383265eed349f90a0726c8e56 SHA512 86de86036f1e89fb53bf84da63fc30457cb300158a66caae3f2baf8ab525de3924677c7c3f2c8675e72c6533b5ea63080590c86c553ec27afd68cdcde606c9d8
 MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
diff --git a/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch b/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
deleted file mode 100644
index 1b9d6ac0ff21..000000000000
--- a/dev-util/lcov/files/lcov-1.9-gcc-4.7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-fix from upstream to work with gcc-4.7
-
-Index: bin/geninfo
-===================================================================
-RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
-retrieving revision 1.95
-retrieving revision 1.96
-diff -u -p -r1.95 -r1.96
---- bin/geninfo	20 Jan 2012 11:53:57 -0000	1.95
-+++ bin/geninfo	10 Apr 2012 11:48:52 -0000	1.96
-@@ -61,6 +61,7 @@ if( $^O eq "msys" )
- our $gcov_tool		= "gcov";
- our $tool_name		= basename($0);
- 
-+our $GCOV_VERSION_4_7_0	= 0x40700;
- our $GCOV_VERSION_3_4_0	= 0x30400;
- our $GCOV_VERSION_3_3_0	= 0x30300;
- our $GCNO_FUNCTION_TAG	= 0x01000000;
-@@ -3023,5 +3024,10 @@ sub read_gcno_function_record(*$$$$)
- 	graph_expect("function record");
- 	# Skip ident and checksum
- 	graph_skip($handle, 8, "function ident and checksum") or return undef;
-+	if ($gcov_version >= $GCOV_VERSION_4_7_0) {
-+		# Skip extra checksum added by android 4.4.0 / gcc >= 4.7
-+		# toolchains.
-+		graph_skip($handle, 4, "function extra checksum");
-+	}
- 	# Read function name
- 	graph_expect("function name");
diff --git a/dev-util/lcov/lcov-1.14_p2.ebuild b/dev-util/lcov/lcov-1.14_p2.ebuild
new file mode 100644
index 000000000000..41677b6255db
--- /dev/null
+++ b/dev-util/lcov/lcov-1.14_p2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LCOV_V=${PV/_p*/}
+DB_V=${PV/*_p/}
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="
+		mirror://sourceforge/ltp/${PN}-${LCOV_V}.tar.gz
+		mirror://debian/pool/main/l/${PN}/${PN}_${LCOV_V}-${DB_V}.debian.tar.xz
+	"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
+fi
+
+inherit prefix
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="png"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/JSON
+	dev-perl/PerlIO-gzip
+	png? ( dev-perl/GD[png] )
+"
+
+PATCHES=(
+	"${WORKDIR}/debian/patches/handle-equals-signs.patch"
+	"${WORKDIR}/debian/patches/fix-undef-behaviour.patch"
+	"${WORKDIR}/debian/patches/reproducibility.patch"
+	"${WORKDIR}/debian/patches/gcc8.patch"
+	"${WORKDIR}/debian/patches/gcc-9-support.patch"
+)
+
+S=${WORKDIR}/${PN}-${LCOV_V}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify bin/*.{pl,sh}
+	fi
+
+	# Broken by https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da
+	rm -rf test/lcov_diff || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index cc94d05627e7..3723ba05ac7d 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,9 +4,13 @@ DIST lldb-9.0.0.src.tar.xz 9846624 BLAKE2B b6bf819c72686cba9e2b0e6a49206b90908bf
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD lldb-10.0.0.9999.ebuild 2440 BLAKE2B bf6f144d0ce7f858a346fcc2506bb79ba48ae2cccde7f7f62157ecee96deecc36ae97ba725056a16d44198da82ce8e7aeaa22d9cb396878820c60125bcc8d4b4 SHA512 3e53ce44234f772270b998e882413f7d3b5cba94f40141f921fc14b0ce7192decfa18f8ee138e961d11cc5bf093e9323d483747a31778ad2b70829e642e6b2a6
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
+EBUILD lldb-10.0.0.9999.ebuild 2434 BLAKE2B 5b76bac2574a08cb8fe9ec86054ffe51337fe2801f85dbbb2497cec37970b940f62085149243409ea3775f9d97f70c50b050a8623d15ce006f2f8831283f94ae SHA512 ef0ff72aa47c6deeefcb77d1d7c2dd01ae8650e866da64b212b85283f59cf25299e0773c83a25af7f16aeb3fbbb81817759d217dbc1ba72b491e5d45458afd12
 EBUILD lldb-7.1.0.ebuild 3088 BLAKE2B 246fc131cd7b629ffe3e541c8f108f3f0ef63b28e68c887c503b2bf55987ccd4ec8dfc4a13763ff42a0a237487d2aee58cba7a72471d2f55359c0514e9f24cdf SHA512 52de6ecdfe24cea6f24f78f7d279ccce295189209b1d99a8bf6fb656f7f2a4c8284a03745f0bdf18bb061bd7eea82afe20d93b926e819b2bbd2f64f89e636db0
 EBUILD lldb-8.0.1.ebuild 3078 BLAKE2B ab71eaa79f68bb2023b3a1376920fb423e9ecd643bdd9421924889ceb370c549fea57f6d8513e2b41305729f0380d62940656023f098c4773f834fb41d591ed9 SHA512 0d78eaadb05dccb38a8e02ddd9b0c7740be3438f65d17766cea26112d74c91ecc204d4eba80eb39a80009276d8baf8166e59987eebe13674eafe5794381d3189
 EBUILD lldb-9.0.0.ebuild 2321 BLAKE2B 67da72dc7eb0c3e108b355b0f322d90a94f33266172053007f9f483db5ffa204262339617b8a93013fe22e7e3622ee895968bbcff81055d881edf77d09f4583a SHA512 473303590bbd86598fb5f78628edb0cb8c5d3a77992804373094f23c625ab5ca437c0196931a951ed14ad736e6273040246e3b4a4cf594e87735ecfacab0842e
 EBUILD lldb-9.0.1.9999.ebuild 2300 BLAKE2B 47b8092e629bcd192cbdbb114fbc3ab159cc2fba589c761b955162300c4c4950671830d96618be0a0e5c4bab728a87c0b9ff3da1f94ae196cafb23409051c721 SHA512 c060abd2b8ae5e3cb47dbbf91d821b990e7e13451fbb549d1a5c97f380cefabc4103ed9489394ec284ea1627b72ccaf02cec72c98bd89714509527ccc60f34c0
+EBUILD lldb-9.0.1_rc2.ebuild 2323 BLAKE2B e49efec55e48cb8028c5ea0e33230e7bc8b3b0b4fe95ed190cb52e8d550dd19d203f67b857624f2e9ea997f5cb2799940dae3218ea01c2141e7d3952b12f9d12 SHA512 c5d4b709636ab6f0bc80e721a80aac100e6bbf2cf102a527c96f711af10ca79155e744d77b8fd1220d8bea5b03f839d2133b154c9e922a3cb6d1a6dd126ca85e
+EBUILD lldb-9.0.1_rc3.ebuild 2323 BLAKE2B e49efec55e48cb8028c5ea0e33230e7bc8b3b0b4fe95ed190cb52e8d550dd19d203f67b857624f2e9ea997f5cb2799940dae3218ea01c2141e7d3952b12f9d12 SHA512 c5d4b709636ab6f0bc80e721a80aac100e6bbf2cf102a527c96f711af10ca79155e744d77b8fd1220d8bea5b03f839d2133b154c9e922a3cb6d1a6dd126ca85e
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild
index 384878929777..c2f8c7dded7c 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -47,9 +47,9 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
 		-DLLDB_ENABLE_LZMA=$(usex lzma)
 		-DLLDB_USE_SYSTEM_SIX=1
 		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
diff --git a/dev-util/lldb/lldb-9.0.1_rc2.ebuild b/dev-util/lldb/lldb-9.0.1_rc2.ebuild
new file mode 100644
index 000000000000..44e3c5a2c8d1
--- /dev/null
+++ b/dev-util/lldb/lldb-9.0.1_rc2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
+	toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libedit ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		sys-devel/lld )
+	${PYTHON_DEPS}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use python && python_optimize
+}
diff --git a/dev-util/lldb/lldb-9.0.1_rc3.ebuild b/dev-util/lldb/lldb-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..44e3c5a2c8d1
--- /dev/null
+++ b/dev-util/lldb/lldb-9.0.1_rc3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
+	toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="libedit ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		~dev-python/lit-${PV}[${PYTHON_USEDEP}]
+		sys-devel/lld )
+	${PYTHON_DEPS}"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use python && python_optimize
+}
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index 3bf0f5315fa8..50655fdd35a3 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -1,6 +1,8 @@
 AUX gentoo-helpers-r1.sh 299 BLAKE2B cac826ecdcf18d07b3bcc612f87090bcb26dc166f49794c0634245e48d0d6ebc93007774e436aa669e0b6eff3ed919524101d8c8b7856cb6cc6c94c48b0bc31c SHA512 71c0c7d8a7cf5c0baa71ecd23d075c8b9d244dbeebfe1c89dad3b8891693f1259de59e8c45718a0a45af97e88c0e943fba5888fbb5018a03fdb24689181019ae
 AUX gentoo-helpers.sh 286 BLAKE2B 8f8ed2932cb2a0c954851804f727f1099bf3f0acd4b2ece892f08edbbedf49be7b9953afdc923aa1fc50a115e01dec03a3d06fcf9a69bcda4d896c8a40560a3e SHA512 51fdfb9330a2d5bec9bcad9e91635a5fc245b3c02527ab70c0f9285cae0bb4266ba1ffaca26eaf6c4f9caf66a151bca776df36a0de2c4862e5d18d9417555502
 DIST buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+DIST buildsystem-1.8.tar.gz 38617 BLAKE2B 0fd5539feae0b81828efe90c82baf6ce7fceec2f2189adddb0e32d2106f9263ebd14b32f3dce8daae13110f0e69801caed48ce81709ce09d809ba50041690cc7 SHA512 0f577f4867e5e12770f9b9c42ea55e884362180bc195b6ebf56e56305ce84e230407cd2ebb3b182cc03087ffef5f39187e52e2e2f8f2b86aa20a16fa33bdff8b
 EBUILD netsurf-buildsystem-1.7-r1.ebuild 703 BLAKE2B e899d1dabcffcb2de57ebfc6cf9cc3881293eb6ec8f326ecd0bb2cbb67cfaa259f5f5b0e2171a87cafb3028618053066b4b377b947f8c16e17625ea6658d44da SHA512 0c3ae21fed977aec71868fbcf65592d07e53d54ceceaf0403be67da250c1579aebd1180cfdaebabeeaa2034b5ad3612ef5ae68c41402daecc431ae30da00e9ba
 EBUILD netsurf-buildsystem-1.7.ebuild 666 BLAKE2B 7e640a421bb041b10a220cad42afa9b6835b65fe0b39b8cdfc63c8e99129c6396bb8247e7f8a280c62276d41b041892e2162126412aad6c35f3ac39fbe7971b2 SHA512 0818bb0dd1f2eac87fcb5da10128d392fdfe274d9594c910a1bfe14f8221716193bff0fbf514dbe9b8cb10117347f04f63dcfad4772074bca4971e28a9af0af9
+EBUILD netsurf-buildsystem-1.8.ebuild 704 BLAKE2B 127aa49ecdbbfee4cfd40bf5dba8d53c58cf6f64c26b826a5470fe6ce8c3fb7bc1ee16cb94fe6748aa55e0b74c64cfb7a72165d60d102c4eda4846d0cd8719e6 SHA512 f9a64ca494d8f1271a05b22ccd0969f2db9bd914eab1e3bcbf858d125412ef17042dd614e1fabb40857ba0c4484c6596df425c672561ec606a246e43d68e0960
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
new file mode 100644
index 000000000000..501f05fcff97
--- /dev/null
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="buildsystem-${PV}"
+DESCRIPTION="Build system used for netsurf and its libs"
+HOMEPAGE="https://www.netsurf-browser.org"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~m68k-mint"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -e 's:/bin/which:which:' -i "makefiles/Makefile.tools" || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX=/usr install
+	insinto /usr/share/netsurf-buildsystem
+	newins "${FILESDIR}/gentoo-helpers-r1.sh" gentoo-helpers.sh
+}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 88da671201c9..44d06ca2515e 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -3,9 +3,9 @@ DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
-EBUILD ninja-1.8.2-r1.ebuild 2664 BLAKE2B 36478412e50d74dc8a8b9a2c7dd0f46e590fcf3117d080420a2cefcdae61ada9e58993c8f8f9e47b79b324d33846df8b239ceabf900491cd22503b5ea562100e SHA512 9deb3f4319fdd09c1fe448565ed01d031308899be3db0a4b896aaeeeb4e395e7858608982d9429a7a34af46db791f3d7037613c36ee617d82e1c8a630bd23bde
-EBUILD ninja-1.8.2-r2.ebuild 2664 BLAKE2B 9e22de951ec10b4da4f7f6623635affd20120b4c530dd6cc9fe418b326f8e3c6459085944aff70921b35c1806bf0225aceacb523665f8ffd5b225c5d861ffd49 SHA512 af03ccde30ad1e236e4564dca907560ac5ce60c158de5f5ab4bbcfda988484baf12b5db5108955abde3c7d60c146db35b4668627b5bafbb8c8b192a1946ec4e1
-EBUILD ninja-1.8.2.ebuild 2521 BLAKE2B 8ff5d56519cbaf75eb0d45bca02c52df7ec531c7f4a2e6b57e647c3cc26735a1caba75e055076237864a5e0cf820ce81f35fa0ca491686317277091171e868e7 SHA512 2e977340df20d1ebf8b428961b9ef978e5ea7cc4038ce2f99165f55902c8b7a5dd947b229d0bf0fcc264796db865358a104d629edc2f2224c9636e1dbb9a5341
-EBUILD ninja-1.9.0.ebuild 2726 BLAKE2B 948ba83a8d26ae6af26c1b64572b2492ca71cdf56e9891f99752ee866f1358e8b00d56eb143cf319df8d283c95b4141fe3aeedce0138769eebc5351a82e38f83 SHA512 ec3008bc38839fc3264ab02b15e41999e776373675bda38649b5b1fa7c50c70f4f3b0b7cf8c982bc8d4eafadb6f6855ae1c401d0d7c2c80334ae56142b67b3f2
-EBUILD ninja-9999.ebuild 2675 BLAKE2B 36326cc7ed88b3fdc42a9d2658c506ec0725e4c60a743ab3684ec505bc3b55fd74911e73baa3a436d700ebbe15e48e1ab8758d42e101f9f658f8c667c30a7489 SHA512 bd29a22f78c1218a7fa09497b1a9c1f5d47317aa7c5710f202f2f7e3161df88fb18afc0437b1d76a3350e2e433290a1f15b453074bfae8ab979c98f199e1e293
+EBUILD ninja-1.8.2-r1.ebuild 2691 BLAKE2B 24c9e48ccdefa9287c0031cc4e65bdadb8909acf3b32411ae26aa9afdafb811e677b380ffb312b8b6fae0c73230761c7b184331edef23d84423ac4acc362c6e9 SHA512 8a6d27700f8998d83e6d21aa372919be165d004b316617f728dcd2d95e5954a2fc6a84d1d5153c1c49e722f39c0c2ab64650c6d27fd74e3bf8e4e8241b3d424f
+EBUILD ninja-1.8.2-r2.ebuild 2691 BLAKE2B 40959f57f525c8589a7f6022d12e778ed54b0a51dfcc1d39a14b0e730d1d5164a77cf2df938600003ddba7ce04f78cbea6090b8ad9771981fc862cdd54238574 SHA512 c350b9e06966b23c8f2d976e5eba9c5eb4b82b46c368e537a46455081b04efa7eea1fc66770f8180c1106d2e553c11c7cc11537ab1dfe7acc3f0c6ff4baa108e
+EBUILD ninja-1.8.2.ebuild 2548 BLAKE2B 821cc06d07578f985ffecd221621e9aeb8548f2000d74024261baf9c3eefe8a9e5fa1d95520b20c75d648fea810a43002f0ffd8fafcf9c617537edc10d0477f9 SHA512 266a51feeedc4e615731d3918871c50c0b4e939f57f5713ae76bee3d14c66d5fc4ee328eb9acb4f78a4e60cb242d70fe15715b7cb76a2e8bc03e60eda7a55a4d
+EBUILD ninja-1.9.0.ebuild 2753 BLAKE2B aec17fc3aae923a2dfb59d68d4bcfa652eac76b1945f0f668f7ba7d5d0223447e289d9f8da91e68a3cd10a68b61ae5b7e10ca4b6ca73e17bcdb9cf3561201901 SHA512 f817f8a1321196ae210e04ac4227711c998beb384f37e879f661c4e1ed1e295f2416c3ea4d81da1c0654961d40178d63c25ef9011f47a937138dfcce20262ded
+EBUILD ninja-9999.ebuild 2702 BLAKE2B 8a1fdf0324d6df01a0f02578186d41cc414eb435b0b8c140803b3dc24005c5d44be3954db5a5eb8ff287eb79b54f9108cfb8d52876fec53c27758c60928d1a27 SHA512 9b8e98e8f16dafb81dd837590016c1b2c1090f12fe9ab1a9d319f1de0b08b15566e901080268494a527e7e7283029b3736f3e51103fe85ef9ac3624c62c7b563
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index ce02ef31849f..70c9c537f182 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.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
@@ -25,6 +25,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
index 6a99f341fabb..ceebd590c4a5 100644
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r2.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
@@ -25,6 +25,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index feb5a1e88fdb..31a17b577b77 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.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=6
@@ -22,6 +22,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index 1d8742de69bf..46fc4f19ce4a 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -25,6 +25,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 3fd1ef3707b0..ae5bb6fa6fed 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -25,6 +25,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	${PYTHON_DEPS}
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index 03b6c628c27b..f3c2dc7ba8e0 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -7,7 +7,7 @@ DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
 DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
-EBUILD nvidia-cuda-sdk-10.1.243.ebuild 3861 BLAKE2B 7a4b8778b6e7d28f7cc992bd36a25a9b5964f014be60c57985229522306b461bb10f22df059dc3e8aff81a281869e5687974ab921859b1c845e38a0d1355114d SHA512 e417d390c5ffbf147f224febff94fb6a7b78a1bb46dd0b70478b31939c2a59e9a47a1a2cb9c1a4de3299a4cd6eff8b2df12c892a9d30c9e8d8ad6168ed1e670d
+EBUILD nvidia-cuda-sdk-10.1.243.ebuild 3855 BLAKE2B 38641a5f691355ddaf84b7e24800e4758245fb2237ca6589c0e589a674f1d0dbdf2ca4396cb61f0d6572374833c9756a751d7b79edb693bd14b1cbdf42d53f44 SHA512 6ec429c1d57814d98050040644aa407247ef0e47c2634fe7e4dd68d8e6c33fc0975ea4688418c07efbee109c3b16f69c08ef16a1812169bacef38307a41f32ee
 EBUILD nvidia-cuda-sdk-6.5.19.ebuild 3992 BLAKE2B 3cd45f806009b7ef888c59c566af037109d20a6a4f5306ff6a6187266cfba019575f94c35df3780377a437074d630edcc88e3c4c3510a2511a27808f4d7d1012 SHA512 367460c2bc89549774ead4cde22c875ed3df9f8002fdd6666289649c6749295389204a11cd0cd6ab201cb2eed1e43d1cda45aea42b9864c9a7fb5ba813aaa04e
 EBUILD nvidia-cuda-sdk-7.5.18.ebuild 3568 BLAKE2B 45c89d2ea4116aa687ea797997cdf03bd7f14626ef49e505144ef9864aa88c7130878dee1896e0b0fbffec5b7815a4f753c1b5a71e4582676efb03aa62c0663a SHA512 199004e748db588de447c71ac2bddb08fdfbbc099a335ecbcd7e57978cc3cbb9cfdd6a87765c6b315cfac067248c133eeff1a98fc2e9d331a138ccb5266a1f7e
 EBUILD nvidia-cuda-sdk-8.0.44-r1.ebuild 3757 BLAKE2B 2a63de4062e746841c0e975aa68a5e40b358267b7682ca54bcad4c4b97ca3a1ac463c98ce081138d56013945cd22e9ff818d9b4391f8f6e15c1ddb8f4813aa70 SHA512 b2270c56dc77e85db6963c01965afb4a85b7acf3790630d955adf0d64d2ca09203c9423285684c99432037c8378dd5856c5ccf4b91a0b364f54c282765c149d9
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.1.243.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.1.243.ebuild
index 3503fb5b2caa..e63a0c26df91 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.1.243.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.1.243.ebuild
@@ -99,12 +99,12 @@ src_install() {
 	if use doc; then
 		ebegin "Installing docs ..."
 			while IFS="" read -d $'\0' -r f; do
-				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
+				treecopy "${f}" "${ED}"/usr/share/doc/${PF}/
 			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
 
 			while IFS="" read -d $'\0' -r f; do
-				docompress -x "${f#${ED%/}}"
-			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
+				docompress -x "${f#${ED}}"
+			done < <(find "${ED}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
 		eend
 	fi
 
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index b451db039347..eea66d1488a9 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -3,6 +3,7 @@ DIST cuda_10.0.130_410.48_linux.run 2020126691 BLAKE2B f784f41c06d81b6f89d07e756
 DIST cuda_10.1.105_418.39_linux.run 2423314285 BLAKE2B 924872eaaa4e8ecd6b81765c91d5e538d968e4fc88792a805339dd9cae15dd70372f310d39b9668d76cadbab875e3c4abcfca5a5cf71e4d83c9db056dc02f51c SHA512 07cdc053989758e4cdccaad566cae7127fa79780ad85033ea52d33cc4c43c9de08e88dd087390c58b542e51703f256859cdf51a018ee57e6a412f45fb9561622
 DIST cuda_10.1.168_418.67_linux.run 2526901749 BLAKE2B ed2207400730600c63895cc894e02a14dce59c6293f198ea2a94f6dd0fab25a005d4754f91376c267cb95f3fdc66ee08e4353ec17b69d28881c59190b9eb4746 SHA512 85635012ec7081e200fb46f973852939f9709e802f495c288d5f31ff1fbd283a578fdaca0afa8955e6e0c7ca6c4862428da5168e0938b48390952d8633350910
 DIST cuda_10.1.243_418.87.00_linux.run 2572375299 BLAKE2B df9cb4faeeeeecc536e72697c6c73d544219f1b23cacb7fed646b0908fc7e573e85920861d56f76776ba637d84964cd1c789a0fe0d6541a4e0adf618b6c74d3c SHA512 f92b19d0242969a65a6e6db43bc293e442abc07a9e168c9e995692e1a401679504598c782e511be3879e1650b90f71a50bbc63c9ee45654c26b5007cdf33c4fe
+DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
 DIST cuda_6.5.14_linux_32.run 76788277 BLAKE2B 75e79dce6cac5155bde8a3cafa945047c489b10272f8a3b94bf55d499df4b9c8b82506a81a20f9fd816bd4fd0514e515a6435399db1cb62b027c76490bd4dfae SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc
 DIST cuda_6.5.14_linux_64.run 972320904 BLAKE2B 4a4361fb7a90989ec4b4aa433189e7b358e5a2272fb9b9c59429e0014ac14e3b8de1b247ee98dc30c3f3ee4cc009eca4fdd86027bd3b9527a683353d60bdf5c6 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e
 DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
@@ -16,7 +17,8 @@ DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac9
 EBUILD nvidia-cuda-toolkit-10.0.130.ebuild 3349 BLAKE2B 19495576988f7e01178ecef6117b4e1a1186ec98174ab77bc14233ba55b199c4ac7068e4f734eba984f6546883aa8dd1787c1eda7b40c60829a0587d8286ba9c SHA512 719f934f1acf7599405a910be3b14f5888583eadc281bc93599ab8441b82c1fca6147d904a8622495c5410a86897c4acb45b3907bf44cc9e00ac9cde905e61fa
 EBUILD nvidia-cuda-toolkit-10.1.105-r1.ebuild 3768 BLAKE2B 3e0a0527e9f174452d27f4072bee45036737a6f4b1615ffdddd99eb1dcd65ee31ade936088c1df8596cdeb4b8b2c165a45753b213f3a9ba90ec0dae58470e29e SHA512 d833f528da327e9478c3ee1bcff3dd722f9a165f45907fd82079d4380aa627ae0e88c684a1c5c37b6397ef30428f01343b16465edeb0144322bfd2accc8f79c4
 EBUILD nvidia-cuda-toolkit-10.1.168.ebuild 3768 BLAKE2B 1499833ee57cd8f57243f1a4c7f2db7d5288945a217a8f56ce345b23ab820d2098f1d2b22a35550146e9f6a2a4806902556dce661acc2c83d358c6c6a4b77c2d SHA512 6737ffda572af284a65c07727dd4d7e67081e7aae3e7d656c3d4c5db7d9ef0f17ffbde069d7fc936d909881670ea34dc2025147741146a59a0330b16cc42444c
-EBUILD nvidia-cuda-toolkit-10.1.243.ebuild 3753 BLAKE2B a6965247c07c75262a50d968f3a76ece7d693912ed76aa1c52c37bed7f9c09ce625945a333c186d45ca68f082ef44777e0877df8d6288f9f78cb3d3f94e508f1 SHA512 b0fa77b925abc516f9e036fb8b67383e2ec0bfdda85bb41506cec2d6e851aac016d118c12fe11ea80694f0e390cdba388aa6aedef7fc9f5ecfacf43ecf9d76fe
+EBUILD nvidia-cuda-toolkit-10.1.243-r1.ebuild 4068 BLAKE2B 8a0aed8f0b383064af4e78382e26c3d1b30148b2a952943cf24b04094a7fc7cada59df9a5073ccf49b409b79af2773aa5629b45bcb8d3b22bdcbc337fb425aef SHA512 9454e7b8b9e1078cf52f06ae297a9cdb5943368d51437c000a369aeecaf90d639f944039ec3deb194d9d83527efdf03b99e00b14a91169975720a6cda16e5385
+EBUILD nvidia-cuda-toolkit-10.2.89.ebuild 3821 BLAKE2B 002b8907aaf2b16f96f69ec692c4245ec0a1722a5bc017067cac8c465fb2e4381863385265a8b5799f43edc51522a3b2f50b2225b0d15f14481a27c6aa17d383 SHA512 b7df4abffcfc02732e66ae97ef1736362e9eb8d46a655a43b2b145cc04dc7cf1c08739782e5972d58c5dbacf9828f4a32fe124016d0265e60d43cf3604a18fdf
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3818 BLAKE2B e368a3fa7258a86f920f53da56039b940cc84e551265d458e1a3c7bc7b9321c4020e5ada9b56fc588ef4708acc4cfe9a8d2e259ad12b0c71fb57635b05b873bf SHA512 7f73c4e321234f6a19166e6e28719f6c98cecb809f9878ee1182b812e18fcc6f8c29fb2ebd0ed520847f38bfddd6a0bc60fae6b711b75f563ab39a9b322468b2
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3844 BLAKE2B 42603527c1f012d49c98026d3f96f5ecd832cc4f31fd1afcf6738dd4e3e2aeee0ac55beeae994bbff4f48562adfe11b72270e516f8fb70d32cf00ae59f55bd78 SHA512 f40103348972041a9d6c09a8c129b68603ce0fafa29df1fdf6b13014bb97156a44881161d4668beef8af9b77adea9df8034c88d6413a6ac2ad709285f785df79
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3355 BLAKE2B 07076b6506902bcadb8f7b6430db04beb380b76da35c5745e313910518855bb7e4c5d746d880bf7f3bbd07fc06cbb17f0d7d76bb267f9679c3d8099e398f7d35 SHA512 4e8070e399766796b1589329db4de04fc0fda0cbd1dc8ec1984b8550f1bc10d490fed7b085066f4419d5cbdf98ea2ae8202b29a9d360fe3b2a3be6e20bc802be
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r1.ebuild
new file mode 100644
index 000000000000..375c8aa7bc1a
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+MYD=$(ver_cut 1-2 ${PV})
+DRIVER_PV="418.87.00"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-9[cxx]
+	!prefix? ( >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm] )
+	debugger? (
+		dev-libs/openssl-compat:1.0.0
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	eclipse? (
+		dev-libs/openssl-compat:1.0.0
+		>=virtual/jre-1.6
+	)
+	profiler? (
+		dev-libs/openssl-compat:1.0.0
+		>=virtual/jre-1.6
+	)"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	cd builds/cuda-toolkit
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb bin/cuda-gdbserver extras/Debugger share/gdb extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight nsightee_plugins nsight-compute-2019.4.0 nsight-systems-2019.3.7.5 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
+		remove+=( extras/CUPTI bin/nvprof )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -r "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install binaries separately to make sure the X permission is set
+	local bindirs=( bin nvvm/bin extras/demo_suite )
+	for i in $(find "${bindirs[@]}" -maxdepth 1 -type f); do
+		exeinto ${cudadir}/${i%/*}
+		doexe ${i}
+		rm ${i} || die
+	done
+
+	# Install the rest
+	insinto ${cudadir}
+	doins -r *
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	b="0.0"
+	for v in $a; do
+		if ver_test "${v}" -gt "${b}"; then
+			b="${v}"
+		fi
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt ${b}; then
+			ewarn ""
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use prefix; then
+		ewarn "Gentoo Prefix does not manage kernel modules.  You need to make certain"
+		ewarn "the function counterpart to >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]"
+		ewarn "is available from the host"
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89.ebuild
index 306345210681..ca7089f105fc 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.1.243.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.2.89.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit check-reqs cuda toolchain-funcs unpacker
 
 MYD=$(ver_cut 1-2 ${PV})
-DRIVER_PV="418.87.00"
+DRIVER_PV="440.33.01"
 
 DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
 HOMEPAGE="https://developer.nvidia.com/cuda-zone"
@@ -27,8 +27,14 @@ RDEPEND="
 		sys-libs/libtermcap-compat
 		sys-libs/ncurses-compat:5[tinfo]
 	)
-	eclipse? ( >=virtual/jre-1.6 )
-	profiler? ( >=virtual/jre-1.6 )"
+	eclipse? (
+		dev-libs/openssl-compat:1.0.0
+		>=virtual/jre-1.6
+	)
+	profiler? (
+		dev-libs/openssl-compat:1.0.0
+		>=virtual/jre-1.6
+	)"
 
 S="${WORKDIR}"
 
@@ -82,7 +88,7 @@ src_install() {
 			chmod a+x bin/${i} || die
 		done
 	else
-		use eclipse || remove+=( libnvvp libnsight nsightee_plugins nsight-compute-2019.4.0 nsight-systems-2019.3.7.5 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
+		use eclipse || remove+=( libnvvp libnsight nsightee_plugins nsight-compute-2019.5.0 nsight-systems-2019.5.2 bin/nsight bin/nsight_ee_plugins_manage.sh bin/nvvp bin/computeprof )
 		remove+=( extras/CUPTI bin/nvprof )
 	fi
 
diff --git a/dev-util/omake/Manifest b/dev-util/omake/Manifest
index 6d181f61b82c..3c549bb4dd79 100644
--- a/dev-util/omake/Manifest
+++ b/dev-util/omake/Manifest
@@ -4,7 +4,7 @@ AUX omake-0.9.8.6.0_rc1-warnerror.patch 287 BLAKE2B 20b28db41f662e8f3fa75a65fd9e
 DIST omake-0.10.2.tar.gz 2434316 BLAKE2B f8ca58058ddee39f4e803b91fce061041adfdd71644c17282353b9057acddf23dcc25f836d0ae4014dd44d9c3889c32e5b14788916bcc07015aa6d93e6b5ebdb SHA512 22c454825287dd54272874ec3aa7c5a79f7eac79e18a3eefd4b2e90a08f9767307b0f627d71049a4c08776c85318ce096e89fcc5619d3ec78cc073744efd0fbd
 DIST omake-0.10.3.tar.gz 2438877 BLAKE2B c14adc4da9849b369a2cf5e3676260a2efeb6339939de95965f708b93ac5964af0a8b7e79ebaf98a20061c45530a20ca3825e7a432a3d8b86cdef3ab661cd5d9 SHA512 77eb87b819048d7d9cb9b89a73c5f922ba3adc93f0d58536b3cfa20abdbf1d2a4c576b77921c52e8ea5f80171e8a503b573bf2a92b65fa0579f6492574079733
 DIST omake-0.9.8.6-0.rc1.tar.gz 3254283 BLAKE2B 0fbb77932178e067ff771ed4d448fa2342f56e281799915ab559a606bc195f7817f710caaa44b2debb6243aabf73ebc3d11e0fa010fdfcca14060c8e6e808b15 SHA512 10a7ef6746c656d25852d408fafdd67a95acc59b73c892f0dbc316f2a01949b5349d5203c9fe2400cc7c05e14a7b1bc075603bd462ab74b60427d944f8e177d0
-EBUILD omake-0.10.2.ebuild 1140 BLAKE2B f235dc6d18f9974359130d7b8012c5236c71524629f5edfad6404675c2242109b75f87e4939f175d8b4b3076de0bf44b4a944d6a60e698632f26e4994d23ee47 SHA512 01468ee64d45d6bb09956c0ba5d9a42a8140ac190cc311d3303814b370fd722acf0d99adf37d78b420d0ee3c412963d81d54f1036fd0ea158bfb560ed959727a
-EBUILD omake-0.10.3.ebuild 1148 BLAKE2B c7affb6ea4041ad65f3732f13799fded819aa2a8532d8d6a98e2c66caeffb4873228a48735ce1773151ed75600aa3f391b3f0f31d4fdd2d37fdca42b6f8e1737 SHA512 af19ccadd72b19416811d9210b483affd6d28dc09adab713e48875610a576cf5aba26592401b613663907357c5b6b11e1e4a9cb862ebdb3e71ef868ea0624ba7
-EBUILD omake-0.9.8.6.0_rc1.ebuild 1985 BLAKE2B 0f9446bd08c27b34840e59b31e9c3ebc6fdb8b7a714c90b153990458f204f08cf118bc982d26c3590e56f0033765883e81adc9641bb46e00a15a20e317a8133b SHA512 453d1380f3df9b214e13246468deb1174a44214168f277b50203ee295eb6789cb72cd7be3782b1b52b8c94779b2a56d672e1cf8714abb0a69853c8657b85c167
-MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
+EBUILD omake-0.10.2.ebuild 1129 BLAKE2B 781ebcf7740cfabcc44ca270733130fe5e9e9931e879987fbfa4767880c1e8b57e3943e081e4b6cbb7cd0f4201b9facca7e7ece9901eb2a5ebb1be53ce518e74 SHA512 c61934697168f2bcc7be90e89e00e0460d94df2b5e2396dc3bfde1036aca4672ee9122154d4d75d25137383fc4f0f83d19a0976e5247f9586f7797f7b916ca47
+EBUILD omake-0.10.3.ebuild 1137 BLAKE2B 8720b34fb92029fb90616a28d937c671e6d8ae06f1d02df65c70b962f8701603a1e1ee0c49889381c556c221216902b0e3d634d528bcb532c14b1013c7880b1a SHA512 3f9137cee89fae65afb4dcd99a680e8debc4938e051f843d6dbd36135b712d9eb6e11306e69eaf4fb6a662316d8ef5a7b35558ce4d219905f6ad0d201beed044
+EBUILD omake-0.9.8.6.0_rc1.ebuild 1974 BLAKE2B 7b5102be1a61ef08989a2027cc5362d1801f84e474ff800570e27343fcdea10aee5d54fbc9129902e44bff36a3d40b41762cff60eeaa8916c6f6cb3fcc1069af SHA512 7480f6d61a3beafc9e78b60eed6968969f3998f7ac1b6c788f966c6b8b76eef88b6ed07af8c0730928dbc75cd3726b334a2aebdee1e30bc68501bb4f1bbe9493
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/omake/metadata.xml b/dev-util/omake/metadata.xml
index ffac4d7ebc01..6f49eba8f496 100644
--- a/dev-util/omake/metadata.xml
+++ b/dev-util/omake/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="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/omake/omake-0.10.2.ebuild b/dev-util/omake/omake-0.10.2.ebuild
index d8f2abbc56cc..b6934c6a855a 100644
--- a/dev-util/omake/omake-0.10.2.ebuild
+++ b/dev-util/omake/omake-0.10.2.ebuild
@@ -5,23 +5,22 @@ EAPI=5
 
 inherit toolchain-funcs multilib eutils
 
-RESTRICT="installsources"
 DESCRIPTION="Make replacement"
 HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
 SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc fam ncurses +ocamlopt readline"
+RESTRICT="installsources !ocamlopt? ( strip )"
+
 DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	ncurses? ( >=sys-libs/ncurses-5.3:0= )
 	fam? ( virtual/fam )
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
-RESTRICT="!ocamlopt? ( strip )"
-
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${P}-cflags.patch"
diff --git a/dev-util/omake/omake-0.10.3.ebuild b/dev-util/omake/omake-0.10.3.ebuild
index 430979c1cfbd..eda48ece533d 100644
--- a/dev-util/omake/omake-0.10.3.ebuild
+++ b/dev-util/omake/omake-0.10.3.ebuild
@@ -5,23 +5,22 @@ EAPI=5
 
 inherit toolchain-funcs multilib eutils
 
-RESTRICT="installsources"
 DESCRIPTION="Make replacement"
 HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
 SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc fam ncurses +ocamlopt readline"
+RESTRICT="installsources !ocamlopt? ( strip )"
+
 DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	ncurses? ( >=sys-libs/ncurses-5.3:0= )
 	fam? ( virtual/fam )
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
-RESTRICT="!ocamlopt? ( strip )"
-
 src_prepare() {
 	epatch \
 		"${FILESDIR}/${PN}-0.10.2-cflags.patch"
diff --git a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
index 2ca918e00a10..b8d6d19812c9 100644
--- a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
+++ b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
@@ -6,23 +6,22 @@ EAPI=5
 inherit toolchain-funcs multilib versionator eutils
 
 MY_PV=$(replace_version_separator 5 '.' "$(replace_version_separator 4 '-' )")
-RESTRICT="installsources"
 DESCRIPTION="Make replacement"
 HOMEPAGE="http://omake.metaprl.org/"
 SRC_URI="http://omake.metaprl.org/downloads/${PN}-${MY_PV}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE="doc fam ncurses +ocamlopt readline"
+RESTRICT="installsources !ocamlopt? ( strip )"
+
 DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
 	ncurses? ( >=sys-libs/ncurses-5.3:0= )
 	fam? ( virtual/fam )
 	readline? ( >=sys-libs/readline-4.3:0= )"
 RDEPEND="${DEPEND}"
 
-RESTRICT="!ocamlopt? ( strip )"
-
 S=${WORKDIR}/${PN}-${MY_PV%-*}
 
 use_boolean() {
diff --git a/dev-util/patchelf/Manifest b/dev-util/patchelf/Manifest
index 6994b8f7bb84..bd7d6d456336 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -1,6 +1,3 @@
-AUX patchelf-0.8-dash.patch 1060 BLAKE2B 37361c4221be04e4a8e672578e8414bde1d03e39fbac60e9dba20ed407347e1e84d193469bc0fba6744953fde4cdf04c807135465edb5519f7b970189df9d7ab SHA512 35f32d43a85ddcfa0a1c3879b0a934dea8c58c7121d3d86157183a175bcf64fc0d4aadf96a91b5e4d5aeade773ff3145c683378fbee019f5293bc0f636104a7e
 DIST patchelf-0.10.tar.bz2 158604 BLAKE2B 6aed9c2e7f37ff0330ca517a9491c46a93212140367b720bf94da4e4ec29a4978c920b53ce306ec333b3f7ac0216ff59637048c6997cfea4a34a87f2a0448796 SHA512 647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501
-DIST patchelf-0.8.tar.bz2 119369 BLAKE2B bfe7dceea9a79845c61bc7490faad5cd4d5e83bc0be4ec7e3b19fbed91ecb7d15e0a0688d4914731b94f0522c80ea9f940b6a8ad5595931df8826ef43f2fd209 SHA512 819ace0ee032612e8bef56f230ea470be9d44bc03ef561f98ffac84f2555e419f87309280df6d265a8ae56452e54d46fc90be13a449847e93e4e7b413dc8605a
-EBUILD patchelf-0.10.ebuild 612 BLAKE2B 2bee5de87f750cc21a0f590270f10e78c35f1f6098f0df696bbeeac48a75bda3d8bb7b425a8551f70b9b746c61519a258efeb61e69da24a459bf40d476a5c2b4 SHA512 c321104e677c145cdb8079e7cde3a05ec58ae026d0e418356e79e29b30f71b6c6b90cefe7cddaf9d44315fae4216152b6d0afad8ded06dc3ad9599ca39518f05
-EBUILD patchelf-0.8.ebuild 858 BLAKE2B 448a57c5e53e6f1520ab07ab9c018b2027b0c6a4f1ac3f532a8dfd6859e4fa272ff5e00d396f58e26c802eb2b56583f5e3d333c593e78f182e642d0ac0ffccf4 SHA512 24528d15b688872f635ded7d0de4697e48bd82b9bd10dc937a00e01ef2fb42dc88cfbaaebeba2a2b885151a04061c0c515dac078b1193783dcfb781c5717c41a
+EBUILD patchelf-0.10.ebuild 614 BLAKE2B f8746020ed527d88057d36d819def0266112d58f56f0ac1f7d66b529aa4cabbc17041ea6659cd46a53c6f941920540481d6d4ee4e81973d82fcbf3b24ddefb8e SHA512 9cc306c95e5b5cc72ec93645c829c10df6263d7929b26274c02cd1fda973812dfef85b1ba8f0437a6318a57573f1eabfaf10b318a44a7b40a46eac0fdb38eeb6
 MISC metadata.xml 220 BLAKE2B 65b0d9db11c166b2887e1a22962830e288eb917a7f15d0ffcecb3c86a1845491cbcbf4ebc7e661ac7041443a8144b218123b4db7a962191a9e9f894ac086a4ed SHA512 512eee7a953300d5e721b64bade8be9bd1b62984e543552b58a7a72b42cb90973c8c6d557ecfe08c2355cab45f640c88dcd31ab8d116815bc01680a65c7a132c
diff --git a/dev-util/patchelf/files/patchelf-0.8-dash.patch b/dev-util/patchelf/files/patchelf-0.8-dash.patch
deleted file mode 100644
index 4210b1c054d0..000000000000
--- a/dev-util/patchelf/files/patchelf-0.8-dash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3b9e7913a6d14cb09ed91ce8a1110955bda200ef Mon Sep 17 00:00:00 2001
-From: Alexandre Pretyman <alexandre.pretyman@gmail.com>
-Date: Tue, 14 Jul 2015 09:12:38 -0400
-Subject: [PATCH] Change configure.ac from OpenWrt to support Mac OS
-
-This change is from the OpenWrt project, from the URL:
-https://dev.openwrt.org/ticket/18998
-It enables patchelf to sucessfully compile and run under Mac OS and
-keeps compatibility with Linux.
-
-Tested under Mac OS X 10.9.5 and Ubuntu 15.04 to patch a binary of type
-ELF 32-bit LSB executable - the patch fully worked
-
-This patch is credited to Felix Fietkau
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8ca9ad4..69e12de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([patchelf], m4_esyscmd([echo -n $(cat ./version)]))
-+AC_INIT([patchelf], m4_esyscmd([printf $(cat ./version)]))
- AC_CONFIG_SRCDIR([src/patchelf.cc])
- AC_CONFIG_AUX_DIR([build-aux])
- AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2 foreign color-tests parallel-tests])
diff --git a/dev-util/patchelf/patchelf-0.10.ebuild b/dev-util/patchelf/patchelf-0.10.ebuild
index 36271cd5f471..481b26d56980 100644
--- a/dev-util/patchelf/patchelf-0.10.ebuild
+++ b/dev-util/patchelf/patchelf-0.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executa
 HOMEPAGE="https://nixos.org/patchelf.html"
 SRC_URI="https://nixos.org/releases/${PN}/${P}/${P}.tar.bz2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3"
 
 src_prepare() {
diff --git a/dev-util/patchelf/patchelf-0.8.ebuild b/dev-util/patchelf/patchelf-0.8.ebuild
deleted file mode 100644
index 3a3ffaccefd4..000000000000
--- a/dev-util/patchelf/patchelf-0.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Small utility to modify the dynamic linker and RPATH of ELF executables"
-HOMEPAGE="http://nixos.org/patchelf.html"
-SRC_URI="http://releases.nixos.org/${PN}/${P}/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-IUSE=""
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=( "${FILESDIR}"/${P}-dash.patch )
-
-src_prepare() {
-	rm src/elf.h || die
-	sed -e 's:-Werror::g' -i configure.ac || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=( --docdir="${EPREFIX}"/usr/share/doc/${PF} )
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test -j1 \
-							 CFLAGS+=" -no-pie" \
-							 CXXFLAGS+=" -no-pie"
-}
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index 661b9a30cfff..6ddcfb392fa7 100644
--- a/dev-util/patchutils/Manifest
+++ b/dev-util/patchutils/Manifest
@@ -1,6 +1,6 @@
 AUX patchutils-0.3.3-format-security.patch 715 BLAKE2B 48be5e5e0376b6520cd0baffca1cc385bf3a267c8443b4ec195d302da6b165604471b919c47104943c1ccdc01d3c9866d93d1d8730e1a8b6889f433f607fb73a SHA512 b98932e5e48dfefb2ef8550c7f212cb0bf7417b0ed42705e3ddd9164d522ebdb47a0610539769a49a19d10e6389eb9e764fc5ef7bdd03af9b29feeb76a51c8fa
 DIST patchutils-0.3.3.tar.xz 156328 BLAKE2B e7da090e1fc7f95f5c2e4c02828702b485dc92fa22a4f45d69f5d9f610fb5a5e3267794fa572cf3aa73be45a86a5c889776eeadf5cca98237d97e53cb1b9be91 SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268
 DIST patchutils-0.3.4.tar.xz 166400 BLAKE2B 382be328bfd1ab848f38126ad7a41a4c953844956c181265953a7496c8de3df5d90d071a823b226ceeddd7321bd4ecae1e06c8583155b08826c97177efa9b68b SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440
-EBUILD patchutils-0.3.3.ebuild 744 BLAKE2B f791fc4376e96181a6dc00e991b39667a60baa2b53b47e1753b090ab2f2d7a013e02228fb353b4b78dd5ce767b4e06f4e287a70052ac942b10149b62b768919a SHA512 5f35bd889833e2fcd4df8d5288e36d40bc6c18f11bee9382c2d5470fb621826f9e87ca66166da7eea264f316161e3ef3c991117772e9ba8f23a24c984afa9f5a
-EBUILD patchutils-0.3.4.ebuild 780 BLAKE2B 802ed48adc72dd9865b130d61b8068812037f3d5cd764b71744b317366478bd6610afd91c6cc562093f6122e357e39b0edc46fe4bef46b617068c66150f7accc SHA512 da860abfb9cd4a29cff972fbf5c3df7c05b9346cd595488ef860c07667a119c4edbfc3c5e041e38d3896c0a5a219b8ae647e858d44c43adc3838150644bff59e
+EBUILD patchutils-0.3.3.ebuild 768 BLAKE2B f9ddbc70b3fa713ba51b85b72f1324de989f704feadd9fcc8ea47d33fa54f5e35a93d8adbfff47ed2be8d626159c3a7ed72fa01502be09cc52b8a67b301f8c11 SHA512 e850247884f0716afa8748319b35323ed520f42a48f72ad540114fd4a8cb838e34d4072a76bc1e56f1abd8764b00d6e821d847301496ce4ea9277b0dd87519c5
+EBUILD patchutils-0.3.4.ebuild 807 BLAKE2B e00dfe5f2e37af73e1b4dd88b5629fb6dbdac3da7ef474637dad9f6a81dee8fa54f07fe4cd0269839ddd251baae44b195c4ad8e2880786184a61168d305d7040 SHA512 299fb22683bcad01b01418871bdbfdddab566dc9c39247d4b0e41cd69f5ce7a69d935e948375b094c62006547242448cdf806c2512ff5bccb4cbebc665b5c4fd
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
index 24bf73e6f18d..c6c38eac90d8 100644
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.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
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 # The testsuite makes use of gendiff(1) that comes from rpm, thus if
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index 5f090fef4c4f..e008ce9b9d5c 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.4.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # testsuite makes use of gendiff(1) that comes from rpm, thus if the user wants
 # to run tests, it should install that package as well.
diff --git a/dev-util/patdiff/Manifest b/dev-util/patdiff/Manifest
index eaf34e7b635d..c99b387b0c84 100644
--- a/dev-util/patdiff/Manifest
+++ b/dev-util/patdiff/Manifest
@@ -1,3 +1,3 @@
 DIST patdiff-0.9.0.tar.gz 40059 BLAKE2B e9994397f44572d4e11d510de79007b0d621ef7c841d9d4d8a8ede2dd9867f202e9b53c31dcdfa7166cec9d7e0aa8ae2151e2cb148a5ddad6da5ea6706aaeef4 SHA512 a48d58c7b2681d5be6281fd6ff4e95df98d6c6f50622eaae5560a9f99c3b8ea0154cec5e6e5eaff687122a1d907657e943239869125089cab5e94e65f7c6a298
 EBUILD patdiff-0.9.0.ebuild 847 BLAKE2B 6fb9f0269b8625015009fa44d911c171896c4335b92f3ff2301791a108e84a8b1ddf60d093e48bb4d4e5dee6ea19f77d3bfbec5141956b3922ff48a7ccc2ac7a SHA512 17cad2854442957d5c5ac9a41d5d35553c1f28c6a39d924757ddac66431152323fbfa9d3eca99427209f9c32c7e05b87406c70c27e7034720a74400ba46ff6aa
-MISC metadata.xml 330 BLAKE2B 25cf17fad7b6600aef724390b7253da203e27748b0582a15f5fef21e8d5025ca560eab4b9202752717b41a142f2a6a564e38a514b872d9eeab38cd746f50167d SHA512 bd88c00a353b7899ccfdecba9c1049a4fd618fcc353dfa7570f5d101c99a8da5037d0593a19d4614a4f640f8c46217c98a2833876b977647235cae9bf2f1c6f0
+MISC metadata.xml 250 BLAKE2B 868d5b05e454f709e10c8569c1d726211c7965601ae1af8d3075eef7820a59e7f1b4f4107fecf4da144b9108519b61da2629128fcf45d9d71ab83d0968cd35b4 SHA512 894e6d492b23667a5977fc819e5dc506f00f06608e37986034eefa11e881f57f77593ad364544f18041c43bbde87f927f3c35a4f5fce077e212d9f7c22260c30
diff --git a/dev-util/patdiff/metadata.xml b/dev-util/patdiff/metadata.xml
index b31ec668fef0..4539784bd6f0 100644
--- a/dev-util/patdiff/metadata.xml
+++ b/dev-util/patdiff/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>Gentoo ML Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">janestreet/patdiff</remote-id>
 	</upstream>
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 4fe46e41d475..9e95b9aa60af 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcheck-0.6.9.tar.gz 196583 BLAKE2B 01d5382c1b64e565eee34efb1723e9324cfa3dffcf9783e1f707fb384caa55c0b926df0638e318e8de03d28f29a1db37d37a6475d15928c8391bb7930239fc0d SHA512 0c7d1564ce01039ee25dd9eeab76105e3c82e0c3fbf7023709ec7d4d430d28c447e821bec992c5aca460bbd53fba070081462a5c95525d50b60d18ce9a5bed7a
-DIST pkgcheck-0.7.0.tar.gz 196523 BLAKE2B 2ac7c61ffa4ff4b7319dc699ddfabcd5006710ff0089893d2c427fc4d1607107a7374fb3fe4d5da16c8a4725d8e350e29433b6c201ce1594169af3d8a04c8c40 SHA512 b7e4f2d044a9afc55810f30be3307b7b3dcc5f5dcfdc3d2702593866f2d6e5c6906175e484185961e9bad4f8f02a729b74bac4cb8e7697f99951b397f8fe8a2e
-EBUILD pkgcheck-0.6.9.ebuild 1452 BLAKE2B 081eeedc8c03355ac7f28fe25c4d9a3904b33be2da9b1c3381b1247ecef3dd6e127d1ca9db859a6ab47179bf0c6097015ee9d2cb0323d6954e64988a2e5198ac SHA512 64d581b240f051959cdf2275489babb620a22f37d516a37f44cbf9f51b00d4418c7b65817f80abb2b1353d95c069828bda75e55d2561909a9db6bd2400f882b2
-EBUILD pkgcheck-0.7.0.ebuild 1452 BLAKE2B 081eeedc8c03355ac7f28fe25c4d9a3904b33be2da9b1c3381b1247ecef3dd6e127d1ca9db859a6ab47179bf0c6097015ee9d2cb0323d6954e64988a2e5198ac SHA512 64d581b240f051959cdf2275489babb620a22f37d516a37f44cbf9f51b00d4418c7b65817f80abb2b1353d95c069828bda75e55d2561909a9db6bd2400f882b2
-EBUILD pkgcheck-9999.ebuild 1491 BLAKE2B 7f364f184c8f1c164958715f3c369bc3b8bee8c601e33b34d228e795cb5e81c608b2fe3d95596c85ca762d408bebff29bd4a5516e1422512bdf17164c3d285cd SHA512 c01a599b65be43641da7d244a04db2dcf8d3aa657101a52f67ce6d72fe7e564987fa0665acaa340d55febf17fd03d5d969a89e26d030005c4ad89bc59cc384af
+DIST pkgcheck-0.7.1.tar.gz 212835 BLAKE2B 07fce0ed898a276ff939aec9018e02816b0abefe2a2c491ba7be8fb9616fd2351d827ae7f9248ed708a6dc1c387e3b7f30fd78ddbf8aa14b247bdec9e4925bf5 SHA512 0aaab2319d8a9c8dacf1027fd45239b11e530f213c940fcd1cda775f3e214064249c5598d586fb7bf3c0da53460de6e4d19e73ad26ec9be2bfdec645a82f78d1
+EBUILD pkgcheck-0.7.1.ebuild 2011 BLAKE2B 6cb277ffa2e9165564a42d70dfad5bb45860baf717bbb3a8d04e5cf059a6e30c03fe21a0cfa8d47cd55cfd9370f3eab924c7ad0a361c7c8afccfb4bf5a97c85f SHA512 7dcff058c8a2085b3346cbc3f8f4282f9c0a2455d3145f9598de5ce31efe2585df480c5f55258260c869f42b064734aaf5096bf19998eb1976270dcff7d5a4e6
+EBUILD pkgcheck-9999.ebuild 1318 BLAKE2B 2b77f6a4b990de4f637ace4ac82eb09674b32f8f50d820b2adb54b9be14eaeaba29dbd086ba4404c293ac92aadbe23f91e0a08a2276b48bdb5390330ccb525c4 SHA512 57b9c24328559fdee739a0143e02dd49d692a6b180cbabb891b970145985b395ce7ceb8a188b98ab2e9e39604a4811f18477f597f1841a7504e73f7ae6d7c677
 MISC metadata.xml 550 BLAKE2B 546180cdc48f3c64c63ab80711aaeb9f0e84380ebafd76aba32b5744652b9de7d242bc886cde704dab3720c9251b1845deb0fae7f8825477efb5d5562df41afb SHA512 9ecdd3db309e3f7f97452303cd058ebd34423feb050250c8bbc917598e68d55b9e99e2f6a6ac02aadde0e2218c89513dcf13983765852d360c1656c4b945025c
diff --git a/dev-util/pkgcheck/pkgcheck-0.6.9.ebuild b/dev-util/pkgcheck/pkgcheck-0.6.9.ebuild
deleted file mode 100644
index 5c6e0fb886b6..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.6.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc network perl test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.7[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	network? ( dev-python/requests[${PYTHON_USEDEP}] )
-	perl? ( dev-perl/Gentoo-PerlMod-Version )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	use doc && esetup.py build_man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	esetup.py install_docs \
-		--docdir="${ED%/}/usr/share/doc/${PF}" \
-		--mandir="${ED%/}/usr/share/man"
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.0.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild
index 5c6e0fb886b6..c4df9003bc22 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.0.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -28,23 +28,41 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.7[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.8[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
 	network? ( dev-python/requests[${PYTHON_USEDEP}] )
 	perl? ( dev-perl/Gentoo-PerlMod-Version )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? ( $(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/snakeoil[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	!doc? (
+		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	)
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
+python_check_deps() {
+	has_version "dev-python/setuptools[${PYTHON_USEDEP}]" || return 1
+	has_version "dev-python/snakeoil[${PYTHON_USEDEP}]" || return 1
+	if use doc; then
+		has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+	fi
+}
+
 python_compile_all() {
-	use doc && esetup.py build_man
+	use doc && esetup.py build_docs
 }
 
 python_test() {
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 46531c291504..b81e8708d7c0 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc network perl test"
+IUSE="network perl test"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
@@ -28,8 +28,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.7[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.8[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
@@ -40,22 +40,15 @@ RDEPEND+="
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
-python_compile_all() {
-	use doc && esetup.py build_man
-}
-
 python_test() {
 	esetup.py test
 }
 
 python_install_all() {
 	local DOCS=( AUTHORS NEWS.rst )
-	esetup.py install_docs \
-		--docdir="${ED%/}/usr/share/doc/${PF}" \
-		--mandir="${ED%/}/usr/share/man"
+	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
 }
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index cb55cb9f43b3..701d89a8afd6 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,4 +1,4 @@
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
-EBUILD pkgconf-1.6.3.ebuild 1665 BLAKE2B 351fd2fcfd9ff25e31a0d3ff7e703ef1182869ad3976f74f2961e91f68ad7d167ef41f35e2d68ad9e12c618c75f504e2cd32b6d4bbeaf90314eaa8f02430372c SHA512 970fc2c306bdb298bb19eb422136293f619325648a72ae0815bc30b4534f99fde19a90b2f9780724ee60c5484b58574fed3f93505637b1a61c875e0da14d519a
-EBUILD pkgconf-9999.ebuild 1676 BLAKE2B e002af8ed8e0fd66befdc63c6da948f317814cca96a9a05b621152f7275f602bdf51675c6efb42298d281bebb89fc40c547831a3831b2a82c79d1d9e5808d0ed SHA512 a34a92898fd598e3eadd092c63750fcba010d64aaa366a231f790a6323a462c54416c02a7d7002dfe0439ab2e1192b60a099051a7fbffed2779c8e79c11a95f6
+EBUILD pkgconf-1.6.3.ebuild 1591 BLAKE2B c9f771bd5ba7eecb705cafa5fa0328e9269c696841bd97d138c69200e817b52fcaa9a4addd5c40fa48a60edb05326e8e114d3c37c6cb8bbc7688081d3360f677 SHA512 8607a4dc3fa5804113d36011053572a1d825081ac16af4d798d8c2c805c6354ecd4b5fd4aee9157986a3687b70e5aac3c1c85ed7dcb9ee5c066e1e8348517abb
+EBUILD pkgconf-9999.ebuild 1602 BLAKE2B 1ba7450e57f37336244018485b633c33362dd1bd6416ce35e796277e0bedc151ec52d05a44775c1cfb397d0b46449396f618b67f6d2394a771067ebfdbc16263 SHA512 71bcf548c986c23df8828dd7cadbad978eb38a0b2d894b818fdf23d8fe471d6fa71770bc975ec8be7e59f198ba17324f52ceb5d9fa5899d782451f66ba52ad88
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 1cb6417d77ca..6168c2b91e2d 100644
--- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -6,16 +6,15 @@ EAPI=7
 inherit multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	#EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	EGIT_REPO_URI="https://git.dereferenced.org/${PN}/${PN}.git"
 	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://git.dereferenced.org/pkgconf/pkgconf/"
+HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
 
 LICENSE="ISC"
 SLOT="0/3"
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 5f58337eda71..28e58496a4d8 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -6,16 +6,15 @@ EAPI=7
 inherit multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	#EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	EGIT_REPO_URI="https://git.dereferenced.org/${PN}/${PN}.git"
 	inherit autotools git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://git.dereferenced.org/pkgconf/pkgconf/"
+HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf"
 
 LICENSE="ISC"
 SLOT="0/3"
diff --git a/dev-util/pkgdiff/Manifest b/dev-util/pkgdiff/Manifest
index 798b2e5b3b9e..d2b8bf8cdc7a 100644
--- a/dev-util/pkgdiff/Manifest
+++ b/dev-util/pkgdiff/Manifest
@@ -1,4 +1,4 @@
 DIST pkgdiff-1.7.2.tar.gz 56592 BLAKE2B 6190a8c1e018766802e12234890629efb356680dee84afdea1f989bc91196edc5460c3af3cba5229116ddcafac81f728d1d4eb52f009f9dc5f711a7718f2b0a9 SHA512 2369488e9705280be9b326b07aa9ef0e211440921b9cce5c35560a14d1ad4ac0040eb54024a88a4a5f8f831208b43124c17a817a44840500b490c89bf877b904
-EBUILD pkgdiff-1.7.2.ebuild 593 BLAKE2B 2d5ba75590773dde9d3b3514b4a264fa02b10b5763c0cd1bbd72cefac56c0360ab1b5a4ee1386bfc0f0ecaaacc531ce68f5bc2b3c68bcf466a2a24e92463520d SHA512 37a30c5eb713ae9c9856664a00ce502e1d8c37505044125cca4398c40b04f3944936f863ef9551bac013b380cb7adb5c170354b4ea225df92ddc9caba3063fd3
+EBUILD pkgdiff-1.7.2.ebuild 592 BLAKE2B a4148c896f92ee0d1101dd99c9214272dab64e5465bd8850f54f543dfa6333b1a76e36836f0a34e59b8ba6d864994f05778995f0905c3b5ff600aab708bff7f3 SHA512 53c7bfa146783a6bac6fd098bb0789e35c6c81f02a91654e5fb76e991ad3299011ab878762f328cc2f1069ea21b594c0c75a5394e41b309864184aeee568f77d
 EBUILD pkgdiff-9999.ebuild 577 BLAKE2B 8d8970773c6029f304cd3016c6d29a0bd6b29d0350d7a5b661621d80f9bca4e8c68ecc25080f620c05012f1ab74ccd5791150111684a98ff21abf248caa4f8bf SHA512 ede9052ebed3eb873e9800873fb9dab101a367697bb94ffdac52877f58c21ccab4562bede98dc8e842fcc3316da89ec9cffd72ecda275b239948e0f8eb35a7aa
 MISC metadata.xml 352 BLAKE2B 33ef4b782964c7577e81764888aaaec31aeee2a62d1a7d1fa227413d762c361ef87f19c3113db6e2c5c8b9d94dc7ec53b6cccd5a342ed1b9da75c407fc2c9e05 SHA512 e5ce8be0292142ecf9e8decdffb71b300f46e01002d33226c317df586039d777b5fee1e3570e745ec5813ffdfabdd5fe2dfc5f1837a9b349564984580a9e938a
diff --git a/dev-util/pkgdiff/pkgdiff-1.7.2.ebuild b/dev-util/pkgdiff/pkgdiff-1.7.2.ebuild
index 10a3971dd704..1293f19d3104 100644
--- a/dev-util/pkgdiff/pkgdiff-1.7.2.ebuild
+++ b/dev-util/pkgdiff/pkgdiff-1.7.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND=">=dev-lang/perl-5"
 RDEPEND="${DEPEND}
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index 926c0e196607..531e6823cc79 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -1,3 +1,3 @@
 DIST promu-0.5.0.tar.gz 643970 BLAKE2B b61e8421b5e68f3cd0ec125faadf64c7491f54cfe03de9d6497cb627e5d548b58fafe735c76a5a86a55489aea56dffb6e02d52acd1ca977ea32ec974f34475ac SHA512 b895c0b5b5a33bd0c2372e8c1c698b8548b1b7086849161ffa99bf9718f4b7f3a57bcf218681d84e4cc5ef31ef39df7e6c59345a84441369ec3ec402999ac4de
-EBUILD promu-0.5.0.ebuild 837 BLAKE2B 04e4d6066ec90ac3046e9f50f37f360ea7fcea9a7acd458f6dc958b93d03af921dc2f5f00ae10de32da9d95224a4701188f4f7e486807ac793c814706a55a1a3 SHA512 98c30d452c359edccf06c83c6eb4abdc3fdd961da554d8ec43752bab8c515d99d574ca7235a370c29df7f90dc59dc11313fbe92831442cbef6ac17d3661559f2
-MISC metadata.xml 326 BLAKE2B 84a14632c102d52e02ac2c9a8e7f8e2edfabb3401ab04d5fe94eab4c83ef053f27260aff0ad2b04769653665325afa6db028c8ee281835b925456b432d593eb1 SHA512 2870183c141e5d9ec65aba01e7ab02443f42d13d0f39c4ba51af7adacabdf360cb2308cb898c4bf4f0a8c3e20b35d511af2b978fafcb4de47177de77819f6853
+EBUILD promu-0.5.0.ebuild 867 BLAKE2B a8adf3266e7acb90a73b50d0a624161eb7bdbd25b176474b259a3cad1d1d6233fe014258a9b1740ad71cef2ec841d96320f2a0f556db1a39db0dbd0df5b953f3 SHA512 c09728becc3a7483c4d3fdaf95964626dea5f9c6dc93bcdaee7825e2123e2cfedad7c0ba2a58d2c2fcd20203ac56d4ba3f7daddcce8478505f27ba24fe0d26ea
+MISC metadata.xml 325 BLAKE2B a6e231de6312601f0f92df0d3422b3527b0869cb484ab20933c5fcfba14a3545b122c83e855df882da09b9016109473230f3c7e8b48e9597ffe755916a3890b4 SHA512 51a31843f4341e22ae270e21d32a672ef5ca9739aa8a2066f9d9da2d0451e3f27c890ee1809bae98a68a73a9b4ab9114c4eb056a1fcabda35ea092bf76e9156a
diff --git a/dev-util/promu/metadata.xml b/dev-util/promu/metadata.xml
index 547d58abc6fd..7446a7253571 100644
--- a/dev-util/promu/metadata.xml
+++ b/dev-util/promu/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">prometheus/promu</remote-id>
diff --git a/dev-util/promu/promu-0.5.0.ebuild b/dev-util/promu/promu-0.5.0.ebuild
index abdc9907574c..7ede34ae7c3a 100644
--- a/dev-util/promu/promu-0.5.0.ebuild
+++ b/dev-util/promu/promu-0.5.0.ebuild
@@ -11,9 +11,10 @@ KEYWORDS="amd64"
 
 DESCRIPTION="Prometheus Utility Tool"
 HOMEPAGE="https://github.com/prometheus/promu"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 IUSE=""
+RESTRICT="test"
 
 DEPEND=">=dev-lang/go-1.12"
 
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 07d084c71130..796872f0cbcb 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,6 +1,10 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2019.2.3.tar.gz 360509772 BLAKE2B 8924e6b5e2823c26a96531d14bc60f01f0849a5cca3c87bdff7c23c304081e668aecb1b2c681622c472cacf4b2e1f58c5fa4e42624f204491d27e37785146fd3 SHA512 65f834ba20cddb93533d596430f8b537167f32e99d224758d9fd4407f95304609912dec7f11cf61f9edf2e30722f1624250f44765c0f83dcbf6815bb8c35d9d9
 DIST pycharm-community-2019.2.4.tar.gz 363680469 BLAKE2B d550dc8144746c0b4bcff408531eba289896dc325eea99a2d2a4363cfaca00de55045cff54a3163acd15105b0705dc48ac28374831bd6f0f6842823cdf4b5ceb SHA512 f7d12ccd8309bf547d1f37853977772d7ab023ebebcc71c6f09f71a21ae9bfceb8718d9ebf77a7717e1b145f56ea902d8d02d573d658b7db540696fb9630b0d3
+DIST pycharm-community-2019.2.5.tar.gz 363809835 BLAKE2B 12310ca0c5a497d70f644d7eaf0b2de2ebe3c6bbaa30727df3fb7381e063facf3ee256af0a8636317559dab2573092e482dfa5baccfc9bef20cafd12e9c28734 SHA512 9054c6a9e48e609b45d786b66db045457d33f916248e949a8d6997e53e4a3b5fe0da00757f13c3cb48ab5f074c971e200d42b14f7941a7d91e1c903f3b5e244a
+DIST pycharm-community-2019.3.tar.gz 385414079 BLAKE2B 6a3a4393ba6ef84a7ec09c2f6ea0ce631ea1d4a004686beeedbee91ee2d3de6273455ef1e8e9f8f0f42360f9b4e42741d81a11825fd9c53e2ed90a987661ba20 SHA512 371619a5716de4df1fd68307f87c877eb435b30f797f06305b228566380f658a18f25022deaa581af9653a5745f2cee0157a9ae83b7be9b97f80aea8b4889496
 EBUILD pycharm-community-2019.2.3.ebuild 1081 BLAKE2B 67dcc04b86db58f962198ff8209e602ecfb355f59b465d343071f1ee55894561c0ec19c3e58a8512d4812f4c28f8506bf5266ecd536dc2ebfeb023228acb45b8 SHA512 f3c51c3027b8c0975ed94d3b25a2ba5d1bdd512e9d0b2236b534ad88776aeccfb4c9313bcb616eafb06bacde6d6845a5b9fa01e7998f5828141b06af23ca31d3
 EBUILD pycharm-community-2019.2.4.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
+EBUILD pycharm-community-2019.2.5.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
+EBUILD pycharm-community-2019.3.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2019.2.5.ebuild b/dev-util/pycharm-community/pycharm-community-2019.2.5.ebuild
new file mode 100644
index 000000000000..3bd1b2cb4101
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2019.2.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-community/pycharm-community-2019.3.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.ebuild
new file mode 100644
index 000000000000..3bd1b2cb4101
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2019.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index fb617fa28aa1..3fa5aa579a8e 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,6 +1,10 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-professional-2019.2.3.tar.gz 482051405 BLAKE2B e299c2d545b808ed15b4775acb003137467694f528a088cd84d7055a9c15ead96a9e0ac6599374faf60fab3c2ca72a390157130411f4b15bc2b7e3f4b41f0c8e SHA512 4474a74d2762b202100ddbcdfa3807a8136bd392200c79b795cee34a843716218ac21d1d7ed3ac7df9b3c6241f77658a535274759473871cd23a4cc4cfafcfdf
 DIST pycharm-professional-2019.2.4.tar.gz 485589877 BLAKE2B c2af015129eec902927ac1b33860ff696e7e3f994a1c827b6e31c84a87a6163262c95a579ec2d4d3c801612af8f8f23b23b432db470f30b199ddca7c6874a37a SHA512 c4fa438ee4ef1de66839a225f61e2b8ecb6e49f41da4099fe0ed8da4840c72c34886a76e090e47fc5ad9f7112b339fec01f5617935e490314d7e73a4585f4ce9
+DIST pycharm-professional-2019.2.5.tar.gz 485853232 BLAKE2B 3bb3576dc8919bdab511a1003353fc910ace2a3553fa7fdb116545c3eceebafc28804abacb88af06ca9c399a0a9c75244fd624d0a84e6db91a56c4ca00398fa8 SHA512 f35d49a0df01431aa72af225e09dfdf2b4f535b342ce3ab4725853a02b524a19a9da89dabdd72a08e294fce5387067ee5a7cc005c28c29717771867ca3377848
+DIST pycharm-professional-2019.3.tar.gz 503439093 BLAKE2B 9d28800534320986cd513fa48cd5f39ea5bb848cd947fdece0289d3c41d5198f3487e453296fcc718057a05d8d0077bc25e209b955dd59ad3bcfa76d1cf94966 SHA512 ec81f418ffd22a8911050a51eeb01c853ded55c528856a4b39b3402cb52ec8b3ab3517a8a4f2b90872437a2740a189d40bc322ee78231cdeb102f1ae60607fa6
 EBUILD pycharm-professional-2019.2.3.ebuild 1225 BLAKE2B bffb2416b7700db9acedd379c865121ee37ca5c7452fa64968f8aed6351646d904e0d3e148ca66381f02e3fdb0892e7b9401c59df24813a29c15d7bd95f8ef49 SHA512 d040e96a09e91f41db9ada5372166721831b03ddb6068f45ee068c6ad5613a818487cd4274986ff4003624641a6c5634301b6e1f9b38641ffee05c75cf7a086e
 EBUILD pycharm-professional-2019.2.4.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
+EBUILD pycharm-professional-2019.2.5.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
+EBUILD pycharm-professional-2019.3.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.2.5.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.2.5.ebuild
new file mode 100644
index 000000000000..9196130c9fd9
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.2.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.ebuild
new file mode 100644
index 000000000000..9196130c9fd9
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 6305de26fb3b..968aa5b76a85 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,5 +1,7 @@
 DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13 SHA512 eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
 DIST qbs-src-1.13.1.tar.gz 4324622 BLAKE2B d64145f38aea95f4b7539a9652c276f4dddb4af8424142b45df77083c2c8821f0858827c6d8390ca70835e9bbd3eda02163b7e180ebb82eb90976afe727b4dd7 SHA512 1626a218665d380a8030bf4930be857399806643e7868bace6cafe269054ec560eb47e37e358acdb3edbbb15bc8f4ec9af55142d6bfe2ab5db0c8a08aa40d597
-EBUILD qbs-1.12.2.ebuild 2863 BLAKE2B 4370fd9d166b14540048249ece2af983041e9416ee77e5908d206e94baed606fb7d99cccb9c0df7c958f41ff9dc9d13a598d194f8c12b9488f9a294f69d3a76f SHA512 8174e680c3d86b70f6560d93e5270d0b7385d1f950d8a9be26b7b362fde6e6f6dc73ff9bea9340fef781f7063f920bfff83668bcb6ab30c61fb64c209b4c71c2
-EBUILD qbs-1.13.1.ebuild 2945 BLAKE2B 8df19e63414683b53e3a899089f5c892b9d0ac1e9cc90431aebe10b61f71d2ca832a5afdf7a0198349c75b79f3fa2ea5f0bf24075f2fda093695af95df0c41c8 SHA512 024fe32bdff219a46bfebbef5a1ef9244ececd358e01f9bbded43d65df4f06e93779738941da4fcfc5935e93be2f19ae156957c6386e5811e84f03bb97fd0467
+DIST qbs-src-1.14.1.tar.gz 4365537 BLAKE2B 5a51ddea64023c76b6934634f72ab19d54a3e857efe30d7698a3970d099e436599b53b369d81434cc8e721606513bd487010047e60ccfa289574f606cf020dc5 SHA512 df9031e2749ba598129daef0a6b4322ad964c87a33bfd079bb231170da49c42708740ec63e351607b7e9da1dd11310802b14917eaf2ec97bb747a6df9890f2f3
+EBUILD qbs-1.12.2.ebuild 2890 BLAKE2B 3ffa01f8ebc8ed8f762f5823f846fedf560db1c49d2488a4c0956b7176f70bcfe521863360c6d04a74754bb354538018b7e2a6ab172f74cbd4354a22374456ef SHA512 9c0a50d5bacb06238ef04f6b788130d228e7d8ad230691b41af62c986394fc65655a2c580ebfa0613f52df41d024c5439697365ca6e2077ee8eafee60b4547e5
+EBUILD qbs-1.13.1.ebuild 2972 BLAKE2B 771f5921f520c57ed2a91f3e1b8aec4bfb0049a384537d2d7aa857bebe9a519a624c29748b3a9746213609e51bd1071026d478de54ad2de4e70327008e9fa6eb SHA512 6da9b15a6fe824d7a1aa257a901a34e35188bd9ac9a52691c14360a210d01c9990f55cb71fc57747d81898ea0e45846576ff360cb8cb4c4933f621f4eaf92a8c
+EBUILD qbs-1.14.1.ebuild 2701 BLAKE2B 6c7453e1fd3997007f7edfcc3b2ac563413ad4c8078e5ed80d271f6e6ca7f1f8b12aef7219db16a3ee7fca43c8c37d75e22586751b602256645f8f67a3de859c SHA512 70c27376061cf0c1f0ee98ac176560b5d8cf103879a33e607b46f5c00330c5e390c5dc43e47046d2937585bad7913192160905bc11cd0f9d47053d630622ea18
 MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/qbs-1.12.2.ebuild b/dev-util/qbs/qbs-1.12.2.ebuild
index 03606d775233..c5815752c219 100644
--- a/dev-util/qbs/qbs-1.12.2.ebuild
+++ b/dev-util/qbs/qbs-1.12.2.ebuild
@@ -15,6 +15,7 @@ LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 # see bug 581874 for the qttest dep in RDEPEND
 RDEPEND="
diff --git a/dev-util/qbs/qbs-1.13.1.ebuild b/dev-util/qbs/qbs-1.13.1.ebuild
index 0eea5267ba76..0ce9c72b16a8 100644
--- a/dev-util/qbs/qbs-1.13.1.ebuild
+++ b/dev-util/qbs/qbs-1.13.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 # see bug 581874 for the qttest dep in RDEPEND
 RDEPEND="
diff --git a/dev-util/qbs/qbs-1.14.1.ebuild b/dev-util/qbs/qbs-1.14.1.ebuild
new file mode 100644
index 000000000000..689ab954a115
--- /dev/null
+++ b/dev-util/qbs/qbs-1.14.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://wiki.qt.io/Qbs"
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+# see bug 581874 for the qttest dep in RDEPEND
+RDEPEND="
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtscript:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	test? ( dev-qt/qttest:5 )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-qt/qdoc:5
+		dev-qt/qthelp:5
+	)
+	test? (
+		dev-qt/linguist-tools:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+	)
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	if ! use examples; then
+		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+	fi
+
+	echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
+
+	# skip several tests that fail and/or have additional deps
+	sed -i \
+		-e 's/findArchiver("7z")/""/'		`# requires p7zip, fails` \
+		-e 's/findArchiver(binaryName,.*/"";/'	`# requires zip and jar` \
+		-e 's/p\.value("nodejs\./true||&/'	`# requires nodejs, bug 527652` \
+		-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
+		tests/auto/blackbox/tst_blackbox.cpp || die
+
+	# requires jdk, fails, bug 585398
+	sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
+}
+
+src_configure() {
+	local myqmakeargs=(
+		qbs.pro # bug 523218
+		-recursive
+		CONFIG+=qbs_disable_rpath
+		CONFIG+=qbs_enable_project_file_updates
+		$(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+		QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+		QBS_LIBRARY_DIRNAME="$(get_libdir)"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+	einfo "Setting up test environment in ${T}"
+
+	export HOME=${T}
+	export LD_LIBRARY_PATH=${S}/$(get_libdir)
+	export QBS_AUTOTEST_PROFILE=autotests
+
+	"${S}"/bin/qbs-setup-toolchains --detect || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
+
+	einfo "Running autotests"
+
+	# simply exporting LD_LIBRARY_PATH doesn't work
+	# we have to use a custom testrunner script
+	local testrunner=${WORKDIR}/gentoo-testrunner
+	cat <<-EOF > "${testrunner}"
+	#!/bin/sh
+	export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+	exec "\$@"
+	EOF
+	chmod +x "${testrunner}"
+
+	emake TESTRUNNER="'${testrunner}'" check
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	dodoc -r changelogs
+
+	# install documentation
+	if use doc; then
+		emake docs
+		dodoc -r doc/qbs/html
+		dodoc doc/qbs.qch
+		docompress -x /usr/share/doc/${PF}/qbs.qch
+	fi
+}
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index d8896cadbf91..776b1eb77bd2 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,5 +1,5 @@
 AUX quilt-0.66-no-graphviz.patch 1464 BLAKE2B b1a67706f29f3986de0202a4ea68aa2f001989354bf9ab91996cb4f5dbb6578baf28fc1ac781a18525d04fb92d9f6d554efcc598dabbdf1a35b0f63b93c3cd8d SHA512 3f935a6e137998f7d0391ef87f5324c8882490001b37333de22efc068bda8a7e84ccefc3e85616c3aa93894acb8a0841a2b089c59c6a658d1157298d4132707c
 DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
-EBUILD quilt-0.66.ebuild 1646 BLAKE2B e1484c788cf95f4f517f1b9f17e0b93b0edf6746f5b8389aaa7342e638f5a850e2a5790fc0c183536463276e86fc8d02d2ffeb20e35a3152332bb54ea0b7f668 SHA512 b186b163a1c12399f334a50272e205e9e22135539735052ca6a4b35be497ea93848edd35a5b1470211b2fa755d7d1ec2dc054db88c172a1e2b57dfb38fe1278a
+EBUILD quilt-0.66.ebuild 1617 BLAKE2B 50ea4e59b5baaf315c4b6ba71f589f716f3dc8f29079c8a28ff7f66c16ef080ba77e22409c7c39ac92998b17ac9361bc5e55ce228858e61a1cf30a9bb2fad2d5 SHA512 5e62c6ecaeb0db16a54aeeb6e137442d9ace3ab85f64827caf34c27efd8671d5b62a33dcd748a9a479c288d9736116537f6170d78ee5b3af7320b57d21925990
 EBUILD quilt-9999.ebuild 1764 BLAKE2B a013dfb3d65d2e69077e75673bcdad06216b40cc35a198346681e42162567f327ec4a0583868b1e62d7dfd8ea451abe3d420f0e7cf9b3491b066bdf4ffb56179 SHA512 ab39ceb5756c763b911a077ca98cde61143332b21708f62963ec0632ae3b02e4d319bc92a3b7c9fd74a5fbb04d6c537088bc63aeff1fc5b06f97fece2d07e2ef
 MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/dev-util/quilt/quilt-0.66.ebuild b/dev-util/quilt/quilt-0.66.ebuild
index 13481d763f2f..cb3d5eb528a2 100644
--- a/dev-util/quilt/quilt-0.66.ebuild
+++ b/dev-util/quilt/quilt-0.66.ebuild
@@ -44,7 +44,7 @@ src_configure() {
 }
 
 src_install() {
-	emake BUILD_ROOT="${D}" install || die "make install failed"
+	emake BUILD_ROOT="${D}" install
 
 	rm -rf "${ED}"usr/share/doc/${P}
 	dodoc AUTHORS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 0f901f123764..937868664f85 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,7 +1,9 @@
 DIST re2c-1.1.1.tar.gz 5907416 BLAKE2B da2544573de0dbca94db8a8e2112de5549ffbbad91bdba187e95c9d8dd36537e099dbc2871b54d62630d91928cdaf384ab069e5e1624f8ff749c2e2743cff766 SHA512 a6fe73611103588043748340976f0e6d07169a6546cb80627c0ccd2ceac83f362dbbf371530361d893537fd95deb19503b2c73c41ed40efe7787210d6c757397
 DIST re2c-1.2.1.tar.xz 2059304 BLAKE2B b05c41112654cd4c7f15ad70229cde02efc4b04ffc63f964ab69e376964a8a952f2c617859b056998127ca9adfd72f7a16e673dd3134ab8244b14b84e023d510 SHA512 c90f45ae435968e950d2340b540269a042201f1f53d7ea067b6d3d9feec063f66559ba970d404d82bfa7b75b9a074328caaa62304d4d876af7c12740d100ef58
 DIST re2c-1.2.tar.xz 2064236 BLAKE2B ebc721de4fe1588a3043bb05298324b61214e074154ebc2adff19c6e5a3cc6a94314216a20020e88069d89768c31ae5c3f09b18176cd241d7aa10aa7b2daf183 SHA512 d029abc3493a26761eaa911cf73961f5b8ec2e00958c97740e73f568fc72b02b5f56d80e09657a95dcf2e7767f3e5085775bb78f0f5bc472d506682a3a7fc278
+DIST re2c-1.3.tar.xz 1239280 BLAKE2B ae2a8fc323408dd31d39c352bd622d89d19178b7993618ea043bbfd32509fb7573d2b5b50663e100d24fc275fa479982cb1f66ed49638edca61f551fb653176d SHA512 c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e
 EBUILD re2c-1.1.1.ebuild 763 BLAKE2B c4bfb586f9fe4422863067466fbeecf17711eaded507eb65e1dfeb5581fe4ec3eeb39567217cd8a1bc1291c7fbaaa0131af6406d38d958d04a337d3a78767a6a SHA512 f6c5caf64a09257bf360c9ac6aa743e9ed511170a62569d36d4b661e20b6bebaea6fefd8a823a2273373b045a7f149bf4310f6a29403642824a82bd1374db356
-EBUILD re2c-1.2.1.ebuild 734 BLAKE2B ae1254e3bb13bf09360cb7be05e525d6100895824e6b392441e2ec89ca3b5d650b488dfb78778b511dd6666b51e9c5f34321c80ee4a7a8cb5eb1c58ea525c2e4 SHA512 0d74f84dbc380442277d38e7e13bf6326997e57fcbe9aeec7e58e6fbaa427f19aebbc64aefae8ffc42cedc731af1fa6322608a0b4fd0f5ba832400f125a0de52
+EBUILD re2c-1.2.1.ebuild 727 BLAKE2B 4dcf16ac9ba35ca08967c6cd7da76906111f19c88f0a91825fcefb002c08a9c3da9a722d847e22f06932a7ba02a5d38c6f48dfaa82d4ece3f01e642b77ec4efd SHA512 683fd01778485a5ce264d0601c6f51849ff3971e77f338fc80ccbf33844b8db5d89a348200d7c41afeccdaaf3ca6e009f25c8889b486b38e885fc3de2aa7c1c3
 EBUILD re2c-1.2.ebuild 734 BLAKE2B ae1254e3bb13bf09360cb7be05e525d6100895824e6b392441e2ec89ca3b5d650b488dfb78778b511dd6666b51e9c5f34321c80ee4a7a8cb5eb1c58ea525c2e4 SHA512 0d74f84dbc380442277d38e7e13bf6326997e57fcbe9aeec7e58e6fbaa427f19aebbc64aefae8ffc42cedc731af1fa6322608a0b4fd0f5ba832400f125a0de52
+EBUILD re2c-1.3.ebuild 734 BLAKE2B ae1254e3bb13bf09360cb7be05e525d6100895824e6b392441e2ec89ca3b5d650b488dfb78778b511dd6666b51e9c5f34321c80ee4a7a8cb5eb1c58ea525c2e4 SHA512 0d74f84dbc380442277d38e7e13bf6326997e57fcbe9aeec7e58e6fbaa427f19aebbc64aefae8ffc42cedc731af1fa6322608a0b4fd0f5ba832400f125a0de52
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.2.1.ebuild b/dev-util/re2c/re2c-1.2.1.ebuild
index a21542c2d598..d1ff144d3cf6 100644
--- a/dev-util/re2c/re2c-1.2.1.ebuild
+++ b/dev-util/re2c/re2c-1.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug"
 
 src_configure() {
diff --git a/dev-util/re2c/re2c-1.3.ebuild b/dev-util/re2c/re2c-1.3.ebuild
new file mode 100644
index 000000000000..a21542c2d598
--- /dev/null
+++ b/dev-util/re2c/re2c-1.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+src_configure() {
+	econf \
+		ac_cv_path_BISON="no" \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	docompress -x /usr/share/doc/${PF}/examples
+	dodoc -r README.md CHANGELOG examples
+}
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 749899eee930..d169b2897c08 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,3 +1,3 @@
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
-EBUILD rebar-2.6.4.ebuild 622 BLAKE2B b6f8fec5b646a10b8c61aa0c7c19565b736cf83dda90e91ee4c6b835dc8c7c628b4d63400025beafa17a5762290e2c0214b65d47aaf013978708d5c12a701f11 SHA512 86b28390cd34aa94f6fc2a686288fe59622b7f179f442bebc71d01cf8117a5d22d257d61cece136f3e7e518944a985030a949915e1d255f3eea295b9354233aa
+EBUILD rebar-2.6.4.ebuild 624 BLAKE2B d634bc46b48270d5c5a4b1c2d3680102d61a469ed8d904faea392a257c161295a2175a26afffaf367b3b2feba3b5268805af142f9cb685a29d6b6945c22ad983 SHA512 08a934a6d39eb91cba297036d22f40f0b6024e05c46630a4096f58cbee55928aeabee71ed0cb3c46a7db0791b7d62ddc6f6306a06756d00987439b0f7b7c4914
 MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
diff --git a/dev-util/rebar/rebar-2.6.4.ebuild b/dev-util/rebar/rebar-2.6.4.ebuild
index 137bd33524f3..67ce5a03f8de 100644
--- a/dev-util/rebar/rebar-2.6.4.ebuild
+++ b/dev-util/rebar/rebar-2.6.4.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND="dev-lang/erlang"
+RDEPEND="dev-lang/erlang:="
 DEPEND="${RDEPEND}"
 
 src_test() {
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index 4467f60dd480..db1ad02cc4ea 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -1,8 +1,10 @@
 DIST rocm-cmake-0.2.tar.gz 12729 BLAKE2B 6380e077cdc0dcc8c40c487789bd4405a9104e0c55e68df0587c74ea140c329b28ef224bea0d9d529ddaca2c3b874e64be840f96191b8bae7d662de5854756b6 SHA512 b2ebd749fb99ac6dbeac005bb0de5ca57e12ae3590d560c0fd03371f2dd0fc6e7862e0bc96046b98b8248770852c6ee64dd349f22405e77d8a210884246213bd
+DIST rocm-cmake-2.10.0.tar.gz 14183 BLAKE2B dab0de02815d6ef71a7143dcbd53dab3134bbfbf39e55375d93c9d0fa35902fa9f8f23f85d1da9994ceb1fa4bec6c113b6062f5953d0213a70daeb26e91ddf9e SHA512 1f3f0424554f16ff317eb910aacfd0713d62ab5f6b708dc273c9ee2634979f89805a23e0afeda4a9d7aeea46d16cc2919963f026107fabad94b67725cf6e041c
 DIST rocm-cmake-2.7.0.tar.gz 13352 BLAKE2B 1dd37f9beed98d2120a42505ef7463de672db01c1213262202819ea4ee76678a3126b7ca52e8738717618247a93af680534262ce56b718f7dc4ebb7f62acd358 SHA512 d08d08ea53c7242fccce808189048d195b8edbaa2a8f0a0fac4267a232dddaadab791f0bf2fe0c975f050cdac095531a2cabcab55157b5405f250f74fa0a01cc
 DIST rocm-cmake-2.8.0.tar.gz 13677 BLAKE2B 24fdb6685190e06be0afe9184b048d1be36f66d0fd5033244d481fdc41db6333cde2d4b5e23808add0115018f23e80cf78e09e01f8aacf1f34eca2e9cf64e0b5 SHA512 61fa614acfdd5d18da617f73f6373e3c39ece22674fc9697e2f2d9595317fed179298672f98e178ddcfd73e7cad908189f32b7265a98f773750616abdd11a74c
 DIST rocm-cmake-2.9.0.tar.gz 14185 BLAKE2B 7eaa8535eae99749d0a46b84daa4ee5d00fd7e992a63d97fb578319a3dc309a61b1b239af4b58ee5c668c0c45e944138c85ab2a5aa3da1f83b129ca6a874c6d6 SHA512 ba619d428e7f5bbd2970eb84df1421e0734f33a259d5c98a62a8ea4859eac5fdaba0d0d36fb504618e605c0c6d62213d696e265054814926b9156822e3cd1f24
 EBUILD rocm-cmake-0.2.ebuild 700 BLAKE2B 4c4da1a130d2e18d7f00713fd24714c1ce28d44c15796c4d9bf1a854ebc4f54e5925d7be69a733dbd9db6e9d635e2087fdd57080b041f7b7029847de1a104d07 SHA512 9fab36b4226fe95da30d14d346adefd7cf75fc9e6f703872597b694cb231dddb2697f43a4508c8c5b6f01366212c8470073504d46f251bfcdbd6322a1090a639
+EBUILD rocm-cmake-2.10.0.ebuild 741 BLAKE2B ddb75c1be4c7334dba970676f392e207807836507968af8921dc224ea6d9b3c13e84225645f6a589efcd1a591fe602f6b1968a604d39afe35163f20d9ad105db SHA512 01ef6b384fc02a2792cc0963091b90556cb3d0ede1346fff2bde55dbace9c1398f53e0e035894e75c11547eecccd4403710d2ca38b6b1ebbb9677d12b52ca0c4
 EBUILD rocm-cmake-2.7.0.ebuild 741 BLAKE2B ddb75c1be4c7334dba970676f392e207807836507968af8921dc224ea6d9b3c13e84225645f6a589efcd1a591fe602f6b1968a604d39afe35163f20d9ad105db SHA512 01ef6b384fc02a2792cc0963091b90556cb3d0ede1346fff2bde55dbace9c1398f53e0e035894e75c11547eecccd4403710d2ca38b6b1ebbb9677d12b52ca0c4
 EBUILD rocm-cmake-2.8.0.ebuild 741 BLAKE2B ddb75c1be4c7334dba970676f392e207807836507968af8921dc224ea6d9b3c13e84225645f6a589efcd1a591fe602f6b1968a604d39afe35163f20d9ad105db SHA512 01ef6b384fc02a2792cc0963091b90556cb3d0ede1346fff2bde55dbace9c1398f53e0e035894e75c11547eecccd4403710d2ca38b6b1ebbb9677d12b52ca0c4
 EBUILD rocm-cmake-2.9.0.ebuild 741 BLAKE2B ddb75c1be4c7334dba970676f392e207807836507968af8921dc224ea6d9b3c13e84225645f6a589efcd1a591fe602f6b1968a604d39afe35163f20d9ad105db SHA512 01ef6b384fc02a2792cc0963091b90556cb3d0ede1346fff2bde55dbace9c1398f53e0e035894e75c11547eecccd4403710d2ca38b6b1ebbb9677d12b52ca0c4
diff --git a/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild
new file mode 100644
index 000000000000..d6c02fff0fd4
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-roc-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+	cmake-utils_src_prepare
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index bac0e55bb677..6cfc6e1f382b 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,9 +1,11 @@
 AUX rocminfo-2.6.0-cmake-variables.patch 1107 BLAKE2B b613dee2b0b44cf4d31afbe3647ebc2c511903c5a6a6a0f74b6c5b419ab17f81b1d92f5802667bfce4444f839f3dedaea0785e2cdac14b7b49be6a9b97c12971 SHA512 59fcf341a381a1fc3c60c8f4f33050f6e31f0f29f53bb9abf2d0c2d0ed28c18f799ed49bf64ebe30a8e94c463aa88a735b1895df955c671f7e589350ea010ebe
 AUX rocminfo-2.7.0-sizeof.patch 1083 BLAKE2B c86e9f90660afa39b2cfcd6c5362734db31d0492ce4e9a39e9f1ca438c124f5f7e280232a1a3d0123ab2034d9fda504d8b766931638b6bba2cd883703df95183 SHA512 e32fb0cdb750780c011d032f44ae64186ad02c24cf9de8506b3224c49439d167b1c4b2f8c850765db8a210a308481bd8a69d5577bb0244ef75d68778972d791a
+DIST rocminfo-2.10.0.tar.gz 14791 BLAKE2B b0396cc837f140938ee889c819001b8a45bb09c8729cf8c3c1751c6f1a6af39a7d5b48e481187248dcbe6bf5c74db3623ff575ee4390227b289f736248c8637b SHA512 56f05e41cca3a401e7b7f18646338e1cc206d4e44cd5ced0f3fbc796830abc1986b8121374f52a3db54efca3d306dca8d308eb688423bdd60386fb055bbe5820
 DIST rocminfo-2.6.0.tar.gz 12293 BLAKE2B b08725b45f48e78841da9d6e57bb19a441a423e20f853d16024c620914059abf3cb2e61c12ae6fdfdb85eb3e984d488ae9975ab3fd2fcc529ecb576c6816fc92 SHA512 e2dae7e2e02b674b3ad959a3dffdcd8f550842edfd0eac5866259a6a12de1a5f935afbdcb37845fa189d0937c41186f0eb8be08e7b346ddef959d5dd7b62dca7
 DIST rocminfo-2.7.0.tar.gz 12671 BLAKE2B 6cb6e2fa458224654f4b672d117e2a6c71c7d5aeed8ac71cf7ecddb76d9209f25596521b31465a94fde1c91744fc9bf68e637f7ff4f67a000cbfbe4793c5fa4b SHA512 ffdaa3d11d85475c7600c6b25d8eb7f90cbda13b820f33c250a7ac9b90f92d4d5352d8baee765b4bd3b9c7389b5ab6d3b87df77bf62d6696ed8cd96bfc6be1a0
 DIST rocminfo-2.8.0.tar.gz 14786 BLAKE2B ec439fb771980d6b4777e9c3b11e23055eee7b898db2fd6d109c8ad53b0d615baa2d29ed4f1eb7ef673520396e63f0901dffc986bf38e58dcf41f068b25e26ce SHA512 7528deb80b97b70215a0e6aeaf55f9409a53d8aeee921d25da037fbc081bda43263954be8c12a0c3e3441b53aa16a10b83cce7698fc1eaeb5a2bf9168844e617
 DIST rocminfo-2.9.0.tar.gz 14791 BLAKE2B 5438862e461b9c2f53560138f4b7437876048edff6ff31715e9af2be535167042b170c492c59c41862a55a742a53047e2e9f0478fa73c8cf948c0fc1ff388594 SHA512 90c5c1de3ea6e917b338a5498d9e071dd491a97bd7b927dc1ddca568df08b52b6b8518a1105dfab7a262b78d1cb89117813084dfce6b73d7aae40abd357f81d1
+EBUILD rocminfo-2.10.0.ebuild 804 BLAKE2B c1a02bd0c6c66a230ea280049e9071ce66774624230d917372eaafd1960ae52f5d4b41b8d5208fd5a5292835377a42a3b82ea331c01ecc6533bcae2b6a0b52d6 SHA512 9d188e2c80bbfef0408b8b6978c6a9ce9ec2853055a499110cc076642b8252f4dca60c35eb8e58c43fa7f9111cccb2b4faa22d0b90cfe8967ae5daa892a8e89c
 EBUILD rocminfo-2.6.0.ebuild 859 BLAKE2B 4e9d3a3472d368d74969ed7bfd5d269343a9612f0ee558d201d5ba24e033c9ad62ce8717abc282147c35dc01cef93e86770a89923ea8fe434bc569a6393be080 SHA512 c10a8cd4a853d7d343d907502c0064f6453cc876e6b34f6c63aec7a355f5114f598478f83d723dcc86d45c0e620b71d6e1d7bf18da429d8619fd0d699bdda88f
 EBUILD rocminfo-2.7.0.ebuild 899 BLAKE2B d353500d57cf39ce63a8caccf6f9ed29d6181aa532a2054fb9ebab01502ac7a5a44d8b871d5763ee5af0111c7d11b7c6f3d1173eac6bbe75267a4513d1cd12c1 SHA512 57b2c8f3f806bde49656a749855c0797559d4d05800d62d8cce295292d11ff51315f871f14ee5c7d2c5294ccd065343134c8e3ba96bc1a60ccf16e03b5601da2
 EBUILD rocminfo-2.8.0.ebuild 804 BLAKE2B c1a02bd0c6c66a230ea280049e9071ce66774624230d917372eaafd1960ae52f5d4b41b8d5208fd5a5292835377a42a3b82ea331c01ecc6533bcae2b6a0b52d6 SHA512 9d188e2c80bbfef0408b8b6978c6a9ce9ec2853055a499110cc076642b8252f4dca60c35eb8e58c43fa7f9111cccb2b4faa22d0b90cfe8967ae5daa892a8e89c
diff --git a/dev-util/rocminfo/rocminfo-2.10.0.ebuild b/dev-util/rocminfo/rocminfo-2.10.0.ebuild
new file mode 100644
index 000000000000..cf2e52c9247d
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-2.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-roc-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-libs/rocr-runtime"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DROCM_DIR="${ESYSROOT}/usr"
+		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
+		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 28f14f6fa00a..abe8b648c865 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,8 +1,8 @@
 DIST rosdep-0.13.0.tar.gz 301327 BLAKE2B 39c39903bb2e6c07dfd4e3aa9546acf434498db518c3bda04ef79c46ed5d13b7cd55978c78bea8294d8e5b84ddddef22814436566f3f958d91d3964650399a08 SHA512 c42aa17ee9b31f7013415e99a484a66a7a7fb52abef4cc9045658150ce0c36b475f2885ebfff537f9ce9f8fd5eeaef5482226c5bff5b4a3df03cc72b149db07a
 DIST rosdep-0.14.0.tar.gz 301534 BLAKE2B 86e4fb42e682218dc1d68851a0023f2fbddc5a8a89d90dd33cc7223080792e3d3dea7607a57692428f81589abc693c9f843be4c10ca81b6419da7e383d1c7987 SHA512 abf9c294b9fb01aa4c32bd7ad563119874e162d6031255edce642eeee1512da39a03383aa6cd55f090587df2b6bd1dc83bc53163be9d2b53be6178ec8a422f66
 DIST rosdep-0.15.0.tar.gz 301659 BLAKE2B c7e5602e78e8f4892f16ef41d7423e653750def24f043c2519646b8c038bcb39b62d60323ef4e8a496a863bb74f51cdce7aebb1b5423120562a34c1988437510 SHA512 d9def23a4c01636a42dbccf99be96b9704eb96641da00db4305c63b18fa0f69de1ae402bcf7fff4030bc20097496086ff9168794d1e5cd44153cb3a84ba18509
-EBUILD rosdep-0.13.0.ebuild 1497 BLAKE2B 52ad758ce1a78f13c469719de4fc6028a26ac570bd43cef5e16b3325ed60d18e39a8ead39c2d0c6f2b8c87e68165f87ae02fb2701c9ce90cb67b4d3ae5eaf098 SHA512 877053b69a0df566a6a04e261f77b50b55ee1b738571b6113eb892ba3fd2d88beb281ff9455340341175e094b7c5626a41f527de2403a82ea54356d69626e977
-EBUILD rosdep-0.14.0.ebuild 1497 BLAKE2B 52ad758ce1a78f13c469719de4fc6028a26ac570bd43cef5e16b3325ed60d18e39a8ead39c2d0c6f2b8c87e68165f87ae02fb2701c9ce90cb67b4d3ae5eaf098 SHA512 877053b69a0df566a6a04e261f77b50b55ee1b738571b6113eb892ba3fd2d88beb281ff9455340341175e094b7c5626a41f527de2403a82ea54356d69626e977
-EBUILD rosdep-0.15.0.ebuild 1497 BLAKE2B 52ad758ce1a78f13c469719de4fc6028a26ac570bd43cef5e16b3325ed60d18e39a8ead39c2d0c6f2b8c87e68165f87ae02fb2701c9ce90cb67b4d3ae5eaf098 SHA512 877053b69a0df566a6a04e261f77b50b55ee1b738571b6113eb892ba3fd2d88beb281ff9455340341175e094b7c5626a41f527de2403a82ea54356d69626e977
-EBUILD rosdep-9999.ebuild 1497 BLAKE2B 52ad758ce1a78f13c469719de4fc6028a26ac570bd43cef5e16b3325ed60d18e39a8ead39c2d0c6f2b8c87e68165f87ae02fb2701c9ce90cb67b4d3ae5eaf098 SHA512 877053b69a0df566a6a04e261f77b50b55ee1b738571b6113eb892ba3fd2d88beb281ff9455340341175e094b7c5626a41f527de2403a82ea54356d69626e977
+EBUILD rosdep-0.13.0.ebuild 1524 BLAKE2B abe6901cc7237b64ab2ea7a0fd65f032c8addcbe44e1508e2341a60bebc3f9697b80b5104919606f5c21262980b6b4988c73545485b4d75f83405addded4f12e SHA512 19b9a4fdc9838db91ba264a2b2c88d514a3e936585250fb6ba34e3a3303b6373cfce2c4be86eac52611a16fdde9eb9c57e55996460357857a65508d3154bf143
+EBUILD rosdep-0.14.0.ebuild 1524 BLAKE2B abe6901cc7237b64ab2ea7a0fd65f032c8addcbe44e1508e2341a60bebc3f9697b80b5104919606f5c21262980b6b4988c73545485b4d75f83405addded4f12e SHA512 19b9a4fdc9838db91ba264a2b2c88d514a3e936585250fb6ba34e3a3303b6373cfce2c4be86eac52611a16fdde9eb9c57e55996460357857a65508d3154bf143
+EBUILD rosdep-0.15.0.ebuild 1524 BLAKE2B abe6901cc7237b64ab2ea7a0fd65f032c8addcbe44e1508e2341a60bebc3f9697b80b5104919606f5c21262980b6b4988c73545485b4d75f83405addded4f12e SHA512 19b9a4fdc9838db91ba264a2b2c88d514a3e936585250fb6ba34e3a3303b6373cfce2c4be86eac52611a16fdde9eb9c57e55996460357857a65508d3154bf143
+EBUILD rosdep-9999.ebuild 1524 BLAKE2B abe6901cc7237b64ab2ea7a0fd65f032c8addcbe44e1508e2341a60bebc3f9697b80b5104919606f5c21262980b6b4988c73545485b4d75f83405addded4f12e SHA512 19b9a4fdc9838db91ba264a2b2c88d514a3e936585250fb6ba34e3a3303b6373cfce2c4be86eac52611a16fdde9eb9c57e55996460357857a65508d3154bf143
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.13.0.ebuild b/dev-util/rosdep/rosdep-0.13.0.ebuild
index 0c2319981163..eef6fa96cc88 100644
--- a/dev-util/rosdep/rosdep-0.13.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.13.0.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosdep/rosdep-0.14.0.ebuild b/dev-util/rosdep/rosdep-0.14.0.ebuild
index 0c2319981163..eef6fa96cc88 100644
--- a/dev-util/rosdep/rosdep-0.14.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.14.0.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosdep/rosdep-0.15.0.ebuild b/dev-util/rosdep/rosdep-0.15.0.ebuild
index 0c2319981163..eef6fa96cc88 100644
--- a/dev-util/rosdep/rosdep-0.15.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.15.0.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index 0c2319981163..eef6fa96cc88 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosinstall/Manifest b/dev-util/rosinstall/Manifest
index 7bd96d99288c..1a581492b020 100644
--- a/dev-util/rosinstall/Manifest
+++ b/dev-util/rosinstall/Manifest
@@ -1,4 +1,4 @@
 DIST rosinstall-0.7.8.tar.gz 26430 BLAKE2B fae82276f5376a94914272e60b2e3b0f81cb37bd7b41e0a4df73c8b58d19a73505a0c5e193495fd59c931c04265cbb372abfad19fd4043fc77e5224127bd97f5 SHA512 a53ae8fb96f9dda4671b22dfd9dbadc18d1e4adbf34a50b6706baf971c1c7ee418e14641d334346b02638f06c10d1bc984b4759c92a39510dd0044fbc346be67
-EBUILD rosinstall-0.7.8.ebuild 1535 BLAKE2B 8836199b7a0848111d86478ceb3db36a88bc87d95f917b50d8f38451fb09aff17109f4d65729552a0ad9725136f2c5621c557c411bb3d394d97e18aeea9a486a SHA512 97524631de8e66c499bcce2962bc59e1d62407457e1e547a7d1fd38bbf4aad92345b57acbdded6a0e7493baf66a4f1e9515d2c2bf560c979c0e57d4fc6f5ca5c
-EBUILD rosinstall-9999.ebuild 1535 BLAKE2B 8836199b7a0848111d86478ceb3db36a88bc87d95f917b50d8f38451fb09aff17109f4d65729552a0ad9725136f2c5621c557c411bb3d394d97e18aeea9a486a SHA512 97524631de8e66c499bcce2962bc59e1d62407457e1e547a7d1fd38bbf4aad92345b57acbdded6a0e7493baf66a4f1e9515d2c2bf560c979c0e57d4fc6f5ca5c
+EBUILD rosinstall-0.7.8.ebuild 1562 BLAKE2B d03e0d878eeda41789e124c2e2e864703c8759f0fda98180a68bf27497a1010f00d6e49c13efb767a4fda936385576d84081037faaf916f3c0153f1b692f6525 SHA512 70e9c779bf38c710f9f1766284d4496f37c3dacfa1c125c1c69e174d9d9508c8b20410cd73fb9a40fa00ba8631b8b73a744a259c8a26af089d043e44ead44434
+EBUILD rosinstall-9999.ebuild 1562 BLAKE2B d03e0d878eeda41789e124c2e2e864703c8759f0fda98180a68bf27497a1010f00d6e49c13efb767a4fda936385576d84081037faaf916f3c0153f1b692f6525 SHA512 70e9c779bf38c710f9f1766284d4496f37c3dacfa1c125c1c69e174d9d9508c8b20410cd73fb9a40fa00ba8631b8b73a744a259c8a26af089d043e44ead44434
 MISC metadata.xml 333 BLAKE2B 55190f2209aab41e0f1625fb699d61be2a53d0af996feff9ee5b0cbb5326363dcb915aa83427096f1723b885806a4cdb5b6cd2285c76064bf0b889b624fbcc31 SHA512 5c6ef4930985cd5c2ea51b18a25d7cc2a5e387bdbd26e42f8710d6ce903cf13fe85ee1f1d13a0ffe82c8056dd295a3e25268ec58353508f30bf10404ae4ffb8a
diff --git a/dev-util/rosinstall/rosinstall-0.7.8.ebuild b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
index 02e024f0e55e..b1f832de970c 100644
--- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild
+++ b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
index 02e024f0e55e..b1f832de970c 100644
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ b/dev-util/rosinstall/rosinstall-9999.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
index be934fe189cb..7c7bc0bf35b4 100644
--- a/dev-util/rosinstall_generator/Manifest
+++ b/dev-util/rosinstall_generator/Manifest
@@ -1,6 +1,6 @@
 DIST rosinstall_generator-0.1.13.tar.gz 11186 BLAKE2B bb6f95eba12ee6b9adfa22d46475d555aa9b3bed225e3be52a52f380bbd1ab3f86871a9a816c56c874f8545d2ef648e226ad5d8d3346444a92202865265260f1 SHA512 c8b5736066f8a42a324b2bed578e03282b6d8ae8df48fb30545617c2995ce53f35d7fea6fab3989383b958e7cb763b24deb67c5ec3496cc77f1ba51f110ab78c
 DIST rosinstall_generator-0.1.14.tar.gz 11419 BLAKE2B af9754f46589aac1e9bb265345319c4037d2b1e10ea8119859e2715b2828974bc4422cac25f84216c401f35b7cddde207e7562afb07e753328940db347b69a20 SHA512 45461917afaf93f38b118951c272ba71a408d2c276b4019739c9c8dc9407812bf166bb762910ce45cedc9b31e2796922a69681ad461c468c7ed2372a1d189904
 EBUILD rosinstall_generator-0.1.13.ebuild 937 BLAKE2B 03b0ce63864341e85fb409c94f0f4d3fc152dbd2eda22a1c621d476b423bc8615c3cba5f79d057ac7ba0c9e56f77770b05e4c1d7645ed6e8f571d6a98faa1337 SHA512 b398a001bec815ad4aa0feea8d01b77420c929e92f2b96fa93e74ae0396fdd61818e4081bea33732dbca1250a4ccf7eabc42efb22ba359135d9c12a202918e73
-EBUILD rosinstall_generator-0.1.14.ebuild 1048 BLAKE2B 88209c9ee8bec83d7af33e9a018debe991b39e5ff657a2354ff384ad58fb273c341564811b3e8754150d8e50bdf74a0cdf5b960dc206cf070dde61acc4e0e0e3 SHA512 eeb270631fb19a65baa66c6a75a9d6abbd3a26c4b4aa6eb6968dbdfd23834d40a3615d9b2f04c3259bfb870d92ab4c9c80ce7f2daf3efbe98dda527a98bffab9
-EBUILD rosinstall_generator-9999.ebuild 1048 BLAKE2B 88209c9ee8bec83d7af33e9a018debe991b39e5ff657a2354ff384ad58fb273c341564811b3e8754150d8e50bdf74a0cdf5b960dc206cf070dde61acc4e0e0e3 SHA512 eeb270631fb19a65baa66c6a75a9d6abbd3a26c4b4aa6eb6968dbdfd23834d40a3615d9b2f04c3259bfb870d92ab4c9c80ce7f2daf3efbe98dda527a98bffab9
+EBUILD rosinstall_generator-0.1.14.ebuild 1075 BLAKE2B 7604cc0dc1c57aa1019145eea59118ea2f72f68d6368fd2eae76ca3e0756863c5b1cc98bcdce563e130f2d6ccad7007c249b2f078e0c83d06c61cedc958ace62 SHA512 2753e4a8bb5e92d92da880f154c468eb3bd3d2e279a68d60949d399fe8f9621067eb88749bc9433f6f1093866f4a8137b3cc23368870a5efe694dbe2ec7d7283
+EBUILD rosinstall_generator-9999.ebuild 1075 BLAKE2B 7604cc0dc1c57aa1019145eea59118ea2f72f68d6368fd2eae76ca3e0756863c5b1cc98bcdce563e130f2d6ccad7007c249b2f078e0c83d06c61cedc958ace62 SHA512 2753e4a8bb5e92d92da880f154c468eb3bd3d2e279a68d60949d399fe8f9621067eb88749bc9433f6f1093866f4a8137b3cc23368870a5efe694dbe2ec7d7283
 MISC metadata.xml 353 BLAKE2B 26692ca3eb76500607275909a9c86bc88f7c80114e7840763136902a59dddc8f23dcd766f821aa5beffff9419d39a48e18682f86c8148df7d640977c9b30ebcd SHA512 a681a9f31c4cf06a775ef57f7a942c76d0e8873c4c854fddaf44df0301f3e14bd836727e6816bc74f0ced9e54dfd9335c376c47b8af2a19455c42a3f6ed38a18
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
index 82bb67839bf8..7376d3a404f2 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index 82bb67839bf8..7376d3a404f2 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/catkin_pkg-0.1.28[${PYTHON_USEDEP}]
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index d670506f37d5..c73d0ccd4368 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -2,5 +2,5 @@ AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2b
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
 DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
-EBUILD schroot-1.6.10-r4.ebuild 3759 BLAKE2B f389b68a46ca5edb2054ecaff03d28873d689b3d6f8a8a0cce45e65a5be7cec4e78fc5346c2e4f33572d41b0b6934fb607a201bc294a47ba595211c062c171b9 SHA512 a9dd8c9c35e5d64bc0e686cfedce9295cd24589758d966dd15b9046f588973822c4f97c2cb288f9e98654e6167c4786109d7c859e47c3836d6286d35c4d1401a
+EBUILD schroot-1.6.10-r4.ebuild 3783 BLAKE2B 6c8840c351a7b42d165c18da51ec73eeab354852c7af75b7a7cc80d3173d02750df3ede79e4ea50ed2136f0696555a95f463d87eb1bc63421f8c8555b0407043 SHA512 e2e410cc7f218c190a09f1515520f7ee40b72ec088e3739576dd05f0ece0d16d24a2bd004f07a0f64f2bd42794ab4cb58934ab69a145e8e5b14e8e0b46c8fe28
 MISC metadata.xml 535 BLAKE2B d75765d4d0f53fbf6469382c1c55285343ce910b13c50997b7840cdaf1f4735af9411f76b18c048db9309f98e63906388836e15cb9cd47ce2c6c437e80220aaa SHA512 1b2ee12df6e663938c1dd3de76ef2597d82f179b3ad8bfea277094a132482b57bb5241a2001919c4b1e94c5569786f2c1d03e3aa567048a0eeaadeb483e93d1f
diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild b/dev-util/schroot/schroot-1.6.10-r4.ebuild
index 432388f071b4..3f08febeed95 100644
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r4.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
@@ -17,6 +17,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	>=dev-libs/boost-1.42.0
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 0c65a5d7032e..171f92e6896f 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,11 +1,3 @@
-DIST ShellCheck-0.4.6.tar.gz 116618 BLAKE2B 67cf8e882e95eaedfbb46e01656889e200b311e3701301da1df02add4c6f7446d275a1b132d6d7e1da0e4eb49205138fffce8d8cb0a2b91045f72cc7f006ca99 SHA512 b053a7f581d73f1e5be51046f2fd77f6e7452acecf841321ef363156a5f72d98c13a723885d1888ab366550625e05396ca207925539fec1d70a00212af920ca5
-DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429a9c4244eb1fa5af71ad8ba2cbdd86a721bbc2b9202c7aecf4ad70025bacb13e696c4731cbfaba22511d773013d6b SHA512 bb9c79911701b3857d29fd63588115888f4d2b1d224066bb944ca00d29d973195ad1f4b1df8e2746fd0666f7438f46abc384f7f915c152f46fcd332163736792
-DIST ShellCheck-0.5.0.tar.gz 133265 BLAKE2B 703e3d994e6302d7bc6124ae064cbc5893c5119918a9a9b6cbda2c0415600b95545146061230b2e6ab07b6b2383a86b9bd3f153643c30c3f765a3424a1cd4bc0 SHA512 3b4b097f507c8910f5da1a739138511b9c30c156667c0887447043a7d0c3c371768953d7039803356f28e863266d3a34b5b1689889f3e524a3768e4d3223ce7c
-DIST ShellCheck-0.6.0.tar.gz 140211 BLAKE2B 5a103bd74e76905b64a882542d1f2bf5cac6b2ec94e9b0f55fdd052f5fd1fe17f9efc02ef9182e7e5965765b428b974bf94fa50d701396fef77bcbfe6185402e SHA512 51c2cc9cfd2f8a145095873f9b19d4fdd67a21eedab4ac2dbe5f43789fd0937a44bdc8480b2d0cceb5bc3802a8243dd3b701a07f1f6b5460291272ee453c7c5f
 DIST ShellCheck-0.7.0.tar.gz 163027 BLAKE2B 2d6348f21cb9598c0133cc1548f43727d56155883db83c38483b581b3565c67d5bf9d5333b6c39569dac1f07b19b21db1d62d83e675bb4aa9735725879aaf6e2 SHA512 88a0cb2a2879f597b832979fd934ee63e0f1ca256e5f9e7c51667744d09848817fdbe3988898f49226fc52ec27d92c314a9075995c3110ee10b24468cb60c657
-EBUILD shellcheck-0.4.6.ebuild 851 BLAKE2B 216770f08f6ec754fcdcfacad62b198c268d0a88aab7b34e6e4f6db56b3fbf997b07f22a5b2c173a23816636730d7f9f427e68f17a4c4fb5218671904196ad8a SHA512 2691559edacdb566ee335939a0319b80123a53a171f65c05010b0f15ce6d8b72cb64f12f708294df277c321e5f45335b0230512d2c9a816e491c8efde397e82c
-EBUILD shellcheck-0.4.7.ebuild 853 BLAKE2B 41c6785636751e212b707717342b56e88c091bda707138b1c850ad1605f9cf2a80e493276b30880b7c7d2e6ffb511ce3fd4888f272803dfbacd7bf9ed25db4f5 SHA512 2b2ed358559ee7332d87ffe39d28624ad0b4b17f0a1886dfc4bf6f34161e4b79042b927b0efc48c41ccd95ecbaa0db1c45854bdd94d037f8af925cc4c8489e7c
-EBUILD shellcheck-0.5.0-r1.ebuild 918 BLAKE2B 53bcabc13346c1a4afb573d8dff1e0ad7fcafc52227a0f585a50c0cee1f1f6a499e0ebbbbcf71a2748d13284d3d23fc0c80bd7b82eee4f54064b57a005176750 SHA512 1ebe43b190db98d471256931cd47478b8c02408a3245f82cafe9332a87c0ab57c149900bbe1cb7884562177b8522f5e34152a57633d1df26474dfd5544b34576
-EBUILD shellcheck-0.6.0.ebuild 918 BLAKE2B 06dcfa527ecb92745f1a707291f722fbf70d111df18f3edc5e3e4e8abdd2a0e101522821cdd49733d58499260ac341c1d4fb39f93eeb5e47a634a23fe4edc65a SHA512 0c6a8cf02d0c4acad05d58b11277b0c41577a0d964bce23a71a8aa50cf63fc55e94435b04194c35638d1ea04809106e07068d53d1745fc7869d1a5dca7cc7228
 EBUILD shellcheck-0.7.0.ebuild 923 BLAKE2B ab287f52a821a175dc6cc29f4c746d0d0eaab0f65d2c747809623138a40045236f7572062784c59f63e106429f318ea7c671dd2b9664aa1d7fbc6b8391be26f5 SHA512 1b32a4bb38eb891c03fe36b95e271e33c3b35f22f1ed6a82352f733b85e9dcfeaee8750a54192f01ad9917cd940c5579d4a51ce9f8bb90e4f9695fa6bf8bdf0e
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.4.6.ebuild b/dev-util/shellcheck/shellcheck-0.4.6.ebuild
deleted file mode 100644
index b52d4a87a354..000000000000
--- a/dev-util/shellcheck/shellcheck-0.4.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="http://www.shellcheck.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/json:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	cabal_src_install
-	doman "${PN}.1"
-}
diff --git a/dev-util/shellcheck/shellcheck-0.4.7.ebuild b/dev-util/shellcheck/shellcheck-0.4.7.ebuild
deleted file mode 100644
index 57e4f620509d..000000000000
--- a/dev-util/shellcheck/shellcheck-0.4.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="http://www.shellcheck.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/json:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	cabal_src_install
-	doman "${PN}.1"
-}
diff --git a/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild b/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
deleted file mode 100644
index c589d149004e..000000000000
--- a/dev-util/shellcheck/shellcheck-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="https://www.shellcheck.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	>=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-2.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	cabal_src_install
-	doman "${PN}.1"
-}
diff --git a/dev-util/shellcheck/shellcheck-0.6.0.ebuild b/dev-util/shellcheck/shellcheck-0.6.0.ebuild
deleted file mode 100644
index 318ab4e35c09..000000000000
--- a/dev-util/shellcheck/shellcheck-0.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.5
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="ShellCheck"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="https://www.shellcheck.net/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	>=dev-haskell/parsec-3.0:=[profile?]
-	>=dev-haskell/quickcheck-2.7.4:2=[template-haskell,profile?]
-	dev-haskell/regex-tdfa:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-2.5
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	cabal_src_install
-	doman "${PN}.1"
-}
diff --git a/dev-util/shelltestrunner/Manifest b/dev-util/shelltestrunner/Manifest
index 375d0e2a3a64..c3a507937645 100644
--- a/dev-util/shelltestrunner/Manifest
+++ b/dev-util/shelltestrunner/Manifest
@@ -1,6 +1,5 @@
-DIST shelltestrunner-1.3.4.tar.gz 21331 BLAKE2B 8530bb93680e678d7b3b439cdcf06817a1054e6c99cbcd028a19b0fb13db5b4e0e9150993348f5dffd7d0dc0dd82acc7a7331e44caf5086df28940e2f739a63c SHA512 b46e5e2456573b06f6958076a001be3fd65471dc6c89b78700f1d77870bb3844e89e9cec98ad2a146554f19550891c2f3c6bd150b8ee8d0b20d9cd3b34f55753
 DIST shelltestrunner-1.3.5.tar.gz 21428 BLAKE2B af7573a16159baf5dbcbedc10a454b1f09875031cc9d619b287aeaf507744a2a1dc5cde8ea509949097b5364b5b9ac9438705e58d2d08647e5fa6c4eccceec37 SHA512 f0cc03c41fe176ddfd0e498121f5ebafda721b93e9a84f320b445bf797022545e1046ffb3814e2eaac72f0975a2a11fb1de5e0a007c5700de028e57ee66fa093
-EBUILD shelltestrunner-1.3.4.ebuild 970 BLAKE2B 300c7d7ef8bc792f40020ddbaae70471d81adb905e961d797f412056311da912e4f3f34924c6f07550f18e48ed1f8b5a826890720bc257c6520d1c8b8e1a2fd8 SHA512 94009c2c937230570df816b8877114180048f5ca463e743608fd5ca38053ae678edf32a5945305988f314e99fe29b6daba91783a9b2be552b9063ad0918d05ce
+DIST shelltestrunner-1.9.tar.gz 39538 BLAKE2B 45dc5acbfd35d65a818938382e62eacc7aa3798e8f0ab9cdd4d4a358f470de9854bedbd2335bae6b4195ea05b2305de84e0b13c86206ac0e53039726fbc59354 SHA512 bdb5476e30189f0997f3a9505d954a828475a5d95e1220dc9ed342e96100f4dfa0cfadc1afd9a5758223cf1a659d1f77d7d0a0533c32bd80b325c9a7ad48178d
 EBUILD shelltestrunner-1.3.5-r1.ebuild 1194 BLAKE2B b5199777a70dc10e1b11d9bb8d94dc4cb20831dd395a281b110956f262a02775fbd484f849756a538ef42726ca3e560abce959ec9b3b9684fe6693f656f80536 SHA512 d1b0ad30f0b273476358b255e6fe22336a2875334592de5a03fa185ddd3af8e8a51715b43ff028eea1a13f0acfcb91cb729b4a2c2e1f2517632080489b8fe132
-EBUILD shelltestrunner-1.3.5.ebuild 1060 BLAKE2B 613efe45e085fa2c57c9ca591908eaa900bfa960356cc160585fad69b8c72afe5cb3f0fee98a7d5627358ea753fa2fb159418a2716c06ed923cabd98fb94a4ea SHA512 fbb24dcb8675c3fd7fb54c73a2b0303d2d462284a23c821f4fba9f89cf543e6fb5d5cbbb98b70fcbc27270fac9c1f08e53b70511523cfadba3a16fb50175d7d6
+EBUILD shelltestrunner-1.9.ebuild 1397 BLAKE2B b59eb984a85b37accd82f6817c93feb7186308913a1d0c79ea70c08e6c49637832b92df7b72d66b1bcf760abdbe28250ec236161e9a41b10de01453c92326ef6 SHA512 2578e83aea10803e869f4fcc35006db208c088fe81dd73e64a29df330774715e1fd03ddc2d68a8efa28d05b991b87f25f9d39ad87e9817513cbd8f9f5985850d
 MISC metadata.xml 635 BLAKE2B d6582231d4828a390bf96dd9c75dfebc87ef599a2e659f281bee36ac2a1ca3cd73702e38518e47343753766caf772180f19c97b1805f236993d4486d2f15ea2a SHA512 a398308f38fffe954bdcb052e6b22997442c2a303896790c643e3e95cc38976f2d5b8fb9d08a713411fd5ec0aca2d2904a5a388276d69ad132e8780115bac6f8
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild
deleted file mode 100644
index 564c9894e257..000000000000
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A tool for testing command-line programs"
-HOMEPAGE="http://joyful.com/shelltestrunner"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-	>=dev-haskell/cmdargs-0.7 <dev-haskell/cmdargs-0.11
-	>=dev-haskell/diff-0.2.0 <dev-haskell/diff-0.4
-	>=dev-haskell/filemanip-0.3 <dev-haskell/filemanip-0.4
-	<dev-haskell/hunit-1.3
-	<dev-haskell/parsec-3.2
-	>=dev-haskell/regex-tdfa-1.1 <dev-haskell/regex-tdfa-1.3
-	>=dev-haskell/test-framework-0.3.2 <dev-haskell/test-framework-0.9
-	>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-	>=dev-haskell/utf8-string-0.3.5 <dev-haskell/utf8-string-0.4
-	>=dev-lang/ghc-7.4.1
-"
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild
deleted file mode 100644
index 791eeecd1932..000000000000
--- a/dev-util/shelltestrunner/shelltestrunner-1.3.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="A tool for testing command-line programs"
-HOMEPAGE="http://joyful.com/shelltestrunner"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cmdargs-0.7:= <dev-haskell/cmdargs-0.11:=
-	>=dev-haskell/diff-0.2.0:= <dev-haskell/diff-0.4:=
-	>=dev-haskell/filemanip-0.3:= <dev-haskell/filemanip-0.4:=
-	<dev-haskell/hunit-1.3:=
-	<dev-haskell/parsec-3.2:=
-	>=dev-haskell/pretty-show-1.6.5:=
-	>=dev-haskell/regex-tdfa-1.1:= <dev-haskell/regex-tdfa-1.3:=
-	dev-haskell/safe:=
-	>=dev-haskell/test-framework-0.3.2:= <dev-haskell/test-framework-0.9:=
-	>=dev-haskell/test-framework-hunit-0.2:= <dev-haskell/test-framework-hunit-0.4:=
-	>=dev-haskell/utf8-string-0.3.5:= <dev-haskell/utf8-string-1.1:=
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
new file mode 100644
index 000000000000..59969639f34d
--- /dev/null
+++ b/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal
+
+DESCRIPTION="A tool for testing command-line programs"
+HOMEPAGE="https://github.com/simonmichael/shelltestrunner"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-haskell/cmdargs-0.7:=
+	>=dev-haskell/diff-0.2.0:=
+	>=dev-haskell/filemanip-0.3:=
+	dev-haskell/hunit:=
+	dev-haskell/parsec:=
+	>=dev-haskell/pretty-show-1.6.5:=
+	>=dev-haskell/regex-tdfa-1.1:=
+	dev-haskell/safe:=
+	>=dev-haskell/test-framework-0.3.2:=
+	>=dev-haskell/test-framework-hunit-0.2:=
+	>=dev-haskell/utf8-string-0.3.5:=
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+
+"
+
+src_test() {
+	# First we have to prepend "dist/build/shelltest" to the PATH, so
+	# that when the tests themselves run "shelltest", they get the
+	# recently-built executable and not an already-installed one. Then
+	# we exclude the Windows tests, leaving (for now...) only the Unix
+	# and generic ones.
+	#
+	# We also skip the macro tests for now because the sdist is missing
+	# some files:
+	#
+	#   https://github.com/simonmichael/shelltestrunner/issues/13
+	#
+	LANGUAGE=en \
+	PATH="dist/build/shelltest:${PATH}" \
+		shelltest -x .windows -x macros.test tests/ || die 'test suite failed'
+}
diff --git a/dev-util/smem/Manifest b/dev-util/smem/Manifest
index 760474cfa80f..affc6230e482 100644
--- a/dev-util/smem/Manifest
+++ b/dev-util/smem/Manifest
@@ -1,3 +1,3 @@
 DIST smem-1.4.tar.gz 15733 BLAKE2B 6c097c10625050a9d3a133144054d9791bb0ae2f498335398889b58c243b4477d38aefd8203a0483016647a6a72b4bcf4b9af23c241c0e87494614ca6cdaeade SHA512 2740b9ebede8e742e3d01f5f2e7a77a4d3ed04bee78585a904d07c299ea5a77be135dd5b6626abfdebcf2742b9004035443d3faeca04ca9b59c603f74708af9b
-EBUILD smem-1.4.ebuild 794 BLAKE2B a93b65d84793751ad86834229db06c58d4c4e6837a09a2a83e8c19b4256711b5d0990130c4f52b086a737f99e031ef0de3769c9ed83ae4137a16c3f44304805b SHA512 79cbdd526a8702104effb3be4c8f64ecbdf10d578d4e78fcddf699f7c8e74f9a9b0457aafaf78eb40bf75682f495668a98d1a95813e30eddc6cb302eea990d2d
-MISC metadata.xml 1006 BLAKE2B c547308370ac8bcd34b17e418415de262efe6b1898ab049e7133aa6715227baecacd23ee5811d6b86b9d095c9fa8756b86f547a1728436e57140f1e303d3b828 SHA512 eed65e803abf73ded23cd7ce0dbc2c5ee32c7ac562e99026828589d964aff5ad19a00c0d21b2602c8737a2203aff7d116fd3fd06316de09276faa9818c87454e
+EBUILD smem-1.4.ebuild 790 BLAKE2B 8d7be570517876bb0c43a4dfbf02361e1ee8996be9b5e9f0e47eefcfa26bfe0dc4effbaee8096917bcd6db5bc5edc45feb070cd43f3de6e92a03cb5be67f0dba SHA512 888639ed02045f15d2864277b334279255f650992ff66cc042b1685b5cf34964e4926636b70b12064ea727409d3a85bf9fa26d63490af747858796ae88b6e358
+MISC metadata.xml 887 BLAKE2B 97eada233bb3bbc6976a34ed5e2ee6b80e0c17e36d7617b2bb109194183878fde46e59a2c38bf84216673850dc21814edf27ba24f189bd03c0240a9c3eed60f1 SHA512 6bb126678342abd8ea5b5c6b4091ffba18d28494db92715d8f2b7dbd363df48d6265579c52340d1b9514b0422b4fcebb0b2f4a9efdfea5e040bf047a1576e478
diff --git a/dev-util/smem/metadata.xml b/dev-util/smem/metadata.xml
index bd732509198c..916d16b6c060 100644
--- a/dev-util/smem/metadata.xml
+++ b/dev-util/smem/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		A tool that can give numerous reports on memory usage on Linux systems.
 		Unlike existing tools, smem can report proportional set size (PSS),
diff --git a/dev-util/smem/smem-1.4.ebuild b/dev-util/smem/smem-1.4.ebuild
index 2eff0923ad8f..410d64cfa06e 100644
--- a/dev-util/smem/smem-1.4.ebuild
+++ b/dev-util/smem/smem-1.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-single-r1 toolchain-funcs
+inherit eutils python-single-r1 toolchain-funcs
 
 DESCRIPTION="A tool that can give numerous reports on memory usage on Linux systems"
 HOMEPAGE="https://www.selenic.com/smem/"
@@ -13,12 +13,11 @@ SRC_URI="https://www.selenic.com/${PN}/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}"
-
-BDEPEND="dev-lang/python:2.7"
+BDEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 41d08e8d19d5..7ebb552d2187 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,5 +1,7 @@
 AUX source-highlight-3.1.8-no-black.patch 416 BLAKE2B d53c85b52a04118b613f7683e0506a0f7440c7a0d98f8b8a632ae30da3e0a62e763d51c7341ff3f78a65a02a04b9c0d25909aed847cdd864f4da46876c36e3da SHA512 c65c7f20f5185635153ee111e0b2fd7762065dd00a1773f1a519a449de2355d7255bfb9fda805ec863331ed9df309694fb978a109a479e1c92c7c8dd612945eb
 DIST source-highlight-3.1.8.tar.gz 1648351 BLAKE2B 1ce1590c86f7aed9d27bb21bce6b0869828b28068d71404410e080b85f6354eb6f520cec8c81d1e9170dd90b158dc4536e5287a04bf2d271fa26354fb853ea32 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c
-EBUILD source-highlight-3.1.8-r1.ebuild 1462 BLAKE2B e7e2410a00722ebbf2fa6f96ce385fd3f4b6d27b359df80da51a5228d4698d96a10eecb805b4eb17498f686dd43fa06241c5310e80484278bdd04435bfc71e4e SHA512 c736e1271d58c696c3017c0e5f8f657d545a8105203dbffd1dfd4dc0d3832bd2415b7978d63b5ee03e72c23b6505cb89b745dc62481e4431f4341697411048ca
-EBUILD source-highlight-3.1.8.ebuild 1393 BLAKE2B 9a6772e90ea7bf4a286d3937c7114c7bd0db5610dd050ee02ccc3a5a8fd3c1cde1959c3d6d7ce0ae364a603144bf859d8be3ecda63dda5f254b93d64f91336c3 SHA512 a7b64423ee9ee9885bb096d0ab1cc1fb936423ee072316cbfa056c1f9f0a3691337201d3405fbf6315084fa0bda0cccebc24a39224d7b300ec3739820f1f8692
-MISC metadata.xml 250 BLAKE2B 50c4b89c67107f8c4eba77c3b35992d381dfc6a30f5e8fb7c696f6b2cde6b7b1f90566a99ceba3df17485a88283059ef51010414e8df6c72d9e7b8c7f9ff0e27 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343
+DIST source-highlight-3.1.9.tar.gz 1717234 BLAKE2B 6eb40b2274df0772c4a241504e5db5dfdaac600549e0b11aba726f7b4d5ab600c3849a8815bc782ad1bb1f99b69766527645dd202731bde4b2466c663842c47c SHA512 d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
+EBUILD source-highlight-3.1.8-r1.ebuild 1460 BLAKE2B fbb8ed50f5a2bfd4017e9842fd06f634ffb8b8b17ff6c1366f7348bd1728a7df7210b4276f8d1bcb37346bee4c06a6f5b59983179e4a6dde0ffaa95103fad1cb SHA512 61cc96bfe1cac828529a70ecfd6443a844c3853814382a81ff859842a1091dc84ed6d17c547e1c427cca93d675065e45b4eb7299090672faff37bcb5e25bcd76
+EBUILD source-highlight-3.1.8.ebuild 1392 BLAKE2B 45db34bf15ead4b78e274bf596d92a24eff056a53c8673e6f6043ef4e06a26e1c6fa89f455444b28ba40d53adb22e75f439bcef82ce1f10d62bbab6cf8363110 SHA512 3532b6c13ba761cbe0c735724f5741fc9ab5269c6e5694a8219297c97c1e02a54e89812966be0b3397dcbea985d2e945e64d5662b34d59d09e57d97baddc7830
+EBUILD source-highlight-3.1.9.ebuild 1411 BLAKE2B 7f00a0f76e2efe69aabf5aa6d417a15a87bcc59a11e4f9dbba696af52946573c47779c1966bfb747a642c62ff9406c62838c4ca2651e6fe7cf77c134f0be08f6 SHA512 a32dbb62bdead42712707d40147a55a485335554a39b78161d0631554746610d764f4849fc5e6006bbae4f9d297c195bad46c4f3e72b11d49dcbd7ea96c76c8a
+MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/dev-util/source-highlight/metadata.xml b/dev-util/source-highlight/metadata.xml
index 5c23291b5215..3a840c8dcd05 100644
--- a/dev-util/source-highlight/metadata.xml
+++ b/dev-util/source-highlight/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild b/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
index a617779a282e..6ffeb75981a7 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
@@ -39,7 +39,7 @@ src_install () {
 	default
 
 	# That's not how we want it
-	rm -rf "${ED%/}"/usr/share/{aclocal,doc} || die
+	rm -rf "${ED}"/usr/share/{aclocal,doc} || die
 
 	# package provides .pc file
 	find "${D}" -name '*.la' -delete || die
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index af831bec3109..73000e024a1b 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
new file mode 100644
index 000000000000..fdc35c641fab
--- /dev/null
+++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 flag-o-matic
+
+DESCRIPTION="Generate highlighted source code as an (x)html document"
+HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
+SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/boost-1.62.0:=[threads]
+	dev-util/ctags"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+src_configure() {
+	# required as rev-dep of dev-libs/boost-1.62.0
+	# https://wiki.gentoo.org/wiki/Project:C%2B%2B/Maintaining_ABI
+	append-cxxflags -std=c++14
+
+	econf \
+		--with-boost="${EPREFIX}/usr" \
+		--with-boost-regex="boost_regex" \
+		--without-bash-completion \
+		$(use_enable static-libs static)
+}
+
+src_install () {
+	use doc && local HTML_DOCS=( doc/*.{html,css,java} )
+	default
+
+	# That's not how we want it
+	rm -rf "${ED}"/usr/share/{aclocal,doc} || die
+
+	# package provides .pc file
+	find "${D}" -name '*.la' -delete || die
+
+	dobashcomp completion/source-highlight
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${S}/lib/srchilite/.libs/"
+	# upstream uses the same temporary filenames in numerous places
+	# see https://bugs.gentoo.org/635100
+	emake -j1 check
+}
diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest
index 851b46151b9d..e90ef157f48e 100644
--- a/dev-util/spec-cleaner/Manifest
+++ b/dev-util/spec-cleaner/Manifest
@@ -1,7 +1,5 @@
 AUX spec-cleaner-1.0.6-pytest-runner.patch 348 BLAKE2B 4bdb0a4db5eb581f826f14452c980381756945985e9d45c09f2e7b16fb7f2367e7781d8a1b7b69f02e2c33cb1527fbcd437462cfed9061ca9ed4edfe4a439b9a SHA512 d971124da1dc1b8c93a359bd139bb6fa9226b383d0261a18f2f821a857872b6fc501649f66f5ad754c17e0f86c14c43eba59f25b9f99e804f76ccdcb973bb0ca
-DIST spec-cleaner-1.0.6.tar.gz 450602 BLAKE2B acd298421f2c119e24dc52cf63e149194d5baa1282f9aef902e2ccaf51de040f5817641b4077f209656f715ea6ceb19bf55b8661c32cd24f461c58f9126d9e19 SHA512 a27b5dc7fdb02ca5c632faa5b6a2b71d6db3e9f97950f20c15b14584fa240ff7b69dc981ca67f4fcb6af207dff28a8267447ad0eb918e06ce2294436892e0eef
 DIST spec-cleaner-1.0.7.tar.gz 450429 BLAKE2B 7ec57076f13c526ca10524a3852a26ddee4581137357dd593312cc1b55d908311c9146ac2b9c0a5f0ea491a2e1cec8b8a3e5dba25467881f656d43872bd69f5f SHA512 705fc3b9d5b927a64bd19bbf6c826464e40ec6b3cc97cd032417f8e4debac721c7e5f0c99e02fafbb5ce3454424a8b398a7827779b0a308549955ecac33d39c7
-EBUILD spec-cleaner-1.0.6.ebuild 968 BLAKE2B e868d5247773fe0cd677857a3ec81cb01df333eabb754afb853fc114ea38ad1811a9ac193d8fc3c1631dab56ed2ea9a1f00626e8756916e29519afde72dfef70 SHA512 b071574af01366630c8941b521e8b6d9c520c7c88415eba72d24b4dff942fc0839e0cd4be75428142b3b8c165caab986122a7502380feb030c81181398e695b2
-EBUILD spec-cleaner-1.0.7.ebuild 974 BLAKE2B 8f5fd6cf2498a37083428e7a0b69ecdabd9b692047510d3c0b15ea4e94dacde80958d56bb7e514f58ce6fc06d7a75e1e6b56a1be80213b2ea0714d829bdf800f SHA512 3c28aab2c29b541f8781379fa6e2b6de335d00840ca0ed750d6c55a1904a29545154100bfa5b700e29de3bdbc95ee2d53fdeca2b722849283444575b8b6c588d
-EBUILD spec-cleaner-9999.ebuild 974 BLAKE2B 8f5fd6cf2498a37083428e7a0b69ecdabd9b692047510d3c0b15ea4e94dacde80958d56bb7e514f58ce6fc06d7a75e1e6b56a1be80213b2ea0714d829bdf800f SHA512 3c28aab2c29b541f8781379fa6e2b6de335d00840ca0ed750d6c55a1904a29545154100bfa5b700e29de3bdbc95ee2d53fdeca2b722849283444575b8b6c588d
+EBUILD spec-cleaner-1.0.7.ebuild 1001 BLAKE2B d5327ea117af00cb9c914b05b8033e04c08b6f117f906e06f1f57f6430a088befa784fa23467f2f068863c29f8f2da1cd4a3380d0e4850ae842c7ef01d69413a SHA512 9f61b512cb09bc665efecb0a41651a475325dbfbd1325cf03b99b5440fc307be2de267572d17bb22c527c88ab2d22a712457100c14a496fb84e9384cc51c2728
+EBUILD spec-cleaner-9999.ebuild 1001 BLAKE2B d5327ea117af00cb9c914b05b8033e04c08b6f117f906e06f1f57f6430a088befa784fa23467f2f068863c29f8f2da1cd4a3380d0e4850ae842c7ef01d69413a SHA512 9f61b512cb09bc665efecb0a41651a475325dbfbd1325cf03b99b5440fc307be2de267572d17bb22c527c88ab2d22a712457100c14a496fb84e9384cc51c2728
 MISC metadata.xml 450 BLAKE2B b091afea0453f996442347131d337d2cb516a4a5e08a98e0b0ab4a6f2cdd19f7d4d284f02a9fecf35590998fd3143b9151c3cd6632c0bd7148374d307b0a28c0 SHA512 6f10ea61bcc2e9982fb7e1383959f36c77d881a495a9251819b47d168114272c5f26b7e5bcc80657f5d8a79ec18e0a1e7c54201fa6c773bc64d3ceff2a1ddc3c
diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild
deleted file mode 100644
index 3f353a195e50..000000000000
--- a/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
-inherit distutils-r1
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-DESCRIPTION="SUSE spec file cleaner and formatter"
-HOMEPAGE="https://github.com/openSUSE/spec-cleaner"
-[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-[[ ${PV} != 9999 ]] &&
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/rpm-4.11.0.1
-"
-
-PATCHES=(
-	# pytest-runner is only needed in test scenario
-	"${FILESDIR}/${PN}-1.0.6-pytest-runner.patch"
-)
-
-[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	# we have libexec
-	sed -i \
-		-e 's:lib/obs:libexec/obs:g' \
-		setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
index 0d59d5864047..5ad1196c7df7 100644
--- a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 [[ ${PV} != 9999 ]] &&
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (
diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
index 0d59d5864047..5ad1196c7df7 100644
--- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
@@ -17,6 +17,7 @@ SLOT="0"
 [[ ${PV} != 9999 ]] &&
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index f95626e3ac4d..be54ea7a5740 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,7 +1,9 @@
 AUX spirv-tools-2019.1-Fix-vertex-instrumentation.patch 4948 BLAKE2B 72df8f60ee84d3b129803e1ac2c2befa59392bd9cde51070155798f12e3d72bb5de0bfb93117599f315e6f106c6f9852dbad4d1ce0d9b4f3831a5af3844ef0c6 SHA512 9f1fe685e9205e848cc931802c003529b885c1f409a12e6bf118269a3073be8535ab3431cfcea9d89e8d78b55205795861d47e94f9728153541efe9354564003
+AUX spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 711 BLAKE2B faed59dc76f9320972bdc7966c757df76a1353ccefe9f6dacbf473a8f576eb222d0b4ceaa97a641b41c6c520a6a21149956aeab88b840124caaac08b7a27d66e SHA512 b12004d2e5d6b058549c4e12abcea531e4b8113beabc2264161197b247209168affa0aae529f5ac122b3aa7ece6f4000d877bd5fa4a230f44cb6e9a08ea22661
 DIST spirv-tools-2019.1.tar.gz 1493682 BLAKE2B 823b6435fd59a732075073bcecfbfa3081248a2fff21a1375502b812b30a1f988bb32afc41d2f6a6244b4bf37aa9fee2fab710f2cf6d051170e3622d8adf632f SHA512 c528046e1495d58ff0aca773b3b8fa091f943414853cf0344d8e690d868e0df5b1aa66bddbab245c5e52cc2fbaf0a2032a3be518fb8ada7f89b8023fa89776b4
 DIST spirv-tools-2019.10_pre20191027.tar.gz 1848978 BLAKE2B 174482c7186569878ec6f3409a68a3e11013b12798ffbbfb94c66ae6cd338a3375330908cfebf0cd3c67901bf9c2459c6e586cf95bbf4fee399504aa9958da66 SHA512 d26480b6c70acbdf63e36fb5ed11ce422b976d48ef85e2be263c3897a4d5181c31fb94c087fa7b20f84446f0059c3bb7eac872a6d1b15a599fdeb2a7924232e4
 EBUILD spirv-tools-2019.1-r2.ebuild 1229 BLAKE2B 737149830215bf07fbdea4f1be11fb7a86ea904bf5975a3431e3ae42d6729a2d017f99bdfc8930cd68fcd077abb32c48f6c96431da21b2356fa22c794defb2af SHA512 d5a70e0c1c35cad10c5e26b4f584f9f51bb0405f236755083bcd3ccbacedb8f167876dceb0f8d0e54675ef46d573725fde15aebb7f715937059db822d9c7c58e
+EBUILD spirv-tools-2019.10_pre20191027-r1.ebuild 1256 BLAKE2B 70e5336a55efe09b60a30a9673559de81c2241feebd49d3ba096c66a63e4ecc7ee7c8d48b1a0ef6f34e022bbf0d514fc9d0bf39183f2487c25e8962c400e896b SHA512 c5c522eba6aff6db77cc01fe3c8a2ca45b556120d7cfacafda2ca72e351c895a2561d95aa5b9f6463b442e55cbb73c51661a7220ecf45edd6bacdc886ef8f52b
 EBUILD spirv-tools-2019.10_pre20191027.ebuild 1164 BLAKE2B 4882d29b08c98a9b09c9f8d65e51e32b598ce63fc1b372bf43b609ebc53bef320b25d19db6c884680482f3497ab2678d56b4a06480b7293f8c08b5819aea18e4 SHA512 39cf6e7d07f34c7105652397b7a63912651de5bad5020a0f29788c6a347246bdb0ab5f37f7b365f3446f264f789c5317e58788c3f571be5b4cce2d4fdfb1a14a
 EBUILD spirv-tools-9999.ebuild 1100 BLAKE2B 9383f01a660bd649a6e004bd0050ff5799dbf72c8c4b7ec5568e9795c624d85d17da5fcecc86eec2b87b59b6b1b3e1622baf7f7eaa654f571d414c8d0eefde52 SHA512 eafd19456cfd873fa2ddd2d699e0a3992e9dfa31cc9f8c8b795e13d92c03bce2e0b68f978575ce394b2495b07e5616ade54d5c1fafcc1e733697fa5e03437253
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch b/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
new file mode 100644
index 000000000000..c7dda4594c2b
--- /dev/null
+++ b/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
@@ -0,0 +1,23 @@
+From 4c9f81249f0808af316f39c8f0e8b67e46ec0967 Mon Sep 17 00:00:00 2001
+From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
+Date: Mon, 18 Nov 2019 11:07:48 -0800
+Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files
+
+Fixes #3017
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 19108f3a0..aecaf8d68 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -215,7 +215,7 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
+     endmacro()
+   else()
+     macro(spvtools_config_package_dir TARGET PATH)
+-      set(${PATH} lib/cmake/${TARGET})
++      set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET})
+     endmacro()
+   endif()
+ 
diff --git a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild
new file mode 100644
index 000000000000..6949158877af
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-multilib cmake-utils python-any-r1
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+EGIT_COMMIT="ec12de9131244a076c34ddca2e8d7451288be7e1"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch" )
+
+S="${WORKDIR}/SPIRV-Tools-${EGIT_COMMIT}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
+	insinto /usr/include/"${PN}"
+	doins  "${PN}-commit.h"
+}
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index 3ac7d7e802dc..f4a609136a6d 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -1,4 +1,4 @@
 AUX statifier-1.7.4-fix-build-system.patch 2104 BLAKE2B 019248feff682a75b90d1aca7eea425aded1b0f01e8dff4bd24410a474ef1350ed8215803915cb52df53866f6dc996428742d0a9187f55bbff17ce30894dd6b3 SHA512 a9bf5adf1206bbca84084df0680785e1f31902fb7ce4d455593ee35e0195ef9546de641d2f5372843afb7c8584fb04b1b13ee7973813ee8561a2282f2162cc87
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
 EBUILD statifier-1.7.4.ebuild 1125 BLAKE2B b0b81af822f90d001cc7509a74334e8149bcc26d0f106d84aaa2ca27d5d79b033da1813d60bb37119c604eaf0f007f6c2a6c3553fedcadaacb53fbc49be116eb SHA512 9a8749dfce5361eb7771e0f330b300c1ce56f08ff6cd93abf1457a2ddcb81b3016c14c54df0fdb602f20b72c97d7f799ae496043024ddae347f3af43da19923e
-MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
+MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/dev-util/statifier/metadata.xml b/dev-util/statifier/metadata.xml
index 54d5423c4060..3e3880cf1051 100644
--- a/dev-util/statifier/metadata.xml
+++ b/dev-util/statifier/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 5a762a94a169..8e5cdaa5a003 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,9 +1,12 @@
 AUX strace-5.2-linux-5.3-compat.patch 3982 BLAKE2B d60a8a17c6a5e1831d9a37dc5dffc1195c4d7ca27be9bb1e1e4ab109aa1813fd08dec512e7e1cdd836d638030140d5f31a07839ceb5fb01c2d9b32bdd83f27bf SHA512 46c442340aa27b1bb6616efd1bb33c0df2987cc75658555e72401c0628787785070579e2054fb9765e5e184f83f3e233594eee8a5589f48d7e1364d011e5c213
+AUX strace-5.4-fix-LTO-CFLAGS-handling.patch 843 BLAKE2B 2cd4c87e972b2bfe6d5755141a64ffbca386047ea68d37c8871bc37e7475f8eb3ce978ead5082ecb3099f599e12914f087773733a7440875a084a5b452b1f92c SHA512 9606c3334d3e01aecccafaa396b5a7440a652872c590ced3c1a88ca6ef083c176a420dfb2154396f94f65b826d6fe2f20556620f364c17d01d0069d630dc5cfe
 DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
 DIST strace-5.2.tar.xz 1515544 BLAKE2B 919a689741eabd843a43fdb557953ee6095a4d1abea808d7c35049b93afd338e0df7c69014486dfb88d22dd7cdb2f74b939ed55f08e85cdb9793d8150d08bde0 SHA512 41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35
 DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c0214348cda2ae45e10876bd6e118c103f15abffdfe0d7fdb01d8d3de163b9c7de3970d9cd07c88ceca11a99dc7f9 SHA512 02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a
+DIST strace-5.4.tar.xz 1599396 BLAKE2B 0a7fd9600488f5f07042ead8123151cf0113f82329c3cc786c8f3ffb8673f73eaaa1a489f1f27c47800a20e5b6327f1bf5fb09a5b798156908f9e10374a04970 SHA512 4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7
 EBUILD strace-4.26.ebuild 2288 BLAKE2B e39d94b807ba5ce91458dda8447ae2b755a5a61b0ad651632e7fde3c755dfe7c0737815f6f40a9cd13e0aeffae1fa55c386a0ff9326d25440f04be487f4d7d02 SHA512 8af2410ba171659feb8495c769c7143d29a1c4c39fa1a3de04c4be9b712663089edfb1c3d811a0fd8d2b039e88cc7f71c73155e46c04a1873ff0072bf829a8f2
 EBUILD strace-5.2.ebuild 2391 BLAKE2B 903f519f389605b6aae22b20609070ae0b2703cdee5952aeb5e153cfea38ed01dfc8721ab40e121bdb40c835fb8d4d053fb8867cef6a3ec3fd86e638a591aaa0 SHA512 489e8ac527c80af548ea5bd0d895f658c6b4f9c0976879e4b5f2aa96b1a4686f81d8548f980a5a6b110d6c790a68fb95cee8ef584076fe76bc026d35ab794b4c
-EBUILD strace-5.3.ebuild 2336 BLAKE2B 476de457dfad9302e5e62b76aae7ecb463074b81f265aaaca03b990241a6d8773b20418ed9aaf00476adea083c2ba7418cf4ce9a9f8ab284a5c393e8f3a6bb6d SHA512 05db005186222d939bd1692b992aa43d74f138458c05d11af5ab8840ebf785f1400e0d59b713e37421d3124306bf47a7d2cf3f783a72d91c7688d9cb6b325f2b
+EBUILD strace-5.3.ebuild 2327 BLAKE2B a754f1f9d19d5c6ec44ad4f9a520adc043a7ba8cc2418472b26312b837ef6afcddc785d787e307531b197270fe437e534d40602feed822975bad0d38b6300e67 SHA512 0846c6f10bfb715cd27d1805cf06e38ba07d1a8ef87ee8c256374468326959a0fb6d4ad83ba1c56c2911a0aa8e770c1352f7038ed636eb068054ad23d8feebe0
+EBUILD strace-5.4.ebuild 2528 BLAKE2B ea885a47f547887f21633fa50c1834800749df4f822d22c36d2b71a17d7410ab2e3e446699af6e9eb9d436ed6580fa89019a2934f3c6e68432e5732bc850bf1f SHA512 cfed508fcfa5dff270c8d038a8dfeaf10d60ad366d7fee0854bd294b7a06d2411fa2a56965b8f4734d14d5571e391f32fadae25ba40a9e8c8c96a6a991e32b3b
 EBUILD strace-9999.ebuild 2336 BLAKE2B 476de457dfad9302e5e62b76aae7ecb463074b81f265aaaca03b990241a6d8773b20418ed9aaf00476adea083c2ba7418cf4ce9a9f8ab284a5c393e8f3a6bb6d SHA512 05db005186222d939bd1692b992aa43d74f138458c05d11af5ab8840ebf785f1400e0d59b713e37421d3124306bf47a7d2cf3f783a72d91c7688d9cb6b325f2b
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch b/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch
new file mode 100644
index 000000000000..0f277962b958
--- /dev/null
+++ b/dev-util/strace/files/strace-5.4-fix-LTO-CFLAGS-handling.patch
@@ -0,0 +1,24 @@
+Based on 52ac53e96143f6aac52738f6e385f75203a68a7b
+[PATCH] configure.ac: do not copy CFLAGS to CFLAGS_FOR_{M32,MX32}
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -984,11 +984,14 @@ AS_IF([test x$arch = xaarch64],
+ 	     ])
+       ])
+ 
+-# Setting default compiler variables for personalities
++# Set default compiler variables for personalities.
+ m4_foreach([pers], [M32, MX32], dnl
+-	[m4_foreach([var], [CC, CPP, CFLAGS, CPPFLAGS], dnl
+-	[[: ${]var[_FOR_]pers[=$]var[}]
+-	AC_SUBST(var[_FOR_]pers)])])
++	   [m4_foreach([var], [CC, CPP, CPPFLAGS], dnl
++		       [[: ${]var[_FOR_]pers[=$]var[}]
++		        AC_SUBST(var[_FOR_]pers)]) dnl
++	    m4_foreach([var], [CFLAGS], dnl
++		       [[: ${]var[_FOR_]pers[=][}]
++		        AC_SUBST(var[_FOR_]pers)])])
+ 
+ st_MPERS([m32], [aarch64|powerpc64|s390x|sparc64|tile|x32|x86_64])
+ st_MPERS([mx32], [x86_64])
diff --git a/dev-util/strace/strace-5.3.ebuild b/dev-util/strace/strace-5.3.ebuild
index db378889c0d5..24e31e77299a 100644
--- a/dev-util/strace/strace-5.3.ebuild
+++ b/dev-util/strace/strace-5.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/strace/strace-5.4.ebuild b/dev-util/strace/strace-5.4.ebuild
new file mode 100644
index 000000000000..31a56378b3f8
--- /dev/null
+++ b/dev-util/strace/strace-5.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs autotools
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl static unwind elfutils"
+
+REQUIRED_USE="?? ( unwind elfutils )"
+
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-LTO-CFLAGS-handling.patch )
+
+src_prepare() {
+	default
+
+	# Needed for applied patch (#701516). Remove with next version.
+	# Don't forget about autotools inherit.
+	eautoreconf
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
+		eautoreconf
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	filter-lfs-flags # configure handles this sanely
+	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
+	use static && append-ldflags -static -pthread
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	# Stub out the -k test since it's known to be flaky. #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	# Don't require mpers support on non-multilib systems. #649560
+	local myeconfargs=(
+		--enable-mpers=check
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/strace-graph || die
+	fi
+	dodoc CREDITS
+}
diff --git a/dev-util/stubgen/Manifest b/dev-util/stubgen/Manifest
index 0b286e23e9e7..71ef3f974750 100644
--- a/dev-util/stubgen/Manifest
+++ b/dev-util/stubgen/Manifest
@@ -1,3 +1,3 @@
 DIST stubgen-2.08.tar.gz 104152 BLAKE2B d3e419cb2dcfe4dfc3f6c04cbf7bd4d0fb380804a1b42f66c7f2fb40ba5e581f1b9342666e008650beaa67a79c4acdb73a6c790bd8f2cbb467c1afe53d311cb0 SHA512 daf8a83963fbc8b6857036a3f67a25031fc9e5f032ffedb1e041246354ede2363f5324b6f52ffe69fb41caa177eeca0a1c120f235e460043da1db5fb78fa5e41
-EBUILD stubgen-2.08.ebuild 531 BLAKE2B a2cd9223a2be09989697630269bbde75eafbec809a131e774585c47622ba9560046079d1c93f4c085011e05742b9c51ee4fb8bdd01c3f68ed834549f31c17185 SHA512 3e64445ddb9037bdac22cbb4dc93bd7c2d1166de01e4dca09c51cd107a77ad810d28b960a0e97c875401d347065d24914fea8da49294850ab5f4099409b83482
+EBUILD stubgen-2.08.ebuild 533 BLAKE2B d56b9a21ec76bc1545084e3b01b56c274e91ac9ba867d6e0ff23fe02607c6e3b64a8729aae2162400fe0c0039405a82cf7cc551e7508dbab1fc80ecfbcd75e22 SHA512 ecf30090db87201a531a22a0c3f678ad051647b5da2c63d2ce1a5a7749c97f613eb4187525ce348da9619d109038853a837c6756ce25fc8eeb2d05cd79cd9690
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/stubgen/stubgen-2.08.ebuild b/dev-util/stubgen/stubgen-2.08.ebuild
index d830848e7908..51755656ed24 100644
--- a/dev-util/stubgen/stubgen-2.08.ebuild
+++ b/dev-util/stubgen/stubgen-2.08.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="a member function stub generator for C++"
+DESCRIPTION="A member function stub generator for C++"
 HOMEPAGE="http://www.radwin.org/michael/projects/stubgen/"
 SRC_URI="http://www.radwin.org/michael/projects/${PN}/dist/${P}.tar.gz"
 
@@ -14,7 +15,7 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 src_compile() {
-	make CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index a51347ff8f68..c172f1992fb0 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -2,5 +2,5 @@ AUX 3.30.2-elogind.patch 1055 BLAKE2B c25d6b83d75d8155ef09d1aa5cdd8dead79a1fe796
 DIST sysprof-3.30.2.tar.xz 393420 BLAKE2B 5e86a78c231d2d2c601198e066c463d8bec95ab1ae6d0f6678e6e80305b8a6d53c604ce54d9fc2a473e4679695cef709f0e1a9514f1091719f33a58b92c896eb SHA512 70c49f7c20742aad82c8d9b1e303d06ca5fd2d27a6868872d28affea22278d381bf3eb0d181cbd1bfa490bda2878c52748ac29273e9e608452e9bf4f29fd9e2a
 DIST sysprof-3.32.0.tar.xz 296052 BLAKE2B f409c64d40bd3451037e601683f270ff93ea2a60a2c104d22edc6bad5ff3f5c974f80137776b6329dae932852fa0871f2b7b9960a282147ddef5402ad840d9ef SHA512 7b9d84ac241d376a5e545082b1224e7db96af26ae0ee297d5f0b2d45abc4676e23009dbd560085e5d4879378a8dd79eefb4449df3961fbfd09238bd2056061d0
 EBUILD sysprof-3.30.2-r1.ebuild 2211 BLAKE2B 13b96d356dbb464c6f1ed74b7f6216d28fd5a8c54a2c9f1611712a49215a9a7b0c32a7f63c949ac270ca1c12e66a49aed16ddf7b1f016175d3a4cc604de9d416 SHA512 5ccd0335b55be7357e57b82105eaecfd54e515c56ccdd63552fa78c7262d3021676a7fc983903e2819b801b56fef7c687670cd4bbbe199c33c87cb5502210c60
-EBUILD sysprof-3.32.0.ebuild 2225 BLAKE2B d51feca57cc2b24e366c1afdd7337fe92b9faee63586cdbc2dcf1c90f48dda54341bfff8428a04703be5ace41edcd411c3a91e135ee7f52e1acf26b5bfc6fd05 SHA512 688f3fdbc8b341d7d60b3536e55fbd94f7a748f393be5159fa8e9317d35b095cca59f4df2d54132230391699bb03c83177946e109b9489c87aab5748f959552d
+EBUILD sysprof-3.32.0.ebuild 2223 BLAKE2B 12c03c2a1ea0a43e3445a1ec80eb95d5f2132eae1128d003fa4e004f30797b3f9d741ced16262a61240f0483361b8d620abb33e272651b201568a39eeda07453 SHA512 26a2a6ff561ac905236cb494517b65d70e6682098e043166e8ad274adc25452e9b75ea36c8cd1651972b80b31b5a84730186007f286180f34bbad51a41cfa0a0
 MISC metadata.xml 886 BLAKE2B 31416bfe6eb56d58ae1c1953d19cc59ee0cff0c0aa7d6c28f6b95b7b4c9038ea9a8af5025e64f29612b6b919953671eb4940ff60d6baf1c79b8d33bdfae2beff SHA512 5514125c6a2dcb55a06bc81e52bb6c94a804b0dc41ce7d7c83e9ee94f06ddcd585716c12887a6428e1afe3a9268cdc4cd0596d7a036de08f0e70ae3d6366f502
diff --git a/dev-util/sysprof/sysprof-3.32.0.ebuild b/dev-util/sysprof/sysprof-3.32.0.ebuild
index 16e41d082136..0dd5b9278923 100644
--- a/dev-util/sysprof/sysprof-3.32.0.ebuild
+++ b/dev-util/sysprof/sysprof-3.32.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="elogind gtk systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index fe27418824f0..eb4f039f8f87 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -4,5 +4,5 @@ DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb1
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 EBUILD systemtap-2.4-r1.ebuild 1982 BLAKE2B cbe92a7d59e7d59a835260c180fc7040058860f4270b88d7cd62a5db74b46a0d5ab462b2bfece63e355882a4b8bb58145fcce4d05610f1702b19cbe9c34e7620 SHA512 fa2e0db9552365f2645d4c46adc66bd835e964aba86818e9e136e32b5ef1e1d02bf00cfbe23955630b266b836efb2cb15a36cfbd4779f7c5df452417686c9be9
 EBUILD systemtap-3.1-r1.ebuild 2203 BLAKE2B e2683da59a09e3de875911e9e034eadd33b1727e417017a0db2021ba04be93a191051d59be33258a849cd207274c6fa8faaa36350e3682e326e0e0bc4a503880 SHA512 18a941078d6de47680554ea2fcb46f65115d6e0e7c63ae6c261dbaff7b2910be6759b20b5a8bec2a8597cb99784491eb2f33cba62fb593b4e5da672c504ecaae
-EBUILD systemtap-4.0-r1.ebuild 2646 BLAKE2B 4e77ae227d92aa502510295e3d5433fbe1b5a7c57e3cec710a7ae702be4e0744958ea69e8c572e60f97c4b8e1654bb1a8d4923f828de62d6536aa6a3583a8a2e SHA512 1ab20cd5c2b02a87aadf2384bbd5d4f8c9c6c3b87ca0a7f06518afccd8e119d06320e863a1e18b0934073fadb650f365b83a0da1bd86ae9a8cdd36bd6809e2f7
+EBUILD systemtap-4.0-r1.ebuild 2640 BLAKE2B a1732ec5da7f4cc5d4b855013810bafe254f81bc7efc9414ea4a1f9d163954aa1771801c3bbf979e48842fae4fc66b74403556e5694f0476af9c674876b72a6c SHA512 b341ea05eeb3b9520f6053a14d79e66129444e0180c4efa5986b21a2f76f61ee8d3ee729e56b1d50f64b84cc9df7955a185a047221666e3437ebaa600f5b7ce5
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index e8fb664f8f9c..f81fccce44c7 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl zeroconf"
 
 RDEPEND=">=dev-libs/elfutils-0.142
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 2268abd6a313..8bfb211c6aba 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -3,6 +3,6 @@ DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
 DIST umockdev-0.9.4.tar.xz 754856 BLAKE2B 92182ee856e9432f02cf3a739c7af6f2220394eb4dd81ef6e2949380d124f70d9e34c3d3e49053af43794dd0f2ce0feed8be7366df2c9a06bebee9c52d24ba53 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
 EBUILD umockdev-0.11.3.ebuild 1038 BLAKE2B a3a3320532272437cfc288c19dc2d699a23f4680849b9909eba5d870b94cd0f3ac6044b8a7bfcf702837ad2be5a25f9fc99601d87f1aec11436da40f1a2a87bd SHA512 e0ea324957343aafa2dc70c321cdcf842903543900c6458d56ae15d668017b11635fffc65193978034dc3896eca3f03e415f96d11314365f7cef25ce539f2d8c
-EBUILD umockdev-0.12.1.ebuild 1146 BLAKE2B da49baa997a987e48a4544270a1400839b09ea4f685f67ccb5eb1ab3f0d190850aabb246b101633b53552d27bff7f1126d2cee2257cac453af56fcd8771bd828 SHA512 b799ec04e9a30b47ba5e5c158ec71ca888bba8dca5023eb00b42d8e83703cbcab928b36211537d29bd54c392100e5e4946c41052a5db1c59e22c18a2bafab2d2
+EBUILD umockdev-0.12.1.ebuild 1173 BLAKE2B 02b72e1df2b3a58d122bf33d3ec730bc3313aabffc8a4475634b151a0398be324eaec8729f88fab6b5cd2570aa37b206debd97f2df0c4b61e726995aaef8a2a6 SHA512 06e7c9ed0f148cac8312e0fb1c620a6b01132d2ea7fa645b48141fed2c599bf8be83ad41f18394f6dce67afbdbd55f0b5d3e2390b23292cf8551925476d11747
 EBUILD umockdev-0.9.4.ebuild 727 BLAKE2B d7ab0652bde1b589e13ccdfb884f1bf97cd5536873638b9292b0f2a2409727f59a98ed79e01460a0f9252cedec348eebbeef9999e52ecf296007498290773263 SHA512 4fde96e58a65b16dea1a0502b0347a78693773c44e185c3f87b1c68b863ae358d70105431116f882ca38818a19ce9febaa7e5c47ae2ccdd5e88560906328cb64
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index 036d7163ded6..1fe8c46289cf 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+introspection static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/libudev:=[${MULTILIB_USEDEP}]
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index 60ecf0205b7e..0f9c5f7bcb96 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,8 +1,8 @@
 DIST uncrustify-0.66.1.tar.gz 1208142 BLAKE2B d642eb6c8e2a147aa17bd25f4ca0ee7e9471fa4f7d288c5e06e4814d0103032989e83349377d9d9a19371047fb82ad4d6e1aeec90bea3a068e8884ec4a698e0c SHA512 edfde1d46bded9febd47b77cbff86028e1d21c41fee6a46a8b43f0928bf937259be2f88fe4606f406f414601bb757e27eda373ca738606d1bb74b6cd27335f47
 DIST uncrustify-0.68.1.tar.gz 1566201 BLAKE2B ca7423088a2059d522d915e23bf1cdecc70d0adf64b9e7af53bfb4185252e4938105696623ba53b7f8be817e9e5ebadabf63417256e6f2b484dbebce868392be SHA512 03df7d2c3130f44021bc86599eae3acbd8dc206f647b476f63b0fe6add207c105c15f9481d6efa6b624d55bfbaeea050d636eabafb30a71a4de9ec8db6fe92dd
 DIST uncrustify-0.69.0.tar.gz 1600390 BLAKE2B 89f194679fe0601c866cb239c8fc900bd4ddf9f5ff23bdfe82df06e284f89f02bf8513153a908aa3bea4a075010bbb022aedee8ab7cd6df8b7922364d8d5cdeb SHA512 06eb985b941bd595c037c71becd277ed68298bebb56e9cdaba5da8315812a43a1455eba8635f370e2b039e665fa89891042f520933b7de5677bdcfb2dd69e6cb
-EBUILD uncrustify-0.66.1.ebuild 738 BLAKE2B 21de236b2b1981e2d730c04c989218629eda9b94b46f4009d20cc019b2b2ae992f14e878781ed10ffa50fab7d6b1ee6f829427dc1932af36b3c3ea8d8a27c791 SHA512 387b2d2a491e87df3bd3323fef3841d9b434d6cd2384b9d19a63713d81ca8ae954f4732aeebae634b1a4d7d93419c964ca5f2b1cb22d3c038479e36cf48ff88d
-EBUILD uncrustify-0.68.1.ebuild 740 BLAKE2B 3c4a9b4fb2a6c381f5f6303f4ce48291b48a29546f8285a4b82485c08836f4b684b6d1f3c7524836906d8230248cf096802571b3fdd32d030e162dcb591b537f SHA512 327e4992f1399ea1db0b81aee3dcdf73c744fa5a94cf686856504e3dd6abaf6905a5f0ca54711d2ef9c2a2ef974de4a8f25cee2dd438a02b0ad733db2c0b256f
-EBUILD uncrustify-0.69.0.ebuild 740 BLAKE2B 3c4a9b4fb2a6c381f5f6303f4ce48291b48a29546f8285a4b82485c08836f4b684b6d1f3c7524836906d8230248cf096802571b3fdd32d030e162dcb591b537f SHA512 327e4992f1399ea1db0b81aee3dcdf73c744fa5a94cf686856504e3dd6abaf6905a5f0ca54711d2ef9c2a2ef974de4a8f25cee2dd438a02b0ad733db2c0b256f
-EBUILD uncrustify-9999.ebuild 740 BLAKE2B 3c4a9b4fb2a6c381f5f6303f4ce48291b48a29546f8285a4b82485c08836f4b684b6d1f3c7524836906d8230248cf096802571b3fdd32d030e162dcb591b537f SHA512 327e4992f1399ea1db0b81aee3dcdf73c744fa5a94cf686856504e3dd6abaf6905a5f0ca54711d2ef9c2a2ef974de4a8f25cee2dd438a02b0ad733db2c0b256f
+EBUILD uncrustify-0.66.1.ebuild 765 BLAKE2B f42a1a63aac961eea17b1ad905c8c4eb86aff8068cf84f2cae98ea8127e948c99671146ccbb31ce2c3fbed32379a242c12af114504886c325a253ee08c2d0a3b SHA512 20fa1b76422958c787555f8fed41e53d423f87fe3d0fed653665c3cf08ef9677dd9ab1961bd39b930be9e224fbe84f16cd15c39d97cd1139be0b2ddf3cff5223
+EBUILD uncrustify-0.68.1.ebuild 767 BLAKE2B acbd07ad8b8413dd1fb3507cbb6069fd4e68f2f19188dda594ece618eee32de82fedddc80c836f6089116d5fe67884b8a9911bffabcd4ed2586b316a771d8a1f SHA512 943936fcc13c958a2b3fa50434c46420794c9ac9ef43aef9476f8eb32c94895f0f8afd31b8214866d86ae4b288624d395d348f9b7e8c0d0d2085d2255c4e0696
+EBUILD uncrustify-0.69.0.ebuild 767 BLAKE2B acbd07ad8b8413dd1fb3507cbb6069fd4e68f2f19188dda594ece618eee32de82fedddc80c836f6089116d5fe67884b8a9911bffabcd4ed2586b316a771d8a1f SHA512 943936fcc13c958a2b3fa50434c46420794c9ac9ef43aef9476f8eb32c94895f0f8afd31b8214866d86ae4b288624d395d348f9b7e8c0d0d2085d2255c4e0696
+EBUILD uncrustify-9999.ebuild 767 BLAKE2B acbd07ad8b8413dd1fb3507cbb6069fd4e68f2f19188dda594ece618eee32de82fedddc80c836f6089116d5fe67884b8a9911bffabcd4ed2586b316a771d8a1f SHA512 943936fcc13c958a2b3fa50434c46420794c9ac9ef43aef9476f8eb32c94895f0f8afd31b8214866d86ae4b288624d395d348f9b7e8c0d0d2085d2255c4e0696
 MISC metadata.xml 499 BLAKE2B 9418af314e83877ee50d76d87b3fbe9223ed7ef21d53ab85d5a916a46bb631296ca2babb8b470049003e1b6889185df52bdb62c9fd1f2f371d6902885dc4f399 SHA512 e8a379440acebe626dc28ecd4de5e76e1a684e67441bcce6720eb4ea834102c4d020d91a5950ffd24fc297ccd5ea8386850b0bfe0771352539936345d8b1f3cb
diff --git a/dev-util/uncrustify/uncrustify-0.66.1.ebuild b/dev-util/uncrustify/uncrustify-0.66.1.ebuild
index 4f7ca1eaf4b8..fa3c210d52ae 100644
--- a/dev-util/uncrustify/uncrustify-0.66.1.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.66.1.ebuild
@@ -24,6 +24,7 @@ HOMEPAGE="http://uncrustify.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
diff --git a/dev-util/uncrustify/uncrustify-0.68.1.ebuild b/dev-util/uncrustify/uncrustify-0.68.1.ebuild
index c7801da62f74..85a400d29cc3 100644
--- a/dev-util/uncrustify/uncrustify-0.68.1.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.68.1.ebuild
@@ -24,6 +24,7 @@ HOMEPAGE="http://uncrustify.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
diff --git a/dev-util/uncrustify/uncrustify-0.69.0.ebuild b/dev-util/uncrustify/uncrustify-0.69.0.ebuild
index c7801da62f74..85a400d29cc3 100644
--- a/dev-util/uncrustify/uncrustify-0.69.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.69.0.ebuild
@@ -24,6 +24,7 @@ HOMEPAGE="http://uncrustify.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
index c7801da62f74..85a400d29cc3 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild
@@ -24,6 +24,7 @@ HOMEPAGE="http://uncrustify.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest
index 1a1052a4221b..167886972ccd 100644
--- a/dev-util/unifdef/Manifest
+++ b/dev-util/unifdef/Manifest
@@ -1,5 +1,5 @@
 DIST unifdef-2.10.tar.gz 73285 BLAKE2B e13b75afc9b8e514559b8a13e3069bfb1cb489d21ce4ac56134921e702666bd9b23dad36d251cb65535e5d6fe02bea0d21a5610c542d727dc5e90d7e1726e4dd SHA512 39d4551f43fa8eccaee8a9fc469b5ddc8ca8eb0e0ce46c17c3a8300f7e6960fbf0960f364a83df20059b4aa623edc7c3c16df1b7162f068332e6c066d7ffe9b3
 DIST unifdef-2.11.tar.gz 77947 BLAKE2B 2ddc1a300b329ae91f72f1a8dad86443ba36fc02c7205eacafe1ec3ef82467003bb855c32485e6ca92b61dc45d160990b8aad531ace60ba3e55967f900150af6 SHA512 948abf878852da321f15c6060dfe33a2ab38f1787b0a6096f10bb3828d0b4e50226643e9dbcb678a422868c215b5c4e981dc7da5244d38688e8e91287beb8845
-EBUILD unifdef-2.10.ebuild 542 BLAKE2B 06bded76e41e766038550174fd3d161f6e7c60c5b5a0d047ecb7c29501d1bc76f94f9b0ce49fb760a56cfcd935d31528da69052eaf48a57db019ea8f5888c9b3 SHA512 322b08a8f1271c80e68eecf36e3da495656ca3cdb9cd0009dbbf6f8085bab08ccaec1460cda894998c80bf197b4bfa099aa4886887bc4faf3a777cf612c53206
-EBUILD unifdef-2.11.ebuild 564 BLAKE2B bbbd92fae4908525fe074816df9117f5f4b39f24a4f91175bb0d9f8d8ab88e44786ba697f0272efac94421871beb1ddaec20e7acb9ec88024d0dffdadd1be6b0 SHA512 8d27b5ca223a6d243e7bead5c6f79bfd7f6d660290bd796468074f8bbddb5b44afcffdb36be0f8b4c0f91636fbe537b4ccbe68b7942de8f2eb54606b20879b15
+EBUILD unifdef-2.10.ebuild 554 BLAKE2B b9ff25849a16f20be133acd1b68d5868df2fbd8f352da2fb726ef8e3b7afc0d68b5184fed285b1a88bdfd35a507ab768ebf63a61c1526a6f6aa63eab88b319ef SHA512 08055bcb1d2802ff68faae83e9ba7c1210fcc2ef808f126da2d87eb5dbf8ecb485f7b999d380cc2d42208205dbe8666e1e7f3e9b137c4f301ec154b0e6de0011
+EBUILD unifdef-2.11.ebuild 576 BLAKE2B 2e9b5e695f99ae2204016461fa70eba340a58453888fed5df40913d480dc08168dcbbfb470af3fc3a27d3d1871c3c630a830a4c1961727a5f3c930c01d784dc5 SHA512 1d8b5c4848da4a3ae48d151624f7ebf3e98939740cef5387242f09464cdd815ad8297578ad9a27ae62fd8a92f1163e574ce967a5647122c00f703c0abd677ea4
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
index 038a1285cef0..7cafc8e46a09 100644
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ b/dev-util/unifdef/unifdef-2.10.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="remove #ifdef'ed lines from a file while otherwise leaving the file alone"
-HOMEPAGE="http://dotat.at/prog/unifdef/"
-SRC_URI="http://dotat.at/prog/unifdef/${P}.tar.gz"
+DESCRIPTION="Remove #ifdef'ed lines from a file while otherwise leaving the file alone"
+HOMEPAGE="https://dotat.at/prog/unifdef/"
+SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -17,4 +18,5 @@ DOCS=( README )
 src_prepare() {
 	sed -i '/^prefix/s:=.*:=/usr:' Makefile || die
 	tc-export CC
+	default
 }
diff --git a/dev-util/unifdef/unifdef-2.11.ebuild b/dev-util/unifdef/unifdef-2.11.ebuild
index cb5bb6583722..848ad49bbe59 100644
--- a/dev-util/unifdef/unifdef-2.11.ebuild
+++ b/dev-util/unifdef/unifdef-2.11.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="remove #ifdef'ed lines from a file while otherwise leaving the file alone"
-HOMEPAGE="http://dotat.at/prog/unifdef/"
-SRC_URI="http://dotat.at/prog/unifdef/${P}.tar.gz"
+HOMEPAGE="https://dotat.at/prog/unifdef/"
+SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -17,4 +18,5 @@ DOCS=( README )
 src_prepare() {
 	sed -i "/^prefix/s:=.*:=${EPREFIX}/usr:" Makefile || die
 	tc-export CC
+	default
 }
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 1a82b93769fb..b28e50d2c4d5 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -15,6 +15,6 @@ EBUILD valgrind-3.13.0-r2.ebuild 3879 BLAKE2B 03709383d7167d639ec5f3d461b0990c1d
 EBUILD valgrind-3.13.0-r3.ebuild 4121 BLAKE2B 0770974a05e87ad0ffec0516521d5954196b0a5ffc62ce2aae925bbe29a2acd076cac3d5751bf92535ce59f554ae51403849b1b7fb4c6f71ade7fcbe0c333554 SHA512 1f0921aba9cdd3a192fdc3ae5a77da773c7c9e485acbb38c9ac8de6208496d44d10edc01126e8488e17231c45cf8a769d3226ab18d8436e7857497a3b07dd2f8
 EBUILD valgrind-3.13.0.ebuild 2854 BLAKE2B 8228042c5f24ce771f07f3b44c94a26dec805e7ce03ecd545a7b7caee1c3a41f93deeed2b298a99b9560614e64b54961e4df3c8d902984b34ed0b2e005568107 SHA512 771bf52c0436aa15175df29d10e3f191e5e9511a50dd466ef6a102c7b13d677ad84adf387b7edb99b6cdce1f38f644adbdc3a40bdaacabb22168f2aa07302fcc
 EBUILD valgrind-3.14.0.ebuild 3681 BLAKE2B 4edebcceac72d0191cc6a7dfc1c47bfb3bf7afb1acc15479346cbb7f4d7afc20311393c68f623e92f6ed7efa12cafb0c33dd888aca27defb6c0e1efe5f235b04 SHA512 e9e987302ff3dc55b345cb5b497b22599eca3c1fda2de35b350189b519ab2a1fcf33e959c814b40918c11994a2421eeb27b66bea48080cc0ac015108828f89d8
-EBUILD valgrind-3.15.0.ebuild 3761 BLAKE2B ab6c185f2539185fca886b5bba8bcdb94bbb79242ba0f0a5a0a7b21e5e012dc6bfd6dd9071a4bdb0a0ac9e6876b9754f80f54d55577a5e3937811968e485e203 SHA512 3a7f23bc0fdd5f03d8c8a4a5966380c75bd0f964ea168c5552d647f5db5ff51da6ebc14ce95580d62698d15943243ab38e572f9b142d81700f213fc8143a4711
+EBUILD valgrind-3.15.0.ebuild 3760 BLAKE2B 5fab0a9e51847ba058db672e57f51bb9926dd8463d5b2e992fb458d2c14877ce3eb81c6e8ac4d69c585f65beb659f421b9b5c499d7a30ff72eba67a5133b33d4 SHA512 f98145f07f64e7576341acc05d222013c5c02755511bb0cf89795c153db34265498f70a7904716a11203262c2a14a3daca49590ed007f68559c9b0d7a1beb98e
 EBUILD valgrind-9999.ebuild 3755 BLAKE2B cc2dd005abd89595057c702a3f9afef60b554b3aaff7b0ad267a4c06db1b38df4106640952eefd2413fac5097a48df2d99f2b9e41f81be4731c587b3b7267156 SHA512 b24c9ebcdd36c1fc981cfd0a9e9233239dc6acc52b9d7a0a6533798580f8516b79486cbad800b9b64a4bcdb90c949bbca1e2fc813c19c7c6ed5ac282e2fe71d8
 MISC metadata.xml 1027 BLAKE2B df13361ec401ce5e0bfa11e51378c432405bd296a874d8c71c26c9cbdf0171689e4b3134b5e05672dfc22bbcd6e2b6c74b96c47367725c209990d3e1fcc65e7b SHA512 da5bcaf596f2adaa552cc3b7296891b40be0bafec8a12695076ce8fbe660b8aabe70508eb02ab3fb66b0d9dd0c0c8615f430c1ee0ce3f3579732ea2406c8a778
diff --git a/dev-util/valgrind/valgrind-3.15.0.ebuild b/dev-util/valgrind/valgrind-3.15.0.ebuild
index 7810056a3669..266a720e3919 100644
--- a/dev-util/valgrind/valgrind-3.15.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.15.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DEPEND="mpi? ( virtual/mpi )"
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index c629fe09bc9a..6b98d5732329 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,5 +1,5 @@
 DIST vint-0.3.18.tar.gz 95865 BLAKE2B 0f7e61b720aa0998091b9b40118b199392fbf1aeace8801d683e8249179cd3d792e15b42df6d34c567c4df1830629a80e6043e87092f37dc46a0e57c6a56cf53 SHA512 1d3e04527a8f5ffae29395010a88258c1771aff2798143eff6572400eaf96323cad04353a7fcee68d9407afde5808446f515fd3d7e8e62de4bef28edf214ebdd
 DIST vint-0.3.19.tar.gz 96755 BLAKE2B 0b03807a4286b3e030e00c112dd0e879fa39e0d2333d46ea159555de50b30098d9a8b2345da8e18b7e1e5c814f10678df2e64398a615bf381186faa0036939f5 SHA512 b9024ed1cd8a18a916798e691ba0db31985034b2420e33c094459a48254c7c8f6fe89a1a64858a67ff95b0b48e67a780cf975940646af2685d2b95640e8121f9
-EBUILD vint-0.3.18.ebuild 1315 BLAKE2B c6ed0e9a0f7f57887fca3ca9bddbf70b4096e36bbdeb2e6e3d4fb73f1a9749d862e92e03cbd0fbe78c46323bd55da152903d0bfc8f8f01cbb6b1f57d3df9e888 SHA512 e40aa6fc1619b0505722cb64272d0b13f73b537650fb6a999aac0e958cc34d9a65397c16ac56a47cb32e76a2f3b2033496426cdcd69fdc2271c21ca9f90909c1
-EBUILD vint-0.3.19.ebuild 981 BLAKE2B 86ff247aebea513fa4a173c5a24e257aeb1468484d595ca779bfd28c480308af4d1a5d3cde9093596ad8f4b2f90271d7cc9bb46d5ca6fdb2d3094e4fa8327be4 SHA512 8ac0b0bf411975913a5c91b09307d15bf6898373f53bcebf77066cfb34c467a76723ab252063053b8eda32f25cbc7e5006b3878a1dbd6088e1a72467f0c52756
+EBUILD vint-0.3.18.ebuild 1342 BLAKE2B c2eb0b60d26f486102b8b40d853a0d0d6f8a67ffa81df45e7d93b6e38262ff9be02acbed0303238fe49c07d541119c61c942a81ebbe97e1d23036769595f883e SHA512 c9cd83fdd23b8b7111d4c8733a44a21fbfd3fb5cdf37f3c051d7d6090782b33fe941edebcdf5fb77018c55a81ff91f5c2a43d5c5289c2ccb4753cb6ac28b2bb6
+EBUILD vint-0.3.19.ebuild 1008 BLAKE2B badbf8251e1c880686e073ca408436e729e969859976160dbc7b3144844590b9a43bde89d56e8a0c56a571158030432edca08c53460f1094c6699450f47051c9 SHA512 d8c3ec17eed7938e5a65449c4074c8e3b017ca9b162a75fee57b830065a44529d457e3a03428402ff51dab7d95f882ae281f18ecf566169beac4cf4d5619664d
 MISC metadata.xml 356 BLAKE2B 2e20ccc80c3828e2dd47f3b073ed3925fd37c010197284dd2b917b01ad365fa7556562a19f5aab16f4e8bb0e43850354075c1802703ecc1e9f43739451247c42 SHA512 3deb46a147db24fd9858b4f4cdc6f864d303ffe2b2989bac8fd6039bbdc7e9e4d06db96a4cdb2441753d103c86523cac48743ecf803d5b0c2f85d0b211052dd3
diff --git a/dev-util/vint/vint-0.3.18.ebuild b/dev-util/vint/vint-0.3.18.ebuild
index 16ebfb587121..1b732f39b0a9 100644
--- a/dev-util/vint/vint-0.3.18.ebuild
+++ b/dev-util/vint/vint-0.3.18.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
diff --git a/dev-util/vint/vint-0.3.19.ebuild b/dev-util/vint/vint-0.3.19.ebuild
index f1b5aef200d5..aecd0e282e6b 100644
--- a/dev-util/vint/vint-0.3.19.ebuild
+++ b/dev-util/vint/vint-0.3.19.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/ansicolor-0.2.4[${PYTHON_USEDEP}]
diff --git a/dev-util/weka/Manifest b/dev-util/weka/Manifest
index 53e05263416a..d6eec07816c9 100644
--- a/dev-util/weka/Manifest
+++ b/dev-util/weka/Manifest
@@ -2,6 +2,6 @@ AUX weka-3.7.13-build.xml.patch 576 BLAKE2B aa7535a003410f9ec6aa091e3fd989182068
 AUX weka-3.8.0-build.xml.patch 568 BLAKE2B 777233f959ec5adcfffb0e12042e11c0dce154a1ab8d54068a6a4d3bffcc059102ebbd96776c24488159230b4b6426a6d7ed7c55810cd98fe95347d340ec010c SHA512 8b1cd5ff6867bf5d43ec1b95d98288f1d035f37878c8fd99f33bb6389dd24e29ba8112f718c02b25cfbae6ed67f02c22643af39cae06e3a2d58081600a918c39
 DIST weka-3-7-13.zip 42159458 BLAKE2B ede4e225dac3d2eb875eaddfee8209a8c50b0095a885c4c9384703aa476d75ec9f1bc4dfcdc2e2874b623f0cf4090f281fe77d8363c1fb5300409c4a6e119f44 SHA512 aa15b857d3b3b35720468206e42a157cc8c63d6bf3f4fdda93845da7e4e4ffca0201b2b92056486a2245681f7e0052dc75959194be954d84b391e812bd49ce5e
 DIST weka-3-8-0.zip 50550487 BLAKE2B 85d7e68155c02f89e296ea1a4ee6e544287458135a941a4f618807f5c5b3e88edc6952fbdf632cfb642ef08fafcb7084dda3bda9269629610e8c532dd63d165e SHA512 7e38646a59e3d3d5fa314d269747ed7c526605253339e20f24bae55684a6cd77eeefb267b05825d8de44ae0e827873ba11ce6759b1d78a1a1975d100fd910b33
-EBUILD weka-3.7.13.ebuild 1468 BLAKE2B 1082a67e52f5425ca08b2664b8203f59b48639dbb025541e8b934e1f8390e202e5e48ab711643a2eb4ab9d4a1ac9a6ff2dbb5dd26a079cced1c6e88e2a80c987 SHA512 2f746f8e8874497a66650d5561412ee92996fd97adb9282a423a34452a261845a9a2d9d6370f01cbd7d6af3c188ac885eb1210058e4722eefa02f87adc54e733
+EBUILD weka-3.7.13.ebuild 1461 BLAKE2B 4b43783512a70d6b67d3b042914ff3a6f0188fed3244808aa373cf2ff12b356ceab0366bc9ee7844ac843b0b576cbb9f1fe6327b4ec9ecabccaa03c9a88f798d SHA512 d6fa3b52b23adbf22c4cbd9e8fec9ef6a113ac83a68a98ca77f489dd364500670a93f21b570ae748437c0cb5d77ee017d9d8d9f608bd7352fd3ebf3a5f67ee9c
 EBUILD weka-3.8.0.ebuild 1776 BLAKE2B 233d1f1d2e51086bc78a5b8c6d2b99dea0eef5a998f8ba99a6c5ceccf22e99b243cae5c171fb69acac04a751d1115fe398615c51c2bdfd37d0348e44820c552c SHA512 f684824f58f527210c932662124d3ab3e3ff77398c4e592bf5e238a3caf57329d8536155a1a54e0efe14a9def8306325ef524ee5d00c1703d6bf1dc7448d80b1
 MISC metadata.xml 388 BLAKE2B 5f655f856c468f07f1b65024d9f86466f633b94f57f8ab384a47959975a8a96ebe910e6c7220c3226c83c90e6ebf3d3128c6d354517b100eb018891a02c3bb69 SHA512 db8902561c4e18c56a16e2445822e5f8592822f911c4f098c444f5345599956d877b8d0a9982c2cd143443231d78bc7931e635657ccb9880a54f8631055d8c54
diff --git a/dev-util/weka/weka-3.7.13.ebuild b/dev-util/weka/weka-3.7.13.ebuild
index 7f39cee56198..3b118c2f74e3 100644
--- a/dev-util/weka/weka-3.7.13.ebuild
+++ b/dev-util/weka/weka-3.7.13.ebuild
@@ -57,7 +57,7 @@ src_install() {
 
 	use source && java-pkg_dosrc src/main/java/weka/
 
-	dodoc README || die
+	dodoc README
 
 	dodir /usr/share/${PN}/data/
 	insinto /usr/share/${PN}/data/
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index 16e0105d30da..d0bb504202cc 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -1,6 +1,6 @@
 AUX wiggle-1.0-cflags.patch 576 BLAKE2B 25b065a28bb88f3163c063a90a9dc60ec9171e4ab43732faf0c493682b05ff37cbc1e99777bfb2fd03894c79bc30713067b3378c02556199fd847f0cf9d4d0bb SHA512 a6bbcbe8307212416ed66f17e5b5dfe2ef2c369f15351623ff1c47c8364da463aeb05241379de28b554a749ce8a66f6f3c0898c8607eabc44797fd2c36bf17d5
 DIST wiggle-0.9.tar.gz 809756 BLAKE2B 62fd35c721c4d54204984fd196686decff54c1613ceabf5c727b6383500158a04110c4fa2e63d6456452ac79fb811aac611876528fd2503c1acb7e0eb000e49f SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9
 DIST wiggle-1.0.tar.gz 868216 BLAKE2B 7241cbbde488b5cbf8970feb1cc258deb04c935347d793796f34993feba3e82870c9ac2aa7d5039f4739308cd0b20b4b104fb50c5ce64a5c66381ff3f6c545d4 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3
-EBUILD wiggle-0.9-r1.ebuild 1690 BLAKE2B f0e67336f89a41e05db5bf0d39d58a7bf57a83e80463fae544f19ea85673a1c9300a8f4fc2ed213b194fb12a198a68f7c00f0e565331a6328fbce68d7c0a258d SHA512 37d5bc901fbfa267d77f6a2eb5cdf32fc24b311c85166de17156f08d4b699e79e69d88ae49031a05efe32cf7b6235c25b0454904400f0390693614c2e27fb1cc
-EBUILD wiggle-1.0.ebuild 1468 BLAKE2B bc428b50db001c2323daec804a317536c9fc63755a4da06135940fb69050e7fe65103f7ae3204d7f860550172ad4480a0ca284ebfe34467243edeb082f33b631 SHA512 9e7a0ebf4d70ce014b2c87dfb87e2d3f7c1766aa7bc67144115fb30c259f4537ffe324a990d6967bd951e28aea224d171ba4cf88af6724e491e248b5f8d21bd9
+EBUILD wiggle-0.9-r1.ebuild 1714 BLAKE2B e8c17c40f61dad213d8cfd43e3211fdcb5293eb46baee1f875f6b262382d6931b1e739d80ffcee7bec2930d6fba1878a1e8d4553dea17daa9be9b74851202f3f SHA512 8b976140f14ac386c2c483f3402097ac49b89bfc7742e8800c1053e3cb46fb75fc8b10ba6be49627aaaaf4261f6c8dff11a8834fdadc31f1029304f062eebe8a
+EBUILD wiggle-1.0.ebuild 1492 BLAKE2B 78af1811c96aff9c1352fbc9b786ce83eacc566431de0299f36d043659037a3eaccbffda21fcb1e582f6cda620740828d943c30f632cecf88da19c42090df476 SHA512 d96b9597f5b23d04adb8d5b25dc18b359cc3555d396a2a1533d75f4e89601750d154b3763ad554f0069a76a63a5f37ecb304eb3a4695300db0be38338f7c6070
 MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index 4c583165574c..d21acc98e25b 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-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=5
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # The 'p' tool does support bitkeeper, but I'm against just dumping it in here
 # due to it's size.  I've explictly listed every other dependancy here due to
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 22f8dc34ed81..11a76e00ddf0 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-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=6
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # The 'p' tool does support bitkeeper, but I'm against just dumping it in here
 # due to it's size.  I've explictly listed every other dependancy here due to
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index e566f5af62ad..7343064de18e 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1,7 +1,7 @@
 AUX prefix2.patch 1031 BLAKE2B 489bc334d6119f1175bf4ea671644ae1878a680b237c424f73ae99ebc20e398d070716bce1df2fa554da382882385693ead202b19af1aaf979b4eff3639dc5b5 SHA512 747b973ec84a31213de84fc15f40d4d9dce854a32602b3dffaac088992578a07f48047358bf7c38b6ca597c251232f48432404836cb2304f5423db4ddf2f9345
 DIST wstool-0.1.13.tar.gz 75188 BLAKE2B 6a34aa04e4a076a75dacf24faf789d5295f6ad9afbbdddae480d8cdd11db63940faeca2c5936a2432aeccae5274e2e9e4e824f303460fe96f95c0d17abeeb9c1 SHA512 4d54f78ca044d31d927de1c3387536d0447ece77672c555845adf54e47f07adb67e6e9c866bc2719aae468aeeb26c900b3784e0ec7cf014c8118e841a92dca14
 DIST wstool-0.1.17.tar.gz 76168 BLAKE2B 4862df0ff16a5102e42d3ed683dbd9e8eb432aaf44f6e641fba6bb6f5d962645685b0fc9ca11f3c8adbe15dbef33086b93e3f9136073f7f181b5da37522e28fa SHA512 13533354a40723137baadc125425a2ec3d6a441da4870f04a9e17c53509ee4d3dc27df1a59edc2c3985a05fbd66a045539e9814f73509ee527fb763f8a804626
-EBUILD wstool-0.1.13.ebuild 1448 BLAKE2B 062e745e900b7a6c0da45c3c781dc5986392313e55cbea79355bb8729c0c918494f7a8674bd8f96f6f43bf378eabc3a135192110cad55e9a67bf86c6a3ae1ab8 SHA512 cea8fceaf3427e8711a02757547379ce3929cdeca0b556740fb441ba8d4897c2fb8886e64771cef09bc74183fccaec67f7d0877811130ce0535ea6236d259838
-EBUILD wstool-0.1.17.ebuild 1452 BLAKE2B 61d45d7c99d618a7f2b2960b557608184e18062a6a89c69da4363861e24f67140143fee13dcd0c7810461b65d0c0d336d838c04bd796ba6a138659ab2dff501a SHA512 953ddad06f06f0f23a65c3b750ea24ecb61703d9f379ab16f2caa924fef0943d6327d1014bf7787993d02aa3960eab5d108c56dd55453a913bfe4a8f151a190b
-EBUILD wstool-9999.ebuild 1452 BLAKE2B 61d45d7c99d618a7f2b2960b557608184e18062a6a89c69da4363861e24f67140143fee13dcd0c7810461b65d0c0d336d838c04bd796ba6a138659ab2dff501a SHA512 953ddad06f06f0f23a65c3b750ea24ecb61703d9f379ab16f2caa924fef0943d6327d1014bf7787993d02aa3960eab5d108c56dd55453a913bfe4a8f151a190b
+EBUILD wstool-0.1.13.ebuild 1475 BLAKE2B 026905800ac1e0d2a2a4b295222dd83f5f909732fab9694b9507aa2845a4e7de2916569555bd04e57248b117f16ce2dcb112429ae49dd0c271aeda9eeca3e429 SHA512 ccd6c8699e844eb076f2502ff23a71537cc04629aefa4c105fd3e369caf8d5d7051916b92b6a712039e1326a944247150e88a3f9e77aaf7f76fe514d1510671e
+EBUILD wstool-0.1.17.ebuild 1479 BLAKE2B 391f46b2f88aef365efca47975c7715a70a8f841575ded7115cbcbac623ba40d2e09110f799ba1ccb5fbbce4cd4cc318c6c0ed5556051dbf8eb860499bd8b31f SHA512 ac097569ede16c6ee0bb7fd389d29dafc176f3c204c273e8f1cbfb88b2f9edff5474b1e338fbfe435ea58edd1bdf31c299778c52b21595661b7e8692191f044f
+EBUILD wstool-9999.ebuild 1479 BLAKE2B 391f46b2f88aef365efca47975c7715a70a8f841575ded7115cbcbac623ba40d2e09110f799ba1ccb5fbbce4cd4cc318c6c0ed5556051dbf8eb860499bd8b31f SHA512 ac097569ede16c6ee0bb7fd389d29dafc176f3c204c273e8f1cbfb88b2f9edff5474b1e338fbfe435ea58edd1bdf31c299778c52b21595661b7e8692191f044f
 MISC metadata.xml 329 BLAKE2B ffdb449cef2fa449771425241f9a03b49d915bed8abc73329586e9a2873e41ac669e4a347ed6f2cabc92b7132a741d5fcc79f13a9d900f7fced17fba322c460c SHA512 7bedf1430c3a2e5a8c98701ef48ce3a97ac59bebe3d42e19da193480c97ef0b2020916c7582f4083ebbf361b5c66b17ad1bfa7889e8aa62d3c945ba8dcf5b62f
diff --git a/dev-util/wstool/wstool-0.1.13.ebuild b/dev-util/wstool/wstool-0.1.13.ebuild
index 6019b9d53713..30a7bd56fa00 100644
--- a/dev-util/wstool/wstool-0.1.13.ebuild
+++ b/dev-util/wstool/wstool-0.1.13.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-util/wstool/wstool-0.1.17.ebuild b/dev-util/wstool/wstool-0.1.17.ebuild
index 694a26e5ca68..44cd350a809f 100644
--- a/dev-util/wstool/wstool-0.1.17.ebuild
+++ b/dev-util/wstool/wstool-0.1.17.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index 694a26e5ca68..44cd350a809f 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -27,6 +27,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index 82c2227693f6..93ba7214e5df 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -6,5 +6,5 @@ DIST xdelta3-3.0.11.tar.gz 683605 BLAKE2B bc33c9d6a3bb21bc52d72bba54f5e2b1058ea8
 DIST xdelta3-3.1.0.tar.gz 727607 BLAKE2B 1dd7846dad0414071a8af172fc3b73a0321fc9c841786563fe92ebe5c53d80d3eb07cc553cb5a9813432d9df5aae51d5b4a4c32a8c06a34dace5868297b5a68b SHA512 848c90a28018ec3c541ec43be59ea90328142c4705d3b59907fd89e8f6ac2758e288b1a1112fea601884c50ef7f6cf2c1634f539a76bea65a2741d3bb0e9b990
 EBUILD xdelta-1.1.4-r2.ebuild 715 BLAKE2B 43a5cd6a8946072fc8345e44680263eb497b5477a5e733ea0784b3cc212cf5a5d06df445438ac2b454ba4c281cbac5cfbfd0c478ad756620b62c4c93c59478d0 SHA512 3cf9a526dbce42aa870704e9fa4d8435dd0f756bc920ac11b9f5e5779000b0d2dceb8907986bf94a41b2bd2855ef7b3b8a00a03f57e02786f593749bc4608215
 EBUILD xdelta-3.0.11.ebuild 837 BLAKE2B f6d575a2bbc1091c0565225bfee15f2ace5c1b308e6970acd8d6755df3b92633ea9b4685a0d51b20ec5ea2cff25f9dc76011e8966ac4ef57435ebc86a5ae229c SHA512 864c62d7307064f7ff8b7c827ec98759a375684e596efdc729b332dafbe22943584c09c2d4cc5391f7e4f4adff358f1d98d1252980222c048602bea83182c819
-EBUILD xdelta-3.1.0.ebuild 1122 BLAKE2B f78880912c1b4436d8ac9d70787a8b3643acb86fd2151c4a2da8f4f4c7d6a929c8490d04fed71ae57a9ccc5f64b5f123e526273ac055a9c3e61b1cd16bc4cf64 SHA512 441fb38fc8a40dbc261fe9efb21a9d026c52f59f2c7f70fc9fcf86f290c9471a0cc380ec919ee18777e13cfacf1a829ec58575f4e5300ccd97c2865a5cae360a
+EBUILD xdelta-3.1.0.ebuild 1146 BLAKE2B 214a9cd0019516af48e204567cba7d68cd370896622ffbf2e86c518ef3ac66d2900174a6fa34034e9788dafaf8d20816120e594f157470839ef6394c5433c9c3 SHA512 1e767dc1456bb84b68866d511423d916fbf1593a68d3a34ec3c863769f37442390f4a96388848e653997ae8cd81b1e12d81926580dc7fd9ee64728ed3ed7b6ce
 MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
index a3ef6307073e..13da9efc6daa 100644
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ b/dev-util/xdelta/xdelta-3.1.0.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
@@ -17,6 +17,7 @@ LICENSE="GPL-2"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-arch/xz-utils"
 DEPEND="${RDEPEND}
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-util
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)