gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-util
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
455 files changed, 3934 insertions, 4373 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e8cf11fe1310..8804e841a107 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Orange/Manifest b/dev-util/Orange/Manifest
deleted file mode 100644
index 632a5880915c..000000000000
--- a/dev-util/Orange/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Orange-3.14.0.tar.gz 22537651 BLAKE2B 253a9bf69856f9167fdc9cf001310982441450a93f3caaa74ed91ae2afbefb421734fda1561aff9e4aa1e3dd786c82c324ced07fcbd97a507197cad28778e27e SHA512 eed1e50826ea0ca7c96ad302eb8fe65f997810786f8c9ad3b3c90e085dd77f61ca75535294b3f0244a237d6ff7fe7d0b4cd9bdbd5bb5f489e45d7b1549ead55f
-DIST Orange-3.4.5.tar.gz 32999331 BLAKE2B a334da0d55096a8b3a6092cab4b79891c085e6faed8ddc738aa720ff97bf4bc70e215814a0770f284f5d34fe6ce58081b916477262ec62cb28dd246a923b589e SHA512 327c99f17b5c6a83c48c1826cf34624aaf620d84a2f566f22e394cfd0f1b9c7863cecde0ea7344f16b706efb6a4581adad90b59872db9f0be355495971aedd58
-EBUILD Orange-3.14.0.ebuild 1909 BLAKE2B 511f189459408e80688939d811b08879040660ae5a17cb6f565475415d4167771c25e3b9cb28c4cec080f13bf98943a218eaf873137b5fb64a64dd1074ce1d89 SHA512 2177e804ba3d27c7ca77803116e71aa21843c8564a44775790228ede0b90357c1c55e61213411973d2b8f37112d4b113894a601b6b96c05edf79a3a16b639190
-EBUILD Orange-3.4.5-r3.ebuild 1462 BLAKE2B 9cb0dbd4ec25c74e9110a2820b889f121642dd2bd4c6cd37906816e51820746c07f2db17539944793872671fb237345598257b1211ffe71d83098405dddeb9b7 SHA512 031fdf235f01332d1766f87ef620577a9c869b1c3a2496103e4542270519ba0c9aac344c9b1393626c50595425969851ab7395ae68357476dcbf16c53abd4312
-MISC metadata.xml 214 BLAKE2B ee4a28a5b07deecdb0f59f382551a5f75712aac4c44a3f1b6086bdc520a5dc1cfaf67982ddeada2044128fcd551b40aba54d463d91142a3c35236cb09e119416 SHA512 e38be8dc636f8d2db14dbf8a5d673224ed83adc030db673cc59ef4c2db90884de5f4e61c3247524d12015486769ee984d1c188acb7488826e659fb36de1b46e6
diff --git a/dev-util/Orange/Orange-3.14.0.ebuild b/dev-util/Orange/Orange-3.14.0.ebuild
deleted file mode 100644
index e6e2de090e36..000000000000
--- a/dev-util/Orange/Orange-3.14.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Open source data visualization and analysis for novice and experts."
-HOMEPAGE="https://orange.biolab.si/"
-SRC_URI="https://github.com/biolab/orange3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc postgres"
-
-RDEPEND="
-	>=dev-python/anyqt-0.0.8[${PYTHON_USEDEP}]
-	>=dev-python/bottleneck-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/commonmark-0.8[${PYTHON_USEDEP}]
-	>=dev-python/commonmark-0.5.5[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/joblib-0.9.4[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/keyrings_alt[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	>=dev-python/pyqtgraph-0.10.0[${PYTHON_USEDEP}]
-	|| (
-		(
-			>=dev-python/PyQt5-5.12[svg,testlib,${PYTHON_USEDEP}]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		)
-		<dev-python/PyQt5-5.12[svg,testlib,webengine,${PYTHON_USEDEP}]
-	)
-	dev-python/radon[${PYTHON_USEDEP}]
-	dev-python/serverfiles[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-0.9.2[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.16.1[${PYTHON_USEDEP}]
-	>=sci-libs/scikits_learn-0.18.1[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-36.3[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/numpydoc[${PYTHON_USEDEP}]
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.3.0[${PYTHON_USEDEP}] )
-	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/orange3-${PV}"
-
-QA_PREBUILT="/usr/lib*/python*/site-packages/Orange/tests/binary-blob.tab"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-util/Orange/Orange-3.4.5-r3.ebuild b/dev-util/Orange/Orange-3.4.5-r3.ebuild
deleted file mode 100644
index 5c6193eb71ee..000000000000
--- a/dev-util/Orange/Orange-3.4.5-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Open source data visualization and analysis for novice and experts."
-HOMEPAGE="https://orange.biolab.si/"
-SRC_URI="https://github.com/biolab/orange3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/anyqt[${PYTHON_USEDEP}]
-	>=dev-python/bottleneck-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/commonmark-0.8[${PYTHON_USEDEP}]
-	>=dev-python/commonmark-0.5.5[${PYTHON_USEDEP}]
-	dev-python/dill[${PYTHON_USEDEP}]
-	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/joblib-0.9.4[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/keyrings_alt[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pyqtgraph-0.10.0[${PYTHON_USEDEP}]
-	dev-python/PyQt5[webkit,svg,${PYTHON_USEDEP}]
-	dev-python/radon[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	>=dev-python/xlrd-0.9.2[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.11.0[${PYTHON_USEDEP}]
-	>=sci-libs/scikits_learn-0.18.1[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.9.0[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/orange3-${PV}"
-
-QA_PREBUILT="/usr/lib*/python*/site-packages/Orange/tests/binary-blob.tab"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-util/android-ndk/Manifest b/dev-util/android-ndk/Manifest
index 53378e7c31bd..1db929059bbc 100644
--- a/dev-util/android-ndk/Manifest
+++ b/dev-util/android-ndk/Manifest
@@ -36,7 +36,7 @@ EBUILD android-ndk-11c.ebuild 1609 BLAKE2B 89017fd82e4da27e65887839054b55a82a71f
 EBUILD android-ndk-13b.ebuild 1656 BLAKE2B 702b84d098e8282aee3b354dd8846eb690c5545b01cb79a052c8d3ec04811ea8a5cc68f8216838ddcd9ead44d949d47a20314122e82b114839adf882614ac633 SHA512 d11a182dedc7437b4c9a05f76226b725f8f4555e32f8d474b247284a869614373c94a38793eac635ca6dd83fa0cefd596570b7b6bcbea667b7fd975fe4d09206
 EBUILD android-ndk-14b.ebuild 1625 BLAKE2B b5dbbffe75041e39cc4cf06924b30e6027ee15890d264e9318b969de59c11db34ec405b633c80a093251935bfaf5ec772ea5a96e445d0a5d57d604d033d74abb SHA512 2a9086e9760eee0b99f90a1fb7a52de645c1c7a365046f21a2028256b1e14537d7ed67d334be5cc40418c67586300c6742d23a23d7c1b7bd93e156033ee07263
 EBUILD android-ndk-16b.ebuild 1625 BLAKE2B b5dbbffe75041e39cc4cf06924b30e6027ee15890d264e9318b969de59c11db34ec405b633c80a093251935bfaf5ec772ea5a96e445d0a5d57d604d033d74abb SHA512 2a9086e9760eee0b99f90a1fb7a52de645c1c7a365046f21a2028256b1e14537d7ed67d334be5cc40418c67586300c6742d23a23d7c1b7bd93e156033ee07263
-EBUILD android-ndk-18.ebuild 1585 BLAKE2B 39cb0799407a4c6eeb543953e91c72d85cd6690595ab60fe7c67185bff9787ddf905a69306ba2cc3eba63a48897c707eabd7642947bc013f7c5d9c997ff76909 SHA512 8e3e1e3f9da5f18d9583035d63953da7ab5b5b8fcb99ce96d2d0a21d4f6b3e1f016894d09bef69ae37cfb50b8bf7683311ea3e475e0c8c616b6297c6ea7c1c8f
+EBUILD android-ndk-18.ebuild 1599 BLAKE2B 6f6a12c4998777d30c7e805f4babaf9ce5ad8b4798367a7891fc316f96c26a0f94907907614e3225cbdfe8bf693feb9c183912aa3384ea9c860f29f2de3f6453 SHA512 97e74b4dc7a0a473d0514d33fff4e9d25eddd91318c2cd3aedb2fff5fd341ab7e7af0ada41e7cffcf46b3ce50a2e4e64aa35b2815a910c9ff6f99e947bd48274
 EBUILD android-ndk-9.ebuild 1801 BLAKE2B 3cc7b9c78df9a96ab3c6e06f313596de2a18b94612c559233610ce1e94ae97889bd51353244d4e45b2b80f5d66b62d2367eb7b811df31eabdd62d51c6aca0be2 SHA512 9894db5c7cee9f67d29bf3a7742baf9afaf3f0bca524bfaeb9a1d049a8449b79bc65ac93b20cf0f6edcbf48ea0ff492978f8014801d662673e1e95d691954ab0
 EBUILD android-ndk-9b.ebuild 1801 BLAKE2B 3cc7b9c78df9a96ab3c6e06f313596de2a18b94612c559233610ce1e94ae97889bd51353244d4e45b2b80f5d66b62d2367eb7b811df31eabdd62d51c6aca0be2 SHA512 9894db5c7cee9f67d29bf3a7742baf9afaf3f0bca524bfaeb9a1d049a8449b79bc65ac93b20cf0f6edcbf48ea0ff492978f8014801d662673e1e95d691954ab0
 EBUILD android-ndk-9c.ebuild 1569 BLAKE2B 260433e5147dd5f8d814a5bf63dc074644e276ad25481785fcfba87545c27230a21aed6f7ef09f004e22de7d47218e05d7c97e99cefdd1ce7e138cf696da492d SHA512 f353af0ad3e4ab5f467880960e5addcf60875c4091f9ca67ae9619bd13e640ae68fa8426033683945128b89b5917f3ef419ec519d3f1f2c934d2607bad77e248
diff --git a/dev-util/android-ndk/android-ndk-18.ebuild b/dev-util/android-ndk/android-ndk-18.ebuild
index 2ee6247899c4..e4e41e77c309 100644
--- a/dev-util/android-ndk/android-ndk-18.ebuild
+++ b/dev-util/android-ndk/android-ndk-18.ebuild
@@ -19,7 +19,7 @@ RESTRICT="mirror strip installsources test"
 DEPEND="app-arch/p7zip"
 RDEPEND=">=dev-util/android-sdk-update-manager-10
 	>=sys-devel/make-3.81
-	sys-libs/ncurses-compat:5[tinfo]"
+	sys-libs/ncurses-compat:5[abi_x86_32(-),tinfo]"
 
 S="${WORKDIR}/${PN}-r${PV}"
 
diff --git a/dev-util/android-sdk-update-manager/Manifest b/dev-util/android-sdk-update-manager/Manifest
index 8d0000ad7387..85083044c827 100644
--- a/dev-util/android-sdk-update-manager/Manifest
+++ b/dev-util/android-sdk-update-manager/Manifest
@@ -26,5 +26,5 @@ EBUILD android-sdk-update-manager-22.6.ebuild 3321 BLAKE2B 066ed641d3dc8a4c2fece
 EBUILD android-sdk-update-manager-22.ebuild 3132 BLAKE2B 33f2bdadbb39382f6ffdf251717569b40e3993518dff6936cb95a1b592a0f83b27b6a490a34826e9939727481ab0d8d6e1abaa5b27812c8d7e828ab0a2df025e SHA512 0af64a571ffd05756a88f40b0fd1c8424877b658ff7d6b8e47d5cef0c1b7a2f514ad944f8c1214383561af0824e80786d2920ecd5b07eeba718a7a117929f8d8
 EBUILD android-sdk-update-manager-23-r1.ebuild 3312 BLAKE2B 0ee7c0692219c073561cc02bf16f3317352c79b275dc07886a436b172a7d003fdb715af3412c795be391f86098b89ba957d30d01e451cb89d198e714b91b210a SHA512 e48a29a6a1cef96e6c11b2dcf8ee3ee2fa76e2445241610b6932f17a0401969f41399a74df2d4a5a791ace70b17bf1d2a70d79a3d74f593b8a792520058d4a3c
 EBUILD android-sdk-update-manager-23.ebuild 3306 BLAKE2B 186a814856c843f7c85d3fe1d60c271ea16602a03eb0e2ca985a2aa4fefdb2b5bc090ee5d80d4c88e3264fdb6b0023f94eb7756c37a0ebfdfbdb2193be3a51d2 SHA512 a869b3366da7ecd4191a0ed47f5f86f85ca1f35ec2b3d6e6645298aff96e068e1074326dcddd3921d8415fe84b83c7d1b2238fb47f75c4ba55cda37b18d833f0
-EBUILD android-sdk-update-manager-24.4.1.ebuild 3312 BLAKE2B 0ee7c0692219c073561cc02bf16f3317352c79b275dc07886a436b172a7d003fdb715af3412c795be391f86098b89ba957d30d01e451cb89d198e714b91b210a SHA512 e48a29a6a1cef96e6c11b2dcf8ee3ee2fa76e2445241610b6932f17a0401969f41399a74df2d4a5a791ace70b17bf1d2a70d79a3d74f593b8a792520058d4a3c
+EBUILD android-sdk-update-manager-24.4.1.ebuild 3351 BLAKE2B 052c6f2ea0e71050d5531956be313d88f78264dbcbaa38b1cde4d0e0d1138239e4e15ba1286ae88289364e4a785bdb1902042657926e2e7609fa0dbe03dc94a3 SHA512 3786634735c12a5f12dd20c65438b8ced1c7f3800a5c479c7fd8954a804fe1aac32408ad87ec6f48f779527590e7d27b1540cf8697d839b0059af53691b61851
 MISC metadata.xml 214 BLAKE2B 48fe26dc32218c5f83cecefd288be1d07314b03aa871c0c322ff125643f0a42598d39b0bf2fb46daf63f3f39df78b869dd4398ab4671dd0f57d62060ce148a2c SHA512 2d699278683037614d2dc6595d6ae71ca4eb3a5b22506ccb0926d932f00bde85c1759caf8c0b1729cd949e652fca33c8ced0e7ac6e65af144f0f66eb064ceed3
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
index 8593117128e6..c86665dd911a 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-24.4.1.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"
@@ -22,6 +22,7 @@ DEPEND="app-arch/tar
 RDEPEND=">=virtual/jdk-1.5
 	>=dev-java/ant-core-1.6.5
 	dev-java/swt:3.7[cairo]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 "
 
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 143f999fd9d5..080a3bc00be2 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -2,7 +2,9 @@ AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951
 DIST android-studio-ide-183.5522156-linux.tar.gz 1087847976 BLAKE2B 6bff44f3d4dd5de1ce65ebc444c5b30d717b92ee34ccdfc268706f1ea07cc6c431ca6a42d361f89fdbe852f347b63afbfb9667acfd80980b869d244e5b957249 SHA512 2d9f10fc53c0d8036e413897c5003b07be106c5108a494d347b8c035b0e8155e13fcd487627b2b4910e918f41b1972b96cd078d09e3469eef2e18ce04a416b05
 DIST android-studio-ide-191.5791312-linux.tar.gz 765055716 BLAKE2B f0259adce0d3589a1c54ad16c1f745a10f4291ceb3554c9e6bb7433e6d57cb1fe6e1647df880b381172949a95cc908010977b87e3c34a868ccd00edfb3b7ba7c SHA512 39bc345e57fba7b49074f412db71bf1ecccc62cb2b23189149b8b1a72cbc159c285969708c8859def2d4a589cf8241b9a9cef2d93d72cf410554e469e66c20a6
 DIST android-studio-ide-191.5900203-linux.tar.gz 774544330 BLAKE2B f1bf4e808a731336c35d2a264fb7608e2129aab31eb9afe0f6e898603dbc5aac13e3c30335ed7c4567b5d3860299ed5ed4d25ba919eebf3f847955fdd49fced4 SHA512 5b736002e3a5dc0c6ff8897f05d20132444304bbd96ec4f14acf93dee8389e67f2bd037ae6d3df9770254a744f364d04f6324dcc17d49bf07006049c80572afa
+DIST android-studio-ide-191.6010548-linux.tar.gz 774544822 BLAKE2B eeeed14c8749015f7a0c9235552c04195f81a30a727adfc48d56d2b39ead6d8b017600be801e19fd8eae25ffd2ccbd081b59d464d7ae6bbf14c0a42dd508087d SHA512 95e7befa684b02c5261244a0568f2180a3fd5cee2abe47309f4d183aae1c97b47c08af3cd228462f7db10f3bdb40c591472e74ffb9d89f08301fc25a04f41507
 EBUILD android-studio-3.4.1.0.183.5522156.ebuild 3826 BLAKE2B 9021769173d13b280d186ae0508f100b219f5203b6e384bb9499ae6c64303945626ac84c6666ffec73c98173b47bdf89fab376684d6001176a92776bfeac3499 SHA512 39484240e0708a5ea4a1c5f9e0309a0dd42916ad4c7f41a53095131342d17bb7d4de97595aadbea37fcd80ef26b1578bb61de254d2a90e2f031003c6915489d3
 EBUILD android-studio-3.5.0.21.191.5791312.ebuild 3656 BLAKE2B d4ebdfb3462e9d86fc72041cecb82e9e78e181886e0c15b8b75fcfe28c3f0d47002a181812e00db3ce8a2af16fe4d989a043c58c9ed0f2399446927f72424ccc SHA512 f5be1e707d7c51734457c61dfa111f92310e24dd810032d890c7ae1735b67d41ae0b95f546b28d957931b0c0adc2b72e1808e0912ab7f393fa3119d9ae93afc6
 EBUILD android-studio-3.5.1.0.191.5900203.ebuild 3658 BLAKE2B 6aae0b97fefc7fb4ab69e2f2630c6dbf27f054f7a986c001b934e657768f51be4b29664a108b4ff2101ff001eeec7ea65be9df7bfafa8a8d36ca4c93f5ec7b02 SHA512 5a427c9d5cebf3ea2e3b2a767265d8ccb3e22717648243ab3805c884ca79709c6644b9633bbe056169f1c1802be5fa67713af188d6984962de82d7db59fc2477
+EBUILD android-studio-3.5.3.0.191.6010548.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
 MISC metadata.xml 313 BLAKE2B 623366c889e8b0d9c33a56fd3ca96156208db355e1549bbf8040a6839a953a82459b3c87e5a0f16f1d67ede403ee5a9e1747c445e855434f25d0f03fe5a6c43a SHA512 1c3e18bd57e48e7f65791f8904bcdde910f1d97d83e781c7c3815df6127aaac9063614e0a11cf7762059f762c4696e2b89ca446ffb9e631a2c85ff2b350e972a
diff --git a/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild b/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild
new file mode 100644
index 000000000000..e9812c3699a7
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop eutils java-pkg-2
+
+RESTRICT="strip"
+QA_PREBUILT="
+	opt/${PN}/bin/fsnotifier*
+	opt/${PN}/bin/libdbm64.so
+	opt/${PN}/bin/lldb/*
+	opt/${PN}/custom-jdk/*
+	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
+	opt/${PN}/plugins/android/lib/libwebp_jni*.so
+	opt/${PN}/plugins/android/resources/installer/*
+	opt/${PN}/plugins/android/resources/perfetto/*
+	opt/${PN}/plugins/android/resources/simpleperf/*
+	opt/${PN}/plugins/android/resources/transport/*
+"
+
+VER_CMP=( $(ver_rs 1- ' ') )
+if [[ ${#VER_CMP[@]} -eq 6 ]]; then
+	STUDIO_V=$(ver_cut 1-4)
+	BUILD_V=$(ver_cut 5-6)
+else
+	STUDIO_V=$(ver_cut 1-3)
+	BUILD_V=$(ver_cut 4-5)
+fi
+
+DESCRIPTION="Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="custom-jdk selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-java/commons-logging:0
+	dev-java/log4j:0"
+
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4
+	dev-java/commons-logging:0
+	dev-java/log4j:0
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/libffi-3.0.13-r1
+	>=media-libs/fontconfig-2.10.92
+	>=media-libs/freetype-2.5.5
+	>=media-libs/libpng-1.2.51
+	>=media-libs/mesa-10.2.8[X(+)]
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	sys-libs/ncurses-compat:5[tinfo]
+	>=sys-libs/zlib-1.2.8-r1
+	>=x11-libs/libX11-1.6.2
+	>=x11-libs/libXau-1.0.7-r1
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXdmcp-1.1.1-r1
+	>=x11-libs/libXext-1.3.2
+	>=x11-libs/libXfixes-5.0.1
+	>=x11-libs/libXrender-0.9.8
+	>=x11-libs/libXxf86vm-1.1.3
+	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libxcb-1.9.1
+	>=x11-libs/libxshmfence-1.1"
+BDEPEND="dev-util/patchelf"
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+	eapply_user
+
+	# This is really a bundled jdk not a jre
+	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
+	if use custom-jdk; then
+		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
+	else
+		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
+	fi
+	# Replace bundled jars with system
+	# has problems with newer jdom:0 not updated to jdom:2
+	cd "${S}/lib" || die
+	local JARS="commons-logging log4j"
+	local j
+	for j in ${JARS}; do
+		rm -v ${j/:*/}*.jar || die
+		java-pkg_jar-from ${j}
+	done
+
+	cd "${S}" || die
+
+	# bug 629404
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
+}
+
+src_compile() {
+	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+
+	# This is really a bundled jdk not a jre
+	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
+	if use custom-jdk; then
+		dosym "custom-jdk" "${dir}/jre"
+	else
+		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
+	fi
+
+	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
+	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
+	if use custom-jdk; then
+		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
+		fperms 755 ${dir}/jre/jre/lib/jexec
+	fi
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 008cc880a31b..f0f671d25f08 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -28,7 +28,7 @@ DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B
 DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a
 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
+EBUILD android-tools-8.1.0_p1.ebuild 3992 BLAKE2B 12ca5b75093c805b2fbf0b52349c56188078accaefa8edfabab3d50ec3f1455e3123a0f84e9bb7ad7157f26933f121f78fefede42954d900278bc58b68a86e46 SHA512 90eefb0a8dcfedfc0176259a6c8581cd8c7b0c4ec93e30c9903a610e6e5e938ff0a992fca92cad5d119430f0ce3c704d1c73a30f34933bd129e467db747a0cd1
+EBUILD android-tools-9.0.0_p3-r1.ebuild 4830 BLAKE2B fc25fedd61c175adeb6f6d83d4b76b9c161403f56494158eebc640d9be557b5025d33b0151faa208d29d10982da5aed51ce1718458bbaee36d662569bd8cd8d1 SHA512 37fc95de2c1fd53f6a17b82a1c8da862dd3f261a8676376f0cd0eba7f70d7a4335d363e351b17b5b9e7ea91e01126b88869aef8683cfd2bcb40ff082e6ab7441
+EBUILD android-tools-9.0.0_p3.ebuild 4543 BLAKE2B 47edca269885b2f69a3da60a123433e8fe35354ed6e31ae13661ba9df065cdf02813bca75609693eda82e69b929f48ce7508b943d8866d25a8e26a06b48008ae SHA512 22808f48fad08c5c286540e5272f57d287a8471c14b0eb1c7a0659e5b29ab621e67fb4e940063eef07859fcdecb1fea4d167fb67608e0a784b7a502aef888633
 MISC metadata.xml 714 BLAKE2B 2ec2b24289241323b1844412e6e0d1edf642dc3391171b474848ea376c51d420c98a4a0c094afad2dc1c7cf55b0efb744ca6a92beeed770d015a6380b07b85b0 SHA512 720b38485a7c248e6a9d43a7056e33a384fe7e295fc843c69e59d48350bb10d7d4446e6cc52b7c87e2b0322733553e16c9dda4e37104753d5aaceec5adf859bd
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
index db699e1b6823..f3ef5da339e2 100644
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
 
 MY_PV="${PV/_p/_r}"
 MY_P=${PN}-${MY_PV}
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
index 973b6de27c5e..f1d554c1c7df 100644
--- 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
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
 
 MY_PV="${PV/_p/_r}"
 MY_P=${PN}-${MY_PV}
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
index ad1df383e858..d7c9ae9def7b 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
+inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
 
 MY_PV="${PV/_p/_r}"
 MY_P=${PN}-${MY_PV}
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index aefdc8816f03..f45104466a0d 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -5,5 +5,5 @@ AUX apitrace-8.0-glxtrace-only.patch 1591 BLAKE2B 45dae3a9bfdea147fd865124db7865
 AUX apitrace-8.0-system-snappy1.patch 846 BLAKE2B 5c5ba05af785556dcd0a7508698693cf73a283a2a476df89b0e0072841de0ed301aaf5d991353f294511aae29c38bc039c1b6b9b23d3d8f61377bbda05843fc6 SHA512 334f607959f6b4d6b0798e6ba6a1e252d6f8fda4560d0ca44be38da803ce545ea15ce951c40604464d283cebb99b16b606dd0403aaa7c9538380f871b3ec87e7
 AUX apitrace-8.0-system-snappy2.patch 1319 BLAKE2B 4c02a87fde35c004177f1fe9df074e3fa01fbcc7dcf6ab9b497cb69259243f9bfb8b76fd2c78194d624ebaf2fbfbb871155a031d6a58e6dc1b9c426c116a590d SHA512 67e7b3bd69023db8341c74fe30d0f846f6b751cc972681062d491414d31dc65c3869e0387b436436394aaf11e0d001652970daa895b6740f94de9bc4544ef0e7
 DIST apitrace-8.0.tar.gz 3601109 BLAKE2B f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc SHA512 1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
-EBUILD apitrace-8.0.ebuild 2553 BLAKE2B cf9ef80a045211a03d13e62eda959d2c6406d61958d0dc1c2e1738f99ee71604c015c661ce9c7d1a679f7546908a5db7b6a3166e013966142f6e030284cb2ce1 SHA512 3bd0f34a52c50e62845605511fef3f0304740abe143a0548614c1cd5944b02ec59e8406316296d23b2d8a2e7ff5737b9a4b2c0772084afce4024306d2218b4b2
+EBUILD apitrace-8.0.ebuild 2560 BLAKE2B 12e58a8f3f6deaa1bad68cded26747eee0103369190acbcdbfe1e8f5226755a853936936855a7b6f25f3bc88b8bdb0b052cde4c03feabe7a6151daa3ba3dbb4c SHA512 a8a38b0ad728a7007932f4f3f79bd35cfa2311387376cb3a3231ac71a4879a41cd29cc200c0a3019066e9a1e20ddca16a76e636d56b88e2587fb3026651bdef0
 MISC metadata.xml 438 BLAKE2B f88a54537c6bd0c1f9965ec8d520928cea727ba4f8424b49993c4e310078676d9394ddaa64c3c0fb9e0f1bf9eca36142260148945f455e0700dbc362dce73fd6 SHA512 45a818f2bbbfd046e403940734323c027929de373f8366a7de29e4342fe3f98ea27ba2c151f80dbbd33d1110acf2f363669c3c4176d2c15d8b5a783182128cd5
diff --git a/dev-util/apitrace/apitrace-8.0.ebuild b/dev-util/apitrace/apitrace-8.0.ebuild
index d37d8c20af6b..27ebcc72ba8a 100644
--- a/dev-util/apitrace/apitrace-8.0.ebuild
+++ b/dev-util/apitrace/apitrace-8.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 PYTHON_COMPAT=( python2_7 )
 inherit cmake-multilib python-single-r1
 
@@ -49,7 +50,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# The apitrace code grubs around in the internal zlib structures.
 	# We have to extract this header and clean it up to keep that working.
@@ -79,7 +80,7 @@ src_configure() {
 				-DENABLE_GUI=OFF
 			)
 		fi
-		cmake-utils_src_configure
+		cmake_src_configure
 	}
 
 	multilib_parallel_foreach_abi my_configure
diff --git a/dev-util/appdata-tools/Manifest b/dev-util/appdata-tools/Manifest
index b9e712b16742..5d981ca1718d 100644
--- a/dev-util/appdata-tools/Manifest
+++ b/dev-util/appdata-tools/Manifest
@@ -1,2 +1,2 @@
 EBUILD appdata-tools-0.1.8-r1.ebuild 450 BLAKE2B 1c4843d123d008961b7da15a5204a5d673e925a434b6481c47ba745a8bfa7a136825f8daf6f21ae1960f9d49f02f949d9957cb3f92b0c143f54092aba510a4f2 SHA512 d7b024aa8e38aff70d9c9ca8f65daf62e69e81a25d8c9d958793db2657e5d57996c41bbbaf1158f1936df7b896f6032bad0f41e324b38a1c8490130c6ea407de
-MISC metadata.xml 451 BLAKE2B df7d5ccf4c6318efb44f840abaa9c42346b302739acee4f21e0ac85653ee44e3fde2050be164474c27c0cdd97b280f891a3ccff8ef738174dbbfe09a54d8d365 SHA512 35a3d284a2adfaa5eeafd5be63757734ef8602e1350a8c616c4e35fbef9a52dfa5fa5c9d08b9570ffe0e537e16054dceed6ba1d5f43277af40d4134a2606e2d9
+MISC metadata.xml 339 BLAKE2B 1500288e60f66ebc2b0dce28e1328e5e829f0dbbcacefa9b609c953b7b04045f6ff3ea244a12dab17c2b0465eb2da257d5a680606b168927f8dc9e00558affd6 SHA512 709b9c7484cd653a88a3e88812a0cf3608f9aeae14eb9c43add2cfe4a53cec02ff4874eaf79b76f718fd6e4cb757474f9d6f0026a67472bd5b8a2c6f13271e4c
diff --git a/dev-util/appdata-tools/metadata.xml b/dev-util/appdata-tools/metadata.xml
index 678390232d25..5a80626c450b 100644
--- a/dev-util/appdata-tools/metadata.xml
+++ b/dev-util/appdata-tools/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>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 212b266c7a8f..1a4fb849535f 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -10,10 +10,10 @@ DIST bcc-0.9.0.tar.gz 2036984 BLAKE2B cebbeb57f06af90442d28be1633a54c198bf796786
 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
+EBUILD bcc-0.10.0.ebuild 1871 BLAKE2B 38d9e1c40bc869de93b07357aa6febb229c69b85fe7b82c466d174980628bfe4e906769351c8c7d8e54c46cf3e16820579160a184e6c92af309b6f2d30a38240 SHA512 720ea74d30e8dd6a52bc99dca8cca84efba470b52aa00817c0bb96e2c5f4a7e7e258f4c4f96fa9bd654c7617eef963b351d1d61d6551339dcd0035d68ff1eddb
+EBUILD bcc-0.11.0.ebuild 1872 BLAKE2B 20fad90ab3b0e83e1ecf67677a9e975555d7b818aff4a743c9d3736799652c687382616c82b28b09f166587225f88418b750af2bf9909a0918b9d44ae825f133 SHA512 076410f72d5bf6fb89b19ab44abbc0fad10fb29168654623e62bf6c251570de8013f337f7bf6beac76c20a066713ba257c55c8be220d1fc865dd1ea839e7be21
+EBUILD bcc-0.12.0-r1.ebuild 1896 BLAKE2B 0221b49e85aa5f3a2075c9044e3e659b6696ac118d92f27d88d86cd9b6f5b6fd104be07e95421aa04b66c32a778c8432585f923a919c4f4419995479ea6ff75e SHA512 076fed242a48258fef117f37ec146de95bd3887d4339710208d470cca16fbd888e1c917d151e204e0e463e0035659447dab4e1bfc5a7ac33a065f254bb610ab9
+EBUILD bcc-0.6.0.ebuild 1112 BLAKE2B 0f0e9f7f2e08d1ab90c211d98ff94c2005f7f8cb0fa388baec122112f18eb469c9665dd5ba94a0ee891c5dc809a555dd811da7e08efde43a7a0ec4ac3c8674bb SHA512 d599bba3b4f83c503618b0c4e742726ef8c6c0bc126083c2b280b4e032d99a99929f69430a8fead778d3478e00638c596d77e5d09a057e5d92b23157f2c2487d
+EBUILD bcc-0.7.0.ebuild 1116 BLAKE2B 0642d96320fa9caf1b7fdf3261604bf016589e8c9a787dfc8ec6e580296371e2a9d3abe149646542dfc6bec9372b4b1a88a67830f686f722ab46c71969252998 SHA512 ca89d6434fda07221aaa1d7ed8a0ef5b2f42677237b902b64d17d0ddba3d0b3061418be21f592274fa09138b5d7613faf0753cc37c1bf5d46a8d0dfc6eb58114
+EBUILD bcc-0.9.0-r1.ebuild 1659 BLAKE2B bb372d878fb09d2a97cd25462d618989effd99d20299cbe17a87770633018ef62225fa1c64a6d6099c9e7d90866cf3c9766191e8043ac1393d718ab8abbcab85 SHA512 60815c8cf376dda81f4cd6532de08a5780af2b2bdd6d6bd5efe63c0206c2bf02e894fc14906421cf9647c3bd38fe92e37acb15a5f0345f72e3a155a11981fea3
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.10.0.ebuild b/dev-util/bcc/bcc-0.10.0.ebuild
index e58cc92b1c9b..7a4272292b00 100644
--- a/dev-util/bcc/bcc-0.10.0.ebuild
+++ b/dev-util/bcc/bcc-0.10.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
+inherit cmake-utils linux-info python-single-r1
 
 EGIT_COMMIT="v${PV}"
 LIBBPF_VER="0.0.3"
diff --git a/dev-util/bcc/bcc-0.11.0.ebuild b/dev-util/bcc/bcc-0.11.0.ebuild
index b213c5e2737b..4fbad99072a8 100644
--- a/dev-util/bcc/bcc-0.11.0.ebuild
+++ b/dev-util/bcc/bcc-0.11.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
+inherit cmake-utils linux-info python-single-r1
 
 EGIT_COMMIT="v${PV}"
 LIBBPF_VER="0.0.5"
diff --git a/dev-util/bcc/bcc-0.12.0-r1.ebuild b/dev-util/bcc/bcc-0.12.0-r1.ebuild
index cb592d045bd2..e200ac3187a1 100644
--- a/dev-util/bcc/bcc-0.12.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.12.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
+inherit cmake-utils linux-info python-single-r1
 
 EGIT_COMMIT="v${PV}"
 LIBBPF_VER="0.0.6"
diff --git a/dev-util/bcc/bcc-0.6.0.ebuild b/dev-util/bcc/bcc-0.6.0.ebuild
index 4e1d37a74c91..852d5503582d 100644
--- a/dev-util/bcc/bcc-0.6.0.ebuild
+++ b/dev-util/bcc/bcc-0.6.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
+inherit cmake-utils linux-info python-single-r1
 
 DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
 HOMEPAGE="https://iovisor.github.io/bcc/"
diff --git a/dev-util/bcc/bcc-0.7.0.ebuild b/dev-util/bcc/bcc-0.7.0.ebuild
index 9d6fc4908ebe..cfcacc44e696 100644
--- a/dev-util/bcc/bcc-0.7.0.ebuild
+++ b/dev-util/bcc/bcc-0.7.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
+inherit cmake-utils linux-info python-single-r1
 
 DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
 HOMEPAGE="https://iovisor.github.io/bcc/"
diff --git a/dev-util/bcc/bcc-0.9.0-r1.ebuild b/dev-util/bcc/bcc-0.9.0-r1.ebuild
index 1f720a826ce8..21fd0809c8fd 100644
--- a/dev-util/bcc/bcc-0.9.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.9.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
+inherit cmake-utils linux-info python-single-r1
 
 DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
 HOMEPAGE="https://iovisor.github.io/bcc/"
diff --git a/dev-util/bingrep/Manifest b/dev-util/bingrep/Manifest
index e86b3d280f0a..addcceedff7e 100644
--- a/dev-util/bingrep/Manifest
+++ b/dev-util/bingrep/Manifest
@@ -1,76 +1,149 @@
 DIST aho-corasick-0.6.8.crate 26786 BLAKE2B 877bac172514332ef3c607fa3c9b4708822543f69091b3151d31d9297306dbcb0b6ce9cf5ba02f3c08f5baff337e3525ada8f22477770fd6aa12cce428694a36 SHA512 1adbce716a3082c3fcd3514c49af3872d926df14044767266707862c0ad7ee22848a6ce99903003c04a3e8f8cd91b38ec8ca5d4a2c9031bfec4c93cf71c15556
+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 arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
+DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
 DIST backtrace-0.3.9.crate 31054 BLAKE2B 5d90d098d149198eabe4665b1eb2cf41c5f392ddc1c5cc499047dd72533d79b679943781445f7d86f269a15d3f8ca2775dfe89123935d32ccef4b8151547283e SHA512 edb485ad27d19e0cccea123cc6a9db5b3222831e48722d8fcec7349fd1c4b62b67ab1f488fea4973da82c8f17a86aeba4ea8f2fc1aa60f6528833cda39efa637
 DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
+DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
+DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
 DIST bingrep-0.6.2.tar.gz 614426 BLAKE2B bf3376e76eda2c40fdf24aec03c5001f02a310ce4b9eb1a8d312eba5f1f7694dad20938630548ca1106a55b251849f6c7db7eadfeeebbec95fb0101410806ade SHA512 3919012d376c9890e1f39610536993c089f9b04f59becc2c14323040eb04a4efb44184fb3375776826bc1073aa8449b90bfbd177e5141411f330602d59ecae13
+DIST bingrep-0.8.1.crate 617177 BLAKE2B a111dab886295f7648833180b484adb39ea8324e1ef2f118e8b201bb8544b82e2b649dc0fd1fc4bc7a1cd7cdcc8138cf35f61fdb943a81b6f855fdcd2cfdc873 SHA512 7660d6b9fb635d47546a9d7453ded0f15e9bab5e4d0cf9ba678bb18165c66f4332d1b47199d0843ab63e413a68f9a0ef4f1fe1a45cd80cb6e40d4b7acbbf29ea
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST blake2b_simd-0.5.9.crate 33575 BLAKE2B f5bd6efad39b7727bdf033bea9796eb0eb24ffdcccf9d9682c22942a5acfac6c566377f635e3030d2ec9cea05129632627c1906031a1c395744c787354e4948c SHA512 cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e
+DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
 DIST byteorder-1.2.6.crate 19985 BLAKE2B 717b3c7a497fc1624a32c38a2f1a5ab48ac76ab996e2b7170c9a295002a64da05538489d7e497d88ae13b66c2d4911daff8840232d4201cef3d26f4e30cdc820 SHA512 7106b5404a213b080a231c4bcc3010caa2f2743a0d0b64553e0c789ad849970ce1fb547b330711d03374cba5a7ff56b728f5259d0c6fe7ac00c8c13324503dce
+DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
+DIST cc-1.0.47.crate 49645 BLAKE2B 39771b601b37a9695a6d49e6d7bba2fa97ff5c1fab11a1a94115d5427a3bfb57cb1501e6b29fe64aa331942a99a9ded88fc8fe21693be697fc7200d919a4e448 SHA512 92bfe74600a43c9d59581641fe0d2aabecb6060b3cbcaac8c8e0fb4f0a21f1099d2887c7b00f205e6c5e972b7aba50e68c360dbcc1090aba942a30199e3cd86c
+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 clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
 DIST cpp_demangle-0.2.12.crate 67328 BLAKE2B 21147d1c7a2214e501b676e3a8c86cdabf5366539df2f8306e1c15cdf52cff1280946a7b073ed8c043d6157a6ff1cd790abeb3f28a23d935a7b25462af7b803f SHA512 0e2d3cb4cb90e156e02db6b09c26cc51eda999b6badda4095bb1be5cde2e144abfeb2ec85aa911650e6385eb9920b83c091c51aeb32770103a475c514c2e96b5
+DIST cpp_demangle-0.2.13.crate 70460 BLAKE2B 8c89ac6af17ab4ae2ccfb2eb1a37fcc4f1892bdc9d94c89212e2875ee9c1fd0c4aa85a08f9dedabebe3194f7fc132c6d12fdc2391af208e6a2c646cf3b2cc649 SHA512 044a05bd9a18b494f4d1330fb4dd46495af4234a6e88ca19f5012da09629c3255b238db69d9c7756324c24ff4c9bfec6cacf808c7a18c1ed1213c5fe37bae15b
+DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST csv-1.0.2.crate 888793 BLAKE2B 12dcb63b31e8bbff21120288b1f8db8c036e83a9f82b0a317def7916797712390cbc44c36ad55b42c13fa7980dd3c66e2d7ef883ef6dfecbe6ffe8aec6766320 SHA512 37ed9432d7362374648cd0cf3470cebf7baad57400f56635e68c28c576f7a8fcb8350a3e420079df329e4c290e816f181712f04dd09e5101600dd4615b4e0afd
+DIST csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77c0bd316f3f3c92f41b6c325f49e631c35498db8bd292fe118e1c44cf016fbf73f9f16a79e2528b0e8811 SHA512 de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6
 DIST csv-core-0.1.4.crate 25406 BLAKE2B 10c6493da7d9adf53fdfb44b7e8b229a40beb9dbb882053d778ef8b54d90001b7592fe6b9e9dc5e48e3f113e55ec01fb05d1399b133d9fd99078b8154ba7fbe0 SHA512 c2e5291489eb1d1c192c7d94cbe8be3c6bcf0a5d8ef2bb525ccdc20a9c512e3a42946241457de7ba219b59d330d87a2ce51995782621e6c1d4192e2a71e888f6
+DIST csv-core-0.1.6.crate 25593 BLAKE2B 9784db836f17e350f2500e90d0d9d73d20274cb8b0c11613db0d1094eebeced4230c11df1c4c6fd15af59b444fb081c7b1103481b765a936ec582a9ca980e394 SHA512 91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8
+DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
 DIST encode_unicode-0.3.5.crate 42677 BLAKE2B d8044f314f03f93965bc4de11c065f08112d33c4e1b42d9054476dd7ea925e22fb7b32fa855250be2053a00d877bbdb83a293c0aede3aa6e48d978b61f0f57df SHA512 e9849cffcffbf66e28b609e86b0d26b1267f6e2858c6564f93b071b1257aa505732dc3b7ae5bcb347874514fb8c21a606282bdcf69de842f8b96e79547f434a2
+DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST env_logger-0.6.1.crate 28567 BLAKE2B a7302e44a807dcb1b523e1dde683a040837b1de2fbda5e8e7347478f77d4b7a39521aadd1d6d42dffbb6229e0dd6bd1b2b9fc47b860db45281a95612dd78faab SHA512 7e5142fa24e46aeb246515f42f9fc561364f266a693ec9f8c45dbe96d31174bf5663ef6233f41a5f96849dd19b61e2a97ab7ca1a7a55c51f741f4efa5af371c5
+DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
+DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
 DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
+DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST goblin-0.0.19.crate 125517 BLAKE2B b66a5a7b85b544d73450f223a3ef74809989dd9bd278bdcd671ca59cc3226b23247654fb781bfa6ecabd53a72598ba2b1e49080e71d2ec583b313532fdb34295 SHA512 50758bd04e31fee5023fde437833ff59a55d717a79a447190b114bdd81794664b3d4be948b62cf5c6243a3d02b28c54f82d6e3da4ee021fb76e6626ebc29d8fd
+DIST goblin-0.1.1.crate 148807 BLAKE2B a23a4106f47ed13680aa7bc2de3cf1ae4d9e3d61e75c84db23fe669ad2926694aa7fa787fb24c9ea06669d088561573cb58838359a27dcd47f804346ab3e4b81 SHA512 88c61be2daef54abfc452a8726cb9ebd55e312ef799ad61ea670cf87d51dd61a4c6ea884a97b4450ea1cf924e5807ed65efeb470179c7eeb4514b11c656e8056
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST hexplay-0.2.1.crate 10043 BLAKE2B 37251bd8ae4c5775b4671266b21441d9a21fa30dcfe95d6d0cec606bb114b5fde9ca25c8d1e5f316f1960b2e5e888c60bcd519811d7543b40a1fd0830ce01af0 SHA512 0c5097c05eb99f4cac11cba11143ade1446035d771104a676860773914f5d1cdbf921d56eb7ac15f00ba63233df03d6c64ae7823891ffc77bf268f6042671e5c
 DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
+DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40
 DIST log-0.4.5.crate 22221 BLAKE2B bf60a62e0fcef107e66cb0f673bdc2d6eabd364424ad82488fb09655258855401f394c4c5fab584560798953e188591524d9c3044d8b42d16bb3f9cb255b747b SHA512 19b1d82ccd929a63d661512dadbb0ce11f6e3679431a40f4c0139d0c2f68d77dcb05be71605eaa23c01c920a38d11e588339ab6d3982418ce61c9df55a4f2b11
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST memchr-2.1.0.crate 21479 BLAKE2B ca97d105cc780f2a22eb1eb7d6bf6755f012b1d15b5c55cffb9a63f3faaf48b5285cc7b4edbdb933c4e81565da163b325a4d570aee5cb479496d8b74c3d52d8e SHA512 6de3056b5fcdf08fcfda34be710d2f4ea326f056450a78a4fd096e5742cc40662d3003f3ef6ced26687dcee7591f5a8323d14df2cc286d732b1b22f05424c476
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST memrange-0.1.3.crate 14013 BLAKE2B 61a6dd89d36cc88bd79d225f1ebd37a906ffe6710e7f93467307b8f42c638642903ad3469fda94166a2d4ddbab59378787c04098748aa40f811947b12581b35e SHA512 343c006c52c6679099b41d0debb42e1241a1b4790ac3b606d90809bc4515dcea5e7759db97e486de191955fda7801ef70c1db5daf5348c219948d21e139c9811
 DIST metagoblin-0.1.1.crate 3107 BLAKE2B 5251d61e7fe7014f414d7829012bf8580c4279de7e5ff940d30544e6db8fc9390218b93783ff65a365172e4c47c1dd2c797ff3df23809cf20e84b3154bceeb1e SHA512 a5c6a36afc4ea52894fed09295f9bbac9be02288091859e6a35bfac849c12adc5485d80ebc58ae4be225d80495503af716276f1e9d9377ce6822178f4dfc294e
+DIST metagoblin-0.3.0.crate 3100 BLAKE2B 7c83d407e74d31d38986863a5afde189a18ba8815167ffa3bffbe2d717dcc4dfd35a0c53ff0e5a1d7814acf8956aaa1b708424ac0fd4da50fa1e80fc19c10a94 SHA512 e9a4fe59fce84226ff4c21788311d9c7dfed36a40442a3064707c322bdb3ea6291f79a0ffc2bbd65807dc369de8e18b0058d5267d688beb6c27b19ddc3dfcd3b
 DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
 DIST prettytable-rs-0.8.0.crate 29000 BLAKE2B b214efcb12d0fcad44763b75e89bcf21923cb3a09764314cbbdb7f8d7fc585550c86ce77e1d97b1cad65f5e72554dd07e354c97aadb415b87464e6b4868bbbe6 SHA512 67a4e7eec303b44e084d80f66ed3c07450fae3316c824da1043a7e348c6895cb30807dee83296e2143405fce8360d77117c8755e8450bac0a4981b6ed102ed35
+DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
 DIST proc-macro2-0.4.20.crate 30516 BLAKE2B c292c4a88dd1c8d998cd683ed6e341fb98e334e481ab91dcb5ef69fd1b83e0d5cd294a3b1221787b641a8f1bb5f51090f87cbc20944af1c41c8ab902840dd5db SHA512 40c3bc5c147325523f02832db015925b7fdbbc7c430be39c8829bf8f7e9bae33fbb3313328daa1dc7d791545df5af76d27f1ec9f44943db91bee8c729a02df79
+DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quote-0.6.8.crate 15530 BLAKE2B c33d890eb5b1fb530d261d49956ddae082129a76d8b3fdadf96df68aa57b05b0e1867b371968def9ea7ae8cbe205c4f696e2b3d5f73bd50c4949c19fc98a8816 SHA512 d436fd7b1a4a16362b5d4a67e051b87ca91012522b0ec2835654dbb15db46953a944521c1c7b7c411b7964ab1ecdab178bf003ef5569c6ab0592d753ab81d6d3
+DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST rand-0.3.22.crate 11318 BLAKE2B 6a8d7bd3a7044a8c1bf8d9e2701a65770365304338ab6b48ccdffdead493213cd7e442dd5a6dae3b5f372d3004c382cd073c60a924f4b2ce50f9e1d5964a996b SHA512 1b3af2048992341ce5a3bb5d5c9bc2580949dc5e92f7aa14d17bc3eb3cde4ff4ffc9201ff2c4dcc02dbfefd5307f0731775ec46825032dc1b576a2d77cb4cee5
+DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
 DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
+DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
 DIST regex-1.0.5.crate 245770 BLAKE2B 2bb5dcf7778ff6e6316f80a028e9e0df34d77660dc1fb21250238de250335ea2546050b0c56c077c4e64788a0fd2b27f7ea6de639feb2b99590fe9e8a2d32e1b SHA512 a4ddc78fcae0a2b3c0e041382bc8c85a216ff380212762459637934c863782445cd289f5cd60c2a923ea9161f4dad9891210fe6a86cd6bbc8db8abd98ead34ce
+DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
 DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
+DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
+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-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
+DIST scroll-0.10.1.crate 25355 BLAKE2B db80a998fbdec38f75301bb3fb0aea358e52ce224b9e5accdc25ccf4d68b434170825e9006b266d0bfbff43fd051e9ad2740d8925ad359637401191ab9d500b4 SHA512 9bd5e592575689a1fef154f305192f7d7225b67cb81d4904d97b5de6e1dd693db57fda97070fcb63e963d0a139a10490a27fd4c64b29100c820d198ed611976e
 DIST scroll-0.9.2.crate 23522 BLAKE2B 48de922d9348708c63c8d83f1849aa903ca78b5988b6bb5ff56ccc1e28677922bd2eac2a7cdf1bafd5eda9b1d460d89c3f732d4b4dbd5696eff9a91df9efb7d0 SHA512 6fd5d72267b1b2840a524f2177f92d240b05b35bc345f2018569c692af8c1deda35fae25230d4652132b3003d740abb4d395aa26cabf958c9544cc5118e335fe
+DIST scroll_derive-0.10.1.crate 4602 BLAKE2B dc58380713d9b7386d91f1370e91786f152daa4d6f1599cc388864d8995f66c7a9cefd3ac94f712876361255431dd345196d346bc8d99791a9c079f61df76e5a SHA512 011381091ba3d123f184c77efbace2f6cfa61c0af8a9adc5c7bcbc9a1d2c2c8aeb4464a8050728afbf7998e3beebf1a2f2cf1edab107a3301288999e33d58ab6
 DIST scroll_derive-0.9.5.crate 4314 BLAKE2B eae8b18aa6e35cc1c003870974b64114817415a4d1e45da6068e11c5132003cc9eb2ce9b538d02709fcc7f137a6c6b1058e4d5f2cdf5b443127eddc55523a81b SHA512 8db648782f4235a0eba142d37e5b60a999874b74c57009e10f4f3bca2a4f26d8eaa0cae4202b1613a98d6e70830b6d2827fb5aa6cd08c510c78079e8eb6b8ccd
 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.102.crate 73356 BLAKE2B 1ac078a443f6afc7bfb31f485f1dfab71e61a8978981a88184b79a87b1b238afd1317dd1825f27fa59c762b98d68322ad9d9ea17629f639ed3c088b556ab180e SHA512 76ba1647a896aa907448e496392359c5de727be14b85352d84e6271ca51da77cbcfc99ff77656eb5897e1a99b1e17aee0cbc35ab4b13201a14b8b2a38ce6b6e8
 DIST serde-1.0.80.crate 73057 BLAKE2B 13a4a49db02b91eba4ff731a2cdbadca0998d46d4f8781d8a2b134e1db0298d3aad4239590e753b6c1f79838754fbd6715279ee0c33425bece03e683e578b079 SHA512 0606758eb1f29310fb2863e1b22c554d9ff290af9365787fd7d0bd76217c81ed9dbd95f3b55c782293db38127dd272368fb59e3b1b9a1e2bf053d69c9ca3abe9
 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.12.crate 21942 BLAKE2B dcb8a53114184bffb3782e7a896f7549a89c27a7446f5d6238a7838f51e51029bb44d60e9900906537685d41cafebba6165ed7a244a6c3b97bdb2173cf70e98a SHA512 36d24a7780332d9a6bf55f329f73b88800dcffc3e74a0c50978d223074e884f9934b8effc38bb67de747fd60fb415035cbfeb84820ecf184ba8aa00290670f7a
+DIST structopt-0.3.4.crate 41301 BLAKE2B 9a7883faff72d748dccaaa888d37b6e2a9b1a9b1fd7aacc9958f9a96dc8df54cdbd722af57117f3b58680e41d9d812ed4513dcd01c5894912823ac1e10e62476 SHA512 90ccf78031f0c6d1071e1e2925e4b0444760ccb45b611190fe22a653943d4337da88a6403b18a869c97cf956744d220427a01996321a62918a1fa66fbe64cc64
 DIST structopt-derive-0.2.12.crate 11213 BLAKE2B 0fd8db15e6d8fc2ebfe93f7e71a6f7a70ee7e3273800c965fa744bcae3a7ebfab226ee2e82259104e3400a5fc7f0f738971dd6dcfd1425795b5bf16af4752242 SHA512 705c0d14cd07b7d6ddf3757f4cfb4e943f9a81513f7db035c14201905be5d245834e9bdeca001b7f5ed3f3c15930c40892b0f539ab44d1139a530c0fba0a62f7
+DIST structopt-derive-0.3.4.crate 16500 BLAKE2B b5c30c0f99c368063ad31fb30f80e87a14ef5699e365d6721b7bae80059a89ed78f9f149c4e694b0b61ddfd2681bfba997d5b94f6739de4afd6fbc5a42c0e3ec SHA512 8cb0a6e0173bb94747a9c7176134ded12feeded597bb8e027ce08e8d5b3200db3cbfc68137c96ba691037195bc634417ce83fdcf30f68dc43b8fd93e2ee974bb
 DIST syn-0.15.13.crate 144437 BLAKE2B 260294de8d28d1fa758013b84a9a811b1e449933dfa773a8f041898c662b8776473d0e73b0042b20ed00906a2db6b801236e457b44d2d6f856ad391af4950328 SHA512 c8d837f4a3f52a527cf7d4f8b5d96bda20e28a0893cb385fedc4672e64fda5dcd8d96338aa58a06d156f8cdc54e0ffd6f999157997b857bbf28d1bdba245be4d
+DIST syn-1.0.8.crate 191978 BLAKE2B 9c4f925cf437c8baec1d0bc347454096124e996f1c26ef27fbb0ccbef087ba7a5eb780f4e1f87037568e93c7b7fea2963e2782621c0ab04e5c33ef98349e97fc SHA512 314229610133a1c1db1d60b549846e7b9f9c50ac345ca59d6fbfb263b828653be7fac0f56fd88312162138d85b915dc994ea651c1f9ac591c9c56c53a1738093
 DIST synstructure-0.10.0.crate 17344 BLAKE2B 6a5d2e54ff1f801858d2c034bdfad85330dae0aad0b3940d41c8b334aedd929b9679f1e0f6d4042756cb37592950c12487993e27301e6371c720a27115c6261d SHA512 573212bfba512225dadf7928172489c7d9f74baa23779831eb1f4fc042f7f79a42d78eacc467e220914885cb3b0329e3cb7b65629f60d59bf1d1e1786c2c7963
+DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
 DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
+DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
 DIST termcolor-0.3.6.crate 13548 BLAKE2B 4d7faffc3be9ffe4e6da0ea20e6b244c0d9e488ff1c97851dfce073622e68f041e1c77d3c49c769a5e6525c28dfcdd998b381a5abcaa5c4ea63b0acf0e28bf2d SHA512 cfb8e0172abad994da27b1474ab0de244db782ac9c7fcd877d9f1727eaa2fb95036638edbab6b69c3302d1b880eba14cc7282ae0ec78ada1d31a9ef682d4cc90
 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 theban_interval_tree-0.7.1.crate 22912 BLAKE2B a7f1a90a8a1f76808f64c013a0603f8b5f2811623511bc636f453a44b2d446bfe1d3f1257c1e20c0901b44b79c76f55145783f3d092fac947e48c909b4c0e135 SHA512 62ec06e13430c5828337300e8d25010b5a262d6359f33c689ea211798e1ba6103d144838ebf77d718e25360763f47265764e49d3332cbb05e91f4be159337f5d
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
+DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
 DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
 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 utf8-ranges-1.0.1.crate 9247 BLAKE2B e1a4a867c32b54b239338ba4c9a209cd5265320349a0a691f70793f1e4f1c9eddfd477cf2f11e4d4cd72e8f78e09fa32562eb0c57a3c7126a37675008b5ce7d8 SHA512 c17ca6aa679f1f974c9673fac6116c5bb48ff59ca65a968520d5e89c52a7d4409d578df4b28dd3feb4aee208d796a47641c4f1de71810de36905c6cd3439ff97
 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 winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 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-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
+DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 EBUILD bingrep-0.6.2.ebuild 1829 BLAKE2B 0567059c90846f6cc118a16a2a7bd09fcf30a80bc829e526278a08d888356fc8a460b4d4248456f601fc6daad0369e635a23828f653f6e6954066148ab93db91 SHA512 68cad8bff4b11c5b73b89c80487c0acde87c7a2bc4a69ba679ace29a29b07321f5ef09c933a6c654a4f509aba5092b978fbe2f58050ec65b4bcc15069ddb242d
+EBUILD bingrep-0.8.1.ebuild 1922 BLAKE2B 8f8f7a9f4493aad4b6c0b758e46828deb1849d55f3839280c76e3f37fae812a4547b50b9aced9f27d4fd800976efa1905ed001477bffd07256a2aed5b8d65d1c SHA512 7ff39a5e9c7976e85112f99d20bda10825277c9706266c3043ea2b622060d76c36b98683204092837fd000a1d8f89e5f19a2e632adf58ca38dcfead622c8c2ce
 MISC metadata.xml 721 BLAKE2B 1033916ecf17446ce916c89c370bb7784c0547427b14f7cde6288f1de1bc883d04ca19bd31170308c8046d236ddacecf933b44f4cb33709327a6f2e4fe122aef SHA512 14014259f5ae3080b1362d2f73c7216bbe03321d01ba228c38e81262e9678b1056a13926515ec9f27a892335975eb7e591e851c03832a31f46449a5edb380ada
diff --git a/dev-util/bingrep/bingrep-0.8.1.ebuild b/dev-util/bingrep/bingrep-0.8.1.ebuild
new file mode 100644
index 000000000000..5eb8912439a7
--- /dev/null
+++ b/dev-util/bingrep/bingrep-0.8.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.6
+ansi_term-0.11.0
+arrayref-0.3.5
+arrayvec-0.5.1
+atty-0.2.13
+backtrace-0.3.40
+backtrace-sys-0.1.32
+base64-0.10.1
+bingrep-0.8.1
+bitflags-1.2.1
+blake2b_simd-0.5.9
+bstr-0.2.8
+byteorder-1.3.2
+cc-1.0.47
+cfg-if-0.1.10
+clap-2.33.0
+cloudabi-0.0.3
+constant_time_eq-0.1.4
+cpp_demangle-0.2.13
+crossbeam-utils-0.6.6
+csv-1.1.1
+csv-core-0.1.6
+dirs-1.0.5
+encode_unicode-0.3.6
+env_logger-0.7.1
+failure-0.1.6
+failure_derive-0.1.6
+fuchsia-cprng-0.1.1
+glob-0.3.0
+goblin-0.1.1
+heck-0.3.1
+hexplay-0.2.1
+humantime-1.3.0
+itoa-0.4.4
+lazy_static-1.4.0
+libc-0.2.65
+log-0.4.8
+memchr-2.2.1
+memrange-0.1.3
+metagoblin-0.3.0
+plain-0.2.3
+prettytable-rs-0.8.0
+proc-macro-error-0.2.6
+proc-macro2-1.0.6
+quick-error-1.2.2
+quote-1.0.2
+rand-0.3.23
+rand-0.4.6
+rand_core-0.3.1
+rand_core-0.4.2
+rand_os-0.1.3
+rdrand-0.4.0
+redox_syscall-0.1.56
+redox_users-0.3.1
+regex-1.3.1
+regex-automata-0.1.8
+regex-syntax-0.6.12
+rust-argon2-0.5.1
+rustc-demangle-0.1.16
+rustc-serialize-0.3.24
+ryu-1.0.2
+scroll-0.10.1
+scroll_derive-0.10.1
+serde-1.0.102
+strsim-0.8.0
+structopt-0.3.4
+structopt-derive-0.3.4
+syn-1.0.8
+synstructure-0.12.3
+term-0.5.2
+termcolor-0.3.6
+termcolor-1.0.5
+textwrap-0.11.0
+theban_interval_tree-0.7.1
+thread_local-0.3.6
+time-0.1.42
+unicode-segmentation-1.6.0
+unicode-width-0.1.6
+unicode-xid-0.2.0
+vec_map-0.8.1
+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-0.1.6
+wincolor-1.0.2
+"
+
+inherit cargo
+
+DESCRIPTION="Binary file analysis tool"
+HOMEPAGE="https://github.com/m4b/bingrep"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 GPL-3 ISC MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+BDEPEND=""
+
+QA_FLAGS_IGNORED="usr/bin/bingrep"
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+}
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 392eb9b54629..a887c8b75848 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 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
+EBUILD buildbot-console-view-0.9.12.ebuild 1161 BLAKE2B a568fe6b3853310640178dfc53d64e841e2b4bf5cf757718c700ff31552252ae4e3b75cec8c37d052cf082a24805c588f2ff3441ff606db5a979092c2222296f SHA512 f2b488e5b49a09e712579902e58e6b745d66e80823341237687844182b9f36bbbd056a628a1bb38f57c521d2c27b3f484b5bff7f8ca4a79e9ee8de629efb7e98
+EBUILD buildbot-console-view-1.1.2.ebuild 1161 BLAKE2B a568fe6b3853310640178dfc53d64e841e2b4bf5cf757718c700ff31552252ae4e3b75cec8c37d052cf082a24805c588f2ff3441ff606db5a979092c2222296f SHA512 f2b488e5b49a09e712579902e58e6b745d66e80823341237687844182b9f36bbbd056a628a1bb38f57c521d2c27b3f484b5bff7f8ca4a79e9ee8de629efb7e98
+EBUILD buildbot-console-view-1.3.0.ebuild 1161 BLAKE2B a568fe6b3853310640178dfc53d64e841e2b4bf5cf757718c700ff31552252ae4e3b75cec8c37d052cf082a24805c588f2ff3441ff606db5a979092c2222296f SHA512 f2b488e5b49a09e712579902e58e6b745d66e80823341237687844182b9f36bbbd056a628a1bb38f57c521d2c27b3f484b5bff7f8ca4a79e9ee8de629efb7e98
 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 6db10ee36cbf..49582ecd23fe 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,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 6db10ee36cbf..49582ecd23fe 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 6db10ee36cbf..49582ecd23fe 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index bf4bf4a7678a..d5cec72aa6de 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 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
+EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1130 BLAKE2B d83bac0b7e466dec412875e43c686f08f04a9cc792b5c6d557479def168c44444c26d26d680647938d4af34dc20bdb8e1863fd808a52b2967c31cec82c9a9687 SHA512 b1549fcf9ec6af84f7d0fb22c46eef72639b670ad71d2b253c07bdc36e46af2e6e821b7be2326aa078243980e4ae41f8d046a1481d4552e08832ef98ac8cd92e
+EBUILD buildbot-grid-view-1.1.2.ebuild 1126 BLAKE2B a9ad8cc6906a13b42f49d8cc56e97d10afeaaad5930d3166a2d2c40a92d14a381f65636ca079043504685093250d8c67837b3785685c3bdfeb5621231609dc48 SHA512 1261824690741edb56f4e732eb95fe0ecf3507e6955c2db41e461fe91bddff7a205a58d86a4f407e33a6fc24cc60cb407e48a86ae704fe72839606c198a05556
+EBUILD buildbot-grid-view-1.3.0.ebuild 1126 BLAKE2B a9ad8cc6906a13b42f49d8cc56e97d10afeaaad5930d3166a2d2c40a92d14a381f65636ca079043504685093250d8c67837b3785685c3bdfeb5621231609dc48 SHA512 1261824690741edb56f4e732eb95fe0ecf3507e6955c2db41e461fe91bddff7a205a58d86a4f407e33a6fc24cc60cb407e48a86ae704fe72839606c198a05556
 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 48ee8398c5b7..10e9caae946f 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,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 203ef445478f..dbd0b9e1966d 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 203ef445478f..dbd0b9e1966d 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index d23b3793d320..9a622854494d 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -2,7 +2,7 @@ AUX buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch 959 BLA
 DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B e8077d3b212c968694d2d9e5018c9c985acbff592dbccfeb59543a507f263133268dde57efcacfabb90ea61c3184d34dced21f8e269f619d505166e68c76d43e SHA512 5b9847747924b7e04ae7584f549fa498715e293c6dbdbfef1fe5896c8c96cd65471a908b48c46a32eddbcf8f7b3642402974b4ed3319cf42e90028e772b5e34b
 DIST buildbot-pkg-1.1.2.tar.gz 4838 BLAKE2B 437fd8c7d293622b8499c45072d03912cb196afa97f06220cd3279ad01d2426e399e9c95ee063146dd8713f0284981c8a42b79f44028aebd19cbd5a4fe518eff SHA512 11fcf96907274b699da23c667d7a634b1af3752b9edf651e3fd50f030bdd80d3170013ac2c789fc2943d2ca8a84cb02b5caaeb60e646a54cf8b89a5e701e21b5
 DIST buildbot-pkg-1.3.0.tar.gz 4835 BLAKE2B d035060ebf1e5823979adea8b7d31a13cc7bf3382eab571090d68db23b476e2fb959deaf249e6d4f2f3b44cf453c407dd0fd39e54a4e5a3d41462b125c573505 SHA512 b8e53de24cd41e31417a4259396fa080c7dad48b5ad2b15d5c9de9eb3fb35196a84f48ba589e8a077382e8a14d760f6148056bbe30972f0542512404e8efbefb
-EBUILD buildbot-pkg-0.9.12.ebuild 1068 BLAKE2B 2db6c1832fd1305ac8a44b7c644d01a93b6c6f845bccce20c014986b6ec85824c505f758489b58c6432bf4d8007f85010f9415d8115039bc9b530bbb5432d0a4 SHA512 68f406a27589210f237334b11186d4d3ea56fbc0d18083923b119c0e22523f468a1f41998edabbf47e2b6fc44176aa953f22d8b67282e89a98b4bfe4dc44d5fe
-EBUILD buildbot-pkg-1.1.2.ebuild 1155 BLAKE2B 766c0e653890ae4318ffec25cf02a53aaf600817539753c6e8b82f4851f6ae8e31460b722bdcac825e709307be85bfc8a466c5aece34e634e7e0c16e724f3240 SHA512 3e61b1cf62e6a12e3cda6d62d418a0bae56fee07c332b2ca13dcbd80252d32d12866f329df5162a274f2be8b5827f5b606e1b055cc6a8c1fc394194d09c4c65a
-EBUILD buildbot-pkg-1.3.0.ebuild 1155 BLAKE2B 766c0e653890ae4318ffec25cf02a53aaf600817539753c6e8b82f4851f6ae8e31460b722bdcac825e709307be85bfc8a466c5aece34e634e7e0c16e724f3240 SHA512 3e61b1cf62e6a12e3cda6d62d418a0bae56fee07c332b2ca13dcbd80252d32d12866f329df5162a274f2be8b5827f5b606e1b055cc6a8c1fc394194d09c4c65a
+EBUILD buildbot-pkg-0.9.12.ebuild 1061 BLAKE2B 5b2c43d74be3b1336fdf3435755b1710e6ab3eb097450ee2eac98a6651ad4db299f24d84ed782b1360b373a304d049a23249a09a499b0738cfaf15a1b5eeeb3c SHA512 024e10a49898a6f8edacb0980f2ab60635cb5e2977594b23731d567d28baee005e8529ace71cc8fcfe5f775f545a91ef2fe2c5fd974219f87f7fe29e47ae12be
+EBUILD buildbot-pkg-1.1.2.ebuild 1151 BLAKE2B 2bdcb99da67ebd1937c1704e4b61d9f6a66acb3bf9e03af2396fe6256139dbd48fc8c27067ee646f411597ec35452a5d66abd2699671529fb0922999d42426f1 SHA512 4da8961a4c4041efee2cb769771e5864be7f3769d4432bad3028a9187e4ebd65714b86ccf5089dea52c8bf149433b70526243ff45aa00d66b335b6066cd26188
+EBUILD buildbot-pkg-1.3.0.ebuild 1151 BLAKE2B 2bdcb99da67ebd1937c1704e4b61d9f6a66acb3bf9e03af2396fe6256139dbd48fc8c27067ee646f411597ec35452a5d66abd2699671529fb0922999d42426f1 SHA512 4da8961a4c4041efee2cb769771e5864be7f3769d4432bad3028a9187e4ebd65714b86ccf5089dea52c8bf149433b70526243ff45aa00d66b335b6066cd26188
 MISC metadata.xml 1120 BLAKE2B 04e28b3993f21c0ec80375dc377079dadeb00e51e071958806505985bd3b10647e0a8396ff4a06f2f635f08d1cc802071b33ca1e6ffbadb712c0be49f81ef47f SHA512 f384c87c8bdc67372bad64103155dac6f7bf7d91b1f3f962e1b1c08cbfe648c8becc21e8af7d7b96c9096073215cb1bab87978132deafa94ce6370eaa027590c
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
index 78d73aebfef0..b03d7a26b859 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-0.9.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
index 8b1c11f90656..6f7a8920b7d6 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
index 8b1c11f90656..6f7a8920b7d6 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 6f1153964025..7ad2c0e6f773 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 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
+EBUILD buildbot-waterfall-view-0.9.12.ebuild 1165 BLAKE2B 7e93870e9546affa03c460c45c5346cd06287624a6585d3fed4839078573ffb54e3f2c4bf8a0686ccc45cb3e6350d96f2b69dbf571a7466910644e24b2ce1eae SHA512 99523f7ffa88f1339907e0af0456b2dfcbaa639b51f7878f06a397a2a893d95950ff12072ec15ae7d3a26fc8eb786e376d8477b9d8a042d62543ac11c1c65b7b
+EBUILD buildbot-waterfall-view-1.1.2.ebuild 1165 BLAKE2B 7e93870e9546affa03c460c45c5346cd06287624a6585d3fed4839078573ffb54e3f2c4bf8a0686ccc45cb3e6350d96f2b69dbf571a7466910644e24b2ce1eae SHA512 99523f7ffa88f1339907e0af0456b2dfcbaa639b51f7878f06a397a2a893d95950ff12072ec15ae7d3a26fc8eb786e376d8477b9d8a042d62543ac11c1c65b7b
+EBUILD buildbot-waterfall-view-1.3.0.ebuild 1165 BLAKE2B 7e93870e9546affa03c460c45c5346cd06287624a6585d3fed4839078573ffb54e3f2c4bf8a0686ccc45cb3e6350d96f2b69dbf571a7466910644e24b2ce1eae SHA512 99523f7ffa88f1339907e0af0456b2dfcbaa639b51f7878f06a397a2a893d95950ff12072ec15ae7d3a26fc8eb786e376d8477b9d8a042d62543ac11c1c65b7b
 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 8f2ec7df2c10..d85d68ec5e89 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,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 8f2ec7df2c10..d85d68ec5e89 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 8f2ec7df2c10..d85d68ec5e89 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index a7dd4988cbd2..fc047a227789 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 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
+EBUILD buildbot-worker-0.9.12.ebuild 4828 BLAKE2B 1b76bdce8838a81a03906637b70ac07de10059172597331dd70f4f902255fbfd6cf9654e009cd615e664c01841a314b961e09d5b353bc62f8763bc286cb32e71 SHA512 a1f8e8aa6461a9997a3f668ce5bef3eb250ec76fb072e8952dde61853a0da4114904aa79245663af0b46e29598cc2c760f9eea06af3dc6d2bae14ada4e2e83b8
+EBUILD buildbot-worker-1.1.2.ebuild 4833 BLAKE2B e8985356c55bca345014e9a461863ec9852a1032f3d3abc1aac01598b0c477130757ea373a3d9531e6664de4a1285ebf00615438af06cbac120ec993b83d7479 SHA512 5a9dcad57e0abf5ac106452de31f7462493cae47e153bd99f03fa8e8f230d5644dc28a94c58b2c83febd6e3726672c6ae9da2a609bdb428510377b656bbe5d34
+EBUILD buildbot-worker-1.3.0.ebuild 4833 BLAKE2B e8985356c55bca345014e9a461863ec9852a1032f3d3abc1aac01598b0c477130757ea373a3d9531e6664de4a1285ebf00615438af06cbac120ec993b83d7479 SHA512 5a9dcad57e0abf5ac106452de31f7462493cae47e153bd99f03fa8e8f230d5644dc28a94c58b2c83febd6e3726672c6ae9da2a609bdb428510377b656bbe5d34
+EBUILD buildbot-worker-9999.ebuild 4833 BLAKE2B e8985356c55bca345014e9a461863ec9852a1032f3d3abc1aac01598b0c477130757ea373a3d9531e6664de4a1285ebf00615438af06cbac120ec993b83d7479 SHA512 5a9dcad57e0abf5ac106452de31f7462493cae47e153bd99f03fa8e8f230d5644dc28a94c58b2c83febd6e3726672c6ae9da2a609bdb428510377b656bbe5d34
 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 0acf8ca32c4b..65fc5de22877 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 294e04869974..d4c993247d75 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 294e04869974..d4c993247d75 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 294e04869974..d4c993247d75 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index d8327eced90b..9fe64e5c543e 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 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
+EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1170 BLAKE2B 5288ba9f6196759d2e58a21863dd3a1be2081752c186f201daa765235e76d2f0f68fa4302167af1b5c9230b6edc1c240977c7b6262e8c148d5f52e3f7eeeff76 SHA512 cba0374459c0a7398381d784502d7946ad477af028831915f077c5ef3a342c6018df132f09027a17a9f651829722edb407bb410ab3e6e83d584849d26e06792f
+EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1170 BLAKE2B 2818702164af7f7ea6f0721f4dd5bf1b0650eec480ffd8608e18ede8dbe374a08d29921c8101a11b477a785a2df46fd8033c9fe9700c61135d1e8e77a2500ac3 SHA512 0e49a5c12448439384fb853375b8fdaf14ef3ed987ebcd6a1e904790a055749e22c6283a94c45e927eacbccb354cb9edc56f9b8f99562b5496e28ed4b5e5e539
+EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1170 BLAKE2B 2818702164af7f7ea6f0721f4dd5bf1b0650eec480ffd8608e18ede8dbe374a08d29921c8101a11b477a785a2df46fd8033c9fe9700c61135d1e8e77a2500ac3 SHA512 0e49a5c12448439384fb853375b8fdaf14ef3ed987ebcd6a1e904790a055749e22c6283a94c45e927eacbccb354cb9edc56f9b8f99562b5496e28ed4b5e5e539
 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 293af6741ad5..514e8a93ce89 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,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 bd88b982d62e..038efd4e9ac5 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 bd88b982d62e..038efd4e9ac5 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 55f1a24e5dfd..b942a472c15e 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 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
+EBUILD buildbot-www-0.9.12.ebuild 1202 BLAKE2B 4eb07467f37b463ed90ecee62c12bff70257bb7844c6b6d18a318901166d00056ca327916482f9806de03d9eb566af69b0549b5925f39bf1dcce1e6491a146b5 SHA512 19d7897dc686527a630ef0153716369347c4551c3a921abe7dac2dccf07d23e42379e3cee913c5422e16161716eb25756c702ba40bc8f807811dc51a81f20b53
+EBUILD buildbot-www-1.1.2.ebuild 1202 BLAKE2B 4eb07467f37b463ed90ecee62c12bff70257bb7844c6b6d18a318901166d00056ca327916482f9806de03d9eb566af69b0549b5925f39bf1dcce1e6491a146b5 SHA512 19d7897dc686527a630ef0153716369347c4551c3a921abe7dac2dccf07d23e42379e3cee913c5422e16161716eb25756c702ba40bc8f807811dc51a81f20b53
+EBUILD buildbot-www-1.3.0.ebuild 1202 BLAKE2B 4eb07467f37b463ed90ecee62c12bff70257bb7844c6b6d18a318901166d00056ca327916482f9806de03d9eb566af69b0549b5925f39bf1dcce1e6491a146b5 SHA512 19d7897dc686527a630ef0153716369347c4551c3a921abe7dac2dccf07d23e42379e3cee913c5422e16161716eb25756c702ba40bc8f807811dc51a81f20b53
 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 ca7e4b8583a9..382d685f46e6 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-0.9.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 ca7e4b8583a9..382d685f46e6 100644
--- a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
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 ca7e4b8583a9..382d685f46e6 100644
--- a/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index b95758937cee..c9581d29440d 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -9,8 +9,8 @@ DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3c
 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 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
+EBUILD buildbot-0.9.12-r1.ebuild 6454 BLAKE2B 4a7e2f95cf3c4e173d958c55058256e548450c77ef89e49518768df12e449e3a1263181a37dbbe99ba6a7d3188b4a8bccc169271e61450950921dc05dd98c2c7 SHA512 044f8f41521bc6536466d7dfffdc3d63824de4047304d7d2952679fc117d1d92db7b23999220809769dee215f7dd83f90cf434f857023c319eb0a94fa8dcbcee
+EBUILD buildbot-1.1.2.ebuild 6568 BLAKE2B ce9a7d886eb84f904d7be4e7b6e31692afd8ca13d3ae6b3cb9ccd59736fa3768faf150d0b648b64eebfe452d08b7d202f126f651545ddedcd028046b068a2c04 SHA512 1d300338000695255f1cf89c48f914f2ff0f9f1ae897bc7afe3bf3baa5c97fc61ad555d3fd7570e2a42507fc87629b85b198ccbd5360bf8ff2d6388578db0f02
+EBUILD buildbot-1.3.0.ebuild 7221 BLAKE2B 2090fec727e4677e35bd1b2318319f869084de2b1ecb2b6f214ba1243ca2960cb6f131cec36f91745e5aa064a1d2b6e91a7ea504da462fcbe85332eaf87f6264 SHA512 7ef5c7c522ad4a710a7b4685250b602a07408443711d1ecf26f377566286f43bfbafc9f192e9b81cadacc7a105b45176b4a632d01e7ebcd032082f1b9f0dff53
+EBUILD buildbot-9999.ebuild 7221 BLAKE2B 2090fec727e4677e35bd1b2318319f869084de2b1ecb2b6f214ba1243ca2960cb6f131cec36f91745e5aa064a1d2b6e91a7ea504da462fcbe85332eaf87f6264 SHA512 7ef5c7c522ad4a710a7b4685250b602a07408443711d1ecf26f377566286f43bfbafc9f192e9b81cadacc7a105b45176b4a632d01e7ebcd032082f1b9f0dff53
 MISC metadata.xml 1427 BLAKE2B 61fb937ec5b16eccfbca293455b8f1dbc8b98f489eeb150a0209b32bf53d79b3ea12841a2bd2a39d9b120009e897469e40aaa189fab33e67e9ef6a396353acd9 SHA512 eec1f2c30d650ae90c80266ffac401e432c75605422110511d40162635da39f3428e33bb04ef58de8124830e34434d2e8b582600d75ffed0bfa8d8e25e2ad1a6
diff --git a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
index 6f20fa2048de..e59e4df328db 100644
--- a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/buildbot-1.1.2.ebuild b/dev-util/buildbot/buildbot-1.1.2.ebuild
index 11d1a6f2e89b..bdd4428972b3 100644
--- a/dev-util/buildbot/buildbot-1.1.2.ebuild
+++ b/dev-util/buildbot/buildbot-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/buildbot-1.3.0.ebuild b/dev-util/buildbot/buildbot-1.3.0.ebuild
index 4007eaa7c96e..38b52878a2e9 100644
--- a/dev-util/buildbot/buildbot-1.3.0.ebuild
+++ b/dev-util/buildbot/buildbot-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 4007eaa7c96e..38b52878a2e9 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/bumpversion/Manifest b/dev-util/bumpversion/Manifest
index 71c3df118a3a..f397998faf81 100644
--- a/dev-util/bumpversion/Manifest
+++ b/dev-util/bumpversion/Manifest
@@ -1,3 +1,3 @@
 DIST bumpversion-0.5.3.tar.gz 16596 BLAKE2B ecd9e999241d0d77161529344d9f83859ab1083c323524f91f84802ff74aa8e9d4d95126b65c685e04183cf7907732f2ad734938db7aa03dfb9e334a1d24222c SHA512 2dc507be98838e4a389502cbdae08d23bad465b171923e15c40ae16da2cc9529c71dfc40213c47d23da363257b363fd5786a5661a4a6d6b568b5f8b2cf8af959
-EBUILD bumpversion-0.5.3.ebuild 806 BLAKE2B 3615b98a753b5ee5af52fb5bda4f5cd46dc941576e2232bfeb0fc7412b3d4022082e2d181db001bd3ec84b72f57789b2cf7b3e5a941167bb5bc8dcbd56190527 SHA512 b31f6c17985dbb5e183c9ace2327a6ab87a741654209c242d499e5d7c1b9726373092306b3817dfa132f349c84222dcd2285723e893d2b2978914afe2170bbb5
+EBUILD bumpversion-0.5.3.ebuild 797 BLAKE2B d9d69705d52ae08e78e8c5f7bfae5d009261c33ab3b6b12c7632730678ad8f9eda6a5f641883c95de4629363dfe6166e554e015109673bb695e65a5e66ef3e32 SHA512 794f2b4b1f38681b8b5a0eaec4d55a6b30276ac5fe6e5c5269403e28ec6f5368183fe1097a896e48718fd3104792c546221f0a2f69842a8c77bf3714eb810e13
 MISC metadata.xml 300 BLAKE2B c9f5c0e8c55aabd0ff79c4ffa4d04195f6e532ebce0c697dd75fe1568399c7dfc8575d27b20781d626a9aa075226688b67f14487db0db9d081da94352eaf1e8b SHA512 de2e356433d02bc7f9b8f24f178fa1124948f9bce7475cf4fea0efc002533755b854cfb5f591343ca73c6b798cbbe15a40c0450f23d994420a9a28f9bfdcb483
diff --git a/dev-util/bumpversion/bumpversion-0.5.3.ebuild b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
index 63789cf1e8f4..78e1b44af263 100644
--- a/dev-util/bumpversion/bumpversion-0.5.3.ebuild
+++ b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 6e4652b44c13..30caadf49142 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -4,6 +4,6 @@ DIST byacc-20190617.tgz 799465 BLAKE2B 2baf34b20da049b3b1d2a569ec6b5470fe4935c9b
 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 619 BLAKE2B 473ac72abadcbb62b64c14e194d32155e635f610d623f0861d3713e4a34dcce66f874d5ca47eb615d6dce8531729fb2111c6901ffe77b9305fe9d92f39eb995c SHA512 f6d7289adb775e965e22cb647ca239b68e1a08bc45ca31b616b365a6d3f81672774ec66745e61c6b3f2039e8e0370414061eca10bbb69b0d31d3ad9b186ff64e
+EBUILD byacc-20190617.ebuild 617 BLAKE2B 26899562d0ad3f35a7785cd320b5e22b29c81dd9a869f2a2c2e6978fcf77e6ef691bd91b39c9c8a9162a0f18c0118394098f1522f585b5ba03adde5cc3f2fe95 SHA512 b4439e20ad1b08a6464ce7a416633980694788145a71fb02bd6d5716895e918f99ebb9c4af808d51af89b7a293cc8cd16a08f8aba97a4e5ece2bd8d9ec03d524
 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 f96e778f6be8..ac1ff5ee28b5 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/cargo-tree/Manifest b/dev-util/cargo-tree/Manifest
index 2399949943bd..2806c7921311 100644
--- a/dev-util/cargo-tree/Manifest
+++ b/dev-util/cargo-tree/Manifest
@@ -10,16 +10,20 @@ DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483f
 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 autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
 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-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
 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 backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST bitflags-1.2.0.crate 16814 BLAKE2B 5b7aee7388b01cebf96651e979025e9bcac85f7324982055d7d805361f91da2b9489a07f00350133c8a58eaf70c5397e3561c15b3f2544aa8202bfdb852c145b SHA512 bd9e3797fb9b91e815308a5286439e7eedb285666c937184493cfce45ff1d4c10f505f29be3a6317add313a7fdc72a006682c1b3e1cc9fa05166f6c4ecaffcaa
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 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
@@ -27,21 +31,26 @@ DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3
 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 c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
 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-0.41.0.crate 1070528 BLAKE2B ebfb4715753f3f01f23aacece54d2391216788b41134943cb5568df87c5891b2c5a8c1e9d33a56f9a274cd61a88106138b5154518863e69aee2ac89c14052b7e SHA512 f2fec39426b6f678e98bc3338a58f54fbac2e3c8e8329d30d798890bca9111512df9e7c4f617804bcc9e566f698e7fa51cf92c41d25d2d9dad355d5dc784847b
+DIST cargo-platform-0.1.0.crate 6677 BLAKE2B 0ab302729e583de701816159af9546aa5370c3d2eda0af4243e380a54e0e2bf0a38af1b616e1f7463f711837591e37edcc77df7098bd978726c8b0dfdee9b06e SHA512 9965f789f7c19a6dc969b381bd6ef6ea742e1d35863cfc4e9d4a39d92ba74027ea31f2b53903fd3892c15dda91f750eb888957119a130d0e773ecb478f42b4c3
 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 cargo-tree-0.28.0.crate 22960 BLAKE2B aa53fb4354da454ab5d87f3a3099a7a4652619bf5c5f6f3889eb874cbc96c138333d1c2d5b6b77bb32c7b982c215c3be8c467194b0a203d0beed1557cd819536 SHA512 f9e59795f13b984fcf85b7260f54fc67df7b055f1dce2f93e06631835bf2c1d8b23fdbc373160952b0d90456a041d25ebec9adba3293eafc6475732cb966ac48
 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 cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
 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
@@ -58,6 +67,7 @@ DIST crates-io-0.21.0.crate 8009 BLAKE2B f640e0cef1cb1b06624d4b2fe1961341a2ea824
 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 crates-io-0.29.0.crate 8955 BLAKE2B 4a0df5bf994dc053987596029b0d12c75f0112aadac9b335f7f1bd6fc8b7b235358d7b7a826f2671c6f75e2f149a0414e8578a8778ca62f468a5d697772c69da SHA512 59969a10162d148b8f10d8a1c3221b686b3656077cfe37efe870fa6f1d8fc3efe0336f5088ad5b17ffd895dd0e58c58a33811d32f7ebb232920804636ace2fa6
 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
@@ -75,23 +85,30 @@ DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d74
 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-0.4.25.crate 75171 BLAKE2B 8b9e10bd0690932dafbe49f825253ab4f0bfad79f7c32d093d31f831076de7a42d6f1944ff2352a71f3c6659203cf3fa5c050e864187e14ec70cc7d56490e52b SHA512 c42efa6bcb5989c4f3a91629d0a547448ccce7fc8556b802ed2bdd10941cae25bb1ad15cd914024f1fdb0d1799ac2345fdc649b985b86eb87074b2b80e7c80d3
 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 curl-sys-0.4.24.crate 2951548 BLAKE2B 9256c9b4d197c29a4958254cf217c80de17dbe1aab7f3f147a96a74df6fe90c5b24de06061d0086fe3b766081321ebd6585f2c109b061594d063611ba1c0bc58 SHA512 3ee3fff70ff9742301b4c8161970e225da462d2306aed03564b3b5ee42d78b5e54a9aaa73a2c53e93d2378dbeb3eeae08ca5eeae9543b623ecb73ae9d2adb7c6
 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 env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
 DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
+DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
 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 failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
 DIST filetime-0.2.4.crate 12044 BLAKE2B 563df5750ef95e392f8458c0a23f106eb310d8e8e7253fba6b2b8245afb103a37b505fa41b915691b8f93ac9d6277e2940ee219a4993232781269c9876c5eb24 SHA512 a27ea45b6de09c93a818f56436e49ed358cd7cdab2a39913de159144da239bef14677b5b521633c68bb9a4f38e71d7e2404b6bf628348b3573e509c9440d0863
 DIST filetime-0.2.7.crate 13469 BLAKE2B 6ec71f64de621b86c0ea46856fd9a7f364820916922f88611bc324696d5d34c73600ddaa204bd2119e29b0b38cdbbabc55aee669d87e9d77408dfdd844200a8d SHA512 410d45d9ad4d657da1d2cd16de58963f3096cf6e1978ffa4579b3696f0f4926cda303df7c4d02cfa8d71560518032750729a4184160a31229d590cbbec471d6a
+DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
 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.13.crate 74039 BLAKE2B ee9411cccbf4e304dd3eebfe62676007eedc72cb6fdf673eba824883d2f4d2adcbe292eba3cf9315da4b509f29ffee7371ef6d8f503c3bedb8d9fdfd5f91d1e6 SHA512 4b3b9e9a9251f0158aa89e4ccd65aef07a48afabe2323a2edc402f36404b632fe47df418d597de1de66898808d88f765444198cfe16ca228ac20406dcd158089
 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
@@ -103,11 +120,15 @@ 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 fwdansi-1.1.0.crate 8280 BLAKE2B 5c46e66a7fe25e02aaf42668853a0eea8ab3bbf9d160702770d94f8e6c4b3efcac9f840387516d1d14cf34271981ba095e3e0f7a5eb009b9d5837f94f8fdee3b SHA512 5f91a6fbc40b00a06abb6686cdc0389a837fea6513a9b9bde7cc4ce5cdb19c180ab21ecb5927c41a52c56675991ee10d127335c1f6d8c52dc7e6b30b32411370
 DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc482af850ac3cb4378327de5afabd50826a686d51b00437d740ac4e3a0bfc761c54ed295806ac8b77ae6848742346 SHA512 0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518
+DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
+DIST git2-0.10.2.crate 158275 BLAKE2B a9f6808653930e26499347349ab7a145f85ee51baa27064cdf576e88abd5eda4ae051ee0e51e3563a3349bccfd3a3819c23fbab9fca18376660c7388fbf87985 SHA512 2d40d579cbcb50d1d7380c79671d5d4c1717918fee6aa92fae38aff17205a439263daac24845b7efb90ce07db8789b71cc5f08504f614b27a0659bc3dad9b3f0
 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.11.0.crate 9350 BLAKE2B ca16e47bb9e63590a7eb81ae7d5a1b6941be1bd225174bc59fe095e79b11743d1861d3f93c899bf7103f1dad0c66f61c6b61be3621495f67806ce6d773b3c520 SHA512 2973f405ead620ee74c545e8a25d1212c972cd48a795513e5a177827cd092d9d95639410a10f3db147cc4c1fde6515ef035b5562172169b5b017b348c1945965
 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
@@ -116,9 +137,12 @@ DIST globset-0.4.2.crate 22474 BLAKE2B 0ae4fb4dcb52822a7c46d8e078ecac18775c1125c
 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 hermit-abi-0.1.5.crate 6790 BLAKE2B c17d2c7a5956b694c914c020e04315cf0a3a9c87b79d2a73faab2b23ffddbbecf6494f9806515ef66619045c98986056a64ea7be3ecd3b8133bc4f22f88bb886 SHA512 11aedede53a934608a1fc3b88ca7c26d0bb1891cf4219c4b402192f13568549b86153f079956942952a1bdd534131c2093b8bf5011fa413334a085f01a00b147
 DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
+DIST hex-0.4.0.crate 10127 BLAKE2B 03201f57ae3ba3e0276dbba28117548bd72570c685001f76e8e6d061c4311ff522243c38c3ed5123e5fe1dbe6b1a46a0887d7b167f8e29eed47ed4138bad6572 SHA512 2c1d3dd8e34ce62e429313837da7bcfdb00881e6de6269377b1a23ca689b1883a312557f186642021782288728f15783908bdbb9a7ab4a5d728325a8d273e0b3
 DIST home-0.3.3.crate 4043 BLAKE2B cd15b8d83b386fb9ce130edbf21307917050865242230af141805b8892d8a295cfb2be0db09296025d75a9c8ee24f6e83188e525ca0fd8753accf1dddc07c7ba SHA512 674f782528c7fc9087d80ff73c224fb5c43d7e14146026064e633841ac08feb342a6a7cc45f29e7da5585a2c920fac8eadd5f143bcaeaec4bdfadf6653ba7b5b
 DIST home-0.3.4.crate 4167 BLAKE2B 8e71387f6063446aa565dcfc6f08f72e2e406681d413bae835393d31ce1f80d451928e3b434bdf569ba3ccde23e55be320f0081f2c2570c3e4e4069915dfc0a9 SHA512 0e6fa44f4464229e833f8ffa893fd84dcd0bff181c718adcbe5f202b76bd2e16044aa44e1828d4eb332fc71637a3e9ac432a048ad2c6e8f87c719e9e88d4a9b1
+DIST home-0.5.1.crate 9531 BLAKE2B 43f30ad557282e2648aec48234dc8dc3ed61e552697ffda9d8caf4220f101fe7f80c9e3542eae1235fac6f097d7547e775f45e04097b4da73df762ab3837efcc SHA512 338cae9c546881bcd1b25c03e1913a4c90142d4f2e7fb0b74f9169f529710251c185bd7fdd6be37cc55515d64384d568aa989b868a90f46f74ef7c2e3d701ae4
 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
@@ -148,12 +172,15 @@ DIST libc-0.2.48.crate 353045 BLAKE2B 707f0311abe07e9a5bb9a1d2597d5a25f837dff783
 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 libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
 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 libgit2-sys-0.9.2.crate 1521778 BLAKE2B 7ffaeb93d29d7280af5143fe719914374466055d8ed5bf3986f8928c1673d3ffbda447eec54de1559e679e4855cea1347373c729b52900d24470c4b611d8ac4b SHA512 9658e9aabfb987d5889622b657551b532986ab3252ca4fe4a258c6c7875f721b1d6593d0e65f4812c544c61a75d44ae2c16a6a99aabc89406ccc7515391df8b3
 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 libssh2-sys-0.2.13.crate 468463 BLAKE2B 705de7c5923c3de5999d04fea991f4fc15c11d190206240974afd1bb952604b41b0adbd64a3a258ab96b82826205e97b5869e182cce5dfb96016812e5d401d6d SHA512 61ec84c2d612df8e90e26a9fba4eb41051743d89b6aaf93f25a6449068c7995c6c7567faf19eb32c8a74127973ef9485b802a85df1e249b0659ba9d8c83a969f
 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
@@ -169,26 +196,31 @@ DIST miniz-sys-0.1.12.crate 78209 BLAKE2B bd6aea3b23382b754a926e8f6f4ba4b1684ea8
 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-0.3.5.crate 54531 BLAKE2B 858a8a47d26e3e06d59547f820f156d28556055f68527e2b19d7516b86d8a4133c225c06b2a3cbb0c2e25f2450358293d54db65ae85bbead1abbdb90f5dd42bd SHA512 6aee406798316986f836822d3d0942ee40f0d3ff707827a6cd407a7565628ad3e5e0b2f072de732bbe0b2d4dc2cf151f8d46f0ff4950c4b1d873ec90ab9f435c
 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.11.1.crate 11798 BLAKE2B e395b63d0c7050e06d4e70dd9581c0c005a673a1534b49fd4a257c3a210d3f48a32fb467aa4f05c69e1324ba0c1e117f3d0802df2cb54080d27ebf9d31d2117f SHA512 c3a943f5ff82eccee6f2e8af73e12fc83a82590030381cfdfa52c79b2f53012012b246fe8fa682606b7ddc011892d72d5579bc17ed072498170b51060c7e7f5b
 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 opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
 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-0.10.26.crate 186994 BLAKE2B f95162ec44905c5da7606cfce2d343ab9538b03774559aa8ab18ee8a9935f2dee542bd26a0ed8704c4bf808ef46569f19e405ac8c2acbd7b05e1cc89ec241a71 SHA512 6a0c2202b4b5d3099712a2badd464eb6e8d310abdeb265050272f7526fb5bf5575ad4a5a5a4f798a5e834b59f223a6a76fa3b2f9bbfc08bbf43b88c3635bd38a
 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 openssl-sys-0.9.53.crate 45434 BLAKE2B 42fef72ebbf3bfcb8eeb6499d2965e297c4e4712ba06354020ae322aded58917e02a77028ddb165b5210e1352a29d74380a7ed93c1b6cb56aa722e803e0bfc70 SHA512 da0b34b5a58abf1b7e40dcdc1d9f4f6f0f8a4d5d8bb7b7417025a6ecf73145e80304541d2944050c162d7a9b1835434a9d7d2fb670d5cf1065055c09e35f940d
 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
@@ -198,13 +230,16 @@ DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb
 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 pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
+DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
 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 proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
 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
@@ -260,29 +295,35 @@ DIST rustfix-0.4.5.crate 12730 BLAKE2B d72a95e684835ce8e951c5e872bfcd347cfded637
 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 ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
 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 scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
 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.104.crate 73258 BLAKE2B 98d63f91c61ac4693e17e0b137379cffd6608933b84d2211509be6b3b25b181592d5e907549fac6ae2e4a45255b8003e1bfd0db683429ac3e78d8ee097d3d79c SHA512 638a1dacc158d69658a005e599adc19d6bc80d0c663f527b1ff906f729e70e027eacc4ea5b9b2c675ac990d5997f50f9d46d614ba95b0c73bb9606aba46b053a
 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.104.crate 49658 BLAKE2B d4a9ecb4a8df87776a83d645778dc050803b16fd5c9889f28e231238223d424dd25b101412e89741fb47be624d1773acf97f6e38809c81110b696701975168df SHA512 303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e
 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
 DIST serde_derive-1.0.90.crate 48815 BLAKE2B f662383f4fe4cd5fd46f763bcd3228eb54ec681231e6749ffe9c3710e3ebc49687eb25435cf9b976322df2cc478d4c9febe1d1d770aa4f11c4102745f52162bf SHA512 50ecd5c54dda7708959a2163e365cff09489489893d421e5dda09bca8a6f824b42722af1eff76fcc93f8b9f507db33019f7eb743301025b3504e19ab3d64d015
 DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4
+DIST serde_ignored-0.1.1.crate 11083 BLAKE2B 990f549b8b4fbd6b67f5bfe06fa6278f357ccd1014ee3a95561a09edab7f7f2e209d80c59ee749c6bc7524a07f0b357601e327d2f96bac0cfa514b3ea73afeed SHA512 1ef241d6a22f47c22305da613554e7c62cab00584e06c81381eab9c1e3e12e7ea9a516f845a5818b33bcbe72ee7dc9be686598bfc0121b400b0a8e165c8941e8
 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 serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
 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
@@ -291,6 +332,7 @@ DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a
 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 smallvec-1.1.0.crate 23593 BLAKE2B f49a79a1c9c312559cb48acaa1ec2d414348c55f05ffc3c2e26da5e5c4ca260101a7f4857cc2d554b7d79391f2ce296df3f889bb1aa9aeb9b97c9be41845f8ab SHA512 78e1ce9b80f59254eec3d9b9788bcb7c4c63992dee0ba0da577c2862884e0c6b6fe7517f79cf3128527d7ec5d2d339de6fb79ce1fcdd4341dd2457d7dec7ea94
 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
@@ -300,17 +342,21 @@ DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d
 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-0.3.5.crate 41425 BLAKE2B 45a6bb49766de1698df0fe0bfef7fd804bc3f29dcd52afcca294927e895a97353477f7dba72c721706b74bf374a8b5ee59f9eaaf43bb77a54d50c6ae04c0eb0e SHA512 a5b981c50d501f08bbacfdf9a9ffb991d1e17059cc502b8bdee70bcc412a9ea42c0840cf1e154647f420fe4817370e63a0824484ea9b40a0de92682820c43bd2
 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 structopt-derive-0.3.5.crate 16524 BLAKE2B c91a6d1bd3817a2ecc95a0063c1086d972c400c06cbaa95875806c2d4795de02d59049c0f4941f4b3fe51c0568a392e7eef82870bc66a7c0b3a16fbc6dec495b SHA512 cf55e93866d80ab266eca6008fb1b841cd6315cea779cc79dcd555ca98d1b85ec9227285c80fa1dd611ebcade6644881fb9ac53be04d7bbb36e3d84ae6b86cfe
 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.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
 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 synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
 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
@@ -326,16 +372,20 @@ DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff5
 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 toml-0.5.5.crate 54805 BLAKE2B 2b319f37165164793866bc4a470ed99447fdccb59242c94e5311906dc764f54131f2bc14921caab56bf84706d12800fb26a58210e3e58728f4076edc9a66e771 SHA512 8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33
 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.11.crate 91048 BLAKE2B 2dd12260a77d9ec10af73bc46178cd49144a8c5206fbd7240c6bd933eb9cb854efedb947b63af165cec51e1677671ddcf2924bb55c4b759dfd2d0939db09f290 SHA512 bee8fd546d4d1ad1179b31790fb5a087daece8a0435d8ba85def9c1d1827a8ce1ca643924863f01515e8fa6f78a47041e1bcda644a33427c65a50c4eb47d5d81
 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-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
 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-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 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
@@ -346,6 +396,7 @@ DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453
 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 vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9
 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
@@ -364,9 +415,10 @@ DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8
 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
+EBUILD cargo-tree-0.23.0.ebuild 3206 BLAKE2B 99ae67b50950aff12782a0f9698170c54b4432f9e85010401f95a949efee0e394b30a4a124f7e4c13b5c8a4de8b80260767fe1c2c3aeda41b1da4334404ab82f SHA512 608c81873fdbfed2efbcd0adcab36aa705c5b5f9725ad62b4081b764b1c85e31091edf869323561bd305f5738bcbc39e45889c18dd861956ad1f89fbb1e8d76c
+EBUILD cargo-tree-0.24.0.ebuild 3032 BLAKE2B fdd788f7e71dab70f204de7e130dfba7cf0abeba3e9aee85f3414225157081e71e89b1f770fee3fdcc767a05486cb3204db8e6db2bb4ca0c9e637ea0e043acf4 SHA512 d845ab12dbdd9c2a335538a09040bc190bddc075f187aa60a5e82664fbf3a6f88d2cab97dbb400d75990b55ea0f360aa0df65c8d8fd11a796757998a7fb1ce5a
+EBUILD cargo-tree-0.25.0.ebuild 3056 BLAKE2B 19946e2d980e4a55fea6d54fdaaecfd754725d5efbc86053d9875dd6e059fee54616ab8f2f42b60062d03dbe471c38d29a95bb4a86e0545a3f91990817a592e0 SHA512 5f6b40cc56cb1e7f9b5deb0a8d8e79f3d9dfde73b1021d6bb721d321f65859057c2a9c0883ac69d9f58db77bf878a544878b5594a91660c3960e3f5cd27fd408
+EBUILD cargo-tree-0.26.0.ebuild 3112 BLAKE2B 8f998c62532bf22bc553a83e569c6e9b0575e204ba7a9865aed7040358724a3254819fff1f6f061355e5993b932949bfe9c05da94649962ec36fec3a3f9fbf7e SHA512 25c378d0820c70fdcfe900797d67b2eece3a80a3bf9362c5d11d06a5b1585393d9f74abb6c69586b35e88be99a4a5c9686dc9ac91fd349cf258daf89d6b93a0d
+EBUILD cargo-tree-0.27.0.ebuild 3136 BLAKE2B 0429af918b552da0dd1f6f5f013f79b9da3fbb577b7667a24423bd7da7ccfdf6a7c2b06ff8a8b73de8aee41bab35d1d5c92f75da573afd03aa675e461b1586c4 SHA512 bf9325902b272653e42994afe852004788255c07ed019da209108483a6543a9b9f67c80c2aaa0f4651947dc6549dc68dcf1ea84ec91e108ed3f6c55f7af672cd
+EBUILD cargo-tree-0.28.0.ebuild 3002 BLAKE2B b568abfb672285b034e4e1e28a11c9fa1f7ec93a143c79375f0013d0a3d2dd2785535badd3fd31d676560cc4413f51a2a7c7e93f48f254e816b90d756b6a2950 SHA512 7633560d606edc5516fecc123d05ed016b34ed129b26b0fc73eb82a5b3987aa999f9975acf2400ba4144918136698ecee2b6aab7b43d3612296685e5ffab5181
 MISC metadata.xml 335 BLAKE2B 458848de5f95f88465b613bc3d2b692c4a8638ae42dda2b98ab6801ec695f92db223d1c115b6021f07822c62bcf98987ffe976f48bb8c3d9c74f35673d810962 SHA512 d7fee3ca27c5b91888e5dcf5d02e453cfa3dd7d8ca72fc2060d052e74990c2311a71bcf60b7ee3ee02cf21229611769e388925d7ef5acf8597dededd6b35f918
diff --git a/dev-util/cargo-tree/cargo-tree-0.23.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.23.0.ebuild
index 360f71e835a7..52eba65bc491 100644
--- a/dev-util/cargo-tree/cargo-tree-0.23.0.ebuild
+++ b/dev-util/cargo-tree/cargo-tree-0.23.0.ebuild
@@ -184,6 +184,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_install(){
-	cargo_src_install --path=.
+	cargo_src_install
 	einstalldocs
 }
diff --git a/dev-util/cargo-tree/cargo-tree-0.24.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.24.0.ebuild
index ac198d100457..131d1816df0a 100644
--- a/dev-util/cargo-tree/cargo-tree-0.24.0.ebuild
+++ b/dev-util/cargo-tree/cargo-tree-0.24.0.ebuild
@@ -176,6 +176,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_install(){
-	cargo_src_install --path=.
+	cargo_src_install
 	einstalldocs
 }
diff --git a/dev-util/cargo-tree/cargo-tree-0.25.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.25.0.ebuild
index cb4b4eb835f9..c291745eb473 100644
--- a/dev-util/cargo-tree/cargo-tree-0.25.0.ebuild
+++ b/dev-util/cargo-tree/cargo-tree-0.25.0.ebuild
@@ -177,6 +177,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_install(){
-	cargo_src_install --path=.
+	cargo_src_install
 	einstalldocs
 }
diff --git a/dev-util/cargo-tree/cargo-tree-0.26.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.26.0.ebuild
index 6e53a2e0be21..94af6ea62fc4 100644
--- a/dev-util/cargo-tree/cargo-tree-0.26.0.ebuild
+++ b/dev-util/cargo-tree/cargo-tree-0.26.0.ebuild
@@ -181,6 +181,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_install(){
-	cargo_src_install --path=.
+	cargo_src_install
 	einstalldocs
 }
diff --git a/dev-util/cargo-tree/cargo-tree-0.27.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.27.0.ebuild
index e0917ba37b57..59ed352059de 100644
--- a/dev-util/cargo-tree/cargo-tree-0.27.0.ebuild
+++ b/dev-util/cargo-tree/cargo-tree-0.27.0.ebuild
@@ -163,7 +163,7 @@ 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"
+KEYWORDS="~amd64 ~ppc64"
 IUSE=""
 
 BDEPEND="
@@ -183,6 +183,6 @@ DEPEND="${RDEPEND}
 "
 
 src_install(){
-	cargo_src_install --path=.
+	cargo_src_install
 	einstalldocs
 }
diff --git a/dev-util/cargo-tree/cargo-tree-0.28.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.28.0.ebuild
new file mode 100644
index 000000000000..3bc53295be46
--- /dev/null
+++ b/dev-util/cargo-tree/cargo-tree-0.28.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2017-2020 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.7
+backtrace-0.3.40
+backtrace-sys-0.1.32
+bitflags-1.2.1
+bstr-0.2.8
+bytesize-1.0.0
+c2-chacha-0.2.3
+cargo-0.41.0
+cargo-platform-0.1.0
+cargo-tree-0.28.0
+cc-1.0.48
+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.29.0
+crc32fast-1.2.0
+crossbeam-channel-0.3.9
+crossbeam-utils-0.6.6
+crypto-hash-0.3.4
+curl-0.4.25
+curl-sys-0.4.24
+env_logger-0.7.1
+failure-0.1.6
+failure_derive-0.1.6
+filetime-0.2.8
+fixedbitset-0.1.9
+flate2-1.0.13
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fs2-0.4.3
+fwdansi-1.1.0
+getrandom-0.1.13
+git2-0.10.2
+git2-curl-0.11.0
+glob-0.3.0
+globset-0.4.4
+heck-0.3.1
+hermit-abi-0.1.5
+hex-0.3.2
+hex-0.4.0
+home-0.5.1
+humantime-1.3.0
+idna-0.2.0
+ignore-0.4.10
+im-rc-13.0.0
+itoa-0.4.4
+jobserver-0.1.17
+lazy_static-1.4.0
+lazycell-1.2.1
+libc-0.2.66
+libgit2-sys-0.9.2
+libnghttp2-sys-0.1.2
+libssh2-sys-0.2.13
+libz-sys-1.0.25
+log-0.4.8
+matches-0.1.8
+memchr-2.2.1
+miniz_oxide-0.3.5
+miow-0.3.3
+num_cpus-1.11.1
+opener-0.4.1
+openssl-0.10.26
+openssl-probe-0.1.2
+openssl-sys-0.9.53
+ordermap-0.3.5
+percent-encoding-2.1.0
+petgraph-0.4.13
+pkg-config-0.3.17
+ppv-lite86-0.2.6
+proc-macro-error-0.2.6
+proc-macro2-1.0.6
+quick-error-1.2.2
+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.2
+same-file-1.0.5
+schannel-0.1.16
+scopeguard-1.0.0
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.104
+serde_derive-1.0.104
+serde_ignored-0.1.1
+serde_json-1.0.44
+shell-escape-0.1.4
+sized-chunks-0.3.1
+smallvec-1.1.0
+socket2-0.3.11
+strip-ansi-escapes-0.1.0
+strsim-0.8.0
+structopt-0.3.5
+structopt-derive-0.3.5
+syn-1.0.11
+synstructure-0.12.3
+tar-0.4.26
+tempfile-3.1.0
+termcolor-1.0.5
+textwrap-0.11.0
+thread_local-0.3.6
+toml-0.5.5
+typenum-1.11.2
+unicode-bidi-0.3.4
+unicode-normalization-0.1.11
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+url-2.1.0
+utf8parse-0.1.1
+vcpkg-0.2.8
+vec_map-0.8.1
+vte-0.3.3
+walkdir-2.2.9
+wasi-0.7.0
+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 ~ppc64"
+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]
+"
+QA_FLAGS_IGNORED="usr/bin/cargo-tree"
+
+src_install(){
+	cargo_src_install
+	einstalldocs
+}
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 00b16e549156..c413eb851ae3 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,10 +1,4 @@
-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
+EBUILD catalyst-3.0.8.ebuild 1885 BLAKE2B 32ce35e2ec842d1a503775a52a24d7dc32bd5b98892f51263a1601f478055edf47165e5002fc90714d73a8203c5e21e2f6bdc2c6547a90f37feca2ab088f2919 SHA512 f73a26108296f01b9993bbec5eae7d407fd331cca91dd01ffa8c930b75071a8885081486e8071d73f60aa84057655147a5fe07d03960a816c322999213648a40
+EBUILD catalyst-9999.ebuild 1897 BLAKE2B d3b994a4d569557fc56d9e94304c218aa8b6f9db7082076289e2d693ea7a8f68bac4633cac7a799a62a6eefd10d6f8db65b327c52971d799ac64b530309bf5c8 SHA512 a685312bf4cc4fb3924b9a03f88b03d92525e136553e7f381a8792398bca6b2a4f0a291188557ecb638ad64c1a539a0aafd07afd3484a661f56528730565d8d1
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.5.ebuild b/dev-util/catalyst/catalyst-3.0.5.ebuild
deleted file mode 100644
index 7da190c26fef..000000000000
--- a/dev-util/catalyst/catalyst-3.0.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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/catalyst/catalyst-3.0.6.ebuild b/dev-util/catalyst/catalyst-3.0.6.ebuild
deleted file mode 100644
index a2ca1e9a4877..000000000000
--- a/dev-util/catalyst/catalyst-3.0.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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/catalyst/catalyst-3.0.7.ebuild b/dev-util/catalyst/catalyst-3.0.7.ebuild
deleted file mode 100644
index 9b191cbaf519..000000000000
--- a/dev-util/catalyst/catalyst-3.0.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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/catalyst/catalyst-3.0.8.ebuild b/dev-util/catalyst/catalyst-3.0.8.ebuild
index 7da190c26fef..06458c752dc9 100644
--- a/dev-util/catalyst/catalyst-3.0.8.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 9b191cbaf519..f49e1e66af5f 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 0a3b8499c5fb..9b080312fc6b 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,3 +1,7 @@
 DIST catfish-1.4.10.tar.bz2 213951 BLAKE2B ff8f710d5f3b5d59e98bd6af9b1dd11499ea331b2d7c78945ebc1051d1b49d28069e47bd8aa3f12d57b646fc6764ccd4f365cda9fdfea15f5a3a4334b6e9b17e SHA512 baf9007b2ce2418fa5704e10884f509e4361505537e2ce70a7f8c8c61009094a09d7d032e0a6b4ca174f33bf76783ee2665f781cce47d2b236f2633e25192f29
-EBUILD catfish-1.4.10.ebuild 1085 BLAKE2B ac6da8b5f96a6f3e569c1478e53eb12dc661168bd111ab54fe466bc55ffdee9493abfc8d095b3946adbc748b1f23d28b4733f46b28f887006fbd1b8913400fe4 SHA512 d0a900d178dfdefc74105ff71dbfd4902f2450dab6e73c9cdcbb5a78fcfa2feb2c03372c04bcc73b486b585dc92f91cd6daba24f4dfb7eed4aa913dba4886985
+DIST catfish-1.4.12.tar.bz2 221813 BLAKE2B 4110ca5844a23b482d9cdc72a62ec49f7b6e2e31b861a38f454c4345642b970b9b6cc497bcbc13ce450476d812c1b6e32a762875d2af0f281a31464a43a543e4 SHA512 053b6ad1d818adc515df16952de656b5ffc44b3bcd59221828850fbcb0080958bd1154ec7dfe4952b358e33068a2b7dee4475dd9f6c6b55e6198ece0587745bd
+DIST catfish-1.4.13.tar.bz2 221999 BLAKE2B b487947954832c691a5a1b3bd2a49e7ae1aedecbe2084b86b9ae1c8bd7c95f6d3746f80723d351bed3abac0e2396fcce134072345a908f5ba9f0dfebdd95108f SHA512 a90c695e7c1a2172ea7a5f7f1a292e95aa290693a24f3988a68f2fb4597183ff7526c98925fb3ef8517fbca508a1c3853e0de87ec023be9424d994d63e29c886
+EBUILD catfish-1.4.10.ebuild 1081 BLAKE2B 0084bc7cdf58f4595670a80f16ec53a5cf847420e9a2e2e2d3ca31107839ea1a474dc44af4d76ecac4afda209d20b14f7952ea46ef2b92fd70c9c7cd1bd8ca13 SHA512 db1d944881defa394dc6ab129bb303d288b684837280111a21e667182f2870a0b1ff2dcd266c15165542251d1a9932119f9f084c8153d02fc3d884f8398b9ee9
+EBUILD catfish-1.4.12.ebuild 1118 BLAKE2B 14d6f5c3953be2a167917810875bc253574387d82fd4385d1a9fe94fbe8c58301eb96414160955887cc1155748e78836d6aa4526b33701d6b7b7b02b8787e4ad SHA512 c666a8764a48b8805d916ef3d8e593e2101bfcb0a94d9dedc41e61c97190647255c240b50f17d9f2d25c43dedb8fc59aaa4d1791390a5361f242ccfb4b580ffb
+EBUILD catfish-1.4.13.ebuild 1130 BLAKE2B 318daed3e38ce41b0ebe84f5aa4f9495d6bc390ec6b91f1b5a926095b7158164e1f46f2338f58c425ef902a06ff4fa1ce3738824bc42c8e1824a7b69799a90ab SHA512 ceaf4e68b61f87f66ccf5e8a16129b1f0697ebaf82b9119ab37191abc7c0e04a04403346cc5900a5af4dddec7f1a37094d50dbaac0ecccef0ae48be8fa26765c
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-1.4.10.ebuild b/dev-util/catfish/catfish-1.4.10.ebuild
index 8c7b7b27e812..d9d46da57b5b 100644
--- a/dev-util/catfish/catfish-1.4.10.ebuild
+++ b/dev-util/catfish/catfish-1.4.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 xdg-utils
 
diff --git a/dev-util/catfish/catfish-1.4.12.ebuild b/dev-util/catfish/catfish-1.4.12.ebuild
new file mode 100644
index 000000000000..75b42f50ed9c
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.12.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	rm -r "${ED}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/catfish/catfish-1.4.13.ebuild b/dev-util/catfish/catfish-1.4.13.ebuild
new file mode 100644
index 000000000000..d28399901b9f
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.13.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	virtual/freedesktop-icon-theme
+"
+BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	sys-devel/gettext
+"
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	rm -r "${ED}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index be05672509ab..dd10a7aa386e 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -11,8 +11,8 @@ AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e
 DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
 DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45
 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
+EBUILD catkin-0.7.14.ebuild 3129 BLAKE2B 75ee868516ea7c24c68a3412036da834d811a9599b88733697356941ccec1afe572602d5f9886e4069644651f4a711b88d104003f997f2cebb84b9ba65481fee SHA512 9b97375821b620a3824dcd233b0d145e10e3bc46e969c34706d4f7588a41e15daa6a9bb41679f0c5556514acce91be2f6c1ce40bf90daed37a966f083f0d1a5d
+EBUILD catkin-0.7.17.ebuild 3132 BLAKE2B 17c7d416ba2d3f54fd4453d79b671587a8cbfeab227c4996818592c9f0ec1277c67980003b9472f7d358484bc3543b432fa393c6925f9e30ef92aea277a1d3aa SHA512 03c7083a1db09b06be03d2f499210174cdc5ad39d9988a2b8e209e58849d8fc49173c7a8ab9349a0a1bafec1761caa0cf83f6c6e356fc0ee132fa6e8dd87b9e3
+EBUILD catkin-0.7.20.ebuild 3139 BLAKE2B 94ec66f1c9537c651082ddb66753349bdd1fd6e2f186364edcc864cace4f46159202c07010eda0fc457220394e3d489535b6be106cef021894fbd46071621c8a SHA512 46244333f2f244cdb529c48ecaab7f9fcd316c37f99206b0993c7d5c44cde83f7a9fd991a70ecf853b2317b962fabfa87d8537f1fcf83e21ea5b98651319423b
+EBUILD catkin-9999.ebuild 3132 BLAKE2B 17c7d416ba2d3f54fd4453d79b671587a8cbfeab227c4996818592c9f0ec1277c67980003b9472f7d358484bc3543b432fa393c6925f9e30ef92aea277a1d3aa SHA512 03c7083a1db09b06be03d2f499210174cdc5ad39d9988a2b8e209e58849d8fc49173c7a8ab9349a0a1bafec1761caa0cf83f6c6e356fc0ee132fa6e8dd87b9e3
 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 74a1aa7e9e01..f97b4adba484 100644
--- a/dev-util/catkin/catkin-0.7.14.ebuild
+++ b/dev-util/catkin/catkin-0.7.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,9 +9,9 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
+inherit ${SCM} cmake-utils python-r1
 
 DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
 HOMEPAGE="http://wiki.ros.org/catkin"
diff --git a/dev-util/catkin/catkin-0.7.17.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild
index 061b05be08af..990f85b60a95 100644
--- a/dev-util/catkin/catkin-0.7.17.ebuild
+++ b/dev-util/catkin/catkin-0.7.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,9 +9,9 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
+inherit ${SCM} cmake-utils python-r1
 
 DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
 HOMEPAGE="http://wiki.ros.org/catkin"
diff --git a/dev-util/catkin/catkin-0.7.20.ebuild b/dev-util/catkin/catkin-0.7.20.ebuild
index 92350f4085ab..6ab9ccf16e50 100644
--- a/dev-util/catkin/catkin-0.7.20.ebuild
+++ b/dev-util/catkin/catkin-0.7.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,9 +9,9 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
+inherit ${SCM} cmake-utils python-r1
 
 DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
 HOMEPAGE="http://wiki.ros.org/catkin"
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 061b05be08af..990f85b60a95 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,9 +9,9 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
+inherit ${SCM} cmake-utils python-r1
 
 DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
 HOMEPAGE="http://wiki.ros.org/catkin"
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index cc89f9d16d26..2810c35184c0 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -1,25 +1,40 @@
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 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.4.crate 10937 BLAKE2B 272fc9d216749941cb73d37d5233d1df4bde5abcf9a6e75ed928ee6493e9011922a06551dac1f6b1d0c34dce587c6ce1442ea62e88457c0cecf985e7a3d5e47e SHA512 811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
 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.12.1.crate 142473 BLAKE2B 7ea4e5547d84999d0b366e079c8f31120ae4b2cf87e32b3f6659e88a59c41c720260de3405cad102b7bd32a7d3529803b05a06ff4b4b329412cceea97198bc36 SHA512 851f82cfdd4304dc57dab1a145f78a05a6c5f05ad607d27e0ae909920a5d99013ffb7f7e87950541bda98462f73f0c338d9761b94a96c3073f39163c2ddacf08
 DIST cbindgen-0.9.1.crate 129676 BLAKE2B 12315522938e941c4a53033f276f6065d6e19ba7cab3ce8aabb17b2ae5fe0c7231e51be33828434d6ca039d79c9414fe8d310a12b07ef1c544ed9b5d8cee74c6 SHA512 0e32563db42363dc82e8aca2f36bdafcdf0ec9156e7238937295c9369d306c2bfa590ea7a9afd61d8b915fc383bb7af8bbb78cde71f6ab30b0c576262c74232b
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST libc-0.2.58.crate 409031 BLAKE2B 81353f2e0962bdc3bca806a195c80b84f9c63c0a7184aad966f33ea073982045577eebb468bf379a7e342bac722b9df7052d25becd9f25c99923bc309ae75211 SHA512 9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491
+DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
+DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
 DIST proc-macro2-1.0.0.crate 34625 BLAKE2B c27040190bb06af8135c0fd85fc285abc3a672e629b43968573a95966ce8beb09b93dc9076e4e78da2434a2803b33c695f71ab6df07c7030432f9863d87ddfa7 SHA512 8b70b107ee0445eacae9a3f35b5c02649cbcc41550fdf109a4bf3248eab20568ad016ccde2274b406a4631605b8414d208187f5fd0090baa182df8aeb68a2727
+DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
 DIST quote-1.0.0.crate 23089 BLAKE2B 89bd0a0857da2c261f529ffce512ac55bcddc3d6aea7ec039a009df045709a15667e9f4869daa1187e1859eb489ee32302bdea1a0ca8010267ae7e892698f7dc SHA512 64db0b1690beb4f0a81dd77ccdf8e3f61b523674802ac657f0849b7ae653d8de41f279e55eb22c5f6080fc9787845cc6470b5486b35c3a0f44f019185db542e0
+DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 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.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
+DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
 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.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a
 DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
@@ -27,25 +42,37 @@ DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b01
 DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.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 remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST ryu-0.2.8.crate 42798 BLAKE2B 393eba320c417af8d2cc23f5fc2874d7813fc3cd4804f7cba1d374f073f74bda4de8208544f30a5650d21cccad28611c8ab2bbdce15ba63b88d6b17100ac5ea7 SHA512 15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4
+DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
+DIST serde-1.0.104.crate 73258 BLAKE2B 98d63f91c61ac4693e17e0b137379cffd6608933b84d2211509be6b3b25b181592d5e907549fac6ae2e4a45255b8003e1bfd0db683429ac3e78d8ee097d3d79c SHA512 638a1dacc158d69658a005e599adc19d6bc80d0c663f527b1ff906f729e70e027eacc4ea5b9b2c675ac990d5997f50f9d46d614ba95b0c73bb9606aba46b053a
 DIST serde-1.0.93.crate 71702 BLAKE2B 3f6802999b67c660b602f0c05606b0853158bba16d321d7a28d14d37bdb7d102daf25472441e1f5a5f63617ed8cae7c8d02326775a92ad6b9deae87dba726d89 SHA512 ec7712ad54bae2d93524e49730e2707b20ef91c8aa05084c6bbbd17e3ca77532cc672b8ae8f3ace25fc72a109cdc06a4b3f74515b7afe35faff6887984ae9309
+DIST serde_derive-1.0.104.crate 49658 BLAKE2B d4a9ecb4a8df87776a83d645778dc050803b16fd5c9889f28e231238223d424dd25b101412e89741fb47be624d1773acf97f6e38809c81110b696701975168df SHA512 303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e
 DIST serde_derive-1.0.99.crate 49786 BLAKE2B 1a8502b8c22053c54cae207dd283402a85a7eec630883de36df85d46bed4519d04c3b82baf660d4863324a3db9875ae62b9486383596487e9648533e05e685d2 SHA512 6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e
 DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
+DIST serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-1.0.1.crate 189474 BLAKE2B 0d2319f149c9430787e5cf2eca01a93b5b642a1e968ec3f328c3b8e79a2b11e5d16fe9da57fcee8c06d9446f3eec6d7e82705a44ee27006b6e5d4577b8aa1c72 SHA512 10ec59186b0090f4a7302ad9504ab78c0a396ce7087b7e75502f12a1c6ba02700455a7f0910f2abfb45dc0c9b59de112a170772f4da11ac8d094a701bbbe754f
+DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
 DIST tempfile-3.0.8.crate 24549 BLAKE2B 839b7637add53e91b232246739b21a60c28bd54704b65da889bc92733fd117d9aa46289c44d94974c9c24d7d532c97a4ad7c64617e1df8bec21671ecd16419e4 SHA512 88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
 DIST termion-1.5.3.crate 22080 BLAKE2B ed62ecffb9deef39682422a9bc97a8c3be63487613b7a950f8e5984a077090f4f93022bc217d0ab16a76c8ad8d15ad12c45b81ec52d343793ba3914002029d68 SHA512 1cbe60f97d5f8b95e6a57ec9b7cfcf37459bc8dbcf8424b055f04b2ecdaf069e1bb52222364a2f380dc3f63039fe3823d424228af1c212a8b3790b7dd55d5deb
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST toml-0.5.1.crate 51029 BLAKE2B 790097610e420241ded7a4bba3e66a6f7f7856e2e3f4f738e4edd764bbb6b5b3a0cfa10c1e1a9210ef0bb55ff67be47f3bdc129063d135daaa16d731d06fafc4 SHA512 4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073
+DIST toml-0.5.5.crate 54805 BLAKE2B 2b319f37165164793866bc4a470ed99447fdccb59242c94e5311906dc764f54131f2bc14921caab56bf84706d12800fb26a58210e3e58728f4076edc9a66e771 SHA512 8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
 DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 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.12.1.ebuild 930 BLAKE2B f703938c5082757237a7b94601f7404f16729797d468d447c0ac9bcd67b35e30a310442dfe3614ba955fbc70ce8275dccf08e5fbaff33ea8805e05f8a8eda131 SHA512 6e5a99197b77b8a125527e1691fd96dddf94c0093db25840b78f0aaadd5ee15b601bc0d2dd7d0e941bfcc65dadb4177ce2f984e5233cb1bb7c45834a807d6df4
 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.12.1.ebuild b/dev-util/cbindgen/cbindgen-0.12.1.ebuild
new file mode 100644
index 000000000000..70580fa9ae18
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.12.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.13
+bitflags-1.2.1
+c2-chacha-0.2.3
+cbindgen-0.12.1
+cfg-if-0.1.10
+clap-2.33.0
+getrandom-0.1.13
+itoa-0.4.4
+libc-0.2.66
+log-0.4.8
+ppv-lite86-0.2.6
+proc-macro2-1.0.6
+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
+remove_dir_all-0.5.2
+ryu-1.0.2
+serde-1.0.104
+serde_derive-1.0.104
+serde_json-1.0.44
+strsim-0.8.0
+syn-1.0.11
+tempfile-3.1.0
+textwrap-0.11.0
+toml-0.5.5
+unicode-width-0.1.7
+unicode-xid-0.2.0
+vec_map-0.8.1
+wasi-0.7.0
+winapi-0.3.8
+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 8c2bd22ca4d0..95e4ca92f127 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -6,8 +6,10 @@ DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c01
 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
+DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
 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
+EBUILD ccache-3.7.6.ebuild 2199 BLAKE2B 4135d5996d89ca571779a21c066f8345e27bc2cfc3c8a4820887a6365f76f082f4699b8cd87c6f764e1b6c5b79f58ed3f51103228404dd19ebc7c2d20bad6524 SHA512 984ddd680b8a943ead93f6466dec4b6ec0a0ca6386473017b4856e0086f4268b9d237281c86dc1366cf8e8223cccea29497c6c405c188e63155797c97b25d056
+EBUILD ccache-3.7.7.ebuild 2207 BLAKE2B 79ad7ca08f4ca19b53e55f828b809e5cd3a49eead4b35e59febc7ba22d2beea74765fca4d80ea4338bc7edf4b9977a83f51cfac33dd5418ec4beba0174752b69 SHA512 9eec115911cd9b84668561f9bda15b311912b4f301c1739a4bde3fab0ee85a94a938259c5ec248b75aaabbef1c25e56cff79a0bebf979aeafd003f099241bc8a
 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
index 998d395a3b2d..6cfc30082f61 100644
--- a/dev-util/ccache/ccache-3.7.6.ebuild
+++ b/dev-util/ccache/ccache-3.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.7.ebuild b/dev-util/ccache/ccache-3.7.7.ebuild
new file mode 100644
index 000000000000..ee06e436089c
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 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/ccglue/Manifest b/dev-util/ccglue/Manifest
deleted file mode 100644
index ceb28ceac4c9..000000000000
--- a/dev-util/ccglue/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ccglue-0.3.1-as-needed.patch 345 BLAKE2B 6c6d64f0e3336efdce0c443967e9482eb6bf9c78297c9d12aea9338cf303b2cd08bd8a520a55e370fc910664f26aa295301b0c436ddfb5bb44604e8df2bbbf48 SHA512 227de72e1931182c2ea1ddfe02a5d44ca04b59505ba7027ee6abbd2be1f5e3a6b2dfbe13042337b97c0f27b1dfd4f1c5fb8f51fd0c70801bcb803120981afa0d
-AUX ccglue-0.5.1-cflags.patch 338 BLAKE2B e001107c205cf96f5acdde38b837269d186edcff7b8d8607c8d47d1f3f744ddfc9f63d634302931012480586540a7cdb22e27632b1a5a722319d19bf6f4ff5db SHA512 6e25a6969011f868c4b703170e04f0e166eb0d370f626fddbbecf1b2e43839392d33600ed7738b2c4d48c7529325f878b731ef49c1879d1efaa29260ab41baae
-DIST ccglue-release-0.3.1.tar.gz 101529 BLAKE2B 62cec2b5329ff3133d64230b63e65a11c312840d7e5a073c3685e7fc5757a4fc7e0b3b6f4dd0e1a21c93ebdcb63716fca001451bd07c1e85f5cf29d894c4dcaf SHA512 bbe4c9ff84869696dac80f801fa54df4f60bbe7615d3cd587713f7cd8c58f056db95a003c47879e0ca4fbd3956f97a4b3d31c6d04f49aecca9db2c5ccfaae4b7
-DIST ccglue-release-0.6.0.tar.bz2 220918 BLAKE2B 447a5db4c43cb7c355b51ccaa9ade6f8cb4d1d36de55af19a76ec567f2da9291268600f2a21149413800fd82ed4ad4f35b3aec21b9e5fb0edaed8990de76eaa8 SHA512 695983741049d460cac3ae906fddd75380a498062373461efb49b976b958b181301c6a028cc76643bee7fe3b59664aa432d1fb0d43446019a116224ff15107aa
-EBUILD ccglue-0.3.1.ebuild 568 BLAKE2B 634e7d11fde9d345eed2b73ccb9b62afdfdca633f7196f1ab878e9fdaa8ad56988edd338e88fa9d83ab23106019c885ab4ebcc95bfb68ee29490ec8fc64c5078 SHA512 a4bfd4be74e57264d29c7517feead01f6f420e8da8b654aa3d242e134eeb6a819ae7bbcf92ebd702120d3018da1fcab913466ad71593a28b0a60151d383901e4
-EBUILD ccglue-0.6.0.ebuild 479 BLAKE2B 4875add4d93349a9b51a461fa9ded725d32e812af068addf1bcef9e42fde9297a47166ea66304ceb0c5c728982e874f3a1fbf4de697d85fb4670d2ed47169b5f SHA512 e7fb8887056d94c4f2c3d1c846b9f7ccad4b12f376b37a3b9274bd4221b4f6368044f4208a89a8d6ee0990354705e7624853407405efa0cc8cd1c34b9df2bab3
-MISC metadata.xml 564 BLAKE2B 43f2de626956d0a33bb2be883f964dbbe8f370482cb0e306c16077a237d5b7ffe4646f4a8a215f844d455b557a53ed6a03533f55beaabe10a9c98c14849888f2 SHA512 d3535dafd6e0a469792cb01b02e3218ec251e0b9fc8fad63c326e55c700c751232912b6dd043179828a20d04db97a724fa0d1b6d45e7650a4ecc9c337500a125
diff --git a/dev-util/ccglue/ccglue-0.3.1.ebuild b/dev-util/ccglue/ccglue-0.3.1.ebuild
deleted file mode 100644
index 2b3f07348a83..000000000000
--- a/dev-util/ccglue/ccglue-0.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Produce cross-reference files from cscope and ctags for use with app-vim/cctree"
-HOMEPAGE="http://ccglue.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-release-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/release-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	eautoreconf
-}
diff --git a/dev-util/ccglue/ccglue-0.6.0.ebuild b/dev-util/ccglue/ccglue-0.6.0.ebuild
deleted file mode 100644
index 60c9355974f9..000000000000
--- a/dev-util/ccglue/ccglue-0.6.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Produce cross-reference files from cscope and ctags for use with app-vim/cctree"
-HOMEPAGE="http://ccglue.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-release-${PV}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.1-cflags.patch
-	eautoreconf
-}
diff --git a/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch b/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch
deleted file mode 100644
index 5f2e5e34c5b5..000000000000
--- a/dev-util/ccglue/files/ccglue-0.3.1-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- release-0.3.1/src/Makefile.am.orig
-+++ release-0.3.1/src/Makefile.am
-@@ -1,6 +1,4 @@
- bin_PROGRAMS = ccglue
- ccglue_SOURCES = cscoperdr.c seqfile.c sym_mgr.c digraph.c options.c main.c c_glue.c
--INCLUDES = `pkg-config --cflags glib-2.0`
--AM_LDFLAGS = `pkg-config --libs glib-2.0`
--
--
-+AM_CFLAGS = $(GLIB_CFLAGS)
-+ccglue_LDADD = $(GLIB_LIBS)
diff --git a/dev-util/ccglue/files/ccglue-0.5.1-cflags.patch b/dev-util/ccglue/files/ccglue-0.5.1-cflags.patch
deleted file mode 100644
index 5d0b294f4ca4..000000000000
--- a/dev-util/ccglue/files/ccglue-0.5.1-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ccglue_v0.5.1/configure.in
-+++ ccglue_v0.5.1/configure.in
-@@ -19,10 +19,7 @@
-                      [want_debug="$enableval"], [want_debug=no])
- 
- if test "x$want_debug" = "xyes"; then
--    CXXFLAGS="$CXXFLAGS -O0 -ggdb"
-     AC_DEFINE([DEBUG], 1, [Define for debugging])
--else
--    CXXFLAGS="$CXXFLAGS -O2"
- fi
- 
- AC_CXX_HAVE_SSTREAM
diff --git a/dev-util/ccglue/metadata.xml b/dev-util/ccglue/metadata.xml
deleted file mode 100644
index c9fda525828d..000000000000
--- a/dev-util/ccglue/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vim@gentoo.org</email>
-		<name>Gentoo Vim Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		ccglue (ctags-cscope glue) is intended to be the interfacing app between cscope
-		and ctags. It can generate cross-reference tag files that can be interfaced
-		with the Vim CCTree plugin.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">ccglue</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index 58f891787e7f..5b5748bc26aa 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,5 +1,5 @@
 AUX cdiff-0.9.2-disable-unimportant-failing-test.patch 383 BLAKE2B 4dfd4cdff8c71ba3cc160317d27a5bf26b2c5ed0d1278403dd7c5ad2a07e0b55759ec8c67c50b5d36aa1a8912f2b4f653fdb0b7ad1b36865367e28a433ebc4d7 SHA512 598cf3d4ccbffb6ac71c3e60c4402001d18172d1f7fb309290c94b0f5d2541c4fc1c6557cb1d5780e993e3fefb84314acb2515ab6e585affb7172327794fb4f9
 DIST cdiff-1.0.tar.gz 33599 BLAKE2B 98e6e8689329bfbdc718e7f6bf3cfb6c6ff92de0b27a44f62f24e35710cf0391c6127833b7f8302aa31d9420147791fdc2861aa95acf5719ce250f7af4d8893f SHA512 74a41bdf9c0ffef5baff775dd32027d401547bdc8f40eb633e11107c74d0e9b31746cedbeffc4a3732ff9abe03a101aa3a7a509d3a0e0e080589c6f18bcb8cfe
-EBUILD cdiff-1.0.ebuild 709 BLAKE2B 9e8d86ac7e5a8fb9dc162f1f63a76a159a1f88d0ef7458eeb2ade055215481d6710fef96ce552ea8e3f3425dd17dd80d5b4a807ca9a9b2e5d914bdac3faff945 SHA512 f711fb7b53f356d5f5a9d7a17cfe3145a3acf34eb70e035240d1cf3d5661f6af415e777565f0d53cf43534dbd127e5bdf396b2388d668216121f24f4a38bc508
-EBUILD cdiff-9999.ebuild 745 BLAKE2B 61f63f8673f91dc7b7b63e5028d6bbde27dac835fd82e17ee02e8bc12473d828c1a36d429a30c022e0edead0c8a4e1d5333dfcc0f2d78f579c9bf08e67a8dcee SHA512 bf47d0032eac6870eb4fd8a49bf17ddc71d8c6e8dfc99d2049440e6dc3b9b5dc5860afdebcdbd750d77a886837c97570e72cee97bc78e57d1c088afa36b8a51a
+EBUILD cdiff-1.0.ebuild 700 BLAKE2B 8fe0cc7375051a86d62240e55a85e2b510aa6e1838580007ab8c028b0bd4cabd72b4488c95989c964c9018c1d24258a8cefb0f6cdd88f36e0b6824949245be60 SHA512 70b277acd5621255f7907097ebaf53a1ca4dda320d0a2d2c5bef552cf62038b143a2c06001fe035ea4689ca501b818a288370d4f6bbb0984a9672327ed3d3984
+EBUILD cdiff-9999.ebuild 741 BLAKE2B 609611e9bb4714a374ccc8676ace6fb65540497187097a73db43d104321182cf158d6c9cd1c5b4d01b06784d93b5a41be18daca258d90c7802ec0153eac4fcbc SHA512 1cba6cd1eeaaa914572945f9cd739721894ac24049a94a1213e9f9a094ca53793e9ad2a57c6f3f6ca7befe41880cb83c765e929839680650b91a4f016c87fb7d
 MISC metadata.xml 383 BLAKE2B c2fba0c9ed05af593bf10ae733401d7de8a1396c22094ba912418a796783e069243506edfa72cfb1a706f63c0bcbc5cfb0321b21a5d699a726901ccae682a32f SHA512 c797a47d8258e3aff9bf93328566438192a37c166733e84fd6846ecccb77ea0398c82dd9abbbe90623d4a1fa33405c75ed1defeb832cb2e55b754d3a594bba5f
diff --git a/dev-util/cdiff/cdiff-1.0.ebuild b/dev-util/cdiff/cdiff-1.0.ebuild
index 98a045cb0db2..326c78bb675a 100644
--- a/dev-util/cdiff/cdiff-1.0.ebuild
+++ b/dev-util/cdiff/cdiff-1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 16e2456ba330..0040b4980847 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-util/cflow/Manifest b/dev-util/cflow/Manifest
index 2c159880547a..8f92f51832c8 100644
--- a/dev-util/cflow/Manifest
+++ b/dev-util/cflow/Manifest
@@ -1,5 +1,5 @@
 AUX 50cflow-gentoo.el 177 BLAKE2B d43229ed9ebeea653f91ceadd84f641eff4bf1168cf6e94524c228c943ff973e2cf99216bf7be10dc766014d607f9edf1ab74230e963fbe62561c66914665b15 SHA512 1edbe2c330206fdb9ad3844a2278dc71d13a0ce7c46c73030192de3f05634fe08012c04e7c94883b1f6fde21483aba29e16f7a1466719c975e9c60d59507c5e3
 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
+EBUILD cflow-1.6.ebuild 1057 BLAKE2B 38ed1704a06d5a638f3e91993ab0e8582065f2a5c1239f30c00bf5d11b65d2bab1ff118cc8b7a85ad1244bfe840e1d59fcf147259d6b227bfa85d2902213675a SHA512 19a38d33c9ad43d90c61ebe006767cbf5a51bd7513000883893ab3d28fb7db8163c35dac4a15452fd5dbc56175e101d62564b37964de18a87bc39af40b7ba03a
 MISC metadata.xml 536 BLAKE2B 69d3347338a5a927ff0df99de6fadf6de6fffe265f46cf8465eb8d973c98de19b05f678ae82281e78a806d2db779bc89045216c655487e7c016e153de6f0421a SHA512 411020d631cff076d887c1a8be507e7dc323b5bd585f7383db0f8a62fdbd41dc704e5d38cfb6ab27a83e3333b43804512046a462526151f3b4669d8a44546749
diff --git a/dev-util/cflow/cflow-1.6.ebuild b/dev-util/cflow/cflow-1.6.ebuild
index a7aa5e876cbf..3aa848e9a2d6 100644
--- a/dev-util/cflow/cflow-1.6.ebuild
+++ b/dev-util/cflow/cflow-1.6.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug emacs nls"
 
-RDEPEND="emacs? ( virtual/emacs )
+RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )
 	nls? ( virtual/libintl virtual/libiconv )"
 BDEPEND="${RDEPEND}
 	sys-devel/flex
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index d5693bdbdb4c..48017c6e57e1 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,4 +1,4 @@
 DIST clazy-1.5.tar.xz 352344 BLAKE2B 0f7200900f1a8bcad3020cf98522e3ac9ba01dddc9b2200f08a8a86102e4389af7a4a86e1832ee4c0e750267948a908627032385a01af94d8d0ae5f438114b9e SHA512 863cb9609d02a2260b61bc6cb3e6d8a84975d3b4e4f1c94a82e8c600d95a28483c323f47ac39c39ecef24d0f51871b358055868c63a49b136cf8ee3060df5a52
-EBUILD clazy-1.5-r1.ebuild 1260 BLAKE2B 98951b2dda81c84f0fd3dce72b7cfb7d70d7cf1cd557a1c1c837724d953e8a81967ff59aeb7ad8ebbe858baf7656622969c82442014dcfba34b7dbd78a0f0f82 SHA512 91c1de9b9fded38a5158251efcd5407b6a2f9eaf4bd51c582a899308e765c67c17ac178cb7e1c545f7cf2ae7b1888a0278ccb852a3445a65df471aa171d8c0da
-EBUILD clazy-1.5.ebuild 865 BLAKE2B 43f896c2e097695685340bb5b9d707bf882f66bba63fd17cf0f1948b222acbcd4d1e773e54d6f0dfea5ea7102c5048a9d5fba1d683eca0c4ccba1b2b75ad4d9f SHA512 9d2b56b4453527e1562e104439271720db5f376e8f474b7082350688b6cbd2565bac4c672b2f239d8b8a770bec9cb9f362d107eec54ff9a21875006769dd8fda
+EBUILD clazy-1.5-r1.ebuild 1236 BLAKE2B 381df225a577f1a9c801629ac08e7a4d755c98c3bacf94ed2c116472e00fb41a1325a1c0a1076bb1e9ed8ca3cfea7668d4b6b64367fe4e1d8b1788f25d95aadc SHA512 36994dab1861a6a42ab03050b64d285710d708b5f139e42329f6d64f0e8dbd89e07e6efa111933077424ebf346287cb90e4474f9a996889c8d5d82731ac4c6ca
+EBUILD clazy-1.5.ebuild 847 BLAKE2B 52865bc6ed518633036e513316d5648aac2e05e208d21c9677e2ca75d4a84aaaf9e98bc8c2a92defdba831ff24ff4b217ce4278a7c93757406616fe362d59818 SHA512 d8081cf01c51604f5f742f8c1c2f3d81b2384429d378d964eb93d90755df5211b30e3a0eb31aaeb59e33e1ddcece9fc4d64cb875f28aca20e2e852aa0ecd8548
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.5-r1.ebuild b/dev-util/clazy/clazy-1.5-r1.ebuild
index f5cd867cd909..d3f38a652bb6 100644
--- a/dev-util/clazy/clazy-1.5-r1.ebuild
+++ b/dev-util/clazy/clazy-1.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
 HOMEPAGE="https://cgit.kde.org/clazy.git/tree/README.md"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 DOCS=( README.md )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
 		-i CMakeLists.txt || die
@@ -39,11 +39,11 @@ src_configure() {
 	# bug #681568
 	local clang_version=$(best_version sys-devel/clang)
 	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
 	rmdir "${D}"/usr/share/doc/clazy || die
 }
diff --git a/dev-util/clazy/clazy-1.5.ebuild b/dev-util/clazy/clazy-1.5.ebuild
index 7bf24b0ba071..ba0428212c7a 100644
--- a/dev-util/clazy/clazy-1.5.ebuild
+++ b/dev-util/clazy/clazy-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
 HOMEPAGE="https://cgit.kde.org/clazy.git/tree/README.md"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 DOCS=( README.md )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
 		-i CMakeLists.txt || die
@@ -33,7 +33,7 @@ src_prepare() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
 	rmdir "${D}"/usr/share/doc/clazy || die
 }
diff --git a/dev-util/cligh/Manifest b/dev-util/cligh/Manifest
index 639f6bf19e6d..fe6d2d4d96ec 100644
--- a/dev-util/cligh/Manifest
+++ b/dev-util/cligh/Manifest
@@ -2,5 +2,5 @@ DIST cligh-0.1_p20120630.tar.gz 7848 BLAKE2B 4690330e4b353244bc1e7065759637fa9d1
 DIST cligh-0.2.tar.gz 7844 BLAKE2B 001e597ee60fd8b9e378c96f1ad4ab9dcf42de049bc2a914f8dece12048beebe0ec04b095cad64508af611b2fe52ca43fcf62b5bded74b3336359be85fef1235 SHA512 9b6e5e187324ccc1d9264aa259f648231f46aa443b75682206a17626f4f6f594a14538066f5e561c8a296d740506216db4cbd6ef7a9d25338a9d641cec7e3b9c
 EBUILD cligh-0.1_p20120630.ebuild 545 BLAKE2B 9480e10e97945bcdf10623417fc745ddd7f6a3751d3255d5b23e4ccd99cb5c3ce818268050a33090547df764cd90e839c4641fc45316ccb44b23022428a847e1 SHA512 fd32a8b47b20d93fc89888c1120f34bf2dde9698550e1b6eeea3bfd155cace25cf6109787dc0ce95f9829bc8e7d0efc3d6f5ad2c6fc317e240163f1c7d115217
 EBUILD cligh-0.2.ebuild 482 BLAKE2B fc1a2f481f693f513b3baacbe283408b26f4681a16f96be98435546bc66ab084ec9f10709bb7ea23d364ab980c1c06542bb78c1142479de868159dd7205abc2d SHA512 e26bd6b4af345ff67c145a55e27dfa37fdc12765a1437d17972c7ae9d7e418785c7649bcd127be9e72575a6de8a6ea032b0ac6fd9f3a545b235a07a203fe6746
-EBUILD cligh-9999.ebuild 472 BLAKE2B ffad639f1b1c2db9360bad1e37efe39ac836c657d8d50a84399ad9de8b698828ac5e0abf36261b7f7fd57950d068f180d2cef0fe62b9774c2fd6bf42c91385fd SHA512 a3dee067afde2e9e3a6f2f9bb0da84a024642c75d1da978ba8114935e224877de91baf3582c1b2c8ce827319b47b9b74d06e99ac110838b2b2dbc334a3d83267
+EBUILD cligh-9999.ebuild 469 BLAKE2B df181e7959b02de776a5e3130ecddb4ad8d60f2140482a9e58316063eeb25050bafcfaa93a141487a3c1a1033a64391cb57fff82ada2a44a49639b99eb681d41 SHA512 aa660c182dc699119edc982f66b454c6a30cfbad2da42bffa66e6c34598445bbff588aa466794093278d2b733cb757371a9218af30085f22e552c159b5e5e99a
 MISC metadata.xml 322 BLAKE2B 17e6d135ed46dac64053e30754ace41a45926ea930b32b4c41493eb67d03ff851301b07e4d42c37f6eef1150546eeec67994d9f3795af7197a376435acb68d2a SHA512 3d76d3e71460441beecd4bfdfd96f033d0701a2fa71918b9ffe222c4354ee5d716415ebb1aeff43818bc34a428ca60ef34894c44cee0256244f118e2b54d090d
diff --git a/dev-util/cligh/cligh-9999.ebuild b/dev-util/cligh/cligh-9999.ebuild
index 524de0ae29d3..808fce4ea2dd 100644
--- a/dev-util/cligh/cligh-9999.ebuild
+++ b/dev-util/cligh/cligh-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
-inherit distutils-r1 git-2
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Command-line interface to GitHub"
 HOMEPAGE="http://the-brannons.com/software/cligh.html"
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 46eaf3d767ce..901f582272a0 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -16,16 +16,8 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
-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.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 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
+DIST cmake-3.16.2.tar.gz 9109837 BLAKE2B a574325eb1f4c59a5745e3fe1def5ac53c36d4ce8dd74e051d8f4fbf41dab1d0134cf04541c1757df178def1eb65bd0536f1db132f5f9ca894870da1daf5901d SHA512 b5e68083713462400b38424bf1dbfe73d37a5fbe211fadac30c576246024a1d40f95fab7044804b7201a1bc2e7fd5b7093257e9534cd35538c8b274dc00f4b76
+EBUILD cmake-3.13.5.ebuild 6179 BLAKE2B 30b41df2a9bf9dea4a375693b5e8b3a8e1a925df878ec6a83cd198cc45c565b5da77aadc6ec8bed43799ab876a0ab34f4bcd6e9e20363a056b1f31173c2b17f2 SHA512 753b19e4a2ec07adf6ca1c519bcbea5a56b0447ad118bd9e8f42b317e51ea89a9d59d8870bd0dc7ca24ae54ed63ea5079c3f69249b94340f3f062ab29b029d28
+EBUILD cmake-3.14.6.ebuild 6233 BLAKE2B d54de0ee0da5fe6dca906105d37b55a90f68426b96766500fba7b8d847dbe8a357b8ce1153344e90962cc6938afe7b9d5e21c430fdb04dc9ae92d0270193e811 SHA512 12bc69453d0695734fe7d5266b8c66441aea2eace35f01f0e69c565f33bc518d6176f08220be6d0db9eaf75dd64e26c8221cf648a6c556847c35b659c6a7e4c3
+EBUILD cmake-3.16.2-r1.ebuild 5849 BLAKE2B b6b96efe81e308591e77e943d0414f5f71656aa15e548cc6e7bf7000605b430d9459e69959665c82bb7a8a619ee1e719e68597527b06b6c1cf9841262e24b942 SHA512 295ee591dccc69ca1b0c1909ba9a4e7894f949a7040498a3f60d9564a650bc8e5c53534c14069098ea4a5719a2cf36f23ffb51d12986078f1ce108642c5f9ad8
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index fdf53e57156e..529cc0a350ef 100644
--- a/dev-util/cmake/cmake-3.13.5.ebuild
+++ b/dev-util/cmake/cmake-3.13.5.ebuild
@@ -4,8 +4,8 @@
 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
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -27,7 +27,7 @@ RDEPEND="
 	>=net-misc/curl-7.21.5[ssl]
 	sys-libs/zlib
 	virtual/pkgconfig
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	ncurses? ( sys-libs/ncurses:0= )
 	qt5? (
 		dev-qt/qtcore:5
@@ -135,7 +135,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -174,15 +174,15 @@ src_configure() {
 	if use qt5 ; then
 		mycmakeargs+=(
 			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+			$(cmake_use_find_package qt5 Qt5Widgets)
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -191,7 +191,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use emacs; then
 		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index 1e43d54469ec..ee04242b9117 100644
--- a/dev-util/cmake/cmake-3.14.6.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
@@ -4,8 +4,8 @@
 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
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -28,7 +28,7 @@ RDEPEND="
 	>=net-misc/curl-7.21.5[ssl]
 	sys-libs/zlib
 	virtual/pkgconfig
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	ncurses? ( sys-libs/ncurses:0= )
 	qt5? (
 		dev-qt/qtcore:5
@@ -134,7 +134,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -174,15 +174,15 @@ src_configure() {
 	if use qt5 ; then
 		mycmakeargs+=(
 			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+			$(cmake_use_find_package qt5 Qt5Widgets)
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -191,7 +191,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use emacs; then
 		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
diff --git a/dev-util/cmake/cmake-3.14.7.ebuild b/dev-util/cmake/cmake-3.14.7.ebuild
deleted file mode 100644
index 98ca83720f9b..000000000000
--- a/dev-util/cmake/cmake-3.14.7.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# 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.4.0_rc1-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.14.0_rc1-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.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/cmake-3.15.4.ebuild b/dev-util/cmake/cmake-3.15.4.ebuild
deleted file mode 100644
index d9456163e0ef..000000000000
--- a/dev-util/cmake/cmake-3.15.4.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# 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.4.0_rc1-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.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/cmake-3.15.5.ebuild b/dev-util/cmake/cmake-3.15.5.ebuild
deleted file mode 100644
index d9456163e0ef..000000000000
--- a/dev-util/cmake/cmake-3.15.5.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# 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.4.0_rc1-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.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/cmake-3.16.0.ebuild b/dev-util/cmake/cmake-3.16.0.ebuild
deleted file mode 100644
index cc262fc75882..000000000000
--- a/dev-util/cmake/cmake-3.16.0.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# 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/cmake-3.16.1.ebuild b/dev-util/cmake/cmake-3.16.2-r1.ebuild
index cc262fc75882..f2216b9a5c2d 100644
--- a/dev-util/cmake/cmake-3.16.1.ebuild
+++ b/dev-util/cmake/cmake-3.16.2-r1.ebuild
@@ -4,8 +4,9 @@
 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
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
+	toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -17,25 +18,25 @@ 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"
+IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/rhash
 	>=app-arch/libarchive-3.0.0:=
 	>=dev-libs/expat-2.0.1
+	>=dev-libs/jsoncpp-1.9.2-r2:0=
 	>=dev-libs/libuv-1.10.0:=
 	>=net-misc/curl-7.21.5[ssl]
 	sys-libs/zlib
 	virtual/pkgconfig
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	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="
@@ -69,16 +70,6 @@ PATCHES=(
 )
 
 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 /' \
@@ -95,7 +86,7 @@ cmake_src_bootstrap() {
 	# bootstrap script isn't exactly /bin/sh compatible
 	${CONFIG_SHELL:-sh} ./bootstrap \
 		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
+		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
 		|| die "Bootstrap failed"
 }
 
@@ -134,7 +125,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
@@ -160,7 +151,6 @@ src_configure() {
 
 	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
@@ -174,15 +164,15 @@ src_configure() {
 	if use qt5 ; then
 		mycmakeargs+=(
 			-DBUILD_QtDialog=ON
-			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+			$(cmake_use_find_package qt5 Qt5Widgets)
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -191,7 +181,7 @@ src_test() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use emacs; then
 		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index 9959fe7e856c..5caa7eca743a 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 709 BLAKE2B 57f62d8d73308a65f39c75f14e256bbff8eb400b427c9b495e71eaff8d6af494140ffd38355a39e51cfbc2c484c6384c776286abf10e620ca3aacc85a7762a07 SHA512 968a22f1465f3ac367a4f360b7a6fa78a3c37bf0c9a14903f261cf6349aa95adb553d0a33e730dd2c360d6002ab7d4fd618ef80848dbcac43fba0335e14805bc
+EBUILD cmdtest-0.32.ebuild 708 BLAKE2B b50218081946cafcbec6be51cdae0ab4d4d2daa241c29be678ce5100da8b1af8d5863b1824b4294ad17f1bd080e6369e6733f234535d0020bab32d4e09b2f4a2 SHA512 0c6661c8ee0bb61ceffe4e3c02058282f793eda78f1d5c6b04811bcc3bf3639ecbfdeae384573b8840f98690d429e60400e26ff47e4f43c36bfe3dff55a48e32
 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 830d69c66302..d89c4fbb9df7 100644
--- a/dev-util/cmdtest/cmdtest-0.32.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 94eab3e879eb..7ecd99137c9b 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 1082 BLAKE2B eadab061651126a8fd3b7d7ead56ed37fd19ab9fbfb996a7b2a6b33e447169e2129b7ef35f4ab45b8d2cef8543bc18722888fdf78165edd98a1babef344e521a SHA512 488cd981eed55f5240981a3eb63d6b86ef45ce1528c41ab24b04a734845c8e90f1ed315b445171a652e56e92a4112b597f1f90f1002bdeb3cb9db5f61842f101
+EBUILD cmocka-1.1.5.ebuild 1071 BLAKE2B 900bf770202115debbf7f24715aab50fcd6376c75c699dc6ead2cdd85f2618ef0cbefc0b91c40acbc89aa1bd28935860314e471fa35a8dd4cdae792167085763 SHA512 11052508de71eefbff96ff765ff6824afb83d5bd874434187fa137d2bac147bb60d9c60cbde8aef2d10f5baaa4281f100305de345d750d983c9266898957dc6e
 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 eecc4f26cc8c..1d03a7176914 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
 DESCRIPTION="Unit testing framework for C"
@@ -24,16 +25,16 @@ multilib_src_configure() {
 		-DWITH_EXAMPLES=$(usex examples)
 		-DWITH_STATIC_LIB=$(usex static-libs)
 		-DUNIT_TESTING=$(usex test)
-		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
+		$(multilib_is_native_abi && cmake_use_find_package doc Doxygen \
 			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+	cmake_src_compile
+	multilib_is_native_abi && use doc && cmake_src_compile docs
 }
 
 multilib_src_install() {
@@ -41,5 +42,5 @@ multilib_src_install() {
 		local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 	fi
 
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/dev-util/cmt/Manifest b/dev-util/cmt/Manifest
deleted file mode 100644
index d2a0e7d3e292..000000000000
--- a/dev-util/cmt/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-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.ebuild b/dev-util/cmt/cmt-1.26.ebuild
deleted file mode 100644
index c36fd4ad8f2b..000000000000
--- a/dev-util/cmt/cmt-1.26.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils elisp-common multilib toolchain-funcs versionator
-
-CPV=($(get_version_components ${PV}))
-CMT_PV=v${CPV[0]}r${CPV[1]}
-
-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
-	dohtml 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/cmt-1.26_p20160527.ebuild b/dev-util/cmt/cmt-1.26_p20160527.ebuild
deleted file mode 100644
index 71772dec6211..000000000000
--- a/dev-util/cmt/cmt-1.26_p20160527.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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/files/80cmt-mode-gentoo.el b/dev-util/cmt/files/80cmt-mode-gentoo.el
deleted file mode 100644
index 91be98ebc614..000000000000
--- a/dev-util/cmt/files/80cmt-mode-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; cmt site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload 'cmt-mode "cmt-mode" "CMT requirements file editing mode." t)
-(add-to-list 'auto-mode-alist '("requirements\\'" . cmt-mode))
diff --git a/dev-util/cmt/metadata.xml b/dev-util/cmt/metadata.xml
deleted file mode 100644
index f4702aff8668..000000000000
--- a/dev-util/cmt/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <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
-  utilities. It is an attempt to formalize software production and
-  especially configuration management around a package-oriented
-  principle. Used in High Energy Physics large experiments, where
-  tailored packages are developped and they do not know the existence
-  of portage and overlays.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-util/coccigrep/Manifest b/dev-util/coccigrep/Manifest
index 209a1e04c4f5..72717cd47529 100644
--- a/dev-util/coccigrep/Manifest
+++ b/dev-util/coccigrep/Manifest
@@ -1,4 +1,4 @@
 AUX 50coccigrep-gentoo.el 99 BLAKE2B 596f01a6ac85deca70bdcf4f50c2475c7a38e44926d719e0da5eb23a8c713f89ebad0182cdca66b3011029bcda14d0cde76d4a186a126e05b74a0ccaa8e9efd1 SHA512 13cf90c99017cfb865c1d41e9813bb20993b4a91419e4bcca6b5536e8c35bfb871616c5174dd08eb8f1726f05296205428d14eaf9e9fabcf08bff01b287581f4
 DIST coccigrep-1.13.tar.gz 32366 BLAKE2B 8b9d8e0832c6bbacb3a8efd74ab8f4a0ec3112e935ddca63f345799ebc96a3dfbc8fe8e9fa77cee912d7dd5ee28c62e72ea00173e4ee4b16588b4b6e1eaf661c SHA512 d01baefe1c5f5d23ce03e5daccde0c38d4c05872313a0c8d15e53444c34fa6ae0db3b25bd62d8635a3f7b16e64767f92051c59d29bbd81cd24f94c9376af08ba
-EBUILD coccigrep-1.13.ebuild 1336 BLAKE2B 7f096b29a8b9556a20b0253ec4016c21f15da1cc51d71dbb15057d0ae890e92d1b7b92d9c728520780ccb4a8b7602cfc6ac9bd45b0e6031d483e9483d0774aa6 SHA512 e8c7b1e718a98695eea59a7a76920c6e97b5967aaa0f961d76063f5d049dc687f274fc2c3fb3d34ba0ee090a07ff7d6dabd105682754a4211c4c0530a7a58de4
+EBUILD coccigrep-1.13.ebuild 1359 BLAKE2B af5e020596d8a540fa5ee2f7e5b7fb00476dbb80432896bdd4b31e00500c2e3896407692e7040564d027ebe1b177e9146727d99a5ed0809f08ea3de50be21786 SHA512 31f62ea2d68fecfaac808ab446c604750dffe6003d0c7a31f03b96461cb3afa3bce909611d2b1b9fa839cb2d3f094674a10efc817cec4371ca9a9ab4b468806a
 MISC metadata.xml 321 BLAKE2B 58502481c090abd4b41a2c9ba39bd7027d03d2a02a65dc462e477917029df36663cac68e98b49d10b28bd73e5cc3a784e69fb1dc2771474f4d97f5f0a7c852e1 SHA512 7b6ae71b16416aa2847c902ebc176ececd5527177c85bfeb2f3e6d8a504405c7d1f34ccfaea2133f49f9052e86b89d8429322c2082f790c230e02da2ca10a2f6
diff --git a/dev-util/coccigrep/coccigrep-1.13.ebuild b/dev-util/coccigrep/coccigrep-1.13.ebuild
index f56d4bacedc9..896adfe6ed09 100644
--- a/dev-util/coccigrep/coccigrep-1.13.ebuild
+++ b/dev-util/coccigrep/coccigrep-1.13.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
@@ -16,10 +16,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc emacs vim"
 
 RDEPEND="dev-util/coccinelle[python]
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim? ( || ( app-editors/vim app-editors/gvim ) )"
 DEPEND="doc? ( dev-python/sphinx )
-	emacs? ( virtual/emacs )"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 
 SITEFILE="50${PN}-gentoo.el"
 
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index 49cadb38ba1e..dd0ec7332e4c 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -2,7 +2,7 @@ AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da
 DIST coccinelle-1.0.5.tgz 5660596 BLAKE2B 9707e4773d165718b973e004e3359608428d8405d560d7013da66e2b1f0205f003ae0905c02a4f13c9725b39dc94710e5ccbc6b5b11ace66d7e87c3a303363c5 SHA512 0fee450554abc40feac9e745a252c1679f8016c82f04236e642e32e129618a950bb9657f1c447d62543289e95bbd4b1a8b0c6030373025c32a37068f82d30678
 DIST coccinelle-1.0.6.tgz 6684278 BLAKE2B b5b390488e818ce05c364f27782bd1c4dc63657a01c7564764d64faea8ff302c8409bb2ef172ce7ab7c2e00ae1a6f2c3bea76a1148eaf5a977f897d39a9fb23c SHA512 b667762ddf5ad30b126e93572cd8a8b3ffc21a790cd9d6df586e421c5db0a8d049af9587c6e5cb8f7a13f2c090ab2a9cca59ecba69069f9d3fe67b6f75dfe539
 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
+EBUILD coccinelle-1.0.5.ebuild 2533 BLAKE2B 2991df294991a093fe689307e4bd8286bf033df166c0a63d6354c689eed590ba514b728feb604ace53b1be0e91650066595503d62c693737ea7771c7f9bb1fa6 SHA512 39effb31dee5307a0ffb0ff2e923fa910c7e45244aaf4e9c16491b127467a77797c60a9cefc959a32540bee867cb36540277b2cef42882ec62e8a998da6ff815
+EBUILD coccinelle-1.0.6.ebuild 2541 BLAKE2B 18380f62384990dcbe1fb675d6847372ff78ae5e21cf3236c65153e6a4889f1b9adf829036e1902732fea8d47a2de9472375ec602308bd51a062cdb6621b34b5 SHA512 9e66e33bbdc2df5b0fbf553ce4e7d7e9117578c7c12c6b8486dcc3064db827ca961fdd041a936813600764094c71ae6d154de5e7094df4c459e09e75d460fdea
+EBUILD coccinelle-1.0.8.ebuild 2555 BLAKE2B 66a93118dff8537fd25118d5c15f0ebb2a081ce75cd0128aebdd0e043a319851a205d0687ad123e584c8859e51dd3144d9cb3cd97241cd50fccd155f59d7e8bc SHA512 b5bcaad5931ba9e864c2f86b338733fadaa98aea4014d6b71d312475a54d9f55b031393451d82e179a496f9cf587ea1d81505d56f86362e3250095aa40dd0b6e
 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 cc744143db9d..241294dd2260 100644
--- a/dev-util/coccinelle/coccinelle-1.0.5.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
@@ -23,7 +23,7 @@ CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
 	dev-ml/menhir:=[ocamlopt?]
 	dev-ml/camlp4:=[ocamlopt?]
 	dev-ml/parmap:=[ocamlopt?]
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	ocaml? ( dev-ml/findlib:= )
 	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )
 	python? ( ${PYTHON_DEPS} )"
diff --git a/dev-util/coccinelle/coccinelle-1.0.6.ebuild b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
index 18640ff2a4fb..55e35ea5d44e 100644
--- a/dev-util/coccinelle/coccinelle-1.0.6.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
@@ -23,7 +23,7 @@ CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
 	dev-ml/menhir:=[ocamlopt?]
 	dev-ml/camlp4:=[ocamlopt?]
 	dev-ml/parmap:=[ocamlopt?]
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	ocaml? ( dev-ml/findlib:= )
 	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )
 	python? ( ${PYTHON_DEPS} )"
diff --git a/dev-util/coccinelle/coccinelle-1.0.8.ebuild b/dev-util/coccinelle/coccinelle-1.0.8.ebuild
index a25a3d05e8f4..ebf1fd10abac 100644
--- a/dev-util/coccinelle/coccinelle-1.0.8.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.8.ebuild
@@ -22,7 +22,7 @@ CDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
 	dev-ml/menhir:=[ocamlopt?]
 	dev-ml/camlp4:=[ocamlopt?]
 	dev-ml/parmap:=[ocamlopt?]
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	ocaml? ( dev-ml/findlib:= )
 	pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] )
 	python? ( ${PYTHON_DEPS} )"
diff --git a/dev-util/codeblocks/Manifest b/dev-util/codeblocks/Manifest
index 3c64d58a6587..e90434fde403 100644
--- a/dev-util/codeblocks/Manifest
+++ b/dev-util/codeblocks/Manifest
@@ -4,7 +4,7 @@ DIST codeblocks-17.12_update_astyle_plugin_to_v3.1.patch.xz 3712 BLAKE2B 4a5f75c
 DIST codeblocks_17.12.tar.xz 15725976 BLAKE2B 871427b5d8a2296e04d640c35d9129deebf1bb35cd1573652099c02ad4495c4c1369ed382ba714848d6bd75304195a25f6a91bece398bedaffbee8ae3547c46b SHA512 f90e756ca6f532656eeed34c6259c6a96ae85d172fc11e39f696ded9189cab7171d0cead18524fbab50dd782f21adbc7d52e2ea90535a3ed0aef5946b8a476e1
 EBUILD codeblocks-17.12-r1.ebuild 2158 BLAKE2B 7a7aa1b17655b4727a1a105dc4c13c2bab3332ce0db027d5417f214f608976e1c17ced1d5374c1055e1ffceb8700f92d2444ee8317c5c34be3324947e815dfb7 SHA512 a71101d41db629227d75a12c9e6802c8329e7c895e14ce3e0c5aac3b780cf2eabd12a1209b7fa3fb424f600c8812bb50c622aa478a27aedc2a4049b58f6549c3
 EBUILD codeblocks-17.12-r300.ebuild 2004 BLAKE2B 6b6b47b35498949282efa068e70c235fa52611580f69d26cdcd483e8fe3c15093921152dd7c2d70a506491efedb1886b44282cbdad8594343c529e1273062029 SHA512 b10b5befad57a1bfc68a27af1eb326a2091600648bb53fb266ac271511ec04bd8005c47a097ba89f486c7f5f260e9e7d38074cb7f3ec9edbad22666ed94ba5b7
-EBUILD codeblocks-17.12-r301.ebuild 2163 BLAKE2B 822425d9a63bc762af6c5527e2f243635b1e4f0a4c322c9fa589d58d118b1fc418c93cd2ced66b3fe943226b68fa3135e91127bcde52d4927b23518b02906769 SHA512 94622088db5b572892eb5c9daa65da7ce4895aae124c5625e5d0efd395426f451a4dfcef4926abf3b80d687a82cdaacb7e291c20e193498c5cf94347dfd32672
+EBUILD codeblocks-17.12-r301.ebuild 2158 BLAKE2B 88352118a259383659f4c9f2cfd820db719fc375a7615f69e5c5f1f5dd870057dde05c8c91908d0ecb2b87a60ce4e850d6bb79336ffca859d528d7c73f74526c SHA512 13336eac42465cb51e05fa81c1732408d429a758032c86909130980b1684304926fd3fd8860b17c9c9fca3c26481279350d77a9bb8c8aac0d68eb42342e36270
 EBUILD codeblocks-17.12.ebuild 1999 BLAKE2B dc09e29a6d21d530388de93ee093ae50da7406a45fba83a021be19f3fbe7ef587bf039b7a9f380d8edf7ff0ffbd4fc3ab09117837978de687bd7b34476478cc7 SHA512 d331f33150e3054fed50b18c78e105fa76e73022a220a8cabd651e63e076fceff80ef1d3997d112f327f8252b1088f3cb3f5c7240d8609dbcc028f9c83c5cacd
 EBUILD codeblocks-9999.ebuild 1632 BLAKE2B 7b595b20cb9bb49870c01ced1e8b5602ceaedcf4e4461bf9a1fcacc8d9a270e49f84c7bf28b735ac6304852a2576e58d70a129c55a1fc5cb626db969c278c91f SHA512 a4e0032db0edd1a4da5d370d60f733aa79624dba2c4fcf3742e1d898b05cf5d70f467f2d7e24337daa0e8427a4814a1859f9349fec42ca9d2cb4c6883e5a85a2
 MISC metadata.xml 675 BLAKE2B db56c15590a97e891e387377cafcb743716d9c84f6adaaf43e3885993842e5456086ef1a59a6579fd5058d5d964cf49b34b7993d56cb5a2e78611a4e9edd0618 SHA512 459846c3e46109fb82d0f37d016fea29e3f69cbf8d03ae2ed2aa0beff443e4206082d9f2e53afc6cdac6862f76037dc652f2dc544d6b9bdf15f2de09d863c735
diff --git a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
index 090c2ad4eb0c..93cfa9d4979d 100644
--- a/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
+++ b/dev-util/codeblocks/codeblocks-17.12-r301.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
 HOMEPAGE="http://www.codeblocks.org/"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
 https://dev.gentoo.org/~leio/distfiles/${P}_update_astyle_plugin_to_v3.1.patch.xz"
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index abd6130aec72..af974f5bbde1 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,5 @@
 DIST conan-1.18.1.tar.gz 532813 BLAKE2B d4c8ec62100b8c4038f9bef8338aa0afccc38ab39d8d953c41934efc43d6ba8e5abda1438e3f8c3f4bba4b770b871a1afc5ef19749771a55873b35f28a427b1b SHA512 f9c4c4cb768c3f015a84adb3d4926cf91a372a8dae6655df9396b645c24c8694f47795064c0e93ee799864d19f6f77983da0a1679ad511d8f11702250ae95124
 DIST conan-1.19.2.tar.gz 944360 BLAKE2B 190cc2a7dbe25420ae1a6b46705078301cdf1deea2b4be3d1244ade84d27250688e2c26cd5d172d4dab68557d758a2afcfebf37c323e42f0b4514455488903d8 SHA512 e9b868561465bda28314813d4114cb2b6b97440f7683c4c91911ed51b8cb06675b37807c28aaed62d5f7b470ce9040929ad61e0e148c04b0fdba7300cb633b5d
-EBUILD conan-1.18.1-r1.ebuild 2153 BLAKE2B 1013cd95766fb0f682e7b6c9a7f98353fe56a6c5603003ed3018b6a89eefd4b9772832baf615d69748371a1ed5b25a9c9d713e0041f727c7976065af5dc4c0fd SHA512 e0629e9f020f2c277da9b2e2d9c7af5cd52f7a7fd8795b581e085b45427221ecf9f1bbcc95208869259c1fbcd99044c0edac9fb3d469d4daeca0f9ac8722c121
-EBUILD conan-1.19.2.ebuild 2470 BLAKE2B 771276957b7fc7c276f3d6d158c8c0a0bb18d1970dddf236219d07700cb4a51f9399d88241ac2a25aa75925ca835f338381f12c009a09cd63c926ad235aaa4cb SHA512 a3ca61ee0f6e80732bcd0692ab0143001e0f2c3026afe91b9181c5599483776ebb6fa0061d9cfc2f01620a59212340b4acc90003a5c583ff7c45f7c42e445ddf
+EBUILD conan-1.18.1-r1.ebuild 2149 BLAKE2B c8c8f7c1f647a0b98c438f8e2a66839206e518d38e91b9ff7cce877e1828921b8030e9294afab9adb4b7e6a978260c5b624432d28b652908353bc90f4e904667 SHA512 19ebe88837d337ccb89e87005c00f89df09524aa1da37050a4c1d600cd42d6ae2cf5412d8689034e16bc07198fdea86b71d933ea84ce814306e4b84f132988b7
+EBUILD conan-1.19.2.ebuild 2466 BLAKE2B a8e952d7cba17b9f45d6f5b27beb56ef9f2e56a78894d4e08683be7e31121b3fbcde8f942d8d23406aa77178d02783077e5c4e33f45458fb9e17a50a38f50f8e SHA512 6ad1610a5bf0d752abe69d627c30363fedf5ae4708b6fcf37dca85d4e94d1c94850b47fe8588455a83e90e6a9056a9c66c30ab8e371c861436d82e71511c1797
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.18.1-r1.ebuild b/dev-util/conan/conan-1.18.1-r1.ebuild
index c026c884daf6..354fd9510eb7 100644
--- a/dev-util/conan/conan-1.18.1-r1.ebuild
+++ b/dev-util/conan/conan-1.18.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-util/conan/conan-1.19.2.ebuild b/dev-util/conan/conan-1.19.2.ebuild
index c640b3e36bfa..784afa385e65 100644
--- a/dev-util/conan/conan-1.19.2.ebuild
+++ b/dev-util/conan/conan-1.19.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 7527a455d671..7b845f516c9d 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 1254 BLAKE2B 2a3ac7f8d4069ffd588251ef4ff38cc84460f9b23282b5dc8948042d4f7869c6d36254d18d4e949bf69a825ebdfc1f55cafc8e19202ded441be1f05f1a15c3a3 SHA512 debf30f1bcd6c3b830a01d0a9278debf7ca9d018e8142d46a362236cb2daa80ba23e48d30b89aa4f0e4532bb0e3e33495b7a527de7628f1de4b98ca2737f60b0
+EBUILD cookiecutter-1.6.0.ebuild 1250 BLAKE2B f4aa48cc7849634286e5bb56d9fe3e62eb238f7d89c76b37386349213f6bb001267be54d067c69e82b024370871e63810e987db0e2c89c04b79ae0839c5b16ce SHA512 28451cab6490d7f76ec4badecb05ab07635790031ea0c174715ee91dca1eec3b237abf1012aca198d710a39f8bc5bd57eb7019bc8cde420d1cc21064c70845f2
 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 316e0d972785..50f38300a5a1 100644
--- a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 45d81e5d0e0e..60e449f71d8d 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -6,8 +6,8 @@ AUX cppcheck-9999-tinyxml2.patch 2491 BLAKE2B df8130302d06dde1c7f21cb4aa49daf0b1
 DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
 DIST cppcheck-1.87.tar.gz 2243258 BLAKE2B ffe42bfb2e896163678c5bb24e46ae2391ba8254cbe7c1c19c3c1b16cd38adf9c773de6aaefe70af08b9c1dca8b0b0b5e9939323368a2f81491fd6981ff18139 SHA512 b0149002b40260c1488904929296403722a66b84263b41d0097c3caed28265332766c114f0d1f378ea6c7e73ab973ea71ab89c6744f6cc818f22de08933e6766
 DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f SHA512 fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
-EBUILD cppcheck-1.86.ebuild 2313 BLAKE2B 21b365c6c4f30089e251c0916e51fa8b6499b164226f844343c7aefca88740d2475ff2d2215eb0ce3ebbe171898458dd3caf419d06ec79c975c647dffe99de94 SHA512 810093dc13abc5742428b043b587265c1670c4df23651b1e73ca3b67b0443c74d02ea34c6b5ad35b51a632e376f4db4f375dfe892fd5dd9d78bcecbb98d4a205
-EBUILD cppcheck-1.87.ebuild 2328 BLAKE2B 0472eb40d75e394e37b3ce4d5089978619164875bd5fb722c0d622f2a0891520de4102b2a5f8c020f8b3dd8b3f571b4b1c5ea088cfffef6bf96d1a8d260fc329 SHA512 7f0672ae4560ae3bc9abaa575dbfa0e0835f3e2081ba4b3f80f9e8b0e8faf59a97ded20c68e68def32e9807d0eeb805945260e3a5d7120fe31857b4f5eb877bd
-EBUILD cppcheck-1.88.ebuild 2328 BLAKE2B 59e8ad03e399ef45c478ab60332f4191871d4f8114e904d438b8b87b6fe414c566bd2c893b6d36836c22f5f86de91b3ded3d1084b5003b4b47b8b1c6c87b8c61 SHA512 d385be61ae7c1e37dbe739818f900deb6222791f49431c3afe15ed11b4824359e644d4a44e39ea4cc08c0d632961eecd419ebfd28577b279af43e412fa4145f6
-EBUILD cppcheck-9999.ebuild 2222 BLAKE2B abd4fb4a91ac18e5e3c7280e1d180039f2a251bcf63d3e436fea917e79343cb84034eae35e42ec101f5fca91dd8a1334141991afd4d0c0a1ad66da30b6511d77 SHA512 fc2c2565d1979f5cd43222a22fd1df2c8d9eebfe8906acb0092d3ee6ddbc54d221651e156c35fa791a0cab8146e84cbfc6daa8d51df384f6a59c647244c15490
+EBUILD cppcheck-1.86.ebuild 2332 BLAKE2B ea33ed0f510ada1672546d21c2642014dcc039c8d9de73fee5bc0a180cb5f43cef3c286a04b8575414694235eb50e6c17133e6ca81f143d9d9b09c26288d6e19 SHA512 cbc2fe277a20665bfcbd4dfd8009b9ed9722bf07c12c3ae42379ed1ab07e3ba343edf8cb6489378fb3ded8a15e3cbb07e48aff4a3ecd8d1ab15b4219abfa4746
+EBUILD cppcheck-1.87.ebuild 2347 BLAKE2B fd57e1aec4034421c8d7182b9665b1c5427707c4158315dd9b5c538c7f1689e74a0ae5c3d010cf96828fd270b17c22c5e0b27cf3e54d55854ec3387a846ce912 SHA512 9ac2af5a7859ccb5e399aa5486c7162a9cb44736c94a59020aad536e667688a7ed207c6ad8804933968b4dd7b4d648693562be6c040a8479fa855a59a5cb04a4
+EBUILD cppcheck-1.88.ebuild 2347 BLAKE2B b1daeb2f3920ade81418efc70934c312a8bd30a3f551503affba2aff95d83c6f4cf0749e53835cef04138b24674ec0b2a8622d93697852babd1d10ed09fc7a26 SHA512 7199613fdaca86057619b891ebb0c5747351b1b8eba53e6ba912b382d54e2f02e855d10723da18d267039bea9c49ed7812e2b4a91bd4b88b54daa39b01c29f1d
+EBUILD cppcheck-9999.ebuild 2241 BLAKE2B 00800a503f3684410a18a5b6d7ec326e6f48a3705cb12a61f46498d5fc04da1d5a8ecd27d298b4214ddbe38ab6d735f53485a325fe57bdfc9a0b7850760ed112 SHA512 60d63e8225eed27d4819233e9580e4a001d6faa8872e1360be96d05f5a8471d8418d03a58ec8978751e19470f3eb77e55ad16ad2fd10ffcfd7c7d783a45bac33
 MISC metadata.xml 401 BLAKE2B b48cd9d365773e4c050d1ce2f58a108fa33bf28fb669a8fbe99a9b15d33cf203fa4a94d3411674892efb4cb5e5bd1cb5a08d97a3054b7fbdacc462695f0d1874 SHA512 08b51c30fcc21277bf320c1c9f36cd9efc7c39261b52f70f686953731c2d075482fc1959457dbe276877d508510b32a23d8f7def4ca52044fabc44a23c56a8f4
diff --git a/dev-util/cppcheck/cppcheck-1.86.ebuild b/dev-util/cppcheck/cppcheck-1.86.ebuild
index e5e40d68d207..d0a3a701f5ee 100644
--- a/dev-util/cppcheck/cppcheck-1.86.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.86.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="https://github.com/danmar/cppcheck"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/dev-util/cppcheck/cppcheck-1.87.ebuild b/dev-util/cppcheck/cppcheck-1.87.ebuild
index 7630b01b69e4..26637d9af929 100644
--- a/dev-util/cppcheck/cppcheck-1.87.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.87.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="https://github.com/danmar/cppcheck"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/dev-util/cppcheck/cppcheck-1.88.ebuild b/dev-util/cppcheck/cppcheck-1.88.ebuild
index 69aa5c7a1adf..8c92f60d8032 100644
--- a/dev-util/cppcheck/cppcheck-1.88.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.88.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="https://github.com/danmar/cppcheck"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index 0bcf6e7db8d0..00d16748b09e 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1 git-r3 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="https://github.com/danmar/cppcheck"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/danmar/cppcheck"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index 920398a05bfc..9a4a2d5ddbfd 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,3 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
-EBUILD cram-0.7.ebuild 554 BLAKE2B 2a85b1a1fd62410e354953065db097b1bf44cfcd132e2434e1448b6d5dd0283597419d5f9bb415adc6f2a84e96f39d499839f11d58098a0540b756b646edec43 SHA512 a86d7bb68dd986786595b4742d48f537d9228b7d154965f755e7df80a0fb62fab4672fce33112818cca83b21105e5dcef2540bd73d696891d5cb740f29b0f892
+EBUILD cram-0.7.ebuild 552 BLAKE2B a9bae927ec315829f1f023981160fb8f1b79d6f9a3cbaec54d914a5b0b3a51d06d900af0904f03f51cde4a2da88a0ecadc2f7dd1ed3d75e9cb47f89877b7a197 SHA512 fb75599eb54bddb3fe541c0fa83ef4f64b30939036c830e9976654f15a4ad5f951fc1e83da35fbf824ae118c5bdadd7accee3cbb9f3273eb0caa758c8f74f739
 MISC metadata.xml 613 BLAKE2B 4e970afed6540c9f375c79858c297326994950a3498b51fde64aff6bf4262e6d73f1c77ef5ca621be1ac4fab79b2e4bde73e914869726a6d8665d291f854aea2 SHA512 6dffd4dc26817f9ff558ab98deb4b0097fbdfd0394291969b817d2edf1caf108d46d0188919d77e54942a35689c564f2948d627e30e5fc6acb403e8d7f6998d9
diff --git a/dev-util/cram/cram-0.7.ebuild b/dev-util/cram/cram-0.7.ebuild
index 668951c86188..870cfc50f50b 100644
--- a/dev-util/cram/cram-0.7.ebuild
+++ b/dev-util/cram/cram-0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index ffd55c47c962..2ba43993a7a1 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -3,7 +3,7 @@ AUX cscope-15.6-darwin.patch 288 BLAKE2B 3426d3f3dcdd67764b8f3ee63bbf1ea6c457231
 AUX cscope-15.7a-ocs-sysdir.patch 582 BLAKE2B f9144657cb8d584f4d504481b986f68322d1a08b408e4f623db0ed3e22474895f4f8464e297a90e635a3dd3e71cb06f79b092a82ab8876d0ed308b71fa0d2812 SHA512 aa296d8839da73b6838c450dfabc9782940a2f9c9cfba2f738993c777c1d4096688d79205ccec58dbf931b2faf45a4c3850ddbd894c7b7e616d18a0014cacfdb
 DIST cscope-15.8a.tar.gz 601232 BLAKE2B 8c67311059a055af775ba3d42942a557b54c0214751d8756e6a5c19a7a271824004e72c533614015ddcb0ffa4c768f99eb736d441dc8467c5be4824cebf5c15e SHA512 bedba69820eca86420f6c975d1f267de67a457b182a3fe49720a2ae5ea48759c5b5b8db06ed5ffd85173ddf4a0f12ca722e87200dea4a2da7d43c8c711b00318
 DIST cscope-15.9.tar.gz 613948 BLAKE2B 66c0c85d0db810e8cd5a286925eeb1026fa4a9e9c3a5a9decd1412188fca43f831949c231acca428b5eeb476662b7ce9f81defcda81759c18027655535b855be SHA512 f3b95da5eb5c036cd39215785990c7cce7ce7b8eda4b18e60792e70d01ffb63809ce32ace310a9aefd88e6761c1609039ccfab0e8e49f81730bc1630babbcb80
-EBUILD cscope-15.8a-r1.ebuild 1366 BLAKE2B 3277a9a401ab14be42a18f9a54d6c430415f956ce0d08bc99f9469d753a8ba118367543edff62d32d3cc882ffe147bff69de13f26f29b194538f3b029348c02f SHA512 0d57232b2f9cc820784c6a7b8cab7ef7043a5e3e74a2cf3b2ddba4e80176a4a456122004ad32fd8194137761db9f785055567e1b6f98c79a95f44d2f8d170f59
-EBUILD cscope-15.8a-r2.ebuild 1579 BLAKE2B 68a8724a6e1e25873ca191521dbf194faae503f67773bba610e8694eb8961ffb76888b4fbe6848c69f4a27e718f19526fd356ccb140d0b074b740133c5e37c7f SHA512 adf4460cca1bbdac433f7fb86a87b79029993df9b26f1e68070410202a2c48d8f7d02003af25c3f67a6bb40f1d81ad781288770a2e7a1b02b05984ea0dae8229
-EBUILD cscope-15.9.ebuild 1546 BLAKE2B 4bd91bec2dde1a21d626d2ed5d3bb01450bce39b59d544b73d11eb765fc3273780134f3ef35013a0415e4f43a46d10bb68fef333205a23c4b618a05e9c56e3e8 SHA512 48cd9fb2c89f45336662debd59e10f860363f3823529cc0966eb319e2112afd348206e56c9d2b18941a5cdec03fad2c61b1ae645a6f388daeda4eb4a8b00e53c
+EBUILD cscope-15.8a-r1.ebuild 1376 BLAKE2B ee9064d7861b6d87453a057889440249c495719948039bfc89349e7f295c503a62c23b7f63416ab6c1b5db000e15011ce4ef71d593cfc0524cc10c8ceb4ccec2 SHA512 8479ea2973b5c3f1ff53ad407ee9a2b2bef69c8a962e221e73922056156016f8f40a37f8b81d0c08115b238536c411ef9ea9f008fbf507fc48f974c08c4c0618
+EBUILD cscope-15.8a-r2.ebuild 1589 BLAKE2B 1e300f1f231129f1ef21ba12501ab286395c9d36bc517271aceb3b1dce9a7945182a6b2a2c583b5e33df38b4444448c9492fda1f0f534782657270c48db7b942 SHA512 d2e81a33ab5afbdeb16dc04dce5cfb9f501c18e175f282cc19431b07f6628592d8302a2e3b1deb26d945464f1a6b2c9aec11dcd691b98097bf8596f725eadb83
+EBUILD cscope-15.9.ebuild 1559 BLAKE2B 5f1bf9518bfc4c144d4331a4113ff06550bb3f8287ab2a5752c5cc22d20deedea57a976bd98eb35b7c9972767fdea6a859c8eb038538be21adef5fa017d395da SHA512 2ddc7e45b1b7c5bfa9118cb7e50bd8efa87c44b16e64f62c95a359217af13d837a2f94e62d5195ff638689ae2f8bba3249947d06d6266a553feb871cbcba83cd
 MISC metadata.xml 1086 BLAKE2B 9fecf3d723e58a1235e3ae94b6a009c16cf91ecf0b27c32de7d8a8f96308e41908b9f2881083acfbf329685cce188b8ee0fb864333d566bc915e1ca2d572ac3f SHA512 a8ebddecfe959cb05a992749f12183baba41950b39e197bd1db0528969dd4e1814dc159555b2e24d85249373da4b60bf05a7d86aac2d7b8969d6d2bed2ab59e1
diff --git a/dev-util/cscope/cscope-15.8a-r1.ebuild b/dev-util/cscope/cscope-15.8a-r1.ebuild
index 5af4bb8a570d..26ec444b64fb 100644
--- a/dev-util/cscope/cscope-15.8a-r1.ebuild
+++ b/dev-util/cscope/cscope-15.8a-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
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
-	emacs? ( virtual/emacs )"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/dev-util/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild
index 8a7367f84848..fa8fde9d60df 100644
--- a/dev-util/cscope/cscope-15.8a-r2.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r2.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
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
-	emacs? ( virtual/emacs )"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/pkgconfig
diff --git a/dev-util/cscope/cscope-15.9.ebuild b/dev-util/cscope/cscope-15.9.ebuild
index 43bbd64bf2f2..02daf13636de 100644
--- a/dev-util/cscope/cscope-15.9.ebuild
+++ b/dev-util/cscope/cscope-15.9.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
-	emacs? ( virtual/emacs )"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/flex
 	virtual/pkgconfig
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 782be8131692..c8e21db663a2 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 1069 BLAKE2B 155c1a81e03abf0c16c534d88fe378a56b8697a0ac26fa96a634e1b04207d39d150fa4465b5627d56b3e84917de3813112e5fceeeb231bf331e902cd7a0daaac SHA512 25554d2fa41000ee7e205bc9bf1b3bfd9b7f80f5c254d48586c6616876e5705412d4be74c01517ae42347d2875cbe7a48325f598d28d053e898e0f9a25fc64d6
+EBUILD d-feet-0.3.14.ebuild 1065 BLAKE2B f1358d5b4189107d553285f030e110fdc44eae48dc81840e896856325ba4f44a924cc73b546b227cde5ee57a476da55519b35eb76d3b51ce17f8113a10ceff9d SHA512 71105d02ed875b333fddb8d6bdff9d404103b566a768eba22a60307c6b3b5c37ccf50da348a357ef490ca2a906a0da040442438e8bf2f6edf409f80c56bf75d5
 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 08174ef46548..e4f0ba6d614d 100644
--- a/dev-util/d-feet/d-feet-0.3.14.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit gnome2 python-single-r1 virtualx
 
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index bc4330169030..b00267283aa8 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
-EBUILD dbus-test-runner-19.04.0.ebuild 1171 BLAKE2B c3f4d3831f1ae23c292d6ec20a0bff50f19acb6381ff8073edcf10a863d4db9321cecedaaeab46aa812a2f4ba3d0bcda3cd425ce3c1cbc7297468eb10a7744c3 SHA512 d01e12bb399798ccfe778c6762add81d845b013f8b50ae92ab6ca81ca153f529233c9f8c62c2c6034d7a7fe0c6f3c307ca23ae3b07d844425c483b6b74c779ed
+EBUILD dbus-test-runner-19.04.0.ebuild 1167 BLAKE2B f5e69b9a1a1b11929ef5c61dff60f084b4d9efb76f2954bd81dcff032992c4b4577a99353cbe07cf107f1ea400f303d6429fdc0fa82460ff0209f27a92fc3ce6 SHA512 afa8ba5e4f1fdc40626bb674c1c00bae4c4f0e920b1594ec923f0b6938cad6984cea64c7ff436f9538efadef9a48bfe772fe1b88f55391a313eb5cd94931dd29
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
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 1ce3b43eece5..f1b34dbecc95 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit flag-o-matic python-single-r1
 
 DESCRIPTION="Run executables under a new DBus session for testing"
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 46238f374c44..1978f2dd2f91 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-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_12.7.3.tar.xz 511396 BLAKE2B ac16bcb3aa6f3807ce29be4e1aa2db36e35fcbf0bfbe6b823bc8388cac8d0ecbba8062bd05a5c7a277a0e56f896923df78c9d6fe38b703b47e92a8901e63aab5 SHA512 802fccba95df5fcd04a5ec9d78610e77c2977d81e6b1e4eba6bb5d4f92e5943db2876e1b011d1822cbbc67c256895045408b7eaf285da2ac55bd8200b6c39fe3
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-12.7.1.ebuild 1534 BLAKE2B ed0daa11059dec73fd59525a40652eec26e3e3ce3501419b5acaf0785f39a130d05f43bead9c4fe565b8ba94e7a5a1c92a40e42654753d3db30329c84f256cb8 SHA512 c0b55b8dc50568b5cccabc80993a807c203d0401d282d349285ce1d12d06ba965bb4834ff22fbd37abd741db050f67173094b1bfc9a151fd9b28c82fbb0227b2
 EBUILD debhelper-12.7.2.ebuild 1534 BLAKE2B ed0daa11059dec73fd59525a40652eec26e3e3ce3501419b5acaf0785f39a130d05f43bead9c4fe565b8ba94e7a5a1c92a40e42654753d3db30329c84f256cb8 SHA512 c0b55b8dc50568b5cccabc80993a807c203d0401d282d349285ce1d12d06ba965bb4834ff22fbd37abd741db050f67173094b1bfc9a151fd9b28c82fbb0227b2
+EBUILD debhelper-12.7.3.ebuild 1534 BLAKE2B ebc4b0a520e3707503e89e5a417ece103f999875dae2e9abb71d944c4def528c89d113d728ca28b5607047161aaab827162569652c3b016f29a46415312961a6 SHA512 6b3d81240a5c1eb5abb27a2aeb31d5d41c17d0c10326e28f3ec76f5b816a715f24859d383f496789ad92d3792c4179e817d3a6dccff538b45413ca44ef218e68
 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.3.ebuild
index 54960e54e86a..f3567e709e9e 100644
--- a/dev-util/debhelper/debhelper-12.7.1.ebuild
+++ b/dev-util/debhelper/debhelper-12.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 3aa3466c5d02..353eddc06acb 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,3 @@
-DIST rpm-4.14.2.tar.bz2 4151934 BLAKE2B eb7e32dd736a195f2e5effc184ee8f2c700dcaf80477574c2112b6c96504d86a67c81e611f82ea35ce244e95fad339bd262eb51c35ada5eeffa8d306b6938cb7 SHA512 22e309e8be936e6070430cedd6f5ea0c3871db4c6aadd0d567a9c418796c178c8dd45d44920d7eaa66681790cc2821347affe471cb215d7a490fe7947fbf291c
 DIST rpm-4.15.0.tar.bz2 4205632 BLAKE2B 3e9701582e82d4164a21374df78c7a9ab3ca4f9aeafc13706fd0aa27782a34d2a732d7ae9659589abc9f9b8a48ce5c2cdbbea72c46768f1baba28ded26817e5b SHA512 bca9cc9ef0ad53fa5cd257c29a0a0b9447956afe4024835f5416b13926bc8bbaf8aacd481e721b4a28983bc57f98b75b91750d39dd72de4876efa9d6db53a26c
-EBUILD debugedit-4.14.2-r2.ebuild 1725 BLAKE2B 7897371964b247c6076d629b6ae6f01473c41d71356c1447bd6f991449320ccda71b6f86b42a3c82c491efec20d2ebf2e4ad559940ce748f4e40f3cd4dac86d9 SHA512 4e36e020e4aada2c378466818763c5b49d888f76627692bf40074ac154678225e77921627ccb2b398026603dfef403548657c1f0068508e309207f41ab097f79
-EBUILD debugedit-4.15.0.ebuild 1763 BLAKE2B 01c3fe20932754926cb903010601a06f9cc332cf6e7d7a3059d8db0f6250dac667106b049a496f0597eee66d4f0d6a775caf0388afe352bdcf4ea4c406ed64fb SHA512 c07b6a694c717a0f09db50784b28209654929a3cad740b27e6e01e8bdb8be9706d0310e7836f3ffe0042109c8ef9464ef39ab2db9e0a94124de094a6604f9688
+EBUILD debugedit-4.15.0.ebuild 1758 BLAKE2B b908d7f51d74fec0fcaefdbc7ae69e134a646a587254baa1fa91c09036bf0aef2393d9fe377a9df8c92221de5a6fd7970fa54d6d8b24b080b9181d3f4caf68c8 SHA512 4e6b42bbd97d9c8d4b1d97bccc81877de702dab2e81293cf4fc87299b10063962007f9a459224fe1ce3257d7ec15e07e23650dfbbe9165e4afd86d981122c8a1
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.14.2-r2.ebuild b/dev-util/debugedit/debugedit-4.14.2-r2.ebuild
deleted file mode 100644
index 99c6e92c4582..000000000000
--- a/dev-util/debugedit/debugedit-4.14.2-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=rpm-${PV}
-DESCRIPTION="Stand-alone debugedit from RPM"
-HOMEPAGE="http://www.rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	sys-libs/zlib:=
-	>=dev-libs/popt-1.7
-	>=dev-libs/elfutils-0.176-r1
-	dev-libs/nss
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	eapply_user
-
-	# cheat it into believing we're bundling db
-	mkdir -p db/dist || die
-	touch db/dist/configure || die
-	chmod +x db/dist/configure || die
-	echo 'install:' > db3/Makefile || die
-
-	# TODO: why do we need to do this?
-	mkdir rpm || die
-	find -name '*.h' -exec cp {} rpm/ ';' || die
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	local myconf=(
-		# force linking to static librpmio
-		--disable-shared
-
-		# disable linking compression libraries
-		ac_cv_header_bzlib_h=no
-		ac_cv_header_lzma_h=no
-		--disable-zstd
-
-		# fake some libraries we don't use
-		ac_cv_header_magic_h=yes
-		ac_cv_lib_magic_magic_open=yes
-
-		# use nss as crypto provider
-		--with-crypto=nss
-
-		# disable other stuff irrelevant to debugedit
-		--disable-nls
-		--disable-python
-		--without-acl
-		--without-archive
-		--without-cap
-		--without-external-db
-		--without-hackingdocs
-		--without-lua
-		--without-selinux
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -C misc
-	emake -C rpmio
-	emake debugedit
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	dobin debugedit
-}
diff --git a/dev-util/debugedit/debugedit-4.15.0.ebuild b/dev-util/debugedit/debugedit-4.15.0.ebuild
index 7a6ec67dddc6..c31eee2f2b6d 100644
--- a/dev-util/debugedit/debugedit-4.15.0.ebuild
+++ b/dev-util/debugedit/debugedit-4.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 8c1714aa1971..f7977e91c129 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,4 +1,4 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
 DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
-EBUILD desktop-file-utils-0.24.ebuild 1276 BLAKE2B 323c5af708bd9e409c5505db430232f2038db06dcd55dcf066f20518eaa994158c4618dcba7c908342e83139befb9913b886836d7a8c67a47c1325747ebb9c5c SHA512 2e9cd8b796c3c63d7587b64d868663cb89abc27190b056d356b969ed9f93598c5538957d2a1bfdd3a44ad60f8f948c3a2692169dc7946fe05bc6a8e8bba2af9b
+EBUILD desktop-file-utils-0.24.ebuild 1289 BLAKE2B e5f16c807234e47d2116263443082b36658b5a083a4047a9f72bf6b618fbc56399c929b0f8664edbbcccbffe7e8c4198a5e5ec77a06bc96f9ce31ad4ba68df99 SHA512 a4d864e5fbdfb90b11a7cb86f7f2dd896c60f8b08dd1c81e450271513081eacc702bbfcd6e54c616b356d6555f8d62e6b02017fc3ea21fb1daf8ed3acceac50c
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
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 24dc06c97027..99072453e1ff 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
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2
-	emacs? ( virtual/emacs )"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-arch/xz-utils
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 7638301d1f66..314a3ac47f78 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,5 +1,5 @@
 AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
 AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
 DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
-EBUILD devhelp-3.30.1.ebuild 1870 BLAKE2B bfdbf12a603d05cf127aa48ada8ea0caa8fa7e842d767bb003ee0e1b5a803bfafb6850520b866dbc3727cb2d33bc9a65366481d4ecac3cdfe61404056b7b5ce1 SHA512 31b951f1c0bba0d8e177b3deec7c79e5cee20ce716466c7bba21229fcb8ae487b0ad973a58b2fb127ea0d0925ac29092dab6b010ebee3e314b00e73db114bf53
+EBUILD devhelp-3.30.1.ebuild 1864 BLAKE2B cc9604cf6b2add2180bf16f78f238919d0b2479d722a82d8f9cfb4d0328974d787abd14fd1a4d618ba9ce59d9778148f905a630e9d8df2e0d32815f8910294b5 SHA512 213181f169942a3956e7af890e2d47a5a24f7c80863b2879fe9678470cf6b4b19abe8a1bbb9d8fcfe9d7950211863eff7bff5fc50a1d6212727a68249e5115d9
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild b/dev-util/devhelp/devhelp-3.30.1.ebuild
index 82b1c5958702..e00885f4d8ee 100644
--- a/dev-util/devhelp/devhelp-3.30.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.30.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 # gedit-3.8 is python3 only, this also per:
 # https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome.org gnome2-utils meson python-single-r1 xdg
 
diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
index 95a30ed84ab6..c2b9f386a27f 100644
--- a/dev-util/diffball/Manifest
+++ b/dev-util/diffball/Manifest
@@ -1,6 +1,6 @@
 DIST diffball-1.0.1-bug_543310_stack_buffer_overflows.patch 2945 BLAKE2B 17aa01d64464edccc490e7714dc9db8767d19b0c8b6d14223359d266d38e47aae822454aa14446c038b2b3477a4d8a8db228be7e28666528883ebf02ac2cb65b SHA512 be9a44cd9abfb41f32683d0363375902477f739f9c0dd23b30cfcd9fc6fced61111a2b101cb46db2d6320b4d70ed04627a1c178d44f23530f248bcb87e6efd32
 DIST diffball-1.0.1.tar.bz2 387787 BLAKE2B e46dbf32b2ec9bece106ca90a6ae46bdfde8b83a5fd41e67f15c4bd25d7015327b4738ce3bfba71c92fd2baa94a5d3bc507dd0fad2b3451447a39a7fe058002e SHA512 1e01fff8bf7d993c828f195d974b7df1cd4fb056e9a51f9533bc8e01666a55e0d9467c799a005f58d7b4369bbf88fc9b716d0fb68ead6171d349e3c874bddb8c
 DIST diffball-1.0.1.tar.gz 86387 BLAKE2B 1e2c6d522b00a643666e88d19d2d6986ce02c7835378dfc9799e43fa291683bf08e129546a85c332b04ab549788ae4ac3b4d57fd6140a29a9556bece4293cbf9 SHA512 3344f03a65e2b44615eaf9210d26a4438712684c438fcea9caabe89688fe3b3d5436703f0ed63412a18a63acb49ca0dacff190fa002ea76b346bbccba3388ee4
-EBUILD diffball-1.0.1-r1.ebuild 1013 BLAKE2B ea7a6f97ae95ce9568c172b865a1fd259a0b4f8014e20754c2f0512084791660f1a4fadba9c2f491dcdc332de90c903e2338551939dfbe62f9e3400d42bc2f81 SHA512 b206297573957da74b7d50cbcf9b410fd6005ae26f77852a44c75262b732e247e1fde141be9dabded566bfdecf0d36e04390461a6ed4d673909e87478d7b50c8
-EBUILD diffball-1.0.1.ebuild 850 BLAKE2B 02535a55320b2cb6831801d8bc4d12675659d10db9909984b88ab5cf605c9d4735ce3198e5579a17cb6cddc444f331a9e230d4ec59d9468b72999c983296295f SHA512 0df7a66f7f67f5d7115c272787f73322767434a4ccbd47cef8e8519acc92c476c23fa98f5c74a11d10142435754cf12daa35ab2ac41a9136f09c1d49e12a5a6f
+EBUILD diffball-1.0.1-r1.ebuild 1030 BLAKE2B 7af7578802bdd739f1245c8576c1b823493f79c0134b09d94e5eccc0ddc3c6a57990091d11578773f6c3d5aa8dc5e2884d95d9006a90bc8de98b9c68e702090f SHA512 5838dea4ec0f4a13c4838447f2bef461eee2bfa093e71439669a62c503725785e218c2e66fa2f4a1e17accf5fe697c0441d2562d8261a4ee43576b81fdf2e902
+EBUILD diffball-1.0.1.ebuild 867 BLAKE2B f16d8e5fdb56e87693d6c99f6724c58c8b452862d42812b6ee49ad566b3763fe49c23c2e8cf431eeab313483c56542943a670316d155cd10f120d6f282550635 SHA512 c28c7cc3318ead6ee3441e68d2d2e34f19f8dab5666f10602c33ab000a82f24210eb4f2810afad9e474f97c298f9ccb0a0c8ba35055afe7d5712ce8162e7db49
 MISC metadata.xml 325 BLAKE2B d2fe2133512a06976ca331af0d318fbe888fac115af9e2635a3f682eb1ffcc0c9088e87437c39803cfa5183aaa2a5df091113efa6f7259e91960340ce095717d SHA512 8c9cb7fc1861a080e525eed799e80650b9c8ec4b0416959c9b754099cec1c26651beb5364992b8a3c80ed3285bff74f0a0b72a4032e3b243cab0191d8fd8856a
diff --git a/dev-util/diffball/diffball-1.0.1-r1.ebuild b/dev-util/diffball/diffball-1.0.1-r1.ebuild
index 9bff04668006..804abc61444b 100644
--- a/dev-util/diffball/diffball-1.0.1-r1.ebuild
+++ b/dev-util/diffball/diffball-1.0.1-r1.ebuild
@@ -34,5 +34,5 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable debug asserts)
+	econf --disable-static $(use_enable debug asserts)
 }
diff --git a/dev-util/diffball/diffball-1.0.1.ebuild b/dev-util/diffball/diffball-1.0.1.ebuild
index fbb4ea67d723..c36e2a324798 100644
--- a/dev-util/diffball/diffball-1.0.1.ebuild
+++ b/dev-util/diffball/diffball-1.0.1.ebuild
@@ -30,5 +30,5 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable debug asserts)
+	econf --disable-static $(use_enable debug asserts)
 }
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 2e55639401fb..ac2788d7e16f 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,7 @@
 DIST diffoscope-129.tar.gz 1766281 BLAKE2B 7e5dfc66a20daa62783811ec6f57b32b0733c65d66d9a17379985d5a18cf0e8b2901cf49a28d72f9305b2721e10c6ac455d747dbf5b5f3b9773c63b7fee0cd5b SHA512 2c472485b594cf2fb424bed52233a422e643bf8d5d8c919b5b5ce20c83ec7345325d337bb188c1a860f85f777012bd3e0137721a418903e0d421d4fe2d5a1b08
 DIST diffoscope-87.tar.gz 1026242 BLAKE2B 5055607c21504bf05f71793b112c1452556ac41e4c193c68fc037ab8089745e9b10dddc04b396f2011d22468e00a07392723631021d062f59935a953effd04fa SHA512 9f46ca0ba52ee991547c1b2b2477bab1e0c065cebf96649cecafc0e78983f42fe18b012a1f17de6184decb6cbb49aede91445c75777cfb292c6abe8bdf2dd6b6
 DIST diffoscope-88.tar.gz 1027126 BLAKE2B 18d2ebc532f5820fcb3f3a2e96a834a06a0f2adf4c14e17a1aa2d7aabc360f6180af2bf2151aac5b4eb33e38aade36e38b5894afbfd73ffa79e74bc45c085cbf SHA512 0fdb4385a0d842dccacc60c9b48b8720f00185bb4b6a5b30b88454a1f08e6ff7ead8fc392f406d2d2aff8b1b901caaa950a011b674d83e354dda4a01ac39ab1c
-EBUILD diffoscope-129.ebuild 1883 BLAKE2B e6153687ef518c9c6aa36d3a64ef7c880fb15d872a73a8631bc65e50c7664b2ce37526ac34816ae3ca353664598595c547f89b56a0bcfe88490755d17e22ca81 SHA512 1213da03b8f0997143c9d25ebc5110ee264b6516de38441e0025640f5860a13beb520ad4789f4d2841d4ab92f6b65ac0150e9402e24c47dc9f1159ae39e6b99b
-EBUILD diffoscope-87.ebuild 1835 BLAKE2B 7e11544ca6290e664e2f243640e70a483ae5aa86ed12b1904c56e46ecb3bfccdf6351e8460df5287006f6ca0c76ed6892bbe8b7804e863f3cc6f592319e4562d SHA512 58ab6f85b61caf31261ede9f807c6bc55a663a3d6582c1f73458b52d8c81bc1009ca8d4966222e2539fce78c0379fe05b938f6f362548b8e5e5f0b785343a1ca
-EBUILD diffoscope-88.ebuild 1884 BLAKE2B dbd6e3783941065ecd855b677b58ae2235cc90f631d9b0d7d415603b730513d32b46da275c3d442990d0b660c5f55761b028170db82737067fec6e4ce6c2a7e4 SHA512 382393caf25441d14a073376273c18691207e4dc3913c736998bac413d5ad1b86bd7843a9030b7bf9d4d78752f538050f95a25887acffc809a07657f116524e4
+EBUILD diffoscope-129.ebuild 1881 BLAKE2B 901b3b35c06ef654cd3be4189cc19160483addf7ee003da320e885e8dc8fdde1c8e6878e414a12f934b1fdd3a7e6d685c3236179714bb2f070d1c4dbc0644a67 SHA512 bde4b0a72ce6c40660f7d0fd3dfcf0076082640e7e747a5080a49a9c04b937650dfdee20ce6dc46ebbcbf36d258d42762d4d1517f635a1ac040bd7b4cf99c538
+EBUILD diffoscope-87.ebuild 1828 BLAKE2B cb454d05f0efafc840e7f0907bcfe53f43bdccba42db155da7a213677799a23ddf6fc1766aa045f500caa8a85f071962a78fb9a62f0b508fa70ed2444fd47a6b SHA512 12ba88855afa1ec84ac44afc089866c08d2a9329586f25e973add25a0178cd69d2ceb044eff7e00fec88fb91f5d4cf2b6476b6c1312a382a38271350ccb8c864
+EBUILD diffoscope-88.ebuild 1877 BLAKE2B f6ff10d8cd3879a43d558cdf3f46987d92f0625c1440376c3972cf142e3d3d0e0fc0721e2b891e744157deca78f150bdd51fe7d9de99d1438b1b9183c3cb5e47 SHA512 612f4270fed9da7412e8f27183f7f2e32d0aa3c06382a525a4c885bbf27b09014844e793a69ea8975a514d2ded9dd0a5d24f66f42a14d5b2ba1dc0b85ed4d62c
 MISC metadata.xml 2078 BLAKE2B 06fb9631030fb0f6d9a482c998238884bb2094751d7f99fb424e5c4f78f97c731eed98b783b14d0215224f786186e5a536e3775a5b7f7b6d980cd468ec243cdb SHA512 69afd9a3ba85d3a6ad92a64811b76708700f0790bff588762a92ad178da94690a940c939de09ca1719fa47ef5c85f10988debda26abef283b9ab01941b3232fc
diff --git a/dev-util/diffoscope/diffoscope-129.ebuild b/dev-util/diffoscope/diffoscope-129.ebuild
index 0ad8e425e9c7..70cbcbe463d5 100644
--- a/dev-util/diffoscope/diffoscope-129.ebuild
+++ b/dev-util/diffoscope/diffoscope-129.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 
 DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
diff --git a/dev-util/diffoscope/diffoscope-87.ebuild b/dev-util/diffoscope/diffoscope-87.ebuild
index 77784a1f3506..1b76a41c26c0 100644
--- a/dev-util/diffoscope/diffoscope-87.ebuild
+++ b/dev-util/diffoscope/diffoscope-87.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
diff --git a/dev-util/diffoscope/diffoscope-88.ebuild b/dev-util/diffoscope/diffoscope-88.ebuild
index 4e57c2b2f0e9..2beae056070a 100644
--- a/dev-util/diffoscope/diffoscope-88.ebuild
+++ b/dev-util/diffoscope/diffoscope-88.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
index f8885b0cf95d..fdc5de3db2cf 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 1942 BLAKE2B 0380f71b8e2b429352ebf66b0f1437067a652bfbb03eaeb823a960df227b5dd9da322b8cd427e94c9a1d0de9c1878d89062bd5a01db861197ae150d491811d21 SHA512 9392836b2d10241ef19b7dee64135bee4e9579f29a53ca6ebe384e3bed214b1b29a3dd7bdf69607809953771d31a64593d7d99854ff43bfba6fa17be0cd5248e
-EBUILD distro-info-0.22.ebuild 1976 BLAKE2B eb03ca273aeadcb902909386fc24e43be9e68f646ccea5fcc6dabadd0b5d868af8103fa59ea2501a1f5e69ecd47b3e7be4738d432e9b1e42774c69c47e0317da SHA512 49bec6f2f9c9d9d6758e6aa70794c00575db1c513d659a26825b4446c6e41bbdf89d47f3999a1129ede11f8ef42ee6209e749bacd6a0da293a2741ba91de8566
+EBUILD distro-info-0.14.ebuild 1938 BLAKE2B bcdbcc88dc4f5d6ca4d87430755435b09e69dcdd645b7843ee7d37f2b0f32abc5b129a9847218fffc7af20ac89750a873520ed8949c3be614a0846b9b6a6b9f0 SHA512 8fc392ea0ec26dad1f89b17673b07ca71f7d35d623f759fbb66be34d7bb02ebb2f39b50660684281990b46f23fc16cfdb7340542684d4accc2cff21bec1400ed
+EBUILD distro-info-0.22.ebuild 1974 BLAKE2B 1dbe82683b54056c4fcf02342979b18a1c5adb429384686a91f87e716f8f6c3d1e92a6c5bab4fd3cc97d6d660fdc12dd302d0c54ba49fee288d676f91bfe9e26 SHA512 8d42924259c4351ee6ddff973f4af5ce5008e5b1ba80d74ef74f35424460abef15a53830f7c07dac22d763a813760d6a334d60cab81f7629a7b24a9dae95c586
 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 a360268d5bb6..11fae490576c 100644
--- a/dev-util/distro-info/distro-info-0.14.ebuild
+++ b/dev-util/distro-info/distro-info-0.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 DISTUTILS_OPTIONAL=true
 
 inherit distutils-r1
diff --git a/dev-util/distro-info/distro-info-0.22.ebuild b/dev-util/distro-info/distro-info-0.22.ebuild
index ab69bf260de2..7e1a4d02db52 100644
--- a/dev-util/distro-info/distro-info-0.22.ebuild
+++ b/dev-util/distro-info/distro-info-0.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_OPTIONAL=true
 
 inherit distutils-r1
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index 07f13933f4b8..3a72b0eda64b 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,4 +1,4 @@
 AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
 DIST dogtail-0.9.10.tar.gz 125995 BLAKE2B e28e9a6330cefc8746b850501a5beba07e18f1e5d5f935ce182103a9ea4ffc95483b3530a705565cbfae1bff24da57839f7e7b6939f42821e31b287150e33b4d SHA512 08ce4ad6e5e492ab04be9964cc6583d96d2d8a707a49721c1bca9248e5c56702fe5d0d84dd992023f731fe87016c88e21929319baff561aa113c6e101343fc3e
-EBUILD dogtail-0.9.10.ebuild 1474 BLAKE2B f85e0a2466c0ffd66066725c167bfb7bdab288fff002eb1a8a7beb84df2c674695469b2140a7825da318ef5121fdae3390228507a6b3b8241342365313de8c8f SHA512 dafdecacab0a9932c0789d18dda7837bef905c673a5f31e82380deecd0a27a6afec6033935fe10ad323df8bdcc0720904ebdc4657b7adbd222d4b231370c47ec
+EBUILD dogtail-0.9.10.ebuild 1470 BLAKE2B 39fd580e47697e0314d442a74c2c4283563eba00ff6d45cb6d41d14cf78a873977ab4960f9d467a600ece36346b4c66fd6f7fa4e0e46901a4e2024984dcfac97 SHA512 e9849d0f93a60d7f95079d9972aa6690c6c6c0d93d436b1f6da7d70b4a2c2fe57f8e81a2aea66d121fafe72bef94f73ea05f3f2d650ae0da3bbd5db981fc1b52
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-util/dogtail/dogtail-0.9.10.ebuild b/dev-util/dogtail/dogtail-0.9.10.ebuild
index 982905cafcaa..1e430b5c9b77 100644
--- a/dev-util/dogtail/dogtail-0.9.10.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 gnome2-utils xdg
 
diff --git a/dev-util/doxy-coverage/Manifest b/dev-util/doxy-coverage/Manifest
index 45c9b1d25704..184e2498815c 100644
--- a/dev-util/doxy-coverage/Manifest
+++ b/dev-util/doxy-coverage/Manifest
@@ -1,3 +1,3 @@
 DIST doxy-coverage-151229.tar.gz 3633 BLAKE2B 02e99a841294ec9acdef1a85948d39bd1c8c5a39cc66e1ed48734ba3fd57a5bb027b4b44675d1bafc0cb42777ddd94f17cf99b8c8cc86c61f23c331653e43b53 SHA512 897c36adb6551ad177429d771b6eb7871a8b024d3cb5915d412b13f92cf8e52b87ba3237093345d51fa5dfbf80a800ab69907518b1a5570d1f056a2de43353fe
-EBUILD doxy-coverage-151229.ebuild 614 BLAKE2B 69daead4e93cb9d89a8ed382e9bc670dd603ef8f2a229cde1a301c871ab6486d00688be405f5697286ebb4f1dffa0e37df4df3578f5be22eacb6f297ef7d3b9a SHA512 c50c945b8b629374db86798cb4b3478c7853e2d76f77b623327aa06a67a99560a84a8c335b97e1ba0bc0f84cf34aaef22eddae39dcf3c7c50b67f83a35e8de08
+EBUILD doxy-coverage-151229.ebuild 642 BLAKE2B cb95962084674229950216cda22da894b79d982c526d9b4564f8df351d32f93c4ac6ecbf13db8d1e6a6312c165d2fd3e1eaed32d2305db815fe32913b06b7ce1 SHA512 95c350c901b0281ebd1e069ee52f1a317bffaa0cfc3603798e9e3141c85b6fb185e71ff15d1d401388d98aa75b9b679834b258beeb3b1ee18730397a88bcabfa
 MISC metadata.xml 405 BLAKE2B 90494442a57563acf15505d646a7311b568980bfeb0f02a09d079e0be2f83d2e0d04331a3f18c38db6e06f3f89ce8256f586af9497431a3e57e7c2c2e517e8ee SHA512 770c698b430f7c7bd93f0dcdbcdb21128da96680825c72e00e7607e8b68e4d159e63bb3f752e168b94041e1e1257bbacaeef11ce0161ad7c1803b211e1ed1580
diff --git a/dev-util/doxy-coverage/doxy-coverage-151229.ebuild b/dev-util/doxy-coverage/doxy-coverage-151229.ebuild
index 7852bde09cfb..22dfdd72406c 100644
--- a/dev-util/doxy-coverage/doxy-coverage-151229.ebuild
+++ b/dev-util/doxy-coverage/doxy-coverage-151229.ebuild
@@ -10,7 +10,7 @@ inherit python-r1 vcs-snapshot
 COMMIT="29a0bbf43bfecb6872cdca0e4a11733954d25196"
 DESCRIPTION="Source Code Documentation Coverage Measurement"
 HOMEPAGE="https://github.com/alobbs/doxy-coverage"
-SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/alobbs/doxy-coverage/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
index 5dc56fb87a23..657f04c9e276 100644
--- a/dev-util/dput-ng/Manifest
+++ b/dev-util/dput-ng/Manifest
@@ -1,5 +1,5 @@
 DIST dput-ng_1.10.tar.xz 82608 BLAKE2B e7b3769490ec0bf4de4f763380e9a50fd2c76778c2864a4ba45eb754f2dc4aa896e556ad86939f9bf003a68b1e185b51507dd0a015453dfb39965c63beab4964 SHA512 4a883350e7a0b47c121b752d1e0ab1470924319ef895f55742fc4d8f8a0cb3a0ab4ae18d54495ebc9229b0cbf18fa375848fcdcd2431ee1f66bff6433b9a3b08
 DIST dput-ng_1.28.tar.xz 85276 BLAKE2B d205d15aad1b81dcf2cc0b765c9724b21add32df39102b63502d99e5da73aa95efdf66e94f6226105ab2ae97a4bf8c43963784f3ddf2d03217ab5023a7a98f22 SHA512 cfd4a6143b33f29eb32b88972a204ab7a6c2f062299c76167434322ae5d6d2cf8654c5b4d1e96db90dbffe372a04e2a7691694ecf46787c7743dd9ac2b7b317e
 EBUILD dput-ng-1.10.ebuild 1715 BLAKE2B faa98615ae8c62f3acd13b8240de04ddbc8640c87ba042bc3e9e9fed5e9a6a1243811993758b24d328ab7256b0bb968a208530cf17bc7ebc81a7f31721666da5 SHA512 77c5f94d12b1f7c61d214ef6630e8ea226fdf6cf6b1a0c94fd9b2c9d8205269881722ef85b3a00083e74d85fc9c9e5f9bf8c98c6dd1e3299ed9762f5e1050626
-EBUILD dput-ng-1.28.ebuild 1792 BLAKE2B 4e0c5a0ac7a2a98126b9b35242de2b4d2b020a62f8a534c9b47e7c95f18ce8a3c0170582d5af0c0486a225d31a848c15da9f76854a3fdd9bf707b2d90ca0f02d SHA512 0a2f346524f8f31c857374d0afd26fd8b3710e680f26d7f0c1935da05831b8245d0aeb8a6c35b068a9f70defcd377fd9f9923104cd01147e57ffa1697d7a821b
+EBUILD dput-ng-1.28.ebuild 1790 BLAKE2B d391c59607aedc945c2c2b443c927b3e4775321dd54f9b499d86f2f39e40cb285b02818ba27ef66ca7393611b9817c9b18a22e371fd17c9ba76c8fc3edb0f22a SHA512 e3ab72d6bc9286ce896b849231a79f87aa4dee2839cf6f8857f491d031840933d0b060e20159947d1fb9c08c81be21547f7dac62a8cfa875302737655386ff2a
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/dput-ng/dput-ng-1.28.ebuild b/dev-util/dput-ng/dput-ng-1.28.ebuild
index 9840d82797b8..d0864124adac 100644
--- a/dev-util/dput-ng/dput-ng-1.28.ebuild
+++ b/dev-util/dput-ng/dput-ng-1.28.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit bash-completion-r1 distutils-r1
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 9ddd6378a8b7..1d1a55f0db9d 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -1,9 +1,13 @@
 AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
+AUX dwarves-1.16-no-libebl.patch 3974 BLAKE2B 88a5170bfed028cf7919ac010112ad21124a994e364af71f5124263b73c0aec00e7c75f73dd26255534a794065e1b17f15b8f27b566cf77a2a7aaf0832760f98 SHA512 9925c01104ccd0f5abc17488673a51b2a674751117a615a87f5b8efd1b6670bc778a5590e6a55e65cb6219d8521040b266b2dc63a31bf9618302e695a815cd71
 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
+DIST dwarves-1.16.tar.xz 273060 BLAKE2B a4cd976ff1cf6af0e2848a337400f4b1961ec5aff528d1c5893053967c0d1e7fc77de8220ae67c4b8a3eb387b659fbfd72113b29b2bf6a20d1fc45a59008a3e0 SHA512 6d57b26db70736353d8797d1f7d68c7c73b6df3ae69eb66dd7cb07d6b50a26c4f2adaa576a8915a4a7f8c41b67dcebbfc8cbdf3ba507dbf941f63941b13d65b1
 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-1.16-r1.ebuild 981 BLAKE2B 73d0c73c70e17641b914ac177c3423a02592bc555c876aa99b2f23bfbf79a8ae3a74b11d593ef28bf34ec47f2b6e9d28637a8f49db9f03f90d25974edf65d69e SHA512 54a0e1425ac72e753e8c70534617f84863897b74689ea1f08602601c490a130830eae1ba3f984cd5a77eb9637131ba7ff7384e27542870871b40f972b932d1e4
+EBUILD dwarves-1.16.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.16-r1.ebuild b/dev-util/dwarves/dwarves-1.16-r1.ebuild
new file mode 100644
index 000000000000..c58ef0fd660d
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.16-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+inherit multilib cmake-utils python-single-r1
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+LICENSE="GPL-2" # only
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.178
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV//_p} == ${PV} ]]; then
+	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
+	S=${WORKDIR}
+else
+	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+fi
+
+DOCS=( README README.ctracer NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-python-import.patch
+	"${FILESDIR}"/${PN}-1.16-no-libebl.patch
+)
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake-utils_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-util/dwarves/dwarves-1.16.ebuild b/dev-util/dwarves/dwarves-1.16.ebuild
new file mode 100644
index 000000000000..d4a49fba59f5
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.16.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+inherit multilib cmake-utils python-single-r1
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+LICENSE="GPL-2" # only
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.131
+	<=dev-libs/elfutils-0.177
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV//_p} == ${PV} ]]; then
+	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
+	S=${WORKDIR}
+else
+	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+fi
+
+DOCS=( README README.ctracer NEWS )
+PATCHES=( "${FILESDIR}"/${PN}-1.10-python-import.patch )
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake-utils_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch b/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
new file mode 100644
index 000000000000..78c6a4e3964f
--- /dev/null
+++ b/dev-util/dwarves/files/dwarves-1.16-no-libebl.patch
@@ -0,0 +1,89 @@
+From fb56a460e23f44a4225d4f507b9ec7cf0790c75b Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Mon, 16 Dec 2019 21:51:45 +0100
+Subject: [PATCH] cmake: libebl was merged into libdw
+
+Since elfutils 178, libebl is now part of libdw, so searching for libebl
+always fails. Simply remove it from the search.
+
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ cmake/modules/FindDWARF.cmake | 23 +++++++----------------
+ 1 file changed, 7 insertions(+), 16 deletions(-)
+
+diff --git a/cmake/modules/FindDWARF.cmake b/cmake/modules/FindDWARF.cmake
+index f4feec4..027d06e 100644
+--- a/cmake/modules/FindDWARF.cmake
++++ b/cmake/modules/FindDWARF.cmake
+@@ -37,14 +37,9 @@ find_library(ELF_LIBRARY
+ 	PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
+ )
+ 
+-find_library(EBL_LIBRARY
+-	NAMES ebl
+-	PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
+-)
+-
+-if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
++if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
+ 	set(DWARF_FOUND TRUE)
+-	set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY} ${EBL_LIBRARY})
++	set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY})
+ 
+ 	set(CMAKE_REQUIRED_LIBRARIES ${DWARF_LIBRARIES})
+ 	# check if libdw have the dwfl_module_build_id routine, i.e. if it supports the buildid
+@@ -52,10 +47,10 @@ if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AN
+ 	# in distributions such as fedora). We do it against libelf because, IIRC, some distros
+ 	# include libdw linked statically into libelf.
+ 	check_library_exists(elf dwfl_module_build_id "" HAVE_DWFL_MODULE_BUILD_ID)
+-else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
++else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
+ 	set(DWARF_FOUND FALSE)
+ 	set(DWARF_LIBRARIES)
+-endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
++endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
+ 
+ if (DWARF_FOUND)
+ 	if (NOT DWARF_FIND_QUIETLY)
+@@ -63,7 +58,6 @@ if (DWARF_FOUND)
+ 		message(STATUS "Found elfutils/libdw.h header: ${LIBDW_INCLUDE_DIR}")
+ 		message(STATUS "Found libdw library: ${DWARF_LIBRARY}")
+ 		message(STATUS "Found libelf library: ${ELF_LIBRARY}")
+-		message(STATUS "Found libebl library: ${EBL_LIBRARY}")
+ 	endif (NOT DWARF_FIND_QUIETLY)
+ else (DWARF_FOUND)
+ 	if (DWARF_FIND_REQUIRED)
+@@ -73,9 +67,9 @@ else (DWARF_FOUND)
+ 		find_path(FEDORA fedora-release /etc)
+ 		find_path(REDHAT redhat-release /etc)
+ 		if (FEDORA OR REDHAT)
+-			if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
++			if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
+ 				message(STATUS "Please install the elfutils-devel package")
+-			endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
++			endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
+ 			if (NOT DWARF_LIBRARY)
+ 				message(STATUS "Please install the elfutils-libs package")
+ 			endif (NOT DWARF_LIBRARY)
+@@ -89,9 +83,6 @@ else (DWARF_FOUND)
+ 			if (NOT LIBDW_INCLUDE_DIR)
+ 				message(STATUS "Could NOT find libdw include dir")
+ 			endif (NOT LIBDW_INCLUDE_DIR)
+-			if (NOT EBL_LIBRARY)
+-				message(STATUS "Could NOT find libebl library")
+-			endif (NOT EBL_LIBRARY)
+ 			if (NOT DWARF_LIBRARY)
+ 				message(STATUS "Could NOT find libdw library")
+ 			endif (NOT DWARF_LIBRARY)
+@@ -103,7 +94,7 @@ else (DWARF_FOUND)
+ 	endif (DWARF_FIND_REQUIRED)
+ endif (DWARF_FOUND)
+ 
+-mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY EBL_LIBRARY)
++mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY)
+ include_directories(${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR})
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
+ 
+-- 
+2.24.1
+
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 9abf6c0107a0..e866c26a1ad0 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -4,6 +4,6 @@ DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c1
 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
+EBUILD edb-debugger-1.1.0-r1.ebuild 1138 BLAKE2B b6172c3cd112dac42ecdc0159b4145c61637e34c0568a79e3ee72a4529cdf1842f11290d9b0ce60d41cf3236878de269e44f693815d53e5c19807d1aa8f58940 SHA512 03ccd279aa5ecbc2f32f9a2f9c722c593e7383f7aedad1d4675007bd7f1e00492601b82b032eeb0ac1c0e277111a80f062933f2ca23a199a2262178a609e9cd6
+EBUILD edb-debugger-9999.ebuild 950 BLAKE2B d083ce5fcbe33aa971241c0a1e0f5f24c9bb12475bc848e4c52bd89e6cd66686d1d1d077da10ef8101d1b2fa070af2065037d3dbf254747e26c53bab4f56866f SHA512 235343deaa24f1f978a29fba6a031c4ec7eb31ac0249bbce83468d244862940c9ee7edc67da76174c8a44773ce33266c9105063e9fac72904f4b1f584baaec04
 MISC metadata.xml 580 BLAKE2B ca6847b4ec53715b5d408e36acf6753a8da4bfb7f8da771bab017daaa92c6b7d34e9100662e209626d49e9a45d1b0624015f46ef83aac0db1b23902521731aaf SHA512 75333f5eba045b2a70efd901680f80781291e85ee3498fb65e9ac8eabf6ba466525eb0f87093d1f173742b01e53d50a8bc874a2a83689c2ae62e90a7dbcbe077
diff --git a/dev-util/edb-debugger/edb-debugger-1.1.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild
index 5b720ad3e0d6..12fcafb7f2c3 100644
--- a/dev-util/edb-debugger/edb-debugger-1.1.0.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ IUSE="graphviz"
 
 RDEPEND="
 	dev-libs/capstone:=
+	dev-libs/double-conversion
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild
index 5c9cd77c65a4..b6517f3c57f3 100644
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,6 +16,7 @@ IUSE="graphviz jumbo-build"
 
 RDEPEND="
 	dev-libs/capstone:=
+	dev-libs/double-conversion
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index d4159551b943..0072bdf27481 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -8,5 +8,5 @@ DIST ELFkickers-3.1.tar.gz 101406 BLAKE2B 8de2c27904909ede753b94cebe87789b27f02f
 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
+EBUILD elfkickers-3.1a.ebuild 863 BLAKE2B af011352123cb593849d27b897d641572e6ce94d88c0ebdfa5c51487cb38c1084702c04d88c56ff51b8b82cc942cda16e4f62ad240fa9d3c5d4a1bcf9d8f30b3 SHA512 c0e14ea9d51b59afebabc5096a7b93b8eb44b3f4a5192cb4e3ad0fddb0608038ad23b7659da3112c65f337ead61ea2885b02d3535481987b9d29c9fc53af16d3
 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
index a581ac986671..cc49c477cb5b 100644
--- a/dev-util/elfkickers/elfkickers-3.1a.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.1a.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 arm ~hppa ~mips sparc x86"
 IUSE="doc"
 
 DEPEND="app-misc/pax-utils"
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index fe24643e6319..253618d149e9 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,5 +1,5 @@
 DIST eric6-18.03.tar.gz 16517664 BLAKE2B f7f5292df8bc694fc4715ec1a250d948123a2eb99a590e6824d985318446babff86aeb745f5b5dbd0707e771638eaa943673e5b546676bea97e266888b844989 SHA512 e488010791b44cc7da782620baec9b97259aaefeb90d491023ec1d4582fb68acbc06d9eedba7beef9ddc706302e06e36b9ebb4e46d6f035b6c74e9f4eb9ac400
 DIST eric6-19.11.tar.gz 16241807 BLAKE2B bd8284164c6c191e91fc08bc42f594107ebab50f71a980ef331d42fbd8d9c488d5674b2f53665718a6e723a228e838d082095fc3c3b2d40c3fb350c5be9a98ee SHA512 a8305c5185687d62231926bd4c484f3786ac1c20d125a1f8fb1b6bc0d42c57ba92bf00aaffd8699f8d7594c6432896bef8db13da85513ba4f217a60223f2f533
-EBUILD eric-18.03.ebuild 1894 BLAKE2B 535be218a5702cb02b155039cf596f36e77dc3643a3696ecdd083d95bcde8341dc0ee4eeafeb7bb990de5c5dfd1e7292e8a96cc68e7f15c567d2a09112a3346f SHA512 b890f91befb946fb0ab92fffe5332ab2dd2f8caaf52de5780bb2012827ee5755389e7c6c37c8994f3ead414b3a4d002616f04829adc504649792728ceff3dce6
-EBUILD eric-19.11.ebuild 1383 BLAKE2B 3108f60a541f90310cd597afb417862c74b1ea3697f5337a86319eb9bbde062d59a2d40931252ad1506e8d5d75decd6cbfc641aec8ab5fd0055928a0c5cf1789 SHA512 612e2d694c94392449307e4b5c441fce74fe196486961bd5d4b7294badfd506f801c6467addf18fbaebacc7e2c484b09600d68397628de91cf92b04d5df2f1db
+EBUILD eric-18.03.ebuild 1890 BLAKE2B 4b88d3921fd5f3ab9d3a21a5eca1de9b7a914382f731578de66039fc3cf6a96bf261296e990b08501df99e1862dcec4c02d44a06a14daaa3dc9784c7e9fd40a8 SHA512 45d1567fc9e1519746441ed7853600d18c7aabfaf3bba343af02d4d0fc2006f6c486b953cd34c80363dd33478896ba90f90aec1a7919f385a1572ea2c4bb0e17
+EBUILD eric-19.11.ebuild 1381 BLAKE2B 360c32ca7d04511139008ab1902d7e606d4bd3c19e8f376b7fc56471f0e3bfd71ee3258351625a2a052bab0b66cca4eaceb4f0e71537af0057c823bf21695a3b SHA512 214d0b9b90ef9ac3935be9f931a0c4adf8d74ff0967ddbae14d1d88589f61d18606dbceef35baf7759a798e7c6368360aa8320787e1b34b88e19f715d68bbeab
 MISC metadata.xml 325 BLAKE2B 5c4bd806e4833d3f4c294ca46b24420c71f8ef234ea732460833f39f583e0e5156d773d6fbf7fb4d45edf409d21622a9b90e0989e9d93632d7dd94b7aa7e6c3f SHA512 e3da71c04a1a2af6b72ff068eba586c14b159034f759448c669032b30a82cc618e58467cc8cec8090d22d0e864338fc62b735f73dc31fd2a33d63cb677178f9e
diff --git a/dev-util/eric/eric-18.03.ebuild b/dev-util/eric/eric-18.03.ebuild
index e4789912cf9c..3e51fdbe81d8 100644
--- a/dev-util/eric/eric-18.03.ebuild
+++ b/dev-util/eric/eric-18.03.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_P=${PN}6-${PV}
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="sqlite,xml"
 inherit python-single-r1 xdg-utils
 
diff --git a/dev-util/eric/eric-19.11.ebuild b/dev-util/eric/eric-19.11.ebuild
index 637b427d81f1..425d51c2062c 100644
--- a/dev-util/eric/eric-19.11.ebuild
+++ b/dev-util/eric/eric-19.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="sqlite,xml"
 inherit python-single-r1 xdg
 
diff --git a/dev-util/fatrace/Manifest b/dev-util/fatrace/Manifest
index daff1ba81356..79d5d78b81ac 100644
--- a/dev-util/fatrace/Manifest
+++ b/dev-util/fatrace/Manifest
@@ -1,4 +1,4 @@
 AUX fatrace-0.11-sysmacros.patch 295 BLAKE2B a7f5350f0158e1f0c529b3a67a59b4a4255cd640287822b57e1f0952029b899fbdaab15e2d22394357e1210bcbafe8678866462a8213a030d5dfed2ec57f214b SHA512 0b3946043f74b957eb1b8caad39cc1b031e40bad564a1ffaa593dd77d5f96f06a1103d8d0b3689b4fe58f4bb4ff105d81855c9088ea5eec9d4ce6876d4a6f7f9
 DIST fatrace-0.12.tar.bz2 19377 BLAKE2B 5279af5497408fdc614f090060e56552e0f396501a0d4155752ab44bfa666878ab4b969979314051b9b3f529e3870ffdc8071f332dbc146f0d2a7798c8b2549a SHA512 76dfc9dfc5c6b8e13f5d0c5c01c5c1b91093a5d980ded1f8fd776c9e861a6679eea193bcdd92b1c8770c9af346820300f186b7167ff4313e670f27ea31f765ea
-EBUILD fatrace-0.12.ebuild 837 BLAKE2B 60ab8ee834cc38fb28d0c4e8a792a60a4d8a7563101aea00d10ac71eba17d47d595f229b9e7449b132e7d52d62e15e6dfd2cc7d7d951ebceeb1af2a3a28b7e1e SHA512 f660b8bed86acd4f00a919a75ffc3b7aa81d72a7060b709ca6d4ce09cde794cc563e936601b6aa59d036b22233bc88aee8e526d403326a371fc5112c61b8167f
+EBUILD fatrace-0.12.ebuild 831 BLAKE2B e42cbccfbb710d89478505f7c3b9c77291a45e0e2cad3b1b51560346aab48ca0e1a6c83cee2714f07ee605337090748035427873eee7ab562281be69e7a539d2 SHA512 15074d73eade890a6504584b7b40d8c674f9dc7088f730cd1993f72e63397c6d6dc417c08f23f6ea4548af3218719645f8d5e33d0744b086f024c4cd79caca8a
 MISC metadata.xml 312 BLAKE2B ddb40aa2eb3e880241bcfc0a99e4a344a13a761d31ae2fd38e5f7050fbdc3087498e195e0725821bea6b824d892a2bd72aaab698ca387cf74f5d6ab9bad76449 SHA512 013d5658ec11cb683dcd6c30d8059099662cf3b27e68ae1312496a54c317965efc73693705db27f96254d7293cf9ea8019237f2ee550cc91bfa2aa7b63c161b0
diff --git a/dev-util/fatrace/fatrace-0.12.ebuild b/dev-util/fatrace/fatrace-0.12.ebuild
index 392bf723af79..f05e10677905 100644
--- a/dev-util/fatrace/fatrace-0.12.ebuild
+++ b/dev-util/fatrace/fatrace-0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit linux-info python-r1 toolchain-funcs
 
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index f7e40affc918..c3f2e63c05f3 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -3,7 +3,7 @@ DIST flawfinder-2.0.10.tar.gz 252772 BLAKE2B 9647bb4258f6a7fcfa84aa119b2b714dbf6
 DIST flawfinder-2.0.7.tar.gz 249177 BLAKE2B 35dc5796ca7ecf456bf623247c7fb3944e05864bb714900a386f3e39eed81695409b44b9684365e4b172feb938a7c781c831856a8a94826c48b1027698b0967a SHA512 ecfe98c58e253b1d90b833747d69c41597ab7b4c82286e5f45dff45de90056216c25d2c9626540aebfc1e475882a04c3cfa3c0cb3ee242f498f5cdfe188d761f
 DIST flawfinder-2.0.8.tar.gz 251546 BLAKE2B 4817d3f529c27f0e969754fab08d1323b5fd778e4914882bdd4a61a96301ded287e2899016e609f658d9fee5dc76c1013e535a32120831cd166bb3f24c443e8f SHA512 9346c60808087ddf28f433067691c662beb0c36375903fdd0b4dbe3e53fe92b3893e38b13ecb0fe134586cf680fc554d33c92ff910dbd1cd4c3cbeab946038f4
 EBUILD flawfinder-1.31.ebuild 724 BLAKE2B 4441a55be26ce38da31944675d0203dac0028b27acbf99dadc1e733114d8e6a80500aa0c90a592f89b188831faa1ffc1160a7f11e96a7b940f9af01f518e164b SHA512 d4730fd182db2bcd39ff3b44c0036fa4dfd00d26b98ff5732c03d89980de5ced3a9a955d926dcf40f1afb829839f5aab0f635d4a60464d15fb603bc7190eba39
-EBUILD flawfinder-2.0.10.ebuild 804 BLAKE2B c06f4c5294f71217367bde02d91d79d12f5ea23bf7d15ff62655c38a267d068b4085bd90a481145a0b915750c2c5c0a05dad0bdfcb40c04bd71e10aac3818b03 SHA512 bfa525396655d991640313738924849bd6ab1650d9e15bae5fcc3569ba5026bfcb520b8c64fee70834f40be08e574c62ba08809dce5aa03f7c82cf7c40a0e4c5
-EBUILD flawfinder-2.0.7.ebuild 804 BLAKE2B c06f4c5294f71217367bde02d91d79d12f5ea23bf7d15ff62655c38a267d068b4085bd90a481145a0b915750c2c5c0a05dad0bdfcb40c04bd71e10aac3818b03 SHA512 bfa525396655d991640313738924849bd6ab1650d9e15bae5fcc3569ba5026bfcb520b8c64fee70834f40be08e574c62ba08809dce5aa03f7c82cf7c40a0e4c5
-EBUILD flawfinder-2.0.8.ebuild 804 BLAKE2B c06f4c5294f71217367bde02d91d79d12f5ea23bf7d15ff62655c38a267d068b4085bd90a481145a0b915750c2c5c0a05dad0bdfcb40c04bd71e10aac3818b03 SHA512 bfa525396655d991640313738924849bd6ab1650d9e15bae5fcc3569ba5026bfcb520b8c64fee70834f40be08e574c62ba08809dce5aa03f7c82cf7c40a0e4c5
+EBUILD flawfinder-2.0.10.ebuild 802 BLAKE2B c99ed692efa9d226f89ae584874d4b2bb46619d56b1e8452e2080814edb6891564207b4902dd77e8cafda587b476ce9c36167a82c5a21c14bd09e0617ac9a0a1 SHA512 e0b060165a052105baf0addc99f7dbd77e71058615e03189ca39569163ab49f66f790f70cbf85fad14cdb822596c36dc99e03ac4c307bb18f6e1486fccc4a637
+EBUILD flawfinder-2.0.7.ebuild 802 BLAKE2B c99ed692efa9d226f89ae584874d4b2bb46619d56b1e8452e2080814edb6891564207b4902dd77e8cafda587b476ce9c36167a82c5a21c14bd09e0617ac9a0a1 SHA512 e0b060165a052105baf0addc99f7dbd77e71058615e03189ca39569163ab49f66f790f70cbf85fad14cdb822596c36dc99e03ac4c307bb18f6e1486fccc4a637
+EBUILD flawfinder-2.0.8.ebuild 802 BLAKE2B c99ed692efa9d226f89ae584874d4b2bb46619d56b1e8452e2080814edb6891564207b4902dd77e8cafda587b476ce9c36167a82c5a21c14bd09e0617ac9a0a1 SHA512 e0b060165a052105baf0addc99f7dbd77e71058615e03189ca39569163ab49f66f790f70cbf85fad14cdb822596c36dc99e03ac4c307bb18f6e1486fccc4a637
 MISC metadata.xml 622 BLAKE2B b86d650364e1cd87b7fadc99bfc02e6acb360147c849846bfc94b3e827042aca129c745240ef8e04e3270ec6468dd5654ef9dbc55eeeb59d0251a73ab9d5f888 SHA512 5eda245e47619da4309fe11fd709daf8aedfefe97624ffcdd898bb4915c29e8dbf07b25543071ea9fe15af604a96f030ba816e26580c7166fd9689a1062e8e2b
diff --git a/dev-util/flawfinder/flawfinder-2.0.10.ebuild b/dev-util/flawfinder/flawfinder-2.0.10.ebuild
index cf9cdb27f945..f69997ccae2b 100644
--- a/dev-util/flawfinder/flawfinder-2.0.10.ebuild
+++ b/dev-util/flawfinder/flawfinder-2.0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-util/flawfinder/flawfinder-2.0.7.ebuild b/dev-util/flawfinder/flawfinder-2.0.7.ebuild
index cf9cdb27f945..f69997ccae2b 100644
--- a/dev-util/flawfinder/flawfinder-2.0.7.ebuild
+++ b/dev-util/flawfinder/flawfinder-2.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-util/flawfinder/flawfinder-2.0.8.ebuild b/dev-util/flawfinder/flawfinder-2.0.8.ebuild
index cf9cdb27f945..f69997ccae2b 100644
--- a/dev-util/flawfinder/flawfinder-2.0.8.ebuild
+++ b/dev-util/flawfinder/flawfinder-2.0.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index 5648c899cdc5..4a933782415c 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1,7 +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
+EBUILD gcovr-3.3.ebuild 440 BLAKE2B 2ce028e987cd62e59f0ea5c6b8412c36f71409dd8c087934bcf0d0b34df5f1c829b9dd5335cd575a952a60213b0ed056b6804f985bcd6f46a0007c769f63c2ac SHA512 c9da775e573658ee505a43c150ba61f88f124250ee20709a851ceef06a480147a416bc384f848741ee0c2d9b54def0b32256fe264c4e7d787f0ac5ff82d8a4fb
+EBUILD gcovr-4.1.ebuild 792 BLAKE2B b7d05bf463adde193ac222a9fcb675f38612074b32a52c471bebd61aa861e5149d64c1be81e60e94ec614acf6d2a9fb9c2d4fea1d1d85853d3192cee360b9903 SHA512 a2315910bc8595aa066abed1a08acee5dc933d11081c72b61ae518e8513b54fb47680b64990c195b64c0c8b42aab28a08e7325091bd6b4defc097960b9c405c6
+EBUILD gcovr-4.2.ebuild 994 BLAKE2B 8149d03da3e5d48ae99ca3ff83ea5a46813a27fea2d759d3529f6e33e9b22e2e0e8509c92dae58b7628d2885ed43006aa99296a09a76a88d27639c3de8023659 SHA512 c5386347cb7285efebdd170b45a2fa06314a755befd2bc3e6708e288044c3fc0716acdd5450d5533d55a14483a4e16fe5db623371b555fdc7ce61cf8bb9291e5
 MISC metadata.xml 404 BLAKE2B 0c1ac87d95e969877abd8993c95d6b723d0faaf645093cc01c3c88dbadce84a218a12d4f799a1e95535d67fcdc5725b02d95cc8b53408af04a1c81382bf223c8 SHA512 472f35c3e963a0eb02f8ede9f996bad20a6b67f364c5b2f40b37b90d552dbc1414af5c01862cd4ed7586a6e02cc10a408134cca6eb994f0b897f2fdef3a2054a
diff --git a/dev-util/gcovr/gcovr-3.3.ebuild b/dev-util/gcovr/gcovr-3.3.ebuild
index 4c9c447f8021..bb2e1eb9d28a 100644
--- a/dev-util/gcovr/gcovr-3.3.ebuild
+++ b/dev-util/gcovr/gcovr-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/gcovr/gcovr-4.1.ebuild b/dev-util/gcovr/gcovr-4.1.ebuild
index 0c6dfe433055..e8f28f45b39e 100644
--- a/dev-util/gcovr/gcovr-4.1.ebuild
+++ b/dev-util/gcovr/gcovr-4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/dev-util/gcovr/gcovr-4.2.ebuild b/dev-util/gcovr/gcovr-4.2.ebuild
index 5b264d4b384b..52a5d6a028fa 100644
--- a/dev-util/gcovr/gcovr-4.2.ebuild
+++ b/dev-util/gcovr/gcovr-4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
 
 inherit distutils-r1
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 78e9945a3f55..ab26176c15d9 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,9 +1,5 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
-DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
-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 2022 BLAKE2B 458f0e8494b24cb079600faf3ebb268f24016a51ccb5c35c003207ef7f75b72994ad9a85d42715ffaa728024deefb8a4052e06c759f9aea236c6ac596bb7a362 SHA512 e54f246ee7ee7d25a2c71b7a649bbfb8433a53a309ea124204cd4220829b1303a09241d32febb34f85d43b316b378e2afabea671f4f75eb9c91587333057d5b2
-EBUILD gdbus-codegen-2.60.7.ebuild 2024 BLAKE2B 93f4e61db70b2c15189b6b86e32e7653af8a7313484ac1060849439916f460f71937d56636585ba22bc96f46055c39ead84a7e106a6b535b2df64dee065bbdd5 SHA512 0d9edcbe2f83fc25bd90555b3f2828006933af58805483d03b6a20ca569a9fea8b9c916753f57fec088909925aae8bf166f4caf7a792784d8b9ced88ee2d4a4e
+EBUILD gdbus-codegen-2.60.7.ebuild 2017 BLAKE2B ca03b50c138accecc1304ae9e8ca7fffd897b14b7ae16e36b8e6e96cf8093abaa00ff492f7af651157ed4f32e7516e7b4d3434aa93327bbf27d04cd4d7fa9bd9 SHA512 8e26d6152aca9e9f89938cb3b6d12406892115bc652450842b619d58b5935f637a7a198b24283a01b32643cf26422e0573e5bc90066df8e202c084eda9c8fabc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
deleted file mode 100644
index f69342240401..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-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"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
deleted file mode 100644
index 518f0b5f3f9a..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-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"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
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 3dc3906c183d..2d7aeb06e80e 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 
@@ -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 113d241e0eba..42ca1b8f6bf9 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 3351 BLAKE2B 6305a706635fa9bc5d335122e5e826568e6ea859039c34ca43eacbd6eb0bceef9cb409ebf953d0fddf1b7b04d1fe8169f74e0149bd7480c114f8de58efbbc529 SHA512 4f754dbf432a71bba156ef9de134a7acbb2d3f8b2efbf7bd6611ee748f6deaf70d0a1f29901d831be1aa762819fb68c233b410119b6d979e17f3a6797d44254c
+EBUILD geany-plugins-1.34.ebuild 3350 BLAKE2B e46889663dd862fc3df8751a21e16a23d9668136322cb42f03593ccf5a140c6e28714d84cee1e24da79f5ff76a394b60843ac098c0bbb60a4c52354b70017654 SHA512 507692e4a910032982aa1041de80128328c1f4ad3b86f8cbd8c18ed589fcd1a057d55311b42d5afe30a90df65b670f42fa883fc9e218522b27bb3cd7341bea1b
 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 4fa6c180c122..8f38ec50b7a1 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 a84b5491cbcd..09375ce42bfe 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 1748 BLAKE2B 79893b09f3c38fdebdcb797a8dcea0ff2cc21d57198dd3d2e26a55d5d77d115ffd1d7b8ffff48f3329079a68fdc9712ac8996134b9b401997bd976a81bb11125 SHA512 07ab7fc7d60d56f3c09e4261e2c387d29a83245ebd4c26e294dd6e0b0442f959a3b9aa5f254d49db9b885a0895aa3ac292db334dedfcf321eca2f43831043310
+EBUILD geany-1.34.1.ebuild 1747 BLAKE2B e35bf705e1d09841fc7d7ff2db413d088cffb3ec282b47771e47c3ddc55cf37336ca7ba4a604b14f9b032b344b3c2412eda019b73dc59fcc4fee9b4bb1424cb9 SHA512 6141aa7b113cfc3acc0e2a929bced4ad93a2a4b2d8b64fe79aac88920f293dfdf361e6e5a1c10a9ad96898a429bd3877a99bb46016bc821d901b849916539c12
 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 cbdab1bb2a5b..89f73691a494 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 b7331720cf0b..d4fe6e5f720b 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 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
+EBUILD gertty-1.3.2.ebuild 1142 BLAKE2B 7f5126a367e4fc5d077bad539a673004ad2b5499fd5ff8b5a55f96d0de915c8b36a6f187cc8e476f81e0364237c5d38070880c8a411ce16eff890add28071b99 SHA512 4ac2662a94f2b0937c4f49cc3423b421554457f48a157968741dd973cffa28931f8f88e5d01b3ccaaa6077401a1fe50120494432044f7e6973114bbff0f85253
+EBUILD gertty-1.4.0.ebuild 1142 BLAKE2B 7f5126a367e4fc5d077bad539a673004ad2b5499fd5ff8b5a55f96d0de915c8b36a6f187cc8e476f81e0364237c5d38070880c8a411ce16eff890add28071b99 SHA512 4ac2662a94f2b0937c4f49cc3423b421554457f48a157968741dd973cffa28931f8f88e5d01b3ccaaa6077401a1fe50120494432044f7e6973114bbff0f85253
+EBUILD gertty-1.5.0-r1.ebuild 1101 BLAKE2B 8e7238fbe92a974c677830f4eec2c4729c6c83963a6ee42bf8922c616ac440dc6faa87870904f8a27f5cb3c79331c35b884a3e47a0cd61dd7e09043931f4aa84 SHA512 2a6487d2dd3ffdc93938354231ee2977db12891ecebded07bdbca0818249a6d8a483773ce092dd7b37683d162d54c575ff58d51e11e7263cfc04a15d5f795585
+EBUILD gertty-1.6.0-r1.ebuild 1252 BLAKE2B 7b1d9364ac74070c8a66785b3a50f1d60f9ee1859ca641590bef65a2502723fb8c836239e78e4235af289f3639be88685cb2c691ac0b4cefa2ac72398c328478 SHA512 020e68add47f0feb392c2c6e005e1187ed2cb2d45054b8bb215f0003c775346f57b44372074d0ec22ce9bc8f9323f3bbab019b43cba46c9577f436097fed5f28
+EBUILD gertty-9999.ebuild 1253 BLAKE2B 1d821ec1cdb6ec17753fd9c4bbb3cf4c3834eac48f8a6a6f8e0a4b8a10f22d1ac4c7c17a381821b083563d1e0f1c23f6138e4ceb49776901ab3312c578bb5d78 SHA512 031d77ad4c0e5996af07b1f64477129bd8e13c8cc3b8eff015c3c8576e3f47fb227224d4ca8e30de9f37d8a1de20979239ba76a64f6994f7bcf617a66d0fd654
 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 f9e1d0c8dd6c..6157972f8d87 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,6 @@ RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
 	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	dev-python/ordereddict[${PYTHON_USEDEP}]
 	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
diff --git a/dev-util/gertty/gertty-1.4.0.ebuild b/dev-util/gertty/gertty-1.4.0.ebuild
index f9e1d0c8dd6c..6157972f8d87 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,6 @@ RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
 	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	dev-python/ordereddict[${PYTHON_USEDEP}]
 	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
diff --git a/dev-util/gertty/gertty-1.5.0.ebuild b/dev-util/gertty/gertty-1.5.0-r1.ebuild
index 37e28a61bc87..c7152e1a9b5b 100644
--- a/dev-util/gertty/gertty-1.5.0.ebuild
+++ b/dev-util/gertty/gertty-1.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,6 @@ RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
 	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	dev-python/ordereddict[${PYTHON_USEDEP}]
 	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
diff --git a/dev-util/gertty/gertty-1.6.0.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild
index 1b48983961aa..456f9c56ca6a 100644
--- a/dev-util/gertty/gertty-1.6.0.ebuild
+++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
@@ -34,7 +34,6 @@ RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
 	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' 'python2*')
 	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
index 1b48983961aa..773f2d6e4dea 100644
--- a/dev-util/gertty/gertty-9999.ebuild
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
 inherit distutils-r1
 
@@ -34,7 +34,6 @@ RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
 	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' 'python2*')
 	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 153db249f014..9645ab73217b 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,6 +1,4 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
-DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
 DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
-EBUILD glade-3.20.4.ebuild 2364 BLAKE2B 3f79522f7bc39a0e9d5c17ef2a72c7ce6632e7ec52662f5d0926b59a69def65aa86eec6fc9109e02ca2c7728137d30c40cd8036b9836f94e157f69c0f4232a26 SHA512 8f1f747eff2dc7936488625ea0e183114907d25576b7190e511bfb4cb20c8a079bede015f246aea06b3612231451922c6ef91d2e6ef454c2adfdfd90d4a892c8
-EBUILD glade-3.22.1.ebuild 2304 BLAKE2B b66c99c271a251ca4d103bd4de878bbc54b79c72aab5929216377dc4f83054008e6746e9bb5440ccbc264d168eeb7b1422e775ad0f10363b3e40d98fec5c5c10 SHA512 c6e9507afdca1643a0340abf3c6cd5015221e271ddb48983ac0686971b8c3739a023f2ccedf579eb0f77875d9abdcc38fcf3540b3fb2fcc12ba6c726efe2e113
+EBUILD glade-3.22.1.ebuild 2303 BLAKE2B c7d1710bce0cf28a8c2cc6b795a7eb19ac08537e9ae9cac004e7c40b69bbe8ca77a69e9d09f7d101767871aaf1df073e87fc7fe02f3757ec1733114a813aa9f4 SHA512 4f1125a7b2ff796834117eba9588697a6a9832f2a31363128f7d92066811fd380fc362515586cccc62eb4ba51c9f70ca887d0a5a623354ef5225fb99a8c2b786
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.20.4.ebuild b/dev-util/glade/glade-3.20.4.ebuild
deleted file mode 100644
index 5b936fab5d77..000000000000
--- a/dev-util/glade/glade-3.20.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1 versionator virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="https://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
-
-IUSE="debug +introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.20.0:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-PATCHES=(
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gladeui \
-		--enable-libtool-lock \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable introspection) \
-		$(use_enable python)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# modify Name in .desktop file to avoid confusion with other slots
-	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
-		-i data/glade.desktop || die "sed of data/glade.desktop failed"
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version dev-util/devhelp ; then
-		elog "You may want to install dev-util/devhelp for integration API"
-		elog "documentation support."
-	fi
-}
diff --git a/dev-util/glade/glade-3.22.1.ebuild b/dev-util/glade/glade-3.22.1.ebuild
index 102316d8da78..b846c91ad27e 100644
--- a/dev-util/glade/glade-3.22.1.ebuild
+++ b/dev-util/glade/glade-3.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 IUSE="debug +introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 13b3eb797410..ef077753036b 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,3 @@
-DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
-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 2397 BLAKE2B e5e44ad3301db39c360ec0ac32d4e0329c48ef648c12e5548dc04c9ebd119045d31c6661ec358fdc0adfdafc9dcb1d41b372459bdc71791b025569750cd7f327 SHA512 b38881d8a9864651233bf7c6f51784100b5cede6bd492efce9ed7c0ebd63eec758f6a028c6707636f6abea819f6347f1af0540b181850eaf9b88e6d7dc8e27a1
-EBUILD glib-utils-2.60.7.ebuild 2399 BLAKE2B 10967dcd8a4b15a37fe97abb699c085c40c9e5173bb601db33c9a0d15249c518a59093fa4866352a81e9a90ba7dafd25389cbf92cb7c70a87a3cbb1bfc5e4088 SHA512 8bcb67f678cfafbc7b10c5106f7639a30f9ffb99a738b9c747ca6e4add3a7b6169b255bbb53bbc6c16597ffe0d7b8d55aefe649ba807253de802c4f53141df72
+EBUILD glib-utils-2.60.7.ebuild 2392 BLAKE2B caf5222d39c3e116f7c03af6c5b7fde53ae0f76f7e11946fef898b937bd33b12c3d8a0eabec44f61118cb1282d5e276fba47b3b7f08418b370f04018757b5f75 SHA512 44b810cd7f4db72d7ee20ab8b9f18aa94c42772ca2d2abd365f12cff4a94d1bbfe7ca96654e07dccc48ca39d8982f493773a1dadd9874a4d47d14c40dcd01d42
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.58.3.ebuild b/dev-util/glib-utils/glib-utils-2.58.3.ebuild
deleted file mode 100644
index 9aefe611d8af..000000000000
--- a/dev-util/glib-utils/glib-utils-2.58.3.ebuild
+++ /dev/null
@@ -1,64 +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,3_7} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-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"
-
-RDEPEND="${PYTHON_DEPS}
-	!<dev-libs/glib-2.56.2:2
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.60.6.ebuild b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
deleted file mode 100644
index d848e41b7ef3..000000000000
--- a/dev-util/glib-utils/glib-utils-2.60.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-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"
-
-RDEPEND="${PYTHON_DEPS}
-	!<dev-libs/glib-2.56.2:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
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 61791724709d..8e1fc5cc7234 100644
--- a/dev-util/glib-utils/glib-utils-2.60.7.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.60.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 GNOME_ORG_MODULE="glib"
 
 inherit gnome.org python-single-r1
@@ -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/global/Manifest b/dev-util/global/Manifest
index 606c1b1a982f..0030191cfafd 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -2,6 +2,8 @@ AUX 50gtags-gentoo.el 183 BLAKE2B 242ceb0370227a6c0f1ee23477aa3798e0e8580e59849a
 AUX global-6.2.9-tinfo.patch 2047 BLAKE2B b88b65679f9b6ed0b96ca236c1918c3238baf99bdff8c7a45f85f982923d82341f23fc961cc4d61ee9269900b48e2d726ab57482e9635b035cf621e27da0f72e SHA512 f5d83716ba2fde29ad5765665d00b4d2a5b4c8d6351cd6ca9d8c375a6c953f795811e156c0cdb28549837c72abbe2c2bef9ad4cb419e7043115c50858b831698
 DIST global-6.3.1.tar.gz 1369634 BLAKE2B 8d93222ccbb4a45c0b9f114cd84b342b3f6ab99f7e0bbc18bfe00912ecd53f606be9d32fce1570e027009fd1fbe4752f03dd19c183dfda438d67a329808a6b45 SHA512 83becd6cda06f8da17ea0c701bb135523ff48cec73b233d24566387d11a35c0b42f410b62753838e2b364a5a485cac033b4aef1159cc6f4cdeca4a7b6c5bb4d6
 DIST global-6.5.7.tar.gz 2940567 BLAKE2B e0c692e09f9f7ea64ecbe47e18691efd3c641f28826e19751fb812690cd9d64a53af03055de9ec8199637da46dbd6084fec16380d7f295c83ed77553a8e301fd SHA512 0d33f718839e5e00bdd6d042b415a69c5e1f232d843610870505f8f20635b445810149b1b84ea8b77881f5f64814783ebe3cdcab2f84b8a085223b64293a9045
-EBUILD global-6.3.1.ebuild 1607 BLAKE2B 993a8c497cf7f06def3f8fa181c389ab4efc8aa0c4b75206521a45f1ca7d53e5305451fd0f2289f29e5b2f5e25ca54cd8911ab4e97c990c304b7b6b8f4f67466 SHA512 30b33ba83e1c98ff0b01b07707bc5d566ff746612b7403ab3f7e4bf64f256cbfbe15377a0de959e31aa1ab4907ca60ce77d80a0a735a8962b117a57fa34724f8
-EBUILD global-6.5.7.ebuild 1623 BLAKE2B 46d2ded4fd370550f2c588a15133875eae403b1e2f75b2f2ab4d7b14246daa1bfceaf38056374031967c9bdd87c2a269af6bbdf4f61526a19136984e6452985f SHA512 02043ad24c6cff23db1edf6cdd538b4b06b426384eb8c2c3e802694971f37e8e8dfccd13c3f597dff0df9d77df04076fcec1bcc795fe04812956ff318487cc34
+DIST global-6.6.4.tar.gz 2988969 BLAKE2B 784087537094d27c10d1f2bc992e799c35ab6ce3b86e041c31279e6954b203e80676b3158ba95e7957456b75a213d70998aae9047836cd4d388212236f05a081 SHA512 cb4ed451d3aaf47c4c59cdc3f74c97d3171108177d4846b5dac843589710e66d87c9d7bbe080c3770329e8e40105ac52dcafb4609257347593cca4d94711f483
+EBUILD global-6.3.1.ebuild 1617 BLAKE2B da9308bdd9572637c53e04dca67806ef0772acf94c749a86f53256d93c387d67e55acfcaa0727f46804aed0aee938716c35ffd9b82af4368d2218d29abc7ed14 SHA512 f161e43192b61a6f3ae10a8955c0625d8b0600529121168c32f51fbf9f6e12d5a9e88d384ab4479b3464b0f14bd9358396314a9716e7458dc298b00ddab55560
+EBUILD global-6.5.7.ebuild 1633 BLAKE2B 6120fd297353f710d91eedf03241552852567b73ff4a1b52e39f49538202961b930f07a5adcb41820c2c817f09b7556982fd2801aed4f332e43d2036bad95775 SHA512 4978e3550ca324412c01ab67264b8227ef35a7fbc0f5719b98c0b77db8f8cc09aa7420097aa3890bbd0f6b07b88a262886d4717c482c669d8d52a28adbfd52d5
+EBUILD global-6.6.4.ebuild 1654 BLAKE2B 4c4b8d0f515519534b4b43ab03a22906a71a1d2e4fa1718359a42bd0ed4f60eaa582c279acd414bc9b90c3ccc143b7110b9f93567c4de4ce7a4d957f7f7a71be SHA512 de7b306fa436ef7367dcc4f09307de5b96d2ab253853da997b280a6d7c2d8b8f96dee227248b2c07460c947b113b1d5abdc773ecd1721dd8a2f3e80ed8762b68
 MISC metadata.xml 398 BLAKE2B fb266f584dfc0e682d13870da7bbb4bbb46027cea3101b196b48d033766d627c723928f9a2f4ac4c8c6159a8ea147810b82fcec9ceb4981dc5491e54ef367c17 SHA512 89b426c4682fa885cedc1755f4720f1a003f9bc2dac725667ae45e098edebf627897830c911762f7d8856fc66cafb1c60d0f315173ddbbebada0d05ca6d8d5e8
diff --git a/dev-util/global/global-6.3.1.ebuild b/dev-util/global/global-6.3.1.ebuild
index 01ef75d4b4e6..4385230ea958 100644
--- a/dev-util/global/global-6.3.1.ebuild
+++ b/dev-util/global/global-6.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ IUSE="doc emacs vim"
 
 RDEPEND="|| ( dev-libs/libltdl:0 sys-devel/libtool:2 )
 	sys-libs/ncurses
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim? ( || ( app-editors/vim app-editors/gvim ) )"
 DEPEND="${DEPEND}
 	doc? ( app-text/texi2html sys-apps/texinfo )"
diff --git a/dev-util/global/global-6.5.7.ebuild b/dev-util/global/global-6.5.7.ebuild
index 196d3ce0b9c6..2b19aa0f759f 100644
--- a/dev-util/global/global-6.5.7.ebuild
+++ b/dev-util/global/global-6.5.7.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
@@ -16,7 +16,7 @@ IUSE="doc emacs vim"
 
 RDEPEND="
 	sys-libs/ncurses
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim? ( || (
 			app-editors/vim
 			app-editors/gvim
diff --git a/dev-util/global/global-6.6.4.ebuild b/dev-util/global/global-6.6.4.ebuild
new file mode 100644
index 000000000000..e45daf3d4f7d
--- /dev/null
+++ b/dev-util/global/global-6.6.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common
+
+DESCRIPTION="tag system to find an object location in various sources"
+HOMEPAGE="https://www.gnu.org/software/global/global.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc emacs vim"
+
+RDEPEND="
+	sys-libs/ncurses
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim? ( || (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	|| (
+		dev-libs/libltdl:0
+		sys-devel/libtool:2
+	)"
+
+DEPEND="${DEPEND}
+	doc? (
+		app-text/texi2html
+		sys-apps/texinfo
+	)"
+
+SITEFILE="50gtags-gentoo.el"
+
+PATCHES=( "${FILESDIR}/${PN}-6.2.9-tinfo.patch" )
+
+DOCS=( AUTHORS FAQ NEWS README THANKS )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		"$(use_with emacs lispdir "${SITELISP}/${PN}")"
+}
+
+src_compile() {
+	if use doc; then
+		texi2pdf -q -o doc/global.pdf doc/global.texi
+		texi2html -o doc/global.html doc/global.texi
+	fi
+
+	if use emacs; then
+		elisp-compile *.el
+	fi
+
+	emake
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins gtags.conf
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins gtags.vim
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} *.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use doc; then
+		# doc/global.pdf is generated if tex executable (e.g. /usr/bin/tex) is available.
+		[[ -f doc/global.pdf ]] && DOCS+=( doc/global.pdf )
+	fi
+
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index b574b1c4553b..76fe81ff155a 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -4,6 +4,6 @@ DIST glslang-7.11.3114_pre20190415.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612
 DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
 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.12.3353_pre20191027-r2.ebuild 843 BLAKE2B 57d3c4089d9d826f8e36971772ce425abc163fd1fd5a8237c11c2bbd9892fe2df1b79ade6d47c405d21940fb25be147060cc038f16910b73e81b393d1570d09c SHA512 6e87e371e322f31156e453bb7783ec6003a2fee504799bddb8a0c55d120db7a70808bbd0a579b4f536afd77c879ab84ea4835f9491d57af05cbee6cae2f74d92
+EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 841 BLAKE2B 09a09058c6c1801e195e6163c603a2c9d89da8711284e9e86f53738f8ce0ae1ac188674b016c7d2c3a6cca557181060ae6368f6dd20e90b939f77aa147ec56b0 SHA512 b9578e487982dd0b2bcbd5a53562f816e0694c8d614bfd4e8b9229631b18a3260ce3e4dfd53b63db07325fdcf07295cf4ae299abdbce21f1138d4aa5b720287d
 EBUILD glslang-9999.ebuild 617 BLAKE2B 30fd7c4245a34d125051b5f41cfe2aa37ba9fa3c921b464f5a6dca09af90a6dfffd13c0dc1551c0da2c56875842c08a2189243e4bd8009ec032d7b5d690d05fc SHA512 6b36df67fd05adc8e89af5da2775ccdd69b6c999b9c9f65808e3660e6d2eb089e52a841bf522d3647aeba7b617af0fcd08cc76b9c53f6d00e6de7e597f9fde9e
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
index d0fcd6b8e021..d629618e2583 100644
--- a/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
+++ b/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,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"
+KEYWORDS="amd64 x86"
 S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
 
 DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 8ca1e6abd168..bdfa11c86916 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -5,5 +5,5 @@ DIST gn-0.1544.tar.gz 911124 BLAKE2B b8bac7783c373e8101cf727c254c2ee50af49c3e679
 DIST gn-0.1616.tar.xz 660332 BLAKE2B dab581d9f05cbe7ed91758d0ec68c61bd4e9fd0357b9cfa04f5276185ed6e810b37d9e2177cf3daec29e25633af2d32c6f733507a77cee7e37681bb977a59818 SHA512 42f68b40eebc423b785b1ba735548b3e5d2b64abd0dc1bb22940b9336c491308f062f547f81b5366c1dfe1f0e3bb41390ed3e3712637765cac1a50499a5e04d2
 EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
 EBUILD gn-0.1544.ebuild 1202 BLAKE2B c4af8539a46361bedc5bb0d214b36c5fad5fff7e5fe541ad53db4dde9d322988461d826b4f3ce4d1888b3eb6a897d6332efff066f1b1a8b49d4c0beb8c90097a SHA512 4b6544fc24a36e926fa72eb7856cbd47d635ff9c800683105830d12b287b4edc3e410cdf8d74523602e94ee615bba8f650109b8eef930cb1dc65ded4c02a6624
-EBUILD gn-0.1616.ebuild 1214 BLAKE2B 612f3c78c9ec7dd5447b466c9f43611784eba78b9b419165694044a2e081928411e0eddc4d1a5ebf384bdf46a31a668570e3c45437053e3ada88e6af7499935b SHA512 4842cdd116d9c6524522c77c5d1628ca81a3fc3dcfc8701b9b220962980e31e3c9ffd3a35ecb12b3898453397a5e4b49ebe2acb2618d5be2b744e32331646ed3
+EBUILD gn-0.1616.ebuild 1212 BLAKE2B 228cf9ab96233a0988236a7579d57ccceb29d2595ff59761fa6520ce53b04b437b2c08709b667d22dc12c55fb3723fa5964b1c5fa311f070526a7f811d4aff15 SHA512 57dc9817674e9d64957327f6ea19009ba77a3ec7313f695e5cc59fda3f34201d72fe61f1460e9b2c7745a462e46ad4a8119a4b5b287822d3a54e7eeeabc8115f
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/gn-0.1616.ebuild b/dev-util/gn/gn-0.1616.ebuild
index 172a7364d2a3..701ddaca2fa5 100644
--- a/dev-util/gn/gn-0.1616.ebuild
+++ b/dev-util/gn/gn-0.1616.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2018-2019 Gentoo Authors
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit ninja-utils python-any-r1 toolchain-funcs
 
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index acf7da47bc6f..07901769fc78 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 7050 BLAKE2B 842399d42dc8bf8798a397394ea68df7b3561b8028381aa55c623959aead2a5adf51dcd6e54b062985b6b3de9a0574af04b99a10954efc46567817672eb0271e SHA512 0178e854811b08f62b09d36cf4bad4e20818d4238b1fe86942cc05b7cebe26edb7f7a1f99cef3f3920d58fbcb53d7c46369516f5184b3d7107eac035184f3464
+EBUILD gnome-builder-3.30.3.ebuild 7046 BLAKE2B 80d59ad24c93ca52f81d316917a28a16561222731dabc20799b7eabd2a3fbe7168025f1d086debdd424e3bb81aac186d7ec0305b86669dbcabecbed84caa9445 SHA512 3ad4ed1153be299f3a23cf242afa859816e8ad27a18825881bc57cc4013d76fe92f917941818a268e6b10d24c1247d5a39a4384e5dff150998d8c70e2827b734
 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 98dd96660821..54d735947ee1 100644
--- a/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 VALA_MIN_API_VERSION="0.36"
 DISABLE_AUTOFORMATTING=1
 FORCE_PRINT_ELOG=1
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 5f997a045eac..cfac0f409b20 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,5 +1,7 @@
+AUX fix_ppc64el_FTBFS.patch 1305 BLAKE2B 9f20c5e91a47f3c88c15990d4ae77c423aa7832f7b95bfc66686751f9f2d8b9eef4ef6b7d73f7fe9296d5d04a154b0330f71000065f03412b440c010d44439e6 SHA512 d1a3f447037c4b7408fa20710989b262d37072c4e0552b74e3e25b673f3da4cb0280bbdccfe2e1c97eeb0b318b3923ad9a3d9afab17ba067e7b6755f33ad4f1d
 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 2327 BLAKE2B 8732f6b11b70863c41d4e14208289d90e51aaeb01a57865ab94247039dc39b974c9910bca52848087074a8de14e11181c4fd42655176b25c24f3b25f44b3ffca SHA512 6a9946cc7b7429949cf9027820bb16f584c2f6237d1bb4c31b1028f39ef152a4c65975c22d423cf6e475066f9ca107a3b8c363446c8c030dc5f369156037930d
+EBUILD google-perftools-2.7-r1.ebuild 2434 BLAKE2B 6c93958996d29273b1dd8da7c7e29d7d0f70a117e48d97b1dca21b1c499d44b8841a6ba60c319be916ca3768752ac5890efaeeea74332d2e02a3d1f4bb68fa36 SHA512 b3ffbc4d01c2c9a64ae9877b1945396f622415ac20832b2940eabd641a57ca336e9fc9a61ce4652de35082bc2e6c4d67c083df9f96c37b853f2295208d4ff690
 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/files/fix_ppc64el_FTBFS.patch b/dev-util/google-perftools/files/fix_ppc64el_FTBFS.patch
new file mode 100644
index 000000000000..84f28e1eefe8
--- /dev/null
+++ b/dev-util/google-perftools/files/fix_ppc64el_FTBFS.patch
@@ -0,0 +1,31 @@
+Description: ucontext constants in ptrace.h on ppc64el
+ Needs to include the mentioned header for ucontext.
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Bug-Debian: https://bugs.debian.org/894749
+Forwarded: no
+Last-Update: 2018-05-06
+
+---
+
+--- google-perftools-2.7.orig/m4/pc_from_ucontext.m4
++++ google-perftools-2.7/m4/pc_from_ucontext.m4
+@@ -55,7 +55,8 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT],
+                         pc_field_found=true)
+        elif test "x$ac_cv_header_sys_ucontext_h" = xyes; then
+          AC_TRY_COMPILE([#define _GNU_SOURCE 1
+-                         #include <sys/ucontext.h>],
++                         #include <sys/ucontext.h>,
++                         #include <asm/ptrace.h>],
+                         [ucontext_t u; return u.$pc_field == 0;],
+                         AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field,
+                                            How to access the PC from a struct ucontext)
+--- google-perftools-2.7.orig/src/getpc.h
++++ google-perftools-2.7/src/getpc.h
+@@ -58,6 +58,7 @@
+ #include <string.h>         // for memcmp
+ #if defined(HAVE_SYS_UCONTEXT_H)
+ #include <sys/ucontext.h>
++#include <asm/ptrace.h>
+ #elif defined(HAVE_UCONTEXT_H)
+ #include <ucontext.h>       // for ucontext_t (and also mcontext_t)
+ #elif defined(HAVE_CYGWIN_SIGNAL_H)
diff --git a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
new file mode 100644
index 000000000000..fb3a1b1d9f3d
--- /dev/null
+++ b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_P="gperftools-${PV}"
+
+inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal
+
+DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
+HOMEPAGE="https://github.com/gperftools/gperftools"
+SRC_URI="https://github.com/gperftools/gperftools/tarball/${MY_P} -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/4"
+# contains ASM code, with support for
+# freebsd x86/amd64
+# linux x86/amd64/ppc/ppc64/arm
+# OSX ppc/amd64
+# 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="!ppc64? ( sys-libs/libunwind )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/fix_ppc64el_FTBFS.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# set up the make options in here so that we can actually make use
+	# of them on both compile and install.
+
+	# Avoid building the unit testing if we're not going to execute
+	# tests; this trick here allows us to ignore the tests without
+	# touching the build system (and thus without rebuilding
+	# autotools). Keep commented as long as it's restricted.
+	use test || \
+		MAKEOPTS+=" noinst_PROGRAMS= "
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
+	use optimisememory && append-cppflags -DTCMALLOC_SMALL_BUT_SLOW
+	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
+
+	econf \
+		--docdir=${EPREFIX}/usr/share/doc/${PF} \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable debug debugalloc) \
+		$(if [[ ${ABI} == x32 ]]; then printf "--enable-minimal\n" else use_enable minimal; fi)
+}
+
+src_test() {
+	case "${LD_PRELOAD}" in
+		*libsandbox*)
+			ewarn "Unable to run tests when sandbox is enabled."
+			ewarn "See https://bugs.gentoo.org/290249"
+			return 0
+			;;
+	esac
+
+	multilib-minimal_src_test
+}
+
+src_install() {
+	if ! use minimal && has x32 ${MULTILIB_ABIS}; then
+		MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/gperftools/heap-checker.h
+			/usr/include/gperftools/heap-profiler.h
+			/usr/include/gperftools/stacktrace.h
+			/usr/include/gperftools/profiler.h
+		)
+	fi
+
+	multilib-minimal_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	use static-libs || find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/gprof2dot/Manifest b/dev-util/gprof2dot/Manifest
index 31197b1aa584..ed2549069c4d 100644
--- a/dev-util/gprof2dot/Manifest
+++ b/dev-util/gprof2dot/Manifest
@@ -3,8 +3,8 @@ DIST gprof2dot-0_p20130517.tar.xz 1080464 BLAKE2B 49fdcc79bc91505cc1d2b823309976
 DIST gprof2dot-2016.10.13.tar.gz 22264 BLAKE2B 612cdaf8491e40223cf856104e49554675f2f83f8fc4ca9932f5b36167408ea51c2020c7c958a014b25010002230b0a6e4d5c70d6791fc445182fc61a9ff7eab SHA512 0568f1afb4e5c9da9e6c3c58d9a3613c90110c338c573e2c088a99f1db4d076a287d1209a132b86334a01404701d6ca0d9b0553e7ce850278956ea79acc2c388
 DIST gprof2dot-2017.9.19.tar.gz 23558 BLAKE2B 3de2a0e7c9731987a1382df9d67badcb19514983fa83af432bb83b5e59762c12fe865af9cb7778ccd37015992384e87b71b53211c33555039ee3f7dffc4e7c9c SHA512 652b38c6cbee47795d866a539e69ff4b2e67e221c8c082c6ecf480a15c24fe6d77e80b7daa5d24e76d27a4ff90836f80e716cb4d51d48d41aea5f661e3ac3598
 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
+EBUILD gprof2dot-2013.05.17.ebuild 1086 BLAKE2B 83c178cfa703ec4e478ee87a0f8cc78e380a97446b5e11a1dcb3258b08d8f2da30192c40aef831df8a2b0d11918d3187413da2eff2c1081970033800000c8b1f SHA512 da634b9a52162dc232403e224cc35dfcb70fdeccf8bc7e63429ea2430e15a5a08cb79491d66cd3761457c1a83c85ac7a9174686d0f1b1f1baac56c0161015df5
+EBUILD gprof2dot-2016.10.13.ebuild 492 BLAKE2B c7b4e96b75da44e6012091236aa33619358d5c1d64f54c27030a6a52e52501ecfeda1b86b8ecbe48fce4fa7ff73bffa863126cf3833020958b991201679e964f SHA512 4bde0fda587c72cc7b05962c8541749a551b10a7a8034eab4f9bf430b5c33f58ca3d1ee5c7967dfe9afc5ff945df81cb74dbc680bd713ca3763140aeacef53d3
+EBUILD gprof2dot-2017.09.19.ebuild 555 BLAKE2B d3e93426e8365969194e73cfe097eec265c3dbc45f7165561c57333bd08be3fba0f23d2cf9f1911eef4a75d7e19d5f6b36f0d93a10e0eeec56e933d8abb2b906 SHA512 e2e602bb7a025e6acb781727a4cdcf9e8ad21fd791e2ac363decf31a7b0fb81a5efab8f7149ad4b78e10acb96c680af844388d68842825ffc72d46d8763ac03a
+EBUILD gprof2dot-2019.11.30.ebuild 561 BLAKE2B 216071645f83c98dd26217961a9758ce7b899667ddc64b510db8b86479f9bd6a7cdfbdf8c38d1cd7c7c63f90c2ae6dac0da84da7d2f42a55d09766ec65016d59 SHA512 acb76bc4b577241536fc67810656b177c815984d5adf09de54103e2886bd4100ba2ca80c4520966d4be625f43160e14472da0fe74af30796fa88721d94c860ea
 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 b9aea7e30d80..b8f3052cdd07 100644
--- a/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='xml'
 
 inherit eutils python-r1
diff --git a/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild b/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild
index de2c46c6d827..2af0fd2445e8 100644
--- a/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1
diff --git a/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild b/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild
index 6d0d8fc65fa8..2d714c23add5 100644
--- a/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1
diff --git a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
index 58ba74769baa..033edacb83c8 100644
--- a/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2019.11.30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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_COMPAT=( python{2_7,3_{6,7,8}} )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 31858b49346b..50bd4e04442b 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,5 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-1.25-r1.ebuild 2753 BLAKE2B 2a546eab9116007cb8371c4af44d7941815d6cd59bbfe3afdfd6e8fa823dc202d763f5b0b02c488a141cdc79a3ec9f39ec76d55ca7b4a59f29c1c9d2c701a64c SHA512 be4c6e93306c97b65099e668543d9a4fa2f5361a0970f6f06cb50abe181f7e614536a24538876970c17ce5fa4bd701f6d9b3dfd7ade3e3fd71fe9e83f34c126b
+EBUILD gtk-doc-1.25-r1.ebuild 2766 BLAKE2B 84b4780047e46433a2b121235179e64ddc4496513c9e2ed3d146b3b7829026293313ce2f86e54b5bf8dfb459379f50d84c5e965cf3d3ed30ca878bf19140eaf7 SHA512 7d534381af64e6c462eed663c1faf10a42171426a9983beccbf0a73ca8f5717ce2b510088b9a734a1cb95654a7ed4a2af2bada7e92e344400c3ac890340914d2
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index f09aca3b44cf..cb4cf718fec5 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-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
@@ -27,7 +27,7 @@ RDEPEND="
 	app-text/docbook-xsl-stylesheets
 	~app-text/docbook-sgml-dtd-3.0
 	>=app-text/docbook-dsssl-stylesheets-1.40
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	highlight? (
 		vim? ( || ( app-editors/vim app-editors/gvim ) )
 		!vim? ( dev-util/source-highlight )
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index cb6441f8e621..13aadc2fddff 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,7 +1,5 @@
 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 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
+DIST gtk-update-icon-cache-3.24.13.tar.bz2 91090 BLAKE2B 26ba67b9b6660d20a4b321f74a43f586628317ef16280413c1c728d2f3d3703f77210e54c5e1a87f02e9bd5de32c54203d686341e19c216d807603fd117a5c4b SHA512 55513079d3da40c29fee5899631d21f699d5846ba3e7b028de3b5f49f200168eab60c96126309e29de6f520cdd7855cfb63b5a1aba3c1061f85d2322a117c6c5
+EBUILD gtk-update-icon-cache-3.24.11.ebuild 896 BLAKE2B 541d6127feb84ea69752a674cae6b6614112ffe96c40c69d78ec87cfa5b9289bc788123ebdfe0f0917b996e24f9d52fdeeb0240d96e04b0660f5c0a41a7094a3 SHA512 4936a0c188d14a2c81be7824a94bff9a2cff7f4125745cacd79d9ad865c504f4fd31002400ea68beb44ac85b34c62252e497175fdb87408b8489fdf81d424933
+EBUILD gtk-update-icon-cache-3.24.13.ebuild 907 BLAKE2B b9225d29c0da51cb7a133b610593009e450c07b634afe00250b19547f5c68988750628d52b3fb7ab8a7a5461b1a00deb8203b9a774e389a1ad0f6e786dc1dc7a SHA512 90cabc4894dc621a90f0a56688a004d418645904de51140e356a57d9979c84cf0d589723b9fb014b902620c871a6022ab58e4549d6e331e74adc3eb428d7ec2d
 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 51a162cee66b..0f247563f2bf 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.ebuild
index 43c9a875e4d9..7b3b5619d047 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.13.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/gtk-update-icon-cache/gtk-update-icon-cache-3.24.3.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.3.ebuild
deleted file mode 100644
index f7025594ac01..000000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="https://www.gtk.org/ https://github.com/EvaSDK/gtk-update-icon-cache"
-SRC_URI="https://dev.gentoo.org/~leio/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-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"
-
-# man page was previously installed by gtk+:3 ebuild
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=x11-libs/gdk-pixbuf-2.30:2
-	!<x11-libs/gtk+-2.24.28-r1:2
-	!<x11-libs/gtk+-3.22.2:3
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# man pages are shipped in tarball
-	gnome2_src_configure --disable-man
-}
-
-src_install() {
-	gnome2_src_install
-	doman docs/${PN}.1
-}
diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest
index 406180c38309..7bea7bb7de2d 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20170904022846.tar.xz 447608 BLAKE2B 41f0e28d04039358a9e4ec9628fe1d936d19748061ea882a4e47f2cb23549db3866c5281e102b8f95d6ed37cfe999e7342129a81333671ee42534fc53d2a0d0e SHA512 9336be1103048fe5f51f90fcb2a153bba7638e71e4b579c47b725db81ae4257a56a8f7dacddc936e627862ee6149a453f1c7f5bede633cbd3076e0fa2fce07a7
 EBUILD gyp-20170904022846.ebuild 917 BLAKE2B 80903a671bf2f4839514d0078fa44cb7b99461f08f09974c1892bd42cc445a72f5a577d9ae508bd5b635e2dc213b789b18452bc4b9c19b58d545cac5d66b7ff3 SHA512 2e725f98f1bac4af1b8f8519f178335ba111a8831b110c8137d152d777efe6fb35f85413f086e566f2e3c00ed98737085b3b4a35f07e473e7660aac29515a72a
-EBUILD gyp-99999999999999.ebuild 901 BLAKE2B 7796a9f7cdbc7bb7742e5637246a393214a149fc81d3be3e928b637ce3000bfd7fa629e8e1c4f735f6a63abe56d029535327d8f53528e48f9cea14bf5a6e8822 SHA512 723a2c6be5dd7e4b0032462eee18949cbfb8596d158c37fb08220020bceae4070ba6db3a037e23b6b5479291d54451923aba8834f272afc530f63f8a8418d34c
+EBUILD gyp-99999999999999.ebuild 839 BLAKE2B 23211f1919910dad238ec6c1bda075cf5fa738a8b1b4e0bc1ce5b9139f81d516d3a59dfa705f97815700c600416fffc21b6692c3a75507a7e9b9652b3a949bf0 SHA512 b80be2b5679e6c06c09264b711636593a19a709828bd0c4e4343d8784b56708c4165ffa51ea2e94b8e5d5f4518ee9a7161f00fb57f4bb4d4683ba84b80c21ae0
 MISC metadata.xml 415 BLAKE2B bee460235492c13da7eb83441f00a502d900c169b48c91802a8891f9856c5f87aa225e61d8efd90ac2aade3ec52a93db293e3927b73c9b9b2708f723370d8585 SHA512 378e53a81fa2177409ae4557c336ddfb62b8657bf2d756ae651011d5dc5e94604d52aece3cdda38fbd0f123d5a1f83b721ccee3ecc5870cc562670fd748631c9
diff --git a/dev-util/gyp/gyp-99999999999999.ebuild b/dev-util/gyp/gyp-99999999999999.ebuild
index 062dcc113759..da57f66635d9 100644
--- a/dev-util/gyp/gyp-99999999999999.ebuild
+++ b/dev-util/gyp/gyp-99999999999999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 2017-2019 Gentoo Authors
+# Copyright 2017-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python2_7)
+PYTHON_COMPAT=(python{3_6,3_7})
 DISTUTILS_SINGLE_IMPL="1"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -25,12 +26,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-BDEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND=""
 DEPEND=""
-RDEPEND="${BDEPEND}"
+RDEPEND=""
 
 src_test() {
 	# More errors when DeprecationWarnings enabled.
diff --git a/dev-util/heaptrack/Manifest b/dev-util/heaptrack/Manifest
index f7ca3d3b519d..0518196f38c9 100644
--- a/dev-util/heaptrack/Manifest
+++ b/dev-util/heaptrack/Manifest
@@ -1,2 +1,2 @@
-EBUILD heaptrack-9999.ebuild 1278 BLAKE2B d4b30ccf6ef53d24fc6151330e121860e7e8559a7c7aa034322cab7398a19bc3eaf2beb409125024947f1fc8a24c75231d867b7ce053c797ceea13adc6b48047 SHA512 76382e5707aae2323353d208113da169217c79d1b5d6b7d36ce6bf9ec415882aec72f3993e845894bb056c9d744e42361730834212d493f07f42595745dd2472
+EBUILD heaptrack-9999.ebuild 1260 BLAKE2B 15663c89de2b4ef9f159fbf7ba50264802780104f99d20dbaaf231a35bdf08662da0ac3084f1ae18260f8b5b3d8448538ae80802511e8e14503a09ffefa30227 SHA512 3875e0f97b32a1d110885a59def38798c42a61ef6ad84bb2b6263aaaf8b8e4a29228861b680f0f78dc26f0dc742ece824c6c9b2be44ef96a31ec3ca942a23a8b
 MISC metadata.xml 326 BLAKE2B c32180909f5265666e505be682fe6144947ee00dc109524bb554f4ebb53ee729b50ddd7fb3a96ddf34d2e5dda7dcb0f85b8a4fdc464412e9df3fef3c6a75ed91 SHA512 dc0e30a1312d9703faa5771706a153f04d0ef59a86deddcf4551788d5c4aef1b8c090e38af13e31b28e875b91d9c2e165eb866fff1c7d343fde6b97f63cb4b39
diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild b/dev-util/heaptrack/heaptrack-9999.ebuild
index 99a1d52e0ce5..b9572355eb6e 100644
--- a/dev-util/heaptrack/heaptrack-9999.ebuild
+++ b/dev-util/heaptrack/heaptrack-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kde.org xdg-utils
+inherit cmake kde.org xdg-utils
 
 DESCRIPTION="Fast heap memory profiler"
 HOMEPAGE="http://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux"
@@ -46,9 +46,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DHEAPTRACK_BUILD_GUI=$(usex gui)
 		-DBUILD_TESTING=$(usex test)
-		$(cmake-utils_use_find_package zstd Zstd)
+		$(cmake_use_find_package zstd Zstd)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 xdg_pkg_postinst() {
diff --git a/dev-util/icmake/Manifest b/dev-util/icmake/Manifest
index 36e1640f95cd..03c2c02a94a2 100644
--- a/dev-util/icmake/Manifest
+++ b/dev-util/icmake/Manifest
@@ -1,5 +1,7 @@
 AUX icmake-9.00.00-ar.patch 600 BLAKE2B f549bcaff7aee31d22a452df5db16695ab75d4b9202067696cfd9aab95c2b044ff8bb47b21e820646525944436b45e88b3592497d1e074d69f02675b60df223e SHA512 ef09e8a356cf8a56285282dd793230eaa0de3d959f1e9e4bb0905d402906f159625645d6e9cf080f1b94b89da7024e1a118ebea8f686713d2872ee20d2102325
 AUX icmake-9.02.02-verbose-build.patch 141 BLAKE2B 14c498f1825bd605f70f409fe0d72f6f494009e6d90e8762305556377671f4d2d11104217888b8300a9fc67e5821c440bb08d444bfec63b987ff8ad67ddc1088 SHA512 7199f34f8b48962e44306e9102d674b8970e03f99f2e2db29b9d813f2c4631f9768582be3423f528f2585106806afff0c2c7430c9125911a1eaca5e77902d546
 DIST icmake-9.02.08.tar.gz 372630 BLAKE2B 0c0437bd44c102a866eb85649df36badc52d0215f76d986bab818c6ad9ca28bcd9dff246f91e03ce623adc860ce434f37c4d1d00f74c8cf11200fb77aede9fe1 SHA512 8c4debbe236b2112f1a3bce6b4bd5f12f156067094af73bfec9f746b59d4fe218aeb9b3d5c82da99301d0f18e7a40cd46c76ec055d6887a72fbd3242c70cfcf4
+DIST icmake-9.02.09.tar.gz 372706 BLAKE2B dc114193fbee9cd7641e0d3c8930c09fb1a3ee705cd14a18c81099cbef90b82e08739ba20344e42ba90c0001b90b274c0e7468f02f84260588659fdea51156a1 SHA512 383ae2e74a5193524aab184e6480cf53d5d3a2296420b8d35c6f223749c74b85f5c88ea00d8ff1e754ddacf2fd7f89c9205df64447fbb292681b069f93eb6891
 EBUILD icmake-9.02.08.ebuild 984 BLAKE2B 445116121ef8ee0ea171c474bf0a7e67aeb59324d61ad943ab7400988dd9d13c9a6574ddd55a889fa6c7376d03d59d3e547de4eeb26a915ef4a24b96bdf04656 SHA512 e482a48dc9873738ab92f8819cae452385b8e8540fb11cb5c65d56fd566c41f3f6c3032db9f608619f5c4d05dbacc597b19b6b2187c0a08e35c1698a30b87f63
+EBUILD icmake-9.02.09.ebuild 981 BLAKE2B 28118c59fde71bc8607fbe53519ddca7a88a62f3257fa4e66882821a051c6022fb44e659ac3f63c3e3d742dd527de82a3f8801ad7e3fe63085f425b337854df5 SHA512 373551e4cdfe94aac23b9bc27afc50a2eff4a8762cc2128e8a85b8322456b1c59e8dc586dca8f46c202c9b07413ad1f6aca79640a7cb65eb8594a560b6ac4ec6
 MISC metadata.xml 246 BLAKE2B 73f4de1e8aae25da0c39c9ed337dfcd7ddd49974f5fc9ac32722a14f541d78f9a946f42cb7d0bad28e77b84f23f07fc90d21039f802023439e6161329507d7f3 SHA512 f590d17146e0ea5b1cc9c4b318544e8af1cf4446769810bf37728008dda25d5e979c6b985e9e952e3b89ee6193aa0ab7b6549234c033f2f636d42f07babe13e4
diff --git a/dev-util/icmake/icmake-9.02.09.ebuild b/dev-util/icmake/icmake-9.02.09.ebuild
new file mode 100644
index 000000000000..4eea0292ebff
--- /dev/null
+++ b/dev-util/icmake/icmake-9.02.09.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Hybrid between a make utility and a shell scripting language"
+HOMEPAGE="https://fbb-git.gitlab.io/icmake/ https://gitlab.com/fbb-git/icmake"
+SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}/${P}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.00.00-ar.patch
+	"${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
+		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
+		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
+		-i INSTALL.im || die
+
+	# fix build issues (bug #589896)
+	append-cflags -std=gnu99
+
+	tc-export AR CC
+}
+
+src_configure() {
+	./icm_prepare "${EROOT}" || die
+}
+
+src_compile() {
+	./icm_bootstrap "${EROOT}" || die
+}
+
+src_install() {
+	./icm_install all "${ED}" || die
+}
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index dc1d89e6eb1b..acd2666ffaef 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -2,5 +2,5 @@ DIST ideaIC-193.5233.102.tar.gz 551536829 BLAKE2B 9dac3f24235ab7bc10d440a43bd431
 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
-EBUILD idea-community-2019.3.193.5233.102.ebuild 3630 BLAKE2B efa17ac54f0365ded9fa819d29f7b56e7fcd9eb663bfbde0fd3d49c8953e904636105caf5fd60183222f98ea6de591b774cb002909cfc0ef8fe102fd82940fe5 SHA512 9cad41636775c535260e53534d29cb9e8d7269333f8c176e678c6ebe9e6a19f1cf90912bc43dcb9274941fc34de311a57d4e240f3ca1b64c8337bc34dfb35fde
+EBUILD idea-community-2019.3.193.5233.102-r1.ebuild 4051 BLAKE2B 2ecbc1d39642896e03609a6bbcbc68eded8fcabe4ded053ccccbe365ecaca999779518689722b2a22bfa8daa9608c72db6e331c6a4a978038b4b553b92f3bd99 SHA512 ff59a65eb104d5608a0b24d4abc9f64ebbe10bb440a379f6f89d84b78804e94be6660ccbbe9ece9e3f2ecbfd9f38fbdbdf71b6c26a22e9010f27907a29db9c64
 MISC metadata.xml 758 BLAKE2B 2009b0e669ca0b3cdaee71ac45bf1bbddf940ae8130b0b5c275fa825781dd71aa1c522307ee44cbcf75dde0796f6f2f77a7f4226917e5da52020cde563f4951b SHA512 9a2dfb6862b8f49de5680af6a8ee703c0e6687b5cd312cf304a60547075ee9e1f888516e2172ff54172f89524bf5bdc33d53848b6fbdb708bbea320b804de591
diff --git a/dev-util/idea-community/idea-community-2019.3.193.5233.102.ebuild b/dev-util/idea-community/idea-community-2019.3.193.5233.102-r1.ebuild
index 9fc7ccc54b82..bf5c5606c6a9 100644
--- a/dev-util/idea-community/idea-community-2019.3.193.5233.102.ebuild
+++ b/dev-util/idea-community/idea-community-2019.3.193.5233.102-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,21 +50,23 @@ DEPEND="!dev-util/${PN}:14
 	!dev-util/${PN}:15"
 RDEPEND="${DEPEND}
 	>=virtual/jdk-1.7:*"
+RESTRICT="splitdebug"
 S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
 
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
 # jbr11 binary doesn't unpack nicely into a single folder
 src_unpack() {
-if use !jbr11 ; then
-default_src_unpack
-else
-cd "${WORKDIR}"
-unpack ${MY_PN}IC-${PV_STRING}.tar.gz
-cd "${S}"
-mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-fi
+	if use !jbr11 ; then
+		default_src_unpack
+	else
+		cd "${WORKDIR}"
+		unpack ${MY_PN}IC-${PV_STRING}.tar.gz
+		cd "${S}"
+		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+	fi
 }
+
 src_prepare() {
 	if use amd64; then
 		JRE_DIR=jre64
@@ -74,6 +76,15 @@ src_prepare() {
 	if use jbr8; then
 			mv "${WORKDIR}/jre" ./"${JRE_DIR}"
 	fi
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
 	eapply_user
 }
 
diff --git a/dev-util/idutils/Manifest b/dev-util/idutils/Manifest
deleted file mode 100644
index 5a1f97c3a545..000000000000
--- a/dev-util/idutils/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX idutils-4.6-glibc-2.16.patch 523 BLAKE2B 271c68c3ceb61a28330d33ff1e07beb9790cfddc51aa347a27303a06e58e1645d5e8d4ea5146f403d50947eba4999449e6252edce5919f95dec7cba0bee7770f SHA512 de4bcdaf2f871de5eeaa026ec578f80dcae73695c65fd5bc7d16a8f377a3e1781805937407fa6e9b50f8ea22a9d1a4575eeea789aa5d5fdfd05456cdbf75896b
-DIST idutils-4.6.tar.xz 1001496 BLAKE2B bbb06fd0c1e585c8022ae46f2c721aef60becd512da91fc4191977cd46ecf2df86e7bc65481182881c434de6e9c740853b916e31dacedb75c1f14ae8d94967ea SHA512 830fe4a36693e9bcc8def25982c1a76decac2076165158c39858106f928c1b6ff2bb941fcce7244357c4205c2ecc945b772c9f5a083c4fedb1b75eea0af5445e
-EBUILD idutils-4.6.ebuild 720 BLAKE2B 51a9d40987fff4f15d50335b5c817b6b3097620a5cc8e95efff7efd93e5be1bbf23d550843eb748f13cae6d106f4094ac2d0d9ec01a3be69b94ae0f4cbc2e557 SHA512 0f35d7b81bc9b06df314b40666bc728316ad36f468f5d8cee602798beee5f960bafc1a8a151a67efa9ba50dbfd1b9b5a4ff1ad0a6786a6e9416b9eadce959072
-MISC metadata.xml 591 BLAKE2B 91443111daa5642e9fdac540aec9f5d406ddec96a3ba68b31c6f282018dd463cec8cf9a9c46c1a882bf6907780f7ac4703f088acfadd2162c845777150049967 SHA512 593591a9d4a0d3303f6b96f06a59bae0983abca6b9d0ad9e0df691d3c192cc442a39bd18bac3b87257057ebde50315dd5d6c1be74ebfaa7f21b5ee0c690e9f25
diff --git a/dev-util/idutils/files/idutils-4.6-glibc-2.16.patch b/dev-util/idutils/files/idutils-4.6-glibc-2.16.patch
deleted file mode 100644
index c8659f071e26..000000000000
--- a/dev-util/idutils/files/idutils-4.6-glibc-2.16.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- idutils-4.6_O/lib/stdio.in.h	2012-01-28 17:26:05.000000000 +0100
-+++ idutils-4.6/lib/stdio.in.h	2013-06-13 18:38:29.787232848 +0200
-@@ -712,10 +712,12 @@
- #  undef gets
- # endif
- _GL_CXXALIASWARN (gets);
-+# if HAVE_RAW_DECL_GETS
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+# endif
- #endif
- 
- 
diff --git a/dev-util/idutils/idutils-4.6.ebuild b/dev-util/idutils/idutils-4.6.ebuild
deleted file mode 100644
index 31f8419d488a..000000000000
--- a/dev-util/idutils/idutils-4.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit elisp-common eutils
-
-DESCRIPTION="Fast, high-capacity, identifier database tool"
-HOMEPAGE="https://www.gnu.org/software/idutils/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs nls"
-
-RDEPEND="emacs? ( virtual/emacs )
-	 nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.6-glibc-2.16.patch"
-}
-
-src_configure() {
-	use emacs || export EMACS=no
-	econf \
-		$(use_enable nls) \
-		$(use_with emacs lispdir "${SITELISP}/${PN}")
-}
diff --git a/dev-util/idutils/metadata.xml b/dev-util/idutils/metadata.xml
deleted file mode 100644
index be1a52884a34..000000000000
--- a/dev-util/idutils/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		Fast, high-capacity, identifier database tool.
-		Actually, the term `identifier' is too limiting--`mkid' stores tokens, be
-		they program identifiers of any form, literal numbers, or words of
-		human-readable text. Database queries can be issued from the command-line,
-		or from within emacs, serving as an augmented tags facility.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index 843d5d450d7b..50007d875d61 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
+EBUILD imediff2-1.1.2-r5.ebuild 782 BLAKE2B c45ffb1a245173a5a260e6e21581bb7788c940d0a5d7938c1612fb73a879e471c41df9951d5a444b722a90f3e4afffe04d76009d9ded3597caefea51d99c05f6 SHA512 b62e6728b0b506285172c1b4e849e24c9ac0570ee221e0ddc385b60a9ab01b56c20927b0ae130a3299e792e8ff69f83dcebdf1f9a2996af09ef2aa2aebfad3f0
 MISC metadata.xml 246 BLAKE2B 464fa3d4dae2c15dd040a7580e6324ebe6cd2fa1d37a746ce991ec34484621fe6d3ae2362ea7696bde10cd6c466e1c8e0fd1fdcc161de4a502970e9e2841faa4 SHA512 30ecd86dc0fd1e0c83b4401da36f040346046e260e53c9ce77336869a2442d6b432863b031f61aa2209e58e43d172ef471c6fae5ef19a4c9e2a653e60e96c73a
diff --git a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
index 6e8fc59be1fe..1e0262909ebd 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1 eapi7-ver
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 6e1235e4d041..93f491c84ca0 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,7 +1,7 @@
 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-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
+EBUILD include-what-you-use-7.0.ebuild 1212 BLAKE2B c33266de88f807a1c6c5520253771e1b6f5c2cf3ca6d15e524b59e74d5447a4ccfd9fd8c78d68c1e6479f31aec4c8a8c08c5ec9d39a41b6d2059b555aee9651d SHA512 de621f948cae0a838670013b7d5896f9fff16ab393647b0f220a50643bffb7767910aaeb1c3bc859107773c84c8f3214ff85b1fff757486bfb322b634de4e05b
+EBUILD include-what-you-use-8.0.ebuild 1212 BLAKE2B e5d2f0c6bd3567d571a3edbe856be0a5643e76d01393723acdce9a6623c841c6345294ec401f29543489c7bdb24c56869143b7e8d9fb07b90556cc28497b9c55 SHA512 0c4ebaf0008bc36d1b33b445ea1a4970451f24af8906c2ecad4796d7dbbac77282ff46bf223b5f3fd803d3223d6c24a9da3dfd0ec4f0928b51b8f84d10422857
+EBUILD include-what-you-use-9.0.ebuild 1212 BLAKE2B ceb97a6f48ccf745b7fec1a5f9f128e853079eff73fd5bfda0b4772d5a43bea63a7b90331d3f2fcca4d8ba11cd5eaea5b2a46a011731f6f76dc75f3c03887af9 SHA512 4e4a6dcb5fb85cef3854296630d9ac589a642e0fe1c41a5873dc670ebe217a499819e721949542dbed81c31bc190ebea164c48f248ee9840f36a66ad14e5cf6f
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
index 3521be3a9273..4f32b5dd25c7 100644
--- a/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit cmake-utils flag-o-matic llvm python-single-r1
 
diff --git a/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild
index b976a734afb7..6e0b616cc307 100644
--- a/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit cmake-utils flag-o-matic llvm python-single-r1
 
diff --git a/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild
index 2b95d9035551..8ef816c7fce5 100644
--- a/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit cmake-utils flag-o-matic llvm python-single-r1
 
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index ab1ce7779d20..13f6efe824ac 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -7,5 +7,5 @@ DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b7
 DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
 EBUILD indent-2.2.11-r1.ebuild 1218 BLAKE2B 7127d515b0f633c6b071a2fbff01d78fff8fa8af5c501511b4e8e74c6b0dba57a2416ed5c7846d4c5d95037ed0f029d25ab9cdc31b70614302f1aef0c3fdd49e SHA512 5e229883fe09c8168f88834f98d92caa1d4460c8be8f91541d3824973b45d1723c989bc81bb66832d996916b414db488ecce814315ab471cc8f8778cec8a38d1
 EBUILD indent-2.2.11_p5.ebuild 1382 BLAKE2B 47c045271db8ee765f5516b8b333c81d6bfbe1847c06904244759aaadd730f3bd94c6101df1d8607a3f8f2ab309be4a143a1478700f5d558df921d9524de35ea SHA512 a2db1fd8937a8608d588304731244824d437d3bf90053897c02dec1defdf7f913dfd9c34600b124d7d93b3b3009c7649065726b1f0c1450a339b9baba8e8208d
-EBUILD indent-2.2.12.ebuild 1016 BLAKE2B 449af66ffb2d117641fae135dff36edec7df7e5d609840c845a783d86221c983acfcb3dc9744d8b2516d076a7ab048b3f6be1a2a8aaf8b4c2f4b58f568290c44 SHA512 cae021586fcdf6f377926e9889d3fee4cf4b1e4131ee60d9dcc0fdf4bbe51afd48529a8f2196a621d4299ff29e26c8399590ffe78c08a00cbf098e981748940d
+EBUILD indent-2.2.12.ebuild 1127 BLAKE2B 7e38608fb850a2249c1fe44edeebc7fb6c875be53120037df3cf173dcf9df45bf312a3f8a7dcbf327436f71a35667234dd50a132509028f517156ac4aadfdd89 SHA512 546599303c7ce7bff6586756a81df6890af9a711a45d1857d37d3e0417a7bb552392dd40fd108d7b84fc6d51867bdb7a6de58ad2b71e280f8b621ed55b395dac
 MISC metadata.xml 371 BLAKE2B f331934c0c8063b13ae4e4290894da6faa7e6f135d1684b7a621b4199b13304496866e7eea31a158a2a0f36ae29da184bca16020425799a6542dd6d213e1b36c SHA512 c3859c430b4d976869789476e59c66bd2967802748abc9a3f53395d170114c21ca11e81c6046fa160ad31d422188dc92f63c9df947ac75ef31bcb1965a7f5dd8
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index a8d9e29f1f6b..6ba9d6e6fd5e 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,14 @@ src_prepare() {
 src_configure() {
 	strip-linguas -i po/
 
-	gl_cv_cc_vis_werror=no econf $(use_enable nls)
+	if use nls; then
+		gl_cv_cc_vis_werror=no \
+		econf $(use_enable nls)
+	else
+		ac_cv_func_setlocale=no \
+		gl_cv_cc_vis_werror=no \
+		econf $(use_enable nls)
+	fi
 }
 
 src_test() {
diff --git a/dev-util/itstool/Manifest b/dev-util/itstool/Manifest
index c56d3d339322..83013bd64d6a 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 891 BLAKE2B fe9b64b01460fde23f7e1da54692d5e4e10ad476b8da4c60bffcd14d7b475e912496bf932fed15847cedd5c54942e704736031d694bcbfa15a196c392c02e242 SHA512 f7731d0da1c30b3f61f07705c7ef58c81eefeadbdd6f4fd4a61b46a0b61b95e738967ef976ddc290afad34f4fb5fdfb6c33350244b8fd08fcc76023bcd6eb88b
+EBUILD itstool-2.0.6.ebuild 879 BLAKE2B 4812c5bbf36c3de33bd36e4bc2396f09df39e1f09305e92372e0a5378ed432bfe24d6d5995bd5806f0539e1e78752afe341382ce6d12c6cde713b0f631764142 SHA512 b1ea4b7ff3607f6d05a3a1a58a8273c8018603fe7acbfa017c168d6e255e1f1a95b02c8096aa172b1998a4d7d0ec8df6b57052d16213c6a36fbae7f9047c2f83
 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 4ccd4663ede4..444c8f20eec7 100644
--- a/dev-util/itstool/itstool-2.0.6.ebuild
+++ b/dev-util/itstool/itstool-2.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit python-single-r1
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
 # files in /usr/share/itstool/its are under a special exception || GPL-3+
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
index 1eca9f5ecb79..b49a138846b4 100644
--- a/dev-util/kdbg/Manifest
+++ b/dev-util/kdbg/Manifest
@@ -1,4 +1,3 @@
-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 1082 BLAKE2B 168fa7e739ce2a707538f46223e9d990993eef11bc185c82f75a9e938b1e2a918ddfaa76fec3cc02164ed6e3a4fe8dcf2e69486e23fb16f193a43206fcdc3a3e SHA512 d47e3b684649c578aeb95a71f5e3a3614331665a9caff63b803bd9fd79db934f10fc679e06ba485ab94ecd9a8472f2de6eabf1b96b91f505f997776ebf820989
+DIST kdbg-3.0.1.tar.gz 431143 BLAKE2B 869bf9765650b2a4a2330f99303b51f599df764848ff18442c8c6813421fece2671e5e78a0e8c66a59bd77f06a7f02677ec08a49fb9a28874b92b0f84bf8f74f SHA512 9f3e0073bf37e56fa8ad0c3ae5f0be80331d8963b564ff376aee40c3ccebab5b5a482c31f110fd0f4dd14f9614cff31102d8edf62ffb33f4ae361d24346543ea
+EBUILD kdbg-3.0.1.ebuild 1011 BLAKE2B 03ad710b8f5ff309ada82d420413c17f01596853eb81f5b39a4720f0584eafec814878b4188bcb09c85468c709d18ec21bf1e7c8b6e7384d85ac055b759bdcc5 SHA512 2eeb4f5ac4e10e6111809ba0b68718045158526dfccaf0aeee9d26668c35f9a97c01da59e820b76c6f382822dbf26a8d0d2ede2ed60ca7a5faa21c803db2541e
 MISC metadata.xml 371 BLAKE2B fe7d9700b798150f83b58f44ae125090c0af51f6d6e81d7c5048828e75d9b95147a01c009b5bb195e6d6fbeb047dc019059802e3f60e02e59596f2f027c7ec4a SHA512 70d360d6ff4a809578a61351cdd5bdc42b6bc72eb6551ef8083595d941909f1c6ab91a4cb793f1161eaad3a65e0313e498bef0cc5e763a918d2e83c7352f7805
diff --git a/dev-util/kdbg/files/kdbg-3.0.0-no-png-install.patch b/dev-util/kdbg/files/kdbg-3.0.0-no-png-install.patch
deleted file mode 100644
index 237feaa981bd..000000000000
--- a/dev-util/kdbg/files/kdbg-3.0.0-no-png-install.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 826d503da8bfe7c567fc44dee178a4fca2b52f0a Mon Sep 17 00:00:00 2001
-From: Johannes Sixt <j6t@kdbg.org>
-Date: Fri, 15 Feb 2019 20:26:03 +0100
-Subject: [PATCH] Do not install the pulse frames.
-
-Andreas Sturmlechner noticed that the frame PNGs are slightly broken:
-
-  .../pulse000000.png: broken IDAT window length
-
-Since the PNGs are only needed to build pulse.mng, do not install them.
----
- kdbg/pics/CMakeLists.txt | 29 -----------------------------
- 1 file changed, 29 deletions(-)
-
-diff --git a/kdbg/pics/CMakeLists.txt b/kdbg/pics/CMakeLists.txt
-index 41625b3..9615b1b 100644
---- a/kdbg/pics/CMakeLists.txt
-+++ b/kdbg/pics/CMakeLists.txt
-@@ -31,35 +31,6 @@ set(PICTOGRAMS
- install(FILES ${PICTOGRAMS} DESTINATION "${DATA_INSTALL_DIR}/kdbg/pics")
- 
- ecm_install_icons(ICONS
--    22-actions-pulse000000.png
--    22-actions-pulse000001.png
--    22-actions-pulse000002.png
--    22-actions-pulse000003.png
--    22-actions-pulse000004.png
--    22-actions-pulse000005.png
--    22-actions-pulse000006.png
--    22-actions-pulse000007.png
--    22-actions-pulse000008.png
--    22-actions-pulse000009.png
--    22-actions-pulse000010.png
--    22-actions-pulse000011.png
--    22-actions-pulse000012.png
--    22-actions-pulse000013.png
--    22-actions-pulse000014.png
--    22-actions-pulse000015.png
--    22-actions-pulse000016.png
--    22-actions-pulse000017.png
--    22-actions-pulse000018.png
--    22-actions-pulse000019.png
--    22-actions-pulse000020.png
--    22-actions-pulse000021.png
--    22-actions-pulse000022.png
--    22-actions-pulse000023.png
--    22-actions-pulse000024.png
--    22-actions-pulse000025.png
--    22-actions-pulse000026.png
--    22-actions-pulse000027.png
--    22-actions-pulse000028.png
-     22-actions-pulse.mng
-     DESTINATION "${DATA_INSTALL_DIR}/kdbg/icons"
-     THEME hicolor
-\ No newline at end of file
diff --git a/dev-util/kdbg/kdbg-3.0.0-r1.ebuild b/dev-util/kdbg/kdbg-3.0.1.ebuild
index 0315c3c7cf77..5a91055027dd 100644
--- a/dev-util/kdbg/kdbg-3.0.0-r1.ebuild
+++ b/dev-util/kdbg/kdbg-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,17 +30,14 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
-	!dev-util/kdbg:4
 	sys-devel/gdb
 "
 
-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
+
+	ecm_src_prepare
 }
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 1c59250cc703..f6cffd501909 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,4 +1,4 @@
 AUX kdevelop-pg-qt-2.2.0-qt-5.14.patch 1988 BLAKE2B cffef4d7f61981b3f8e236e225e54b9ccb1964b1648c78b506678a76c0082f4e9ad8b6f1b68ff5d7e7a6f2413c7589513bf0db288d57cbc176d37a3b5959d7c9 SHA512 6b4429de2c8770c869e821a1a196cafdb52c6aa350c8d0dffd9d232fb1cb1ca3ef1da01fee70195b7344685ee82b735f9baea6e1365e58a98b52dbb4d29fdf2d
 DIST kdevelop-pg-qt-2.2.0.tar.xz 660284 BLAKE2B 103572038bc3c3c43eecd3ff9411e2d28aeabf60bfc0bb91c6056d05901711f2dfe03ba098c658000b1a68998644efe34cede2857b3131e2a59f4accf8cecbf2 SHA512 a34bbdbf6e99d3b004c8a1d925fa5d45d9084b1542551f71de6a79c7ef851ca7057593f09c8824ae7961072c9f5e16199d7c4d7a037174f81163f669c96970f4
-EBUILD kdevelop-pg-qt-2.2.0.ebuild 514 BLAKE2B d0b103446fe315ec4fcc07a0883a8fd565a03b8c9f0947b686682a0598dc6eca1791844094b77fd6a71ef8cdaf9cfc32ea9a95b2848a21b724543a5da9142470 SHA512 f519e5a1f26592d5a64a240b4d520498773cefeb8c48324f01ae9dba28a1984587696ddb5d2861e1190c753e30521e15172d435997858bc2cfed721e177a06d8
+EBUILD kdevelop-pg-qt-2.2.0.ebuild 531 BLAKE2B 00ef3f6743a06fd8fd3a7c2bc3e1a8f0bf49110b6c75908d935924930420ec7ae886b3473f062a3358b7e59e9b4803dd9d7b1a30879e484497741fa446c6bcc9 SHA512 920d51678d03733ba0a2cac526fc84f6ef1456e1353127a0f30f13201bb148253c5a6df42f9ccd53bea7539a96fed794cd039277262e9abd976cd501e5641cbb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
index 4fac1ce848d0..7aea0fc71f7d 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
@@ -13,7 +13,9 @@ fi
 
 DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
 HOMEPAGE="https://www.kdevelop.org/"
+
 LICENSE="LGPL-2+ LGPL-2.1+"
+SLOT="5"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-qt-5.14.patch" )
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index a50af6b26453..9593a6689f3d 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,7 +1,5 @@
-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
+DIST kdev-php-5.4.6.tar.xz 1046776 BLAKE2B b69539971ed666c7887e1aed0998da59c887000c785e965d2220e829e485f46c28e12e04b3c084681dd2a96dae1d4d5fa73bd2501359de8960f8bca0e64a1968 SHA512 6711dd9034054ce2bfd684d7fabb3349436a4a8ae0924b8a6ae56a8b39aa83d4501fec389cb73d3c4c20abcfcf8c5f7dd04f63e059b987adc7991806c7eee252
+EBUILD kdevelop-php-5.4.5.ebuild 1237 BLAKE2B ae25bed02dd98e93b441ceb983dd48dfee27823b2f02b689fa4b1b232823998b7e0768c601dcf3f61b63f1ce66ed1b20e00138f494dca5afef3a393a9a09ad65 SHA512 256e896c11d6ce4d63debb844328371497fdb989dfc1c0c8051f481dd8c5a495f0daa6cf053e38eba87ec412c9e5a27744b7b065de07bbe0037042c764991425
+EBUILD kdevelop-php-5.4.6.ebuild 1239 BLAKE2B 3b5d44fc31da740ff5043c38251e67daf7cd061415502f3ad2ee423148ce5b47c6a6361e2bc44797230bb721fc610f7c07dc040757523a17dd41cc668185ea3e SHA512 795ed215b6749694961c4ce157a791149274bb8ab927105a63428bde8680efe8165a3d212d38f3852887a1a3d2c3c10ad2e03d4959e28c70fe66a17103ee3471
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild
deleted file mode 100644
index 9ab3c8b228dc..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.4.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_DOC_DIR="docs"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-KMNAME="kdev-php"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-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"
-IUSE=""
-
-BDEPEND="
-	test? ( dev-util/kdevelop:5[test] )
-"
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	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)"
-	)
-	kde5_src_test
-}
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.5.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.5.ebuild
index 0db9fdcfa08d..085316c767e6 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.4.5.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="PHP plugin for KDevelop"
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.4.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild
index 0db9fdcfa08d..c5e4f236e045 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.4.4.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index c8f5d59e30ba..b78a7042fbdf 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,7 +1,5 @@
-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
+DIST kdev-python-5.4.6.tar.xz 1072228 BLAKE2B 199b8f1b0f6a4f072f2fdafa25b2653cfe855c10d601f3be7f47db84140aea84987cf1ae5f0ae19e08af5b3092cfab16aac0704f20ed46c6d872345482a663f3 SHA512 116b5649f59c2ec46aba083f9e0edebfb481c86d7677ce08fe69e161e344addbd6b4f9c955ebc2866ea118d3139377c59315c46b9e7defec119a47ff50bdd2ac
+EBUILD kdevelop-python-5.4.5.ebuild 1212 BLAKE2B e4ba668c7c59787d17812a647b41a284221cac3b56d98c8dfa1fe7a00b5af9f245fcc7bd11026cde8f8e1c78cb6754640b9a224fc9009ca51305bd6a9b48ba88 SHA512 d1d585ec58bc73a0bec5e8ed7b964cd74622973ae98f398bfd36a6b93128bee77f6db82a0d294982b406553ef751359d676d61f5e3493e5e5e7ad6d40ae9baa8
+EBUILD kdevelop-python-5.4.6.ebuild 1214 BLAKE2B fc23d22751f44d85e546d3ef3d729e0f65fc1cd2b3dc61be1cbf9831118efef0cf6a3722c3080ddc5981201266f52b8347bd762a8ccd851f116146ff06af9f7e SHA512 7ea709ab6cb2e40482904634b574e8ff79e468c998a60b0845e974c6dc7e95813606a4f0a96af85175724f78077744268ff1feb40a7819058180eee17a174ae6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild
deleted file mode 100644
index e5342a7fcbd4..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop:5=
-"
-RDEPEND="${DEPEND}
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.5.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.5.ebuild
index 5a4714ae5ddc..5cd079d31e5f 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.5.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ QTMIN=5.12.3
 inherit ecm kde.org python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Python plugin for KDevelop"
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.4.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
index 8eef9e15c30f..b91e2c1036fe 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.4.4.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 KFMIN=5.60.0
 QTMIN=5.12.3
 inherit ecm kde.org python-single-r1
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 8d068a02348b..492f2f77c565 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,7 +1,5 @@
-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
+DIST kdevelop-5.4.6.tar.xz 7011868 BLAKE2B f8dc80e88592aaff6c2cc90667006a235cb4930aa6249558ee69feee8180b012b3ca6ad39bf553743a3b35bdd2c40754dd1f6081d3630566cad1d71ec75e42f2 SHA512 bcc7ee982f48982c63dbe8ac3dcfc9bdb4dda855d0d8b82740e12a616eaca71fe9e2f4a39626d70ce28d09c5f805a462ade06829f04db682fde72a2594ea4234
+EBUILD kdevelop-5.4.5.ebuild 4206 BLAKE2B 9ebbdfe406c2c7dd9543b9ca59c117dd070fa1b8043dcc3d924c4539e93b9bc7947b9c80e37982c1588e8069b9472edb8bbc18a16f958d6f94af17ee40736592 SHA512 269a12d204a1a3090ad1fd0812472e3b420f5153deb0cda68aa0bb5be60ce44dba35f938655d66d922def5e385eb16e07ffe2c44252f2adddee2f87e75ff6871
+EBUILD kdevelop-5.4.6.ebuild 4208 BLAKE2B f584a1f7d51b64d779ca1637fce0444e143b7dc019b647452a8bbbc0646bbc01edd849abea187e97f1a43614e424addc588b3c3bb4be61aff21f23c6fcfc5db9 SHA512 6dd6e298ff879fd5fe0783528f03e8462856dcc6f39ffb678f5cfcce6b416049bb0c99e85899c5309c8250d1fbe3639963674a10fbf87cc1194edff6cb761f17
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.4.2.ebuild b/dev-util/kdevelop/kdevelop-5.4.2.ebuild
deleted file mode 100644
index 4fe926d9971e..000000000000
--- a/dev-util/kdevelop/kdevelop-5.4.2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-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="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qthelp)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	>=dev-util/astyle-3.1:=
-	>=sys-devel/clang-3.8.0:=
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( $(add_frameworks_dep purpose) )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!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 )
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_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/kdevelop/kdevelop-5.4.5.ebuild b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
index 8467cba14272..e431aec2acbc 100644
--- a/dev-util/kdevelop/kdevelop-5.4.5.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
@@ -103,14 +103,14 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		$(cmake_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)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+		$(cmake_use_find_package !webkit Qt5WebEngineWidgets)
 	)
 
 	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
diff --git a/dev-util/kdevelop/kdevelop-5.4.4.ebuild b/dev-util/kdevelop/kdevelop-5.4.6.ebuild
index 8467cba14272..5590f33b0143 100644
--- a/dev-util/kdevelop/kdevelop-5.4.4.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -103,14 +103,14 @@ RESTRICT+=" test"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
+		$(cmake_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)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+		$(cmake_use_find_package !webkit Qt5WebEngineWidgets)
 	)
 
 	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
diff --git a/dev-util/kelbt/Manifest b/dev-util/kelbt/Manifest
deleted file mode 100644
index 557d715de221..000000000000
--- a/dev-util/kelbt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ragel-6.7+gcc-4.7.patch 5585 BLAKE2B d8b7056d501ea0373f2a0381d59766e95741f963e48f40fca8dc81f097f4bced320dfbfc1e920858af7f37a14a206da43131c3175a839b30b7a911693dc91103 SHA512 160aea4100328accbe423e98f7f5741309b9e293aea992f287cb5d9fab25ae74c76933e924658dd4670d317b01e76d37c3defeeb47ada07370b819a16515ebf4
-DIST kelbt-0.15.tar.gz 232537 BLAKE2B 1e22baa26256fc77f42b499849525d62a2e46f9167c3e0176ade32943db1912ea71aae6bbb8fa28cb04d0a4e39dc7f8786a2926b44d45823b957476bee4f447b SHA512 2f203d3c3a12cc03d96a4d650dde3902d6815a3978af6f78f759b8dfce7971e2799e1325dc043cbc8a5b1fedaf9553a8f1693a159afa4f3601b3bdbc844df647
-EBUILD kelbt-0.15.ebuild 813 BLAKE2B 86b35bdfabcf69a880ec3ee0394c9ad7f4f7342b3f9770f148daa8d101f2bc43cb780eba887c2304c23ccec93f54ea7de8ba26d32f844442c89ff967a8633bf2 SHA512 c3e6e61bed164747a85e78ea5d4be8a2f2d291ad2c2eba218f0581ef1082fd1d0d251f2e6bbb2c9cdd18a7d65047ba0ba9d33cd6757115691bcf19845bf1ec67
-MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
diff --git a/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch b/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch
deleted file mode 100644
index 80eb29a46f05..000000000000
--- a/dev-util/kelbt/files/ragel-6.7+gcc-4.7.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From 27454d1e55b2a5cefc3cc1044d036add9ee9a6d3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Tue, 22 May 2012 16:25:37 -0700
-Subject: [PATCH] aapl: fix building with gcc-4.7.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Starting with GCC 4.7, you have to explicit methods inherited from
-base templates, otherwise it will refuse to build.
-
----
-
-The URL reported in the README is no longer registered, so I couldn't
-find a way to report this to an upstream project.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- aapl/avlcommon.h  |   12 ++++++------
- aapl/bstcommon.h  |   16 ++++++++--------
- aapl/bubblesort.h |    2 +-
- aapl/mergesort.h  |    2 +-
- 4 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/aapl/avlcommon.h b/aapl/avlcommon.h
-index 06983bc..2e3c190 100644
---- a/aapl/avlcommon.h
-+++ b/aapl/avlcommon.h
-@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 		}
- 
- #ifdef AVL_BASIC
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- #else
--		keyRelation = compare( element->BASEKEY(getKey()), 
-+		keyRelation = this->compare( element->BASEKEY(getKey()),
- 				curEl->BASEKEY(getKey()) );
- #endif
- 
-@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( *element, *curEl );
-+		keyRelation = this->compare( *element, *curEl );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
-@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 			return element;
- 		}
- 
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 			return element;
- 		}
- 
--		keyRelation = compare(key, curEl->getKey());
-+		keyRelation = this->compare(key, curEl->getKey());
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 ) {
-@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>::
- 	long keyRelation;
- 
- 	while (curEl) {
--		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
-+		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
- 
- 		/* Do we go left? */
- 		if ( keyRelation < 0 )
-diff --git a/aapl/bstcommon.h b/aapl/bstcommon.h
-index 888717f..7c53ff3 100644
---- a/aapl/bstcommon.h
-+++ b/aapl/bstcommon.h
-@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>::
- 
- 			lower = mid - 1;
- 			while ( lower != lowEnd && 
--					compare(key, GET_KEY(*lower)) == 0 )
-+					this->compare(key, GET_KEY(*lower)) == 0 )
- 				lower--;
- 
- 			upper = mid + 1;
- 			while ( upper != highEnd && 
--					compare(key, GET_KEY(*upper)) == 0 )
-+					this->compare(key, GET_KEY(*upper)) == 0 )
- 				upper++;
- 			
- 			low = (Element*)lower + 1;
-@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(key, GET_KEY(*mid));
-+		keyRelation = this->compare(key, GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>::
- 		}
- 
- 		mid = lower + ((upper-lower)>>1);
--		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
-+		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
- 
- 		if ( keyRelation < 0 )
- 			upper = mid - 1;
-diff --git a/aapl/bubblesort.h b/aapl/bubblesort.h
-index bcc2fb6..f0f4ce5 100644
---- a/aapl/bubblesort.h
-+++ b/aapl/bubblesort.h
-@@ -72,7 +72,7 @@ template <class T, class Compare> void BubbleSort<T,Compare>::
- 		changed = false;
- 		for ( long i = 0; i < len-pass; i++ ) {
- 			/* Do we swap pos with the next one? */
--			if ( compare( data[i], data[i+1] ) > 0 ) {
-+			if ( this->compare( data[i], data[i+1] ) > 0 ) {
- 				char tmp[sizeof(T)];
- 
- 				/* Swap the two items. */
-diff --git a/aapl/mergesort.h b/aapl/mergesort.h
-index 68b8426..8cefa73 100644
---- a/aapl/mergesort.h
-+++ b/aapl/mergesort.h
-@@ -110,7 +110,7 @@ template< class T, class Compare> void MergeSort<T,Compare>::
- 		}
- 		else {
- 			/* Both upper and lower left. */
--			if ( compare(*lower, *upper) <= 0 )
-+			if ( this->compare(*lower, *upper) <= 0 )
- 				memcpy( dest++, lower++, sizeof(T) );
- 			else
- 				memcpy( dest++, upper++, sizeof(T) );
--- 
-1.7.8.6
-
diff --git a/dev-util/kelbt/kelbt-0.15.ebuild b/dev-util/kelbt/kelbt-0.15.ebuild
deleted file mode 100644
index 98730ed05558..000000000000
--- a/dev-util/kelbt/kelbt-0.15.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="A backtracking LR parser by the author of Ragel"
-HOMEPAGE="http://www.complang.org/kelbt/"
-SRC_URI="http://www.complang.org/kelbt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="vim-syntax"
-
-RDEPEND=""
-
-src_prepare() {
-	find "${S}" -iname "Makefile*" -exec sed -i \
-		-e '/\$(CXX)/s:CFLAGS:CXXFLAGS:' \
-		{} \;
-
-	epatch "${FILESDIR}"/ragel-6.7+gcc-4.7.patch
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_test() {
-	cd "${S}"/test
-	./runtests || die "tests failed"
-}
-
-src_install() {
-	dobin kelbt/kelbt
-	dodoc TODO CREDITS ChangeLog
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins ${PN}.vim
-	fi
-}
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
new file mode 100644
index 000000000000..8c4f14544dd7
--- /dev/null
+++ b/dev-util/libabigail/Manifest
@@ -0,0 +1,3 @@
+DIST libabigail-1.6.tar.gz 176133766 BLAKE2B 4a8fd6861f2213f45bbc5814a8a4e0941c236660ea6f84f09eedf6c08eff963c956f27967581501cd73b51057c3d36a74d53b6bf63d0be4d2c931d465d0564eb SHA512 2ba775bd836b53265dae60e66065fc2106e7f633e890cc70b6abacb8426e04ec0b7b38593c21336f5785cf5e4eb8d110fb15ce63124cddc59f660f31c7b25b3c
+EBUILD libabigail-1.6.ebuild 1505 BLAKE2B eaf813c7f56b0d703e03ae350885ed6beb54fa7dd08bc62eb58c7b935d4d4a9857f7c8f0e130ee74334bb52c1f967e334d835922ea52569f435df5857276adbf SHA512 5b6db24c5a22f369675f0a1e308ad42b4e79940a8e632503c28f43c528051227a2cb808e050c2cc5918fc519002bedcabb3f8a745bc7c3a125596650a57b84d4
+MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/dev-util/libabigail/libabigail-1.6.ebuild b/dev-util/libabigail/libabigail-1.6.ebuild
new file mode 100644
index 000000000000..639ff46eaed0
--- /dev/null
+++ b/dev-util/libabigail/libabigail-1.6.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit autotools python-any-r1 out-of-source
+
+DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
+HOMEPAGE="https://sourceware.org/libabigail/"
+SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/elfutils:=
+	dev-libs/libxml2:2="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		sys-apps/texinfo
+	)
+	test? ( ${PYTHON_DEPS} )"
+
+src_prepare() {
+	default
+	# need to run our autotools, due to ltmain.sh including Redhat calls:
+	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
+	eautoreconf
+}
+
+my_src_configure() {
+	econf \
+		--disable-deb \
+		--disable-fedabipkgdiff \
+		--disable-rpm \
+		--disable-static \
+		--disable-zip-archive \
+		--enable-bash-completion \
+		--enable-cxx11 \
+		--enable-python3 \
+		$(use_enable doc apidoc) \
+		$(use_enable doc manual)
+}
+
+my_src_compile() {
+	default
+	use doc && emake doc
+}
+
+my_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use doc; then
+		doman doc/manuals/man/*
+		doinfo doc/manuals/texinfo/abigail.info
+
+		dodoc -r doc/manuals/html
+
+		docinto html/api
+		dodoc -r doc/api/html/.
+	fi
+}
+
+my_src_install_all() {
+	einstalldocs
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/kelbt/metadata.xml b/dev-util/libabigail/metadata.xml
index 71e948fffb95..70f78a5392df 100644
--- a/dev-util/kelbt/metadata.xml
+++ b/dev-util/libabigail/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lu_zero@gentoo.org</email>
-  </maintainer>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 3723ba05ac7d..a0a95651c3d3 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,16 +1,10 @@
 DIST lldb-7.1.0.src.tar.xz 19384976 BLAKE2B a1d5afea255f06221516e21e80120cb35d870ec447aff774d8c610c889c8f28228c7c8e93eec160fc5424736666fcaac8ed42d9181373d266202c9f8aa4c3061 SHA512 773f79939c540f349f1c85d6b1d89fa312488c4c70f100f05cb6250f62e8d6a05832d57c02750439ede905fa69e1380a73ddde0d3ad2f99a0910acd1011559df
 DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713f1c16121905d7a5f71e770ceafdff40d9d19e0a983d9290da2d4eb3acd0987d50607bea17efdb7dc0127d7f5cf8a SHA512 eb031985ad4d08226ec47a90fe32c1e6d070948971ca5235fd431cf7d5b7ea20f5d5131237bf83a6419773d18c339590bf9672e7b4f884304497e63c1030988f
-DIST lldb-9.0.0.src.tar.xz 9846624 BLAKE2B b6bf819c72686cba9e2b0e6a49206b90908bfe7c834e1e50e15be1c53dc8003cc6ed8ad4c83eef662b775997395bdb7e70835f94eca3768288fcbfeece68356b SHA512 86455d9d9866cde75e8d9bee7ddeb2680088dbc671e7d0c7bfff4c68ac963bc293bcaaf1a595db2b5529ddeee0dd0057ece37c90ee4ea194ac5e3fdb3122de01
 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
-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
+DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
+EBUILD lldb-10.0.0.9999.ebuild 2432 BLAKE2B 8f37d1c268866deaf96fae901539abfd99cc9c606c0debeb90029d096c65c5184d839c048fab8c9997cf990d1c63d78e5f7de1d60806b528bbc01f8bf1e051ee SHA512 f19fe7f0f3231de291b7b4aa826136662fa186cd8508213b51585ab895d164c08a1b5d0ef73c05497cd0384eaa5a894e0cab80134c0519b00e7821f0407857eb
 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
+EBUILD lldb-9.0.1.ebuild 2321 BLAKE2B acd5a2981f624675282a9779d1807f85c2f6b12e824e816f0058fd6c5061fa79055c18e57699c68500da7e9f1ca0cbb8cb5e62e2ccf765de1edbe40e62d3ab4e SHA512 41f4155072bd2c9bedf8bff4c160e6100339f382542cd7114595cd1bcebab4fb85e6810bef5a4c2f8c0649752f892ba3e0199c57421e7b2115dd59e45418e7c9
 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 c2f8c7dded7c..de7777bae713 100644
--- a/dev-util/lldb/lldb-10.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
 	toolchain-funcs
 
diff --git a/dev-util/lldb/lldb-9.0.1.9999.ebuild b/dev-util/lldb/lldb-9.0.1.9999.ebuild
deleted file mode 100644
index 2e9e420b07e7..000000000000
--- a/dev-util/lldb/lldb-9.0.1.9999.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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=""
-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.0.ebuild b/dev-util/lldb/lldb-9.0.1.ebuild
index bc79687eb310..ec6cf263abff 100644
--- a/dev-util/lldb/lldb-9.0.0.ebuild
+++ b/dev-util/lldb/lldb-9.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
 	toolchain-funcs
 
diff --git a/dev-util/lldb/lldb-9.0.1_rc2.ebuild b/dev-util/lldb/lldb-9.0.1_rc2.ebuild
deleted file mode 100644
index 44e3c5a2c8d1..000000000000
--- a/dev-util/lldb/lldb-9.0.1_rc2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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
deleted file mode 100644
index 44e3c5a2c8d1..000000000000
--- a/dev-util/lldb/lldb-9.0.1_rc3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 21cf988fd326..d7fe000ca506 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,3 +1,3 @@
 DIST lxqt-build-tools-0.6.0.tar.xz 22520 BLAKE2B 99e8032e111f776708d0a84e65db6534f517e75803d2cf747618889dccc46e9d55caa0ba3c89c88d56143a69ced015df9f1eae68a34c7ea050c6f97aedcf0f33 SHA512 f95c47d40f26defa8bc4e13a0449428945c282cb5e2201610e9529bfd5154a438ee9dcc4f556bd76efe13b97533bbed2f49ab5c100225907781093094a692227
-EBUILD lxqt-build-tools-0.6.0.ebuild 516 BLAKE2B 5958fc29fb51d05a42874230903cef632a6094176f371c53d9c072ad950f8fd3f634970f183cb23c54125c9c362b6d119302264aef400d8d52d57560f18610c7 SHA512 dba4af1c7090ca0cd8a887ac991749eeea9df3c68a0016186c91190c161ad9e55c6ca0adc40dcfa24a067a555d97fd41b85633db9c3ba31998e64cc9423fa14e
+EBUILD lxqt-build-tools-0.6.0.ebuild 510 BLAKE2B d94d9035cce2a2c78fd1dc9e16a16f510152603df6160181eeee0a9997619f3e4774800cddbfcaa34df2199424e1d25333480a4e923d011bfb4e178cb56a00e0 SHA512 e4e146d77ae1f4f87249043cd1cbbe5a6c3cac4fcb33332059da104aa7246965c3e581e9515419a2fac48920b91e306ac7027b5ebb216d696c26eeb01fdb72bb
 MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
index 9efd9eafc847..5fa7d1b35f6b 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="LXQt Build tools"
 HOMEPAGE="https://lxqt.org/"
diff --git a/dev-util/massif-visualizer/Manifest b/dev-util/massif-visualizer/Manifest
index 4ad9c4dc4c6b..3fdc4980cd50 100644
--- a/dev-util/massif-visualizer/Manifest
+++ b/dev-util/massif-visualizer/Manifest
@@ -1,4 +1,4 @@
 AUX massif-visualizer-0.7.0-fix-window-icon.patch 815 BLAKE2B 253bd14bef04a2f1abe531d0dffaec837502a4ae56db341a875888160553a3246cd71fcb01977844482eccbf123dbb4fc4ddcb4b50c06230ce7544dfebb4cb57 SHA512 ecb5d0aceefd82bc05da91fe2e76f999078e41f10821534e512a52f13f43ac247ddf88e7f5d0952e5d8aa07c2714f7ea8f2e31b8361a2a0eb1de5a25692dd984
 DIST massif-visualizer-0.7.0.tar.xz 257380 BLAKE2B fa6cce5377c2c8eb8d170970304384ec7d745ebf7e324ebe42fb4f57f230e1f39bc9078bf89ea5de7d84e0e669a61e4e6f027ebd7ebec31ab0479336f1cd72f7 SHA512 058412e34c0899a34fb4080a602cb0c70a9ac707f27b72a79fb412ea35a6e8c66ce06df15b3153fdc1a70a27232f98b508c7441b657eb73466962b33f9b2f561
-EBUILD massif-visualizer-0.7.0-r1.ebuild 1135 BLAKE2B ff8941c0feabd90eee02ef1ded88406a500332681aef34b2f3a244319ab7d0949e64b9c095dbd5380038cf30b7649ae98b4245c289ea7133d7ff8b8045b70018 SHA512 085d20a0f29457c9c103ef1f5ac9e4d7a391a1eed6c2d1f48901db2c0031b6749aac5b87f1cad73d684868ae5ece9b9c35cd20ef0f471f8496f976965581ecad
+EBUILD massif-visualizer-0.7.0-r1.ebuild 1250 BLAKE2B 00bc35aa4dca405a16de8ea3af8a31fefabe51f20b308af7b8d43941be129e991186de6696adcf7483e5c8560ed7e8adf1ad4885bd592da9b60e31065dd65399 SHA512 eef1b7978ce6f3aabe2f55bbe6d06b5a9d008d7df63a1bbc66943f83f2b597f119b877493ded2d6bb46870bbccdc3e073c2f9afe05da1df544e59f81afe0c967
 MISC metadata.xml 370 BLAKE2B 8b260169231c67d50430301c4d6b3f87a07b59cc3d6a961a05d7f2e6987128ca7f5582d3b09812fdd6a0079b32f539ba0107b4338905766cba81ca79fd31c155 SHA512 a47938e506c035d69c8e69a4edb2e2587f76e9bd348aa0d9e88455cdf8c0d988b276e9f81c67c2039bef153051dcebd7b62b6b3d6bff1ebbbc572f87bbcd6382
diff --git a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
index bf0964314b2a..8ea3099d0c62 100644
--- a/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
+++ b/dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
@@ -1,46 +1,49 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Tool visualising massif data"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/Massif+Visualizer?content=122409"
+HOMEPAGE="https://kde.org/applications/development/org.kde.massif-visualizer"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
 KEYWORDS="~amd64"
 IUSE="+callgraph"
 
 RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
 	dev-libs/kdiagram:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${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/kparts-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	callgraph? ( media-gfx/kgraphviewer:5 )
 "
 DEPEND="${RDEPEND}
-	$(add_qt_dep qtxmlpatterns)
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
 "
 
 PATCHES=( "${FILESDIR}/${P}-fix-window-icon.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package callgraph KGraphViewerPart)
+		$(cmake_use_find_package callgraph KGraphViewerPart)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 470cda5b1959..0d96f6e94632 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,3 @@
 DIST meld-3.20.1.tar.xz 594812 BLAKE2B a06ae48af37008b99e7110a826e1d97326b71150870c1546b50d971f51d6c9eb3b24fd8e5ae8e8e8daf30f0a83c71356a368d9ed49114989cd22fb793a644a78 SHA512 cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f
-EBUILD meld-3.20.1.ebuild 897 BLAKE2B 0628c4a96d5c6fc30498da1a690c60c00025d1ebb473412eaa62ad302143d299ed9640d6f4d37b8c557fe12067237fe358ad1c1e0ca1d01aabf10c7656b27cdd SHA512 39a45150eb7a001d34cce5df2d7492fb819c54e25afba2fe5878bfa09c4ac0f2dd6144165dc2ff0ede82b43b48e6c3e8d6116fe71973a3c989c58cbc900b7b7c
+EBUILD meld-3.20.1.ebuild 895 BLAKE2B 3fba9c3984529910a5037c95d94bc0bca502e41ab536e8a9f0137eec297f9bb3fd25eed865c48c25f78c6870c94454e2bf126a50076e3c2bced9b8867c64bc88 SHA512 058ba3d3c59d6747e575f5f602ce0fa238d22dbcf01b7490cf86a0870b031ae82ee3dae19425b43d4159cf054f9f723559c06069f1ab8ee8e18c89325a6e0328
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.20.1.ebuild b/dev-util/meld/meld-3.20.1.ebuild
index 92fef8f37b16..7b08ebcc80d2 100644
--- a/dev-util/meld/meld-3.20.1.ebuild
+++ b/dev-util/meld/meld-3.20.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit gnome2 distutils-r1
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 2f638351baaf..7a3aa987bd1f 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,8 +1,9 @@
-DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
+AUX 0.52.1-test_pkgconfig_gen_deps.patch 1688 BLAKE2B f228e1d721449611799606cfb3aabcd3f347b0776a0f25dcf3b1abcfa6b5eb0506cb9e5b4069dfd9008a0c11569db9a50885c9edf59e1f4a129e6f571921bbed SHA512 4720834226b88661d7b631f1739c6ae48ebabd1604081380e143ab420e78236db7bc3141f5adc68aa03c6c074d1ed415ac515b351bd34c1d4dbbdbf1492cd5ef
 DIST meson-0.51.2.tar.gz 1453328 BLAKE2B 514995ba8db534ecd488e99fb1aed25d33de73ca65fdfaf18584bd8c113eca3602a73ac42f2ae5ddd4362f8989a02d3d3aa75487ba665706c75039e3f039056c SHA512 332fa0801accd91dc8f3cc1e4e701b1139fdb17c4ae8371fab419e83305ef41534e5f367fbd9323936afb6912d5c3e7cffa9cef658550fad0861ccca9812d5b0
-DIST meson-0.52.0.tar.gz 1507218 BLAKE2B d3d869cf4a992ba89f150960ed742ac5da2b63b60a3583f2c4c7cce1e2a86f5101a90a05f59000af70c7ada00c119268df87aaadc55ccee50b85c24e308c1d5c SHA512 b32206c5499580a74bb5442d21263b5328cc3302c3226452fb3a2434fdcf55d5fc16fc841102b09a85abc19dbd00e836a571f917833ef3d726d84524f89b2e1c
-EBUILD meson-0.51.1.ebuild 1940 BLAKE2B 6dc6c1a49dffa23edcab9da8e60cf20d9e57d2ce612a6adf7e5cc92f21b0eaef6b241f5dccbfbdfa05de8542b473ff175f639eb5abbcc0fa23e8033ac6988628 SHA512 e3afe681ac5b465bac3d80ed6f083750430971aec0dc82ecd98910cf27f0ffd0aab40e80ae9713fd471e62bb0f7298f993564d9fc150ceba66ca02214b6701f2
-EBUILD meson-0.51.2.ebuild 1941 BLAKE2B a2037c7b214b9349c956c7275c7ad187bcdec091b316a401e312e959242fcf4ce913291c1eaf63169fcf647794e1276dacee26eff3207128f778c9447b9ad605 SHA512 dbba78b53f1ba5f52ddc8c9bc4fc6abfb276c713253bcce475d39214bf1dbdb6934ec79614946b63d30efc3f440609c000007f9fa0307f90641a8aef234fdfea
-EBUILD meson-0.52.0.ebuild 1953 BLAKE2B b3f8c0795268e0e0ca6e5495e5a70de318632787e4e169eda0051b940f04a944e1873ee5a100ab5d73a9f3b8fb335b6965b87ad98eb5360b56a7f32032440fb8 SHA512 230e63b2c09aecacdb198186cc277582fbfcd4afdcaccc069a37a701c8466b57cd74a78bd4cb075abe40d3ab37be92b35023cdee07eae290c33302112ecea223
-EBUILD meson-9999.ebuild 1953 BLAKE2B b3f8c0795268e0e0ca6e5495e5a70de318632787e4e169eda0051b940f04a944e1873ee5a100ab5d73a9f3b8fb335b6965b87ad98eb5360b56a7f32032440fb8 SHA512 230e63b2c09aecacdb198186cc277582fbfcd4afdcaccc069a37a701c8466b57cd74a78bd4cb075abe40d3ab37be92b35023cdee07eae290c33302112ecea223
+DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
+DIST meson-0.53.0.tar.gz 1548138 BLAKE2B 42340645f3417930856e05da9b479e9352e1fe3ea567929215f433a04fe3b0216d6de8693428be058048d2bd9c8d21031b19d0d5599a99e8f61aa9b6da689bf7 SHA512 e79a093aba5df137d463ac1334199833b8374689b2aba1cfd935fc484fff524d84bf6c2b3fcd9371b67daade0e18d1fe5e47dccdb7cf416932e86b83f49fec73
+EBUILD meson-0.51.2.ebuild 1913 BLAKE2B 8b3ff8f9a249c018a67dbf3a37954ce9b0dab5876e5f06a8066384958f55ef1037f2823b186334478237b450343e06bfdaa1672704c281355e008362807ecbe8 SHA512 6623c39876b25df3bd72b29d8a2512e12f0dad2791aedd6bbdbec32b6553ccce50b4aeb3b7400cd3437f778e6c3ede8935537851b1ca78e2277c70d9785779e4
+EBUILD meson-0.52.1.ebuild 2056 BLAKE2B 97daa03333835f4d5ef3920de9ba23f4ec7e0cf74fd6d3838b82c59bc6991f5b7531d53668bf43035aac319b096bdef66c74b74d9438418347c8087673bef295 SHA512 dff49479711a176066a415d5ebb9626fd7ba9f554fda9921e392d8645bb04c3bc07af23181670014083a4132fdb9a8dc95db44f7891b355c2dcf3c6a8ae2608c
+EBUILD meson-0.53.0.ebuild 2069 BLAKE2B cadf14d173234effe76c0444aa6c235bbe9f162b0523228e46989d75e1297517e22c118b402e6d0d9c1e29ebd7f48d82a36b408cfec124eaf0eea6334efd400b SHA512 93e39c8181e43e1b30226482bf90cffa3d3b4dde70334d0afcc7bfae9d4920702c240dc0e834758982fd5f27b5d2c7a5cbee3973eb148835cca9e004c568826a
+EBUILD meson-9999.ebuild 1995 BLAKE2B 077063da3cd5c8458313b759da409e2f73177e1418b3ee318eb60f474b62e6d822b36ee78179728b916ba1b6c3116b29009c6ec2b6e88b16cd681d5fb47d4dd8 SHA512 abfe6967a70dc0c4b951e304ccd271741d53a9cc10c1051d0a97afac6f2e5fe52ed31f729f15822c8bdfc09f461f2df8ede06b854733b6e699bc392fa7a40c4b
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch b/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch
new file mode 100644
index 000000000000..ec753e00230a
--- /dev/null
+++ b/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch
@@ -0,0 +1,46 @@
+From 1ce668f9163e1c912382eeb0e6ae40d123c0cca9 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 13 Jan 2020 23:46:09 -0500
+Subject: [PATCH] test_pkgconfig_gen_deps: set
+ PKG_CONFIG_SYSTEM_LIBRARY_PATH=/usr/lib
+
+pkgconf automatically prunes "system library paths" from its output. The
+system library paths depend on the system toolchain. A common value on a
+64-bit system is as follows:
+
+/lib64:/usr/lib64:/usr/local/lib64
+
+So, if -L/usr/lib64 appears in the Libs section, it will be pruned from
+the output of pkg-config --libs.
+
+The pc files generated for this test contain something like this:
+
+libdir=/usr/lib
+Libs: -L${libdir} ...
+
+pkgconf may not consider /usr/lib to be a system library path, so it is
+not pruned as the test expects. To work around this, override the
+compiled-in list of paths via the PKG_CONFIG_SYSTEM_LIBRARY_PATH
+environment variable.
+
+Fixes: https://github.com/mesonbuild/meson/issues/6004
+---
+ run_unittests.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/run_unittests.py b/run_unittests.py
+index 898f05e54d..5a60b9b6a4 100755
+--- a/run_unittests.py
++++ b/run_unittests.py
+@@ -4832,7 +4832,10 @@ def test_pkgconfig_gen_deps(self):
+         privatedir2 = self.privatedir
+ 
+         os.environ
+-        env = {'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2])}
++        env = {
++            'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2]),
++            'PKG_CONFIG_SYSTEM_LIBRARY_PATH': '/usr/lib',
++        }
+         self._run(['pkg-config', 'dependency-test', '--validate'], override_envvars=env)
+ 
+         # pkg-config strips some duplicated flags so we have to parse the
diff --git a/dev-util/meson/meson-0.51.2.ebuild b/dev-util/meson/meson-0.51.2.ebuild
index 2025bfdfa9ec..f7c71e2ff810 100644
--- a/dev-util/meson/meson-0.51.2.ebuild
+++ b/dev-util/meson/meson-0.51.2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
@@ -22,8 +23,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
diff --git a/dev-util/meson/meson-0.51.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild
index 2d3a813898bf..232e93978e1a 100644
--- a/dev-util/meson/meson-0.51.1.ebuild
+++ b/dev-util/meson/meson-0.52.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
@@ -22,8 +23,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 "
 
 python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/0.52.1-test_pkgconfig_gen_deps.patch
+	)
+
 	# ASAN and sandbox both want control over LD_PRELOAD
 	# https://bugs.gentoo.org/673016
 	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
@@ -43,6 +47,9 @@ python_prepare_all() {
 	# https://bugs.gentoo.org/692822
 	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
 
+	# Requires python2
+	rm -r "test cases/frameworks/1 boost" || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-util/meson/meson-0.52.0.ebuild b/dev-util/meson/meson-0.53.0.ebuild
index 6a59a76c31ba..c03f936be1ba 100644
--- a/dev-util/meson/meson-0.52.0.ebuild
+++ b/dev-util/meson/meson-0.53.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
@@ -22,8 +23,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 "
 
 python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/0.52.1-test_pkgconfig_gen_deps.patch
+	)
+
 	# ASAN and sandbox both want control over LD_PRELOAD
 	# https://bugs.gentoo.org/673016
 	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
@@ -43,6 +47,9 @@ python_prepare_all() {
 	# https://bugs.gentoo.org/692822
 	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
 
+	# Requires python2
+	rm -r "test cases/frameworks/1 boost" || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 6a59a76c31ba..1cb26feeb184 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
@@ -22,8 +23,7 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="
 	test? (
 		dev-libs/glib:2
 		dev-libs/gobject-introspection
@@ -43,6 +43,9 @@ python_prepare_all() {
 	# https://bugs.gentoo.org/692822
 	sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
 
+	# Requires python2
+	rm -r "test cases/frameworks/1 boost" || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 6ca7d08acd06..71146c760210 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,6 +1,5 @@
-DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb572386b2ca8508fd5a5edd9e715ced41c05c62efec8eda07b9ec7a1e9e658bf3b3dedeb18695a076b5bc2067e86d68d SHA512 5b279222e86475a982e2aeb9fc14853f4fac0ca0c5a2d56f303584d1b348726afd99b0292a5ed050d326e7cb1434e5ad5b5dfdfb37c73fd08f13e7f4f4bcc046
 DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e
-EBUILD mingw64-runtime-5.0.4.ebuild 2548 BLAKE2B 82805af12130881e40369c5c2074bd622f4ce19e3d1ca1b845d6f03bfe84c271b22ee55d1ba639827d67506262a05f917509df2d632b34cca141d62a02487539 SHA512 bc4fdf9844d0b09ac4045cd51529b14ecf9fe8bb4f2fa428d141bdcb6352a0b1912d471ac133b768dcd26c65c05d345594123fade22f525b8fd803b234b9250d
-EBUILD mingw64-runtime-6.0.0-r1.ebuild 2862 BLAKE2B b10758329649069509ca617a9b1159f480eb1b84c89bf9130004b2d1e089dcdb02ac6a896b376dd7486c6fc86c12468162f089377ba2fc5390549476957ef83c SHA512 4dc7a111aab0b5a01cb1559efe7ca4126b32f77e88852ff2940cfe23fb78ade8561653c3f9d08a1e0530e875227ab50f51d820c887737454491306fc29b12ca5
+DIST mingw-w64-v7.0.0.tar.bz2 9071231 BLAKE2B da00794ec456ede5913a565248c79255407c058469cb7338cf81b8d03c1e39f4189016b01734b786c0ad8f18166a24fdb95ca72edc954f31151e5d3aa2b2a899 SHA512 30e5b2824a24eeb99ab519e3fc134cc9a7f04ee8b853bc8d66a13d1ab74144bf78b93e162bfe6de2a5e61f63c0e620a933b260b02d019cd68cc4b78bd36c67fd
 EBUILD mingw64-runtime-6.0.0-r3.ebuild 2958 BLAKE2B 8f91f93b5cf45c52dd8750eacf640a76d56115710a5e58930a6176db7c54a67a42ad59ad74c5503235fa946473bb8c1bbba68b5fd939640768e22375f95696b8 SHA512 30cc5cb2e975a0048007734836b8ef0052ea9470622d71fcc4c2e343996f564b9f402fc273a8bdd03961148a8156c6e38fd8eff6b26c1d830d47d6c619a81bbd
+EBUILD mingw64-runtime-7.0.0.ebuild 2917 BLAKE2B ff108cced053a135936dd0deea64c585a010831b002118de38cd7b816decf3daded03cabe6caaee684930e73c32a71731690eb8be4dc0f8398cbce978fe104af SHA512 ef52c741f89719f7284a516b4b4651a0ea0d8aafade99153e5e5d7541a8d12b083f9b5458450cae66f617a0890c052a50869b22c7a35112b086459c3acd0f623
 MISC metadata.xml 643 BLAKE2B a66741716a2729da314650e4435c616a0a3912cedcc142f23ce74b23c59e21b8a456697a7d38880c1b7d876909ba4b3617a0c72c9f054fcbcbe68841d76c5903 SHA512 fd9528a194bcda889d719ba7f4759414b86cc0d75d9790a9478c46e2abf62b01355e4e01b8e05b7accda0ff0dab94607182671f367cf600e47443b0d4a0bcd53
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild
deleted file mode 100644
index 93965bb06d7c..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only
-}
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	# By default configure tries to set --sysroot=${prefix}. We disable
-	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
-	# That way we can cross-build mingw64-runtime with cross-emerge.
-	CHOST=${CTARGET} econf \
-		--with-sysroot=no \
-		--prefix="${EPREFIX}"$(alt_prefix)/usr \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-7.0.0.ebuild
index dbf9db4e858c..424ab317b1db 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-7.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 export CBUILD=${CBUILD:-${CHOST}}
 export CTARGET=${CTARGET:-${CHOST}}
@@ -75,9 +75,11 @@ src_configure() {
 	# By default configure tries to set --sysroot=${prefix}. We disable
 	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
 	# That way we can cross-build mingw64-runtime with cross-emerge.
+	local prefix="${EPREFIX}"$(alt_prefix)/usr
 	CHOST=${CTARGET} econf \
 		--with-sysroot=no \
-		--prefix="${EPREFIX}"$(alt_prefix)/usr \
+		--prefix="${prefix}" \
+		--libdir="${prefix}"/lib \
 		--with-headers \
 		--enable-sdk \
 		$(crt_with crt) \
diff --git a/dev-util/molecule-core/Manifest b/dev-util/molecule-core/Manifest
index 0706d956a0d1..2e8bb1abe046 100644
--- a/dev-util/molecule-core/Manifest
+++ b/dev-util/molecule-core/Manifest
@@ -1,3 +1,3 @@
 DIST molecule-core-1.0.2.tar.bz2 30616 BLAKE2B 00aff5ffa61eac63dbd9bf93027f24e5953a1cb1daa8855e9904f75b8afc68677306ccda40cb5a1db765b086a8cce608ffa5a24efd69de7cab86c43ae3aec07b SHA512 1f501960e4029cb993680c7356aa8fc0ac7afa249d106b4ce97afb39f58cd666640bcf9fd8cee64482077ad23f91da743d6ce54e82863faab20d68a1814d92cb
-EBUILD molecule-core-1.0.2-r1.ebuild 625 BLAKE2B 83a7f15430cdd5ac29e938792095528b16e474b2778fc769246e6d22ab8f7a494658c8b2af854fea2618e3c5319dd9446400eed142f2f31ecb1a72c0b59181a5 SHA512 eaae8b5cdb45d3ba854c6094e815ae04310a672ee1efc0151415d635722a234a3a73efa9be488591c7ebb7fbbe7591661a0244a16bf0c63c253a3ef7b1ac3a83
+EBUILD molecule-core-1.0.2-r1.ebuild 621 BLAKE2B ca04a0d60702c14edcc2fa8f53c329836860485d056101fe88be7f56798bad38bb594a28b82ade7627678d4a2178274ff465384f35424b68a5546f449812042d SHA512 dc94063aca6731747a3079c87672be120e48a57c78e73151f7767915edfd2c55402d5bcc88dc1d323e1234384a9e649e7886697bb122b880480fb3326344184c
 MISC metadata.xml 1197 BLAKE2B 2ab6fff633d6e31b8c8721f39138026dafd6ac7a5fa9e559e93f39b12e59a4f449704a8a2f4c3dd2f2d1aeb1572e0af22afb54ecd0da9b1165c0af5ebeb43f08 SHA512 740155e85fbd48b3e747a88cd6a1b612f1f6802e9a62c7a3f454fa4908150e0c37ed3c10505b4192acba929d45714bad4856aa3945c33ed5fd48e59435553362
diff --git a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
index 0f7dc44ac275..042948d69fd4 100644
--- a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
+++ b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-r1
 
diff --git a/dev-util/molecule-plugins/Manifest b/dev-util/molecule-plugins/Manifest
index 4c6df8aba136..5f483b6ca30c 100644
--- a/dev-util/molecule-plugins/Manifest
+++ b/dev-util/molecule-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST molecule-plugins-1.0.3.tar.bz2 17662 BLAKE2B 6bbbd484ec7fc8441bfccc8c716475e9bf831804a79a0add1dedd428f2dadbbd1a3025966db25619c34364f2a0b6873946c121f1df6fd3a2dc041a3a7341565a SHA512 e00bb7ed9a19452f0363e3453b56a86c22b2f96b843798ad20c6c61a87acf72a389158bb7c8b1b09cbcdfbcbb4b081996c47b6327d790b72c98a13270ce4cb6c
-EBUILD molecule-plugins-1.0.3.ebuild 682 BLAKE2B 43c4c718948c9870b8f8ff1325b971a167f2d506161d9105cb23d6f16c7c9b6da1ed3bb7a472cee45a5d56cb72c989dc19f7d72a695c954b06510ef032dc0dee SHA512 b1990abe912e1cdf079686d90ee0034e6cd7738d0f6427eb7343935623edca4943f6587d00339ec0ca4c310f0c4eb46c4f796619be2a6aa8f6e70ae9c03646af
+EBUILD molecule-plugins-1.0.3.ebuild 678 BLAKE2B ebd1dcf59c70ac15ed36fb062340e1e8b757102478606bbbac3e3302f57da42ea511f8a273d574029dbadafe905d9bd9fe315933d62786ff9c55501e68f89806 SHA512 f3b35c7825526fba5cbed0ffc2bb465eea4b1df25c00cdbf9d26c4bc3c823d8c185c7a489c772c1af5a7128dd0efc92b465eeda52f0362a96ada97f461577fbc
 MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
index ab606c5cbc65..b42a13d5ae25 100644
--- a/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
+++ b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-r1
 
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 44d06ca2515e..0e9f4640a045 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 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
+EBUILD ninja-1.8.2-r1.ebuild 2700 BLAKE2B cd4447774a0d216c683a50f4e8da0e929819906357d1cc5d523024e26a3c58da448dec07118958b15e4fad058189d3c07bd8857645c23db4ab76882b2d9635ff SHA512 1ffd863f81980669ab90f003e46fa7447357a7d41a53cb7414fcc7c1006095d78ed28d535797059523235cf11acec49e4dc666855f9f933a0bdf86539347977f
+EBUILD ninja-1.8.2-r2.ebuild 2700 BLAKE2B 2c34df96e0b655a249a1e6c01e5429101c212a0658332daee1befcaa1ff14af5397ba19eb2703ff1c37c73942347a6a455c5c5bcd8d5f125b326cfd3ed69f5b8 SHA512 00d767a58867ffd834c4c775dbf573dfd276c563be166f660139f51dc99b1d1848112f600624f7221c01bdca3649b713ba84b5dc91246c4eaebb1fd7f818b497
+EBUILD ninja-1.8.2.ebuild 2557 BLAKE2B 004add966245c638468d9445b23d7c0f69731cc7ac0d46b4b3413d58e881642056074e282ba67fd2bc9b8589fb811abe4f80ec3bc0f982cdb136ec38f008ad74 SHA512 923ca88d7f607b0f5adb02c59110badac26a08ed65ab485d2a90647931cbb06b72dd5c8e835bc19d92d84103139a3cb25b85ef3a6f90343c269d6c0fa5249979
+EBUILD ninja-1.9.0.ebuild 2762 BLAKE2B 84a230be226d88b6a421cb287e283d4d5b5a8fcaa17a3b90efa99daa9541fc5608f051612b433273274a59a7d864a44d18e6513859200a1696d3e9aea953d750 SHA512 1b8d72ae9da50bc0b9573bac266ca9b96272fcb9672b2a171d806fcb3b7955a23b12e465c667c006be5e8c605a09eb9a3862d73403df97893c75d3196e48dba9
+EBUILD ninja-9999.ebuild 2711 BLAKE2B 999158f073e0e89d4ac3448d50a775a4b055c9a9524aa92cd8e0f3c9b0591aa798e9fcb5649ef26c9316686e4a3eccdb998834834686ec64243441f094c75cf7 SHA512 781697bd6aca1615c37eb3b3baa68f92ce3a157f3f9a8a7baf76d97902824b0b35a7513638577c54183dda83a00632fe4bd9cb55602d67c262d23d4896180134
 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 70c9c537f182..792e3102bb19 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
@@ -38,7 +38,7 @@ DEPEND="
 	test? ( dev-cpp/gtest )
 "
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim-syntax? (
 		|| (
 			app-editors/vim
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
index ceebd590c4a5..51bc23afa6b7 100644
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
@@ -38,7 +38,7 @@ DEPEND="
 	test? ( dev-cpp/gtest )
 "
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim-syntax? (
 		|| (
 			app-editors/vim
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index 31a17b577b77..99d58c0c9f41 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
@@ -35,7 +35,7 @@ DEPEND="
 	test? ( dev-cpp/gtest )
 "
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim-syntax? (
 		|| (
 			app-editors/vim
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index 46fc4f19ce4a..843267a75dde 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2012-2019 Gentoo Authors
+# Copyright 2012-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
@@ -38,7 +38,7 @@ BDEPEND="
 	test? ( dev-cpp/gtest )
 "
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim-syntax? (
 		|| (
 			app-editors/vim
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index ae5bb6fa6fed..e9f27dec4ff3 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2012-2019 Gentoo Authors
+# Copyright 2012-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
@@ -38,7 +38,7 @@ BDEPEND="
 	test? ( dev-cpp/gtest )
 "
 RDEPEND="
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim-syntax? (
 		|| (
 			app-editors/vim
diff --git a/dev-util/osc/Manifest b/dev-util/osc/Manifest
index cb0c31199b2d..b2b6978dbe11 100644
--- a/dev-util/osc/Manifest
+++ b/dev-util/osc/Manifest
@@ -3,5 +3,5 @@ DIST osc-0.152.0.tar.gz 331512 BLAKE2B 19605f2cba7befca160ed213ab13ddd337726602a
 DIST osc-0.154.0.tar.gz 341789 BLAKE2B 69fdaea439c7d82efba7568c318f076b5b267ea4ffb319ca95c81b85305aa4daba43f53d6b9979c6d76c0b0c0bef124e25d3fa4cdb2ac74a044c12b7bd3ea06b SHA512 1240bc9cc9079115342fc0bff1e522ca8fbff0a22b15fc2bfa90817241fd42e2350dd9344e5d6e3e0b5842be3f010398d108c7f9c7d474bde5c2300f7bf6bfb7
 EBUILD osc-0.152.0.ebuild 1520 BLAKE2B ca46aeaa8904653bd3cf496bce9ba0147bb8a000ed39d9fee9fd75a791b48885996ff7cf73bd027b8d601b40d514f61539af0b0d1e0b70821d359f760f6d544b SHA512 d9147c1a3c9269a46095e72cd2bfb7d09b1a8bbcd51ee76ea2f7134cf154509cf92d1440fecb42c0b91a99fa2502fecf7d32eea2ed0f391a983284ee2799f1ea
 EBUILD osc-0.154.0.ebuild 1522 BLAKE2B d154b437c6a2343e7225e0864fd384deba8d89e84b8722c694548eeaa1335e6ec80f977b3104942abf13162e80e7c7f5ed8f8a1d29bec64f85d7bfd0f5d0a1a7 SHA512 fea65ff434da0ce6e4d4bf78261dddb8f20c26404c25562129346998bac7d8b98ebfb49325f1861c7736904937ce32d47da47905b492af6090ce631192c7a3f8
-EBUILD osc-9999.ebuild 1522 BLAKE2B d154b437c6a2343e7225e0864fd384deba8d89e84b8722c694548eeaa1335e6ec80f977b3104942abf13162e80e7c7f5ed8f8a1d29bec64f85d7bfd0f5d0a1a7 SHA512 fea65ff434da0ce6e4d4bf78261dddb8f20c26404c25562129346998bac7d8b98ebfb49325f1861c7736904937ce32d47da47905b492af6090ce631192c7a3f8
+EBUILD osc-9999.ebuild 1520 BLAKE2B db5e7a027d63465c76921f1e2e9e0306bfb7ab6d8760a94cb04290ba2b1f529445e18509d876771602a12e1d7aadd9861c0f09dce5ada1e27f6d79380cd5ecd2 SHA512 9bd1338e5556c1827e1867b5c9415f6e51c26b1f9e8b78679e399c8b873238964fa885326895fa0f3ad2d62e73302e3212af8c560a50e4278a4e6c5f655aabc5
 MISC metadata.xml 430 BLAKE2B d370b0f0fac018360b50b72c4499da1214014850deedae7eddfb90370abd5f4dbad3ff670d2494626cb4155173778e29a403a97c0e2df53340abba9b237e5ca9 SHA512 ee79421a372b98b0f1f7da27fefb5f4502f941446a082b02cb7ffb16919e4c06f7c51db9f3ddd5101f48465661218032050d0f2c12abae5466abfd13e772a710
diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index 42d6d248359a..bd32f689995e 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
 if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
+	EXTRA_ECLASS="git-r3"
 else
 	OBS_PROJECT="openSUSE:Tools"
 	EXTRA_ECLASS="obs-download"
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index ed15c39bc4e3..0f4f5f18292f 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,11 +1,16 @@
 AUX perf-5.1.15-fix-clang8.patch 659 BLAKE2B 5f68efedb5dfe092116db7cb1a0586dbefbd40d8f6d3cac00a8a5ef33d0f94f99dfb06ea70a7df5b81e1917c8d5f82e63d76c118b6c386f0c228ae5bc20a7b2f SHA512 66bae97bcd73cf9fe5bc68e843cb46921511bafc8671e0cd058b1493e83fccd41b786ab5b45f8fe3f3cfccefe3b6bd209e66533fc9331853484e212b0207bf98
+AUX perf-5.4.6-fix-clang9.patch 558 BLAKE2B 001bde226595891626dc7b46ece6de240696bbfb7e5071e4f071653f90e3b98a032ed375b0ec4a3f88795c20b8066954e8934fc4c38f8814c0349c6037d60a1a SHA512 af1c82863b2e7e9d87199896765646622d8431fac7a80b7579fb88ca83df182493996b61033618632a9b11ca6c87e4400cf14506ade9b00d327ed2cf644e1945
+AUX perf-5.4.7-propagate-cflags.patch 1502 BLAKE2B d35f94d10ecc2d384cae9084a7f843581553682bd1ec66e7dd33d0fe110e03c01761b9b2472aa637a71f5c694f4c4eb10691afefb08351e06ea607ca4a460248 SHA512 a5506e118f75439386b3c7699197b20017ef819669b06d89ed79886146e7a79d52d1397680cc94e10137bd6665d3dc2812cb1556498de2739f4d967582522a80
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
 DIST linux-5.3.tar.xz 108558876 BLAKE2B 0d08eed879d05734e4542f0c93823d43f8dc042a54ba5268064c4bbebd7a9d59c03abf3ad5dee8280e784ae148a3b0c56181eaf2d5b3c079b6fe9f5191544df6 SHA512 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
+DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
 DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
 DIST patch-5.3.7.xz 255616 BLAKE2B 18ec40508fdb2cc17dd927f3ddef07b2b744ff993de75bb7adebe3a3f97c9383ea1845085899aa939ca8a15515420c18a1ac0ae832f9ae52f18cc8ed59a1e75f SHA512 bf2717b721b3acfd423537a6a520388e6a596ae65605ed8c029a67c117a002e9a21c324de0dd41407bfdc8ef95263687764f4f46aa59cbb50f68ab21b96c29d6
+DIST patch-5.4.7.xz 272092 BLAKE2B dc9e1cede993144a4d9cb17cb91d3857b6492fa1a971c743268afdc601edfafb033abc3ac24cb7789d3f171ea7fb6b60ad5197da445ab72f5e9cf2ae00e7f495 SHA512 396eaf9fe88045e6e308cbe8e72217b3334b637bfa7e85f8d27cc4dd8e3d94c6f58d2b7b3e237defcf647d500610b85780ec2e21f1d91ac41c5f4ef3e74dc161
 EBUILD perf-4.14.33-r1.ebuild 5052 BLAKE2B 5da35d5037d73c909e15727a9e969d285de0eff5d5b4dcef95ce1e2ebe7d9a13ed8a6f95a713dfa97113a051669abf576722473a65020d832d2b39288136a108 SHA512 34b059d824eed25f6cc2b599866aecc2b74fcd2537826853d992013b9c6eb23ae5f424a6a2f8af93658c0526dfd3235934c62da41a2261164e400244cd966bed
 EBUILD perf-4.20.3.ebuild 6042 BLAKE2B e1498b914f8b135927f5e97211d5246dab4bfd5bafbcf9ba431c2f8d95cf1568a162d2704f6cf851951178287efdcc6d75391ede09ea101b18d88463a4586912 SHA512 3f45b1edfefd658eaa48b4e4ae02c09e39cd6f2f7235bbb8eb9d90d69028df6d53709dac1790f932c7a20e7e77fad8327867ccdec80f302c0d72958d3c1bb138
 EBUILD perf-5.3.7.ebuild 6360 BLAKE2B f3f17e3ba1375c7a2e1e4ae33053318b58344c43fad7c8fdde8b867f4a2d326b201c74260df4438eb2314013d110f6e72488601ffe3f40c0473c8a3de4f080b4 SHA512 87f79ea8c9cd3c5709f6592b7f7ba979cfafe6479809aa3f59ca45d35fc4b2f4b2532fdc4e4c49b903a9a647dfabb93899a7c8c7a7a0a01aafcac54fe3293af3
+EBUILD perf-5.4.7.ebuild 6603 BLAKE2B 337de5593d74f85c0c4595adf493b9932fcff4d5dd727bbbe14f270cfe459383885f6aed194c4fc2f6c31f11b5deaf258acee3932031ad6a6d52e147430af844 SHA512 619a24799a921b3c870b07e3ff395478947bae04da909eb5cad49d9d930566c3add5fabfd9d2c373176dc3e73ae434d5146037aad4f8a2c2fb24af193e345c88
 MISC metadata.xml 1245 BLAKE2B 78921a70a2d435eac57471863f5f8f50eaae16049c6085326cc91a82437b42ada7c3a5fa97124a01f5477b02e37fa03212eb65d9652a71b8c8886f99e2986d22 SHA512 99fcebf78438dd22f2ff35846fadd1280e25154dab4a4ab8bf9bc13d911c7450f92234ed2c39d9905d6b138a783af1e20896e0b09e9dd07813baf5da48234ea2
diff --git a/dev-util/perf/files/perf-5.4.6-fix-clang9.patch b/dev-util/perf/files/perf-5.4.6-fix-clang9.patch
new file mode 100644
index 000000000000..614e62f676d2
--- /dev/null
+++ b/dev-util/perf/files/perf-5.4.6-fix-clang9.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/695726
+Created-By: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
+Created-By: Dennis Schridde <devurandom@gmx.net>
+--- a/tools/perf/util/c++/clang.cpp.orig	2019-12-20 16:39:21.015363866 +0100
++++ b/tools/perf/util/c++/clang.cpp	2019-12-20 16:40:04.051639185 +0100
+@@ -71,7 +71,11 @@
+ 	CompilerInstance Clang;
+ 	Clang.createDiagnostics();
+ 
++#if CLANG_VERSION_MAJOR < 9
+ 	Clang.setVirtualFileSystem(&*VFS);
++#else
++	Clang.createFileManager(&*VFS);
++#endif
+ 
+ #if CLANG_VERSION_MAJOR < 4
+ 	IntrusiveRefCntPtr<CompilerInvocation> CI =
diff --git a/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch b/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch
new file mode 100644
index 000000000000..b1a9bcc25a1e
--- /dev/null
+++ b/dev-util/perf/files/perf-5.4.7-propagate-cflags.patch
@@ -0,0 +1,44 @@
+From 55542113c690a567e728e40d4181d7d037fc21b0 Mon Sep 17 00:00:00 2001
+From: Jiri Olsa <jolsa@kernel.org>
+Date: Fri, 11 Oct 2019 14:21:55 +0200
+Subject: perf tools: Propagate CFLAGS to libperf
+
+Andi reported that 'make DEBUG=1' does not propagate to the libbperf
+code. It's true also for the other flags. Changing the code to propagate
+the global build flags to libperf compilation.
+
+Reported-by: Andi Kleen <ak@linux.intel.com>
+Signed-off-by: Jiri Olsa <jolsa@kernel.org>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Michael Petlan <mpetlan@redhat.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Link: http://lore.kernel.org/lkml/20191011122155.15738-1-jolsa@kernel.org
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+---
+ tools/perf/lib/core.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+(limited to 'tools/perf/lib/core.c')
+
+diff --git a/tools/perf/lib/core.c b/tools/perf/lib/core.c
+index d0b9ae422b9f..58fc894b76c5 100644
+--- a/tools/perf/lib/core.c
++++ b/tools/perf/lib/core.c
+@@ -5,11 +5,12 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <unistd.h>
++#include <linux/compiler.h>
+ #include <perf/core.h>
+ #include <internal/lib.h>
+ #include "internal.h"
+ 
+-static int __base_pr(enum libperf_print_level level, const char *format,
++static int __base_pr(enum libperf_print_level level __maybe_unused, const char *format,
+ 		     va_list args)
+ {
+ 	return vfprintf(stderr, format, args);
+-- 
+cgit 1.2-0.3.lf.el7
+
diff --git a/dev-util/perf/perf-5.4.7.ebuild b/dev-util/perf/perf-5.4.7.ebuild
new file mode 100644
index 000000000000..bec92bb4af81
--- /dev/null
+++ b/dev-util/perf/perf-5.4.7.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit bash-completion-r1 estack eutils toolchain-funcs python-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+	PATCH_VERSION=$(ver_cut 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.xz
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+	# stable-release series
+	LINUX_VER=$(ver_cut 1-2)
+	LINUX_PATCH=patch-${PV}.xz
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+	SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
+# TODO babeltrace
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+	crypt? ( dev-libs/openssl:0= )
+	clang? (
+		sys-devel/clang:*
+		sys-devel/llvm:*
+	)
+	demangle? ( sys-libs/binutils-libs:= )
+	gtk? ( x11-libs/gtk+:2 )
+	java? ( virtual/jre:* )
+	lzma? ( app-arch/xz-utils )
+	numa? ( sys-process/numactl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	slang? ( sys-libs/slang )
+	systemtap? ( dev-util/systemtap )
+	unwind? ( sys-libs/libunwind )
+	zlib? ( sys-libs/zlib )
+	dev-libs/elfutils"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.19
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	java? ( virtual/jdk )
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+src_unpack() {
+	local paths=(
+		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+		include lib "arch/*/lib"
+	)
+
+	# We expect the tar implementation to support the -j option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+			> ${P}.patch
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+
+	# support clang8
+	echo $(clang-major-version)
+	if use clang; then
+		local old_CC=${CC}
+		CC=${CHOST}-clang
+		if [[ $(clang-major-version) -ge 8 ]]; then
+			pushd "${S_K}" >/dev/null || die
+			eapply \
+				"${FILESDIR}/perf-5.1.15-fix-clang8.patch" \
+				"${FILESDIR}/perf-5.4.6-fix-clang9.patch"
+			popd || die
+		fi
+		CC=${old_CC}
+	fi
+
+	pushd "${S_K}" >/dev/null || die
+	eapply "${FILESDIR}/perf-5.4.7-propagate-cflags.patch"
+	popd || die
+}
+
+src_prepare() {
+	default
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		pushd "${S_K}" >/dev/null || die
+		eapply "${WORKDIR}"/${P}.patch
+		popd || die
+	fi
+
+	# Drop some upstream too-developer-oriented flags and fix the
+	# Makefile in general
+	sed -i \
+		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+		"${S}"/Makefile.perf || die
+	# A few places still use -Werror w/out $(WERROR) protection.
+	sed -i -e 's:-Werror::' \
+		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
+
+	# Avoid the call to make kernelversion
+	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
+
+	# The code likes to compile local assembly files which lack ELF markings.
+	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+	# The arch parsing is a bit funky.  The perf tools package is integrated
+	# into the kernel, so it wants an ARCH that looks like the kernel arch,
+	# but it also wants to know about the split value -- i386/x86_64 vs just
+	# x86.  We can get that by telling the func to use an older linux version.
+	# It's kind of a hack, but not that bad ...
+
+	# LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+	local arch=$(tc-arch-kernel)
+	local java_dir
+	use java && java_dir="/etc/java-config-2/current-system-vm"
+	# FIXME: NO_CORESIGHT
+	# FIXME: NO_LIBBABELTRACE
+	emake V=1 VF=1 \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+		prefix="${EPREFIX}/usr" bindir_relative="bin" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		ARCH="${arch}" \
+		JDIR="${java_dir}" \
+		LIBCLANGLLVM=$(usex clang 1 "") \
+		NO_AUXTRACE="" \
+		NO_BACKTRACE="" \
+		NO_CORESIGHT=1 \
+		NO_DEMANGLE=$(puse demangle) \
+		NO_GTK2=$(puse gtk) \
+		NO_JVMTI=$(puse java) \
+		NO_LIBAUDIT=$(puse audit) \
+		NO_LIBBABELTRACE=1 \
+		NO_LIBBIONIC=1 \
+		NO_LIBBPF="" \
+		NO_LIBCRYPTO=$(puse crypt) \
+		NO_LIBDW_DWARF_UNWIND="" \
+		NO_LIBELF="" \
+		NO_LIBNUMA=$(puse numa) \
+		NO_LIBPERL=$(puse perl) \
+		NO_LIBPYTHON=$(puse python) \
+		NO_LIBUNWIND=$(puse unwind) \
+		NO_SDT=$(puse systemtap) \
+		NO_SLANG=$(puse slang) \
+		NO_LZMA=$(puse lzma) \
+		NO_ZLIB= \
+		WERROR=0 \
+		LIBDIR="/usr/libexec/perf-core" \
+		"$@"
+}
+
+src_compile() {
+	# test-clang.bin not build with g++
+	if use clang; then
+		pushd "${S_K}/tools/build/feature/" || die
+		make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
+		popd
+	fi
+	perf_make -f Makefile.perf
+	use doc && perf_make -C Documentation
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	_install_python_ext() {
+		perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
+	}
+
+	perf_make -f Makefile.perf install DESTDIR="${D}"
+	if use python; then
+		python_foreach_impl _install_python_ext
+	fi
+
+	rm -rv "${ED}"/usr/share/doc/perf-tip || die
+
+	if use gtk; then
+		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+			"${ED}"/usr/libexec/perf-core || die
+	fi
+
+	dodoc CREDITS
+
+	dodoc *txt Documentation/*.txt
+	if use doc ; then
+		HTML_DOCS="Documentation/*.html" einstalldocs
+		doman Documentation/*.1
+	fi
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Without the doc USE flag you won't get any documentation nor man pages."
+		elog "And without man pages, you won't get any --help output for perf and its"
+		elog "sub-tools."
+	fi
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 9e95b9aa60af..1caaefc92e77 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,6 @@
-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
+DIST pkgcheck-0.7.3.tar.gz 221266 BLAKE2B f4633a3c115913d8973b82f8ab6a4550334f5091fcf02d4557932e903e984fe659e75fc581a6ab10775630045c8d912bb34b098ffe75c563e338453d90e30b2e SHA512 2f2ec7ab8a43840e9e1ed419564835384419c87aa71f45f233714ddea0f66c837769e47502b3f12cd3cae4107c81e14b483f36c070da59964c0a9274965e0fa1
+DIST pkgcheck-0.7.4.tar.gz 222384 BLAKE2B 4461a4b01755a6e1095c4a80c001381807e7b153ecc1b7770b0b58e2f4aebc2db35cbe4f37354424ecb8c7d139cc2258568df28c00f0a0c082dec8831161c885 SHA512 11ba1ea9e40d56fb24c136296b8ff06643d3519e330421fd0ec336ff5d9fb079f9e04269cb1521a60e6d68fa5cd7c03e0c595a042d7f9ec77944a30e399abe74
+EBUILD pkgcheck-0.7.3.ebuild 1318 BLAKE2B 2c937d6a7b13c51a1a260e36042caa38db07e1267dc820fdd2be880f78a09b4e814ab8872fe930a1d95afd8983450a8ab6b6d7cafcd46ab8d8beb4d62d635ca5 SHA512 dbd792542bfa92a7b28cef7633fc9618e95c84ed940a6a5701f145e05e1752478f9c763c68f4914bfd6cc2309fcdb42e1b3c6eb124ed09d6429de5a07446e1ba
+EBUILD pkgcheck-0.7.4.ebuild 1318 BLAKE2B 9373935373bbb8d12d78e6ee7a3e179e0c2adb1987e1fb22f379352d62486806010ff0d9136a37eb051d29487968eddcaae7b1e0045eea8c30e088cdf463dd18 SHA512 6b5ab1b5492d99685e041a6f78960bf5f0fd23dea682ceb94bf080409dbba5aa3c7cdfc18796ca1a30ea8e7ddfde9fabc92394610a7cef7276e1690adaefd5b6
+EBUILD pkgcheck-9999.ebuild 1318 BLAKE2B 2c937d6a7b13c51a1a260e36042caa38db07e1267dc820fdd2be880f78a09b4e814ab8872fe930a1d95afd8983450a8ab6b6d7cafcd46ab8d8beb4d62d635ca5 SHA512 dbd792542bfa92a7b28cef7633fc9618e95c84ed940a6a5701f145e05e1752478f9c763c68f4914bfd6cc2309fcdb42e1b3c6eb124ed09d6429de5a07446e1ba
 MISC metadata.xml 550 BLAKE2B 546180cdc48f3c64c63ab80711aaeb9f0e84380ebafd76aba32b5744652b9de7d242bc886cde704dab3720c9251b1845deb0fae7f8825477efb5d5562df41afb SHA512 9ecdd3db309e3f7f97452303cd058ebd34423feb050250c8bbc917598e68d55b9e99e2f6a6ac02aadde0e2218c89513dcf13983765852d360c1656c4b945025c
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.3.ebuild
index c4df9003bc22..4626c74a350b 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.3.ebuild
@@ -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.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.8[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.9[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
@@ -40,39 +40,15 @@ RDEPEND+="
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${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_docs
-}
-
 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/pkgcheck/pkgcheck-0.7.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.4.ebuild
new file mode 100644
index 000000000000..bbcc3dd247b0
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.7.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+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="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.5[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.9[${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}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index b81e8708d7c0..4626c74a350b 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -28,8 +28,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.8[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.9[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 796872f0cbcb..4d00a43e545d 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -2,9 +2,11 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 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.1.tar.gz 389620376 BLAKE2B a780ab27feef9747539d9cd607b67c7e047d0a7c1eb6b090a63c4f1c11c80c49e5091a29d80ea249ace1f16acdcd418f0a4901e10c2c623e792da9d7d0e7c9d6 SHA512 4bfa78a5f3993e85ad5ba624ed9e586d195b9f4bffa8bd764e8dba27edc1cdc0bd2b3bba86135156c1f306601db290703e61e7561badc7dcb634dc5826134b1f
 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.1.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.3.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.3.1.ebuild
new file mode 100644
index 000000000000..3bd1b2cb4101
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2019.3.1.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 3fa5aa579a8e..ad5a6cc51d73 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -2,9 +2,11 @@ AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73
 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.1.tar.gz 509724729 BLAKE2B cd466d9c2b0f9be8442c719066d5647f0b9631dde38b782d23250207760247380419d7470826da2d5c4203dbca2742aa8fcd1987a4204d229cd700ac6f6a68f2 SHA512 3c3ad0546926dac4a0e336e04a16bb5f630066c7b2abeb16eda698fcc92dd0c165237bb3ad9b6382b38b989e67b8c3a4649bf8361421c7da6916a99eb3ea4633
 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.1.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.3.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.3.1.ebuild
new file mode 100644
index 000000000000..9196130c9fd9
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.3.1.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 968aa5b76a85..f2948493f33f 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,7 +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
 DIST qbs-src-1.14.1.tar.gz 4365537 BLAKE2B 5a51ddea64023c76b6934634f72ab19d54a3e857efe30d7698a3970d099e436599b53b369d81434cc8e721606513bd487010047e60ccfa289574f606cf020dc5 SHA512 df9031e2749ba598129daef0a6b4322ad964c87a33bfd079bb231170da49c42708740ec63e351607b7e9da1dd11310802b14917eaf2ec97bb747a6df9890f2f3
+DIST qbs-src-1.15.0.tar.gz 4531882 BLAKE2B 95ef24a3c63972a5c4111b68c19d57d83552c8c2fd771bda6291d99564c2e3e80488700ceaf88e64bf6edca1d156dc912757ebe682cb5e3d5aec015640e8641f SHA512 461ac2e1574c163149b080936233144b3941024e7f61c2b2514e58089b7fa100e576c0336e16a3c51a0f4b77e575081350550e23b543e86a2023d524aba18d07
 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
+EBUILD qbs-1.15.0.ebuild 2840 BLAKE2B d0a706886502a5034865421025271088de9fbe5da10fea012bfbe844766b2f712b84df8a3af66b39d3988b72644b24752a51854ee23eb25ee026264105b968a0 SHA512 98b927b20cd37dce72b3fda3089b2de83433af471d61369c65537bce1c99c9db31933cd8297a1028ff67997e4b2e20840abfb5ada415741c9ec3671b2c5b3e2c
 MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/qbs-1.13.1.ebuild b/dev-util/qbs/qbs-1.15.0.ebuild
index 0ce9c72b16a8..5fa4f467db39 100644
--- a/dev-util/qbs/qbs-1.13.1.ebuild
+++ b/dev-util/qbs/qbs-1.15.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit qmake-utils
+inherit qmake-utils toolchain-funcs
 
 MY_P=${PN}-src-${PV}
 
@@ -48,14 +48,6 @@ src_prepare() {
 		sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
 	fi
 
-	# replace hardcoded "lib" with QBS_LIBRARY_DIRNAME
-	sed -i -e '1i include(src/library_dirname.pri)' \
-		-e '/qbslibdir =/ s:/lib:/$$QBS_LIBRARY_DIRNAME:' \
-		static-res.pro || die
-
-	# respect LDFLAGS
-	sed -i -e '/QMAKE_LFLAGS =/ s/ = / += /' src/lib/library.pri || die
-
 	echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
 
 	# skip several tests that fail and/or have additional deps
@@ -88,10 +80,11 @@ src_test() {
 
 	export HOME=${T}
 	export LD_LIBRARY_PATH=${S}/$(get_libdir)
-	export QBS_AUTOTEST_PROFILE=autotests
+	export QBS_AUTOTEST_PROFILE=testProfile
 
-	"${S}"/bin/qbs-setup-toolchains --detect || die
-	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
+	"${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die
+	"${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" ${QBS_AUTOTEST_PROFILE} || die
+	"${S}"/bin/qbs-config profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || die
 
 	einfo "Running autotests"
 
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 776b1eb77bd2..afd6c7a4a237 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 1617 BLAKE2B 50ea4e59b5baaf315c4b6ba71f589f716f3dc8f29079c8a28ff7f66c16ef080ba77e22409c7c39ac92998b17ac9361bc5e55ce228858e61a1cf30a9bb2fad2d5 SHA512 5e62c6ecaeb0db16a54aeeb6e137442d9ace3ab85f64827caf34c27efd8671d5b62a33dcd748a9a479c288d9736116537f6170d78ee5b3af7320b57d21925990
-EBUILD quilt-9999.ebuild 1764 BLAKE2B a013dfb3d65d2e69077e75673bcdad06216b40cc35a198346681e42162567f327ec4a0583868b1e62d7dfd8ea451abe3d420f0e7cf9b3491b066bdf4ffb56179 SHA512 ab39ceb5756c763b911a077ca98cde61143332b21708f62963ec0632ae3b02e4d319bc92a3b7c9fd74a5fbb04d6c537088bc63aeff1fc5b06f97fece2d07e2ef
+EBUILD quilt-9999.ebuild 1753 BLAKE2B 68bd7408caa296dd0d88fe40a39dfb231749a3c96121ce74ff793ea79d7252f57b43a07f04b0bdf2586a319c4b8b59b3a6f9ea00251e0d123b81a135a821ad82 SHA512 9eac74ba4f87b97bfe3d095b83027b5d8c4e67bd624ee8bd1cbc045c3bdc2b3caa1118e932c19bb396c951871130c15197e96bf7ca10dec83502ab2498eebbef
 MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
index 4a4042e9a2f0..1698d8c89c9e 100644
--- a/dev-util/quilt/quilt-9999.ebuild
+++ b/dev-util/quilt/quilt-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 EGIT_REPO_URI="git://git.sv.gnu.org/quilt.git"
 
-[[ ${PV} == 9999 ]] && inherit git-2
+[[ ${PV} == 9999 ]] && inherit git-r3
 
-inherit bash-completion-r1 eutils
+inherit bash-completion-r1
 
 DESCRIPTION="quilt patch manager"
 HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
@@ -30,8 +30,11 @@ RDEPEND="
 "
 
 src_prepare() {
+
+	default
+
 	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${PN}-0.60-no-graphviz.patch"
+	use graphviz || eapply "${FILESDIR}/${PN}-0.66-no-graphviz.patch"
 
 	# remove failing test, because it fails on root-build
 	rm -rf test/delete.test
@@ -45,15 +48,14 @@ src_configure() {
 }
 
 src_install() {
-	emake BUILD_ROOT="${ED}" install
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO quilt.changes doc/README doc/README.MAIL \
-		doc/quilt.pdf
+	emake BUILD_ROOT="${D}" install
 
 	rm -rf "${ED}"/etc/bash_completion.d
 	newbashcomp bash_completion ${PN}
 
+	rm -rf "${ED}"usr/share/doc/${PN}
+	dodoc AUTHORS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
+
 	# Remove the compat symlinks
 	rm -rf "${ED}"/usr/share/quilt/compat
 
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 937868664f85..e37aace24c45 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -3,7 +3,7 @@ DIST re2c-1.2.1.tar.xz 2059304 BLAKE2B b05c41112654cd4c7f15ad70229cde02efc4b04ff
 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 727 BLAKE2B 4dcf16ac9ba35ca08967c6cd7da76906111f19c88f0a91825fcefb002c08a9c3da9a722d847e22f06932a7ba02a5d38c6f48dfaa82d4ece3f01e642b77ec4efd SHA512 683fd01778485a5ce264d0601c6f51849ff3971e77f338fc80ccbf33844b8db5d89a348200d7c41afeccdaaf3ca6e009f25c8889b486b38e885fc3de2aa7c1c3
+EBUILD re2c-1.2.1.ebuild 724 BLAKE2B fb7f8df52e886a9b13062ec02728b4446d209c5cf8730861fb2cfa13b03e10231997e72c19684097c57e57063f10080d32603fbf2da79716e6653116ed17c47b SHA512 ad17c13302bf7ed3bf1c8bd27cc56e3c3f4a86f29089b3a7db9eee17cb05c3220596e77d435004683746c9424f441f4454a88f6ac93870e7c51a2cb06e380f3d
 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 d1ff144d3cf6..d4f33d7ceb90 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/redo/Manifest b/dev-util/redo/Manifest
index e7d642d8d898..08cc36b33c69 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,6 +1,4 @@
-DIST redo-0.41.tar.gz 140177 BLAKE2B 13a73843064fc9fb4607426c1d4d6358b688ba30671d4b5e60428481489ff59060b2bb0b1473f0926702100d311fcaeb846a5898209e07f0d0867766fb951a93 SHA512 c7826e82776a323243dafe5b8011ac619dc0376c2b36524aa1ad23bac54f9d946f395e12a4ea943ee065847db4817afbc5101a703d59e1f90b812a6ef028427b
 DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
-EBUILD redo-0.41.ebuild 1000 BLAKE2B e7013f7f0985fc5c6d69ef5bb424fcdf86a720f13a50bf83cf40c6034a7533eb4e24f98e365311001f5b45c63b4e2af41ed663279457e4d80cb6b7dc692b6471 SHA512 3e25758b7d2e36bab5d225248c80077025348d000b25f488333cc4703759f718bbc02bb05d325c2d08cf6e536d614fea37cb74b168fa6af143de3557d574c72c
-EBUILD redo-0.42.ebuild 1000 BLAKE2B e7013f7f0985fc5c6d69ef5bb424fcdf86a720f13a50bf83cf40c6034a7533eb4e24f98e365311001f5b45c63b4e2af41ed663279457e4d80cb6b7dc692b6471 SHA512 3e25758b7d2e36bab5d225248c80077025348d000b25f488333cc4703759f718bbc02bb05d325c2d08cf6e536d614fea37cb74b168fa6af143de3557d574c72c
-EBUILD redo-99999.ebuild 992 BLAKE2B fc28366bcc74fcc7e5ba7968681be93535524ee2be30490bdd00b8c7821629c6faf07b215015192ff65b3b151eec3df4a1d51d068074754eea3be0f0d5c24f39 SHA512 d79fdce3442042bfc67c9151c075c44fe18f55cf33d4f028e69fe4708bc3cf6a0b91ddcf9d41a731c04257258ab7fc48561432c61ac6857003da45400c396a46
+EBUILD redo-0.42.ebuild 1021 BLAKE2B 20de212a0cfefd413028c3492235a074366971c9680b2ec2b01381531ba3a2fad44f0a38f0404329ab08442ca950c1a5d427251727785ebb65d75280b052727f SHA512 bae98a58189cba6452a5cbe59d5b3a40b50b229cb01830ca97da4e43a2d5029cf4969b9f1d5db1d09138226e8b92ea9bed40872f890c9525ebc1a7e05b755a7d
+EBUILD redo-99999.ebuild 1013 BLAKE2B a9ca19da5f94f366d48a048d85f37028ac557ad8a2477ff3198c25ce1ffcb4a0202d55ea1cef1d087c77cdd61148b126b365b789d0f7c041d516c146e935a0de SHA512 c01c16ed861d3829d070b5663dc4f35728d0f4b4ca89b7becae0e3423a9a87e221cb8a3a2e36f03c5f81c2108acdc489f988fa6879dea1fc3bf7ad02136474e9
 MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
diff --git a/dev-util/redo/redo-0.41.ebuild b/dev-util/redo/redo-0.41.ebuild
deleted file mode 100644
index a979123b762f..000000000000
--- a/dev-util/redo/redo-0.41.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2018-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit multilib multiprocessing python-single-r1
-
-DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
-HOMEPAGE="https://github.com/apenwarr/redo"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-BDEPEND="
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	${BDEPEND}
-"
-S=${WORKDIR}/${PN}-${P}
-
-src_compile() {
-	./do -j$(makeopts_jobs) build || die
-}
-
-src_test() {
-	./do -j$(makeopts_jobs) test || die
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	DOCDIR="${D}/usr/share/doc/${PF}" \
-	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
-	./do -j$(makeopts_jobs) \
-		install || die
-
-	python_fix_shebang "${D}"
-
-	sed -i \
-		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
-		"${D}"/usr/bin/* || die
-}
diff --git a/dev-util/redo/redo-0.42.ebuild b/dev-util/redo/redo-0.42.ebuild
index a979123b762f..17098dc04661 100644
--- a/dev-util/redo/redo-0.42.ebuild
+++ b/dev-util/redo/redo-0.42.ebuild
@@ -8,7 +8,7 @@ inherit multilib multiprocessing python-single-r1
 
 DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
 HOMEPAGE="https://github.com/apenwarr/redo"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+SRC_URI="https://github.com/apenwarr/redo/archive/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index 30c70257c019..57197b9f75d3 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -8,7 +8,7 @@ inherit git-r3 multilib multiprocessing python-single-r1
 
 DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
 HOMEPAGE="https://github.com/apenwarr/redo"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/apenwarr/redo"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-util/reswrap/Manifest b/dev-util/reswrap/Manifest
index 671b81c5902f..6b6ce2061bd7 100644
--- a/dev-util/reswrap/Manifest
+++ b/dev-util/reswrap/Manifest
@@ -1,3 +1,3 @@
-DIST fox-1.6.40.tar.gz 4353981 BLAKE2B f024341d12a9ab0e69284513e0500a0448a66f112a656cfbaa700720a4823f8a13fa81752ed90b843eb27f72bd948ea3fd7ab106e9fb57fc43c728aefcfc88f5 SHA512 63c46b3db2693c91dc6277b08395ab3a0748414471b7bff10062cac9ddc5e743ee7af5b85ea5f7b7dc96723baa1c9ff7ae18a0f503a210b6255ac956023ac17b
-EBUILD reswrap-4.0.0.ebuild 586 BLAKE2B 383fdd5fbc93aefb0c213b72b60d1ba24ef22e3d1b9e24802f3c0a9cdea39d16250c112a98d3906af53d6369b9b4e1d26ae298ce6208390b45e4e2c6f4a44a15 SHA512 9163945bc77146ecc747904daeca92bc8535c27f54536f9952f2067b8120bacd4833b7963e1588100ec9a5fe28d35f54c81f01074cf76f69f5ce3f20a830cb2e
+DIST fox-1.6.57.tar.gz 4284018 BLAKE2B 3efbc6188225f9444fbd347359e8b4041a08fe654acb99c48e4966e501a2f72a44863f2e9b60ae810a259951f89cfc27b9a8b6341e029627066712e0dbf20e40 SHA512 e7b91054a9ea674818803415284cb61572935d22466e446cb37ef68344e2684e8acd567f7c8a6912f939dcbcc37455119ad6a01ac30513f460d0b3937b7e6087
+EBUILD reswrap-4.0.0.ebuild 586 BLAKE2B e9306540faa5b9f94f42257e5efb9e8ac895ae1766232738665c21b815e5af8da487d77e184de507fdd4b5f17385d1e02707286ee9a89766d13413ecd289a007 SHA512 026ae1c4ed2640390605ae03e108288a2349e26978139fd2c83b9100d212f5e5b7e7ca68095f65e7c920f51c83f095f9c19e953835cfb0efbf7eca30c9a41371
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/reswrap/reswrap-4.0.0.ebuild b/dev-util/reswrap/reswrap-4.0.0.ebuild
index fc29ccd3ba1c..eaf511e523d1 100644
--- a/dev-util/reswrap/reswrap-4.0.0.ebuild
+++ b/dev-util/reswrap/reswrap-4.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 FOX_COMPONENT="utils"
-FOX_PV="1.6.40"
+FOX_PV="1.6.57"
 
 inherit fox
 
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index db1ad02cc4ea..fe627a90677f 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -3,10 +3,12 @@ DIST rocm-cmake-2.10.0.tar.gz 14183 BLAKE2B dab0de02815d6ef71a7143dcbd53dab3134b
 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
-EBUILD rocm-cmake-9999.ebuild 741 BLAKE2B ddb75c1be4c7334dba970676f392e207807836507968af8921dc224ea6d9b3c13e84225645f6a589efcd1a591fe602f6b1968a604d39afe35163f20d9ad105db SHA512 01ef6b384fc02a2792cc0963091b90556cb3d0ede1346fff2bde55dbace9c1398f53e0e035894e75c11547eecccd4403710d2ca38b6b1ebbb9677d12b52ca0c4
+DIST rocm-cmake-3.0.0.tar.gz 14239 BLAKE2B 31876239f0bc21b2d37cacb69e3ff1199d7ffa27c92ae1af6e18959af40e6e3bf59279a2fb12b64927e741325c27e6f9b988918e0b6773181bd2ae93fe3b5d8f SHA512 c70e53256c6d4bbd40c9f32939c4aae27ade7191050cd30bcbc7ea8da07493cc1ff8911ebc4a6a4ed1bc12a3e799a5c238539916587a87fd7627408a88fe2f6c
+EBUILD rocm-cmake-0.2.ebuild 688 BLAKE2B 883c05135b78959990b24da69f48b2ef32e78359b1b8cb1b8e44426ef0ba80235c74f835817a76bd804e70124fb99358781dd260cf629a1381ee7e61484e4428 SHA512 25a3e1dc8ce461cfcf3fc8c3eb7a714d0c3ce5e04eecc01d399aae91083abce9bed028e601ef70b2b580bfac0e51ff76f1ab8596f0cc74970b22c7fce4fa5d52
+EBUILD rocm-cmake-2.10.0.ebuild 729 BLAKE2B 1dd5a0ab1ffc6b55e67bc5db389b440b441a4ee7162316ce51129584d709aace675c10b6555830fb82e63657a0fef68c8eaa99088ab928e9a72f5ee35f8dcf86 SHA512 85a40390b62574e0718c81e5846a88ba403712f6140c9cf202710ca09861c0814160c21e9a670a0c452ac272cd3d9107bd505091bb0488d736b43ededda15012
+EBUILD rocm-cmake-2.7.0.ebuild 729 BLAKE2B 1dd5a0ab1ffc6b55e67bc5db389b440b441a4ee7162316ce51129584d709aace675c10b6555830fb82e63657a0fef68c8eaa99088ab928e9a72f5ee35f8dcf86 SHA512 85a40390b62574e0718c81e5846a88ba403712f6140c9cf202710ca09861c0814160c21e9a670a0c452ac272cd3d9107bd505091bb0488d736b43ededda15012
+EBUILD rocm-cmake-2.8.0.ebuild 729 BLAKE2B 1dd5a0ab1ffc6b55e67bc5db389b440b441a4ee7162316ce51129584d709aace675c10b6555830fb82e63657a0fef68c8eaa99088ab928e9a72f5ee35f8dcf86 SHA512 85a40390b62574e0718c81e5846a88ba403712f6140c9cf202710ca09861c0814160c21e9a670a0c452ac272cd3d9107bd505091bb0488d736b43ededda15012
+EBUILD rocm-cmake-2.9.0.ebuild 729 BLAKE2B 1dd5a0ab1ffc6b55e67bc5db389b440b441a4ee7162316ce51129584d709aace675c10b6555830fb82e63657a0fef68c8eaa99088ab928e9a72f5ee35f8dcf86 SHA512 85a40390b62574e0718c81e5846a88ba403712f6140c9cf202710ca09861c0814160c21e9a670a0c452ac272cd3d9107bd505091bb0488d736b43ededda15012
+EBUILD rocm-cmake-3.0.0.ebuild 729 BLAKE2B 1dd5a0ab1ffc6b55e67bc5db389b440b441a4ee7162316ce51129584d709aace675c10b6555830fb82e63657a0fef68c8eaa99088ab928e9a72f5ee35f8dcf86 SHA512 85a40390b62574e0718c81e5846a88ba403712f6140c9cf202710ca09861c0814160c21e9a670a0c452ac272cd3d9107bd505091bb0488d736b43ededda15012
+EBUILD rocm-cmake-9999.ebuild 729 BLAKE2B 1dd5a0ab1ffc6b55e67bc5db389b440b441a4ee7162316ce51129584d709aace675c10b6555830fb82e63657a0fef68c8eaa99088ab928e9a72f5ee35f8dcf86 SHA512 85a40390b62574e0718c81e5846a88ba403712f6140c9cf202710ca09861c0814160c21e9a670a0c452ac272cd3d9107bd505091bb0488d736b43ededda15012
 MISC metadata.xml 468 BLAKE2B a05fff7df6fd53ff6793719b621d44ffec411b8c287a8fae36f6f07860cbbf819328bf579c8a0972d72fc6cbbdaee6dd628d4fadb9a2100e1fe1dc97911cb012 SHA512 2907497bd76b1a7f265c371fc55773a541647ec5c4ae42257a405bacc0b2839023a44b282719c0b9d4938e53eb55d5929679242219254db9ee728463d0b2a69b
diff --git a/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
index eee840d3674b..64d281c7f8bf 100644
--- a/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
+++ b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
@@ -21,5 +21,5 @@ 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
+	cmake_src_prepare
 }
diff --git a/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild
index d6c02fff0fd4..727e94103366 100644
--- a/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild
+++ b/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
@@ -22,5 +22,5 @@ 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
+	cmake_src_prepare
 }
diff --git a/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
index d6c02fff0fd4..727e94103366 100644
--- a/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
+++ b/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
@@ -22,5 +22,5 @@ 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
+	cmake_src_prepare
 }
diff --git a/dev-util/rocm-cmake/rocm-cmake-2.8.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.8.0.ebuild
index d6c02fff0fd4..727e94103366 100644
--- a/dev-util/rocm-cmake/rocm-cmake-2.8.0.ebuild
+++ b/dev-util/rocm-cmake/rocm-cmake-2.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
@@ -22,5 +22,5 @@ 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
+	cmake_src_prepare
 }
diff --git a/dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild
index d6c02fff0fd4..727e94103366 100644
--- a/dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild
+++ b/dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
@@ -22,5 +22,5 @@ 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
+	cmake_src_prepare
 }
diff --git a/dev-util/rocm-cmake/rocm-cmake-3.0.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-3.0.0.ebuild
new file mode 100644
index 000000000000..727e94103366
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-3.0.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
+
+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_src_prepare
+}
diff --git a/dev-util/rocm-cmake/rocm-cmake-9999.ebuild b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
index d6c02fff0fd4..727e94103366 100644
--- a/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
+++ b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
@@ -22,5 +22,5 @@ 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
+	cmake_src_prepare
 }
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 6cfc6e1f382b..40f3c6ccc29d 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -5,10 +5,12 @@ DIST rocminfo-2.6.0.tar.gz 12293 BLAKE2B b08725b45f48e78841da9d6e57bb19a441a423e
 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
-EBUILD rocminfo-2.9.0.ebuild 804 BLAKE2B c1a02bd0c6c66a230ea280049e9071ce66774624230d917372eaafd1960ae52f5d4b41b8d5208fd5a5292835377a42a3b82ea331c01ecc6533bcae2b6a0b52d6 SHA512 9d188e2c80bbfef0408b8b6978c6a9ce9ec2853055a499110cc076642b8252f4dca60c35eb8e58c43fa7f9111cccb2b4faa22d0b90cfe8967ae5daa892a8e89c
-EBUILD rocminfo-9999.ebuild 804 BLAKE2B c1a02bd0c6c66a230ea280049e9071ce66774624230d917372eaafd1960ae52f5d4b41b8d5208fd5a5292835377a42a3b82ea331c01ecc6533bcae2b6a0b52d6 SHA512 9d188e2c80bbfef0408b8b6978c6a9ce9ec2853055a499110cc076642b8252f4dca60c35eb8e58c43fa7f9111cccb2b4faa22d0b90cfe8967ae5daa892a8e89c
+DIST rocminfo-3.0.0.tar.gz 14786 BLAKE2B 4fab1258ff9b43620c79c811678071c38db5afedd9fb5a95227d73e7d2d4104dfbaa72855c845a663b8dabb9ea8f17962baa5ca65613fc40c2d3c3e1c1b7d08b SHA512 94f7c3773b18a8d3bce773b624164d0a4b928b2411ef83307e46634e09259eb8f431f576f0673186f1f44b54c72004818aa10858520b8d86fe283f2f5ed3f5f1
+EBUILD rocminfo-2.10.0.ebuild 792 BLAKE2B d76302e09810ed23f4709eebc60b532e96d4b897cdc99eee5a0ca6daa4e8a8e1b894cfd0f0e9113a9cd9d7ff179ab48ec0b03557a30a11ad9f1b69c7309ba088 SHA512 3ae2e0b0c0b13245667368c3cd4b40c6ee1d9c91273ae8964e8d8df847e1c9fa5c557d4bafc0a92345cb9beded25802d3754c38ccfd528960b91c1471de41994
+EBUILD rocminfo-2.6.0.ebuild 847 BLAKE2B 8375b03a7cd01a6af84544e8527e4546420535f323734794716764d7e529c7be9ca136dbbeac5ba6319f384e45c67e33fb7762a4fd1921fd7e0c271312c2117f SHA512 ce23a52887b25fa71ae92d063030ce41af8d45fba443517bd629dea704d61f3a1e97dab51c14abf087cf4a59e226e40447e6fea197eca9c091d685f110b0ffb5
+EBUILD rocminfo-2.7.0.ebuild 887 BLAKE2B a59f0722d5c80d3de7041a58d2ad4b25c59885e890a02b3315483a411674ed9a562a8d946cc8850bc5cf282996124d7dde61e29573e39fdd316cc7464dad8edc SHA512 706c3f8e26e37c7c53ac51c71843dc4dfe982b335bc0eed481f61043be2a2a00edd65a4b847e5fa6b816580564f378bae747d71f3f957d8665926373940d6253
+EBUILD rocminfo-2.8.0.ebuild 792 BLAKE2B d76302e09810ed23f4709eebc60b532e96d4b897cdc99eee5a0ca6daa4e8a8e1b894cfd0f0e9113a9cd9d7ff179ab48ec0b03557a30a11ad9f1b69c7309ba088 SHA512 3ae2e0b0c0b13245667368c3cd4b40c6ee1d9c91273ae8964e8d8df847e1c9fa5c557d4bafc0a92345cb9beded25802d3754c38ccfd528960b91c1471de41994
+EBUILD rocminfo-2.9.0.ebuild 792 BLAKE2B d76302e09810ed23f4709eebc60b532e96d4b897cdc99eee5a0ca6daa4e8a8e1b894cfd0f0e9113a9cd9d7ff179ab48ec0b03557a30a11ad9f1b69c7309ba088 SHA512 3ae2e0b0c0b13245667368c3cd4b40c6ee1d9c91273ae8964e8d8df847e1c9fa5c557d4bafc0a92345cb9beded25802d3754c38ccfd528960b91c1471de41994
+EBUILD rocminfo-3.0.0.ebuild 792 BLAKE2B d76302e09810ed23f4709eebc60b532e96d4b897cdc99eee5a0ca6daa4e8a8e1b894cfd0f0e9113a9cd9d7ff179ab48ec0b03557a30a11ad9f1b69c7309ba088 SHA512 3ae2e0b0c0b13245667368c3cd4b40c6ee1d9c91273ae8964e8d8df847e1c9fa5c557d4bafc0a92345cb9beded25802d3754c38ccfd528960b91c1471de41994
+EBUILD rocminfo-9999.ebuild 792 BLAKE2B d76302e09810ed23f4709eebc60b532e96d4b897cdc99eee5a0ca6daa4e8a8e1b894cfd0f0e9113a9cd9d7ff179ab48ec0b03557a30a11ad9f1b69c7309ba088 SHA512 3ae2e0b0c0b13245667368c3cd4b40c6ee1d9c91273ae8964e8d8df847e1c9fa5c557d4bafc0a92345cb9beded25802d3754c38ccfd528960b91c1471de41994
 MISC metadata.xml 475 BLAKE2B c1ca0f1d0ec94ae012d3a6c2e5b0a896de75fae32ab8af40d2d0e8747544c15f11ce76cc45bd429d4b5b3b3abde5c896fed362641abf995c4bf9f10077e6933d SHA512 f84d5a379fc07d3410bf6cf946c91056295dccad64f100be02959d94e39eaa47d4fcfed84ea2bd596b2ecccb4ad3267bd86cd76b50d938b235655220fcef1549
diff --git a/dev-util/rocminfo/rocminfo-2.10.0.ebuild b/dev-util/rocminfo/rocminfo-2.10.0.ebuild
index cf2e52c9247d..9a0ed95e0f89 100644
--- a/dev-util/rocminfo/rocminfo-2.10.0.ebuild
+++ b/dev-util/rocminfo/rocminfo-2.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
@@ -28,5 +28,5 @@ src_configure() {
 		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
 		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/rocminfo/rocminfo-2.6.0.ebuild b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
index 31ca101fc69b..d8f13e6406bb 100644
--- a/dev-util/rocminfo/rocminfo-2.6.0.ebuild
+++ b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
@@ -32,5 +32,5 @@ src_configure() {
 		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
 		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/rocminfo/rocminfo-2.7.0.ebuild b/dev-util/rocminfo/rocminfo-2.7.0.ebuild
index 6a46a0806b11..74fb8d24fe31 100644
--- a/dev-util/rocminfo/rocminfo-2.7.0.ebuild
+++ b/dev-util/rocminfo/rocminfo-2.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
@@ -33,5 +33,5 @@ src_configure() {
 		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
 		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/rocminfo/rocminfo-2.8.0.ebuild b/dev-util/rocminfo/rocminfo-2.8.0.ebuild
index cf2e52c9247d..9a0ed95e0f89 100644
--- a/dev-util/rocminfo/rocminfo-2.8.0.ebuild
+++ b/dev-util/rocminfo/rocminfo-2.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
@@ -28,5 +28,5 @@ src_configure() {
 		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
 		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/rocminfo/rocminfo-2.9.0.ebuild b/dev-util/rocminfo/rocminfo-2.9.0.ebuild
index cf2e52c9247d..9a0ed95e0f89 100644
--- a/dev-util/rocminfo/rocminfo-2.9.0.ebuild
+++ b/dev-util/rocminfo/rocminfo-2.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
@@ -28,5 +28,5 @@ src_configure() {
 		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
 		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/rocminfo/rocminfo-3.0.0.ebuild b/dev-util/rocminfo/rocminfo-3.0.0.ebuild
new file mode 100644
index 000000000000..9a0ed95e0f89
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-3.0.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
+
+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_src_configure
+}
diff --git a/dev-util/rocminfo/rocminfo-9999.ebuild b/dev-util/rocminfo/rocminfo-9999.ebuild
index cf2e52c9247d..9a0ed95e0f89 100644
--- a/dev-util/rocminfo/rocminfo-9999.ebuild
+++ b/dev-util/rocminfo/rocminfo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
@@ -28,5 +28,5 @@ src_configure() {
 		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
 		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index abe8b648c865..3031d73c4cc4 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 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
+EBUILD rosdep-0.13.0.ebuild 1517 BLAKE2B fe316205bacf370094664c11bd7d3bf73e410e95dac67b306f125d463cee47dd8282b0631bd9dca1da1fd34fa4b31bd4f5066e573f934d9487f46f8d9475d32d SHA512 6570ef9759ea07a11c7d046c98ef0caa5281c9ce1f4e6839d56c975fd0e7680480463598fbda7e42805606a4063d1af77e167affd5a78ee847738a84d3aff43f
+EBUILD rosdep-0.14.0.ebuild 1517 BLAKE2B fe316205bacf370094664c11bd7d3bf73e410e95dac67b306f125d463cee47dd8282b0631bd9dca1da1fd34fa4b31bd4f5066e573f934d9487f46f8d9475d32d SHA512 6570ef9759ea07a11c7d046c98ef0caa5281c9ce1f4e6839d56c975fd0e7680480463598fbda7e42805606a4063d1af77e167affd5a78ee847738a84d3aff43f
+EBUILD rosdep-0.15.0.ebuild 1517 BLAKE2B fe316205bacf370094664c11bd7d3bf73e410e95dac67b306f125d463cee47dd8282b0631bd9dca1da1fd34fa4b31bd4f5066e573f934d9487f46f8d9475d32d SHA512 6570ef9759ea07a11c7d046c98ef0caa5281c9ce1f4e6839d56c975fd0e7680480463598fbda7e42805606a4063d1af77e167affd5a78ee847738a84d3aff43f
+EBUILD rosdep-9999.ebuild 1517 BLAKE2B fe316205bacf370094664c11bd7d3bf73e410e95dac67b306f125d463cee47dd8282b0631bd9dca1da1fd34fa4b31bd4f5066e573f934d9487f46f8d9475d32d SHA512 6570ef9759ea07a11c7d046c98ef0caa5281c9ce1f4e6839d56c975fd0e7680480463598fbda7e42805606a4063d1af77e167affd5a78ee847738a84d3aff43f
 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 eef6fa96cc88..2e5c95c40b2a 100644
--- a/dev-util/rosdep/rosdep-0.13.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosdep/rosdep-0.14.0.ebuild b/dev-util/rosdep/rosdep-0.14.0.ebuild
index eef6fa96cc88..2e5c95c40b2a 100644
--- a/dev-util/rosdep/rosdep-0.14.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.14.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosdep/rosdep-0.15.0.ebuild b/dev-util/rosdep/rosdep-0.15.0.ebuild
index eef6fa96cc88..2e5c95c40b2a 100644
--- a/dev-util/rosdep/rosdep-0.15.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.15.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index eef6fa96cc88..2e5c95c40b2a 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall/Manifest b/dev-util/rosinstall/Manifest
index 1a581492b020..f1e1bfb351dd 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 1562 BLAKE2B d03e0d878eeda41789e124c2e2e864703c8759f0fda98180a68bf27497a1010f00d6e49c13efb767a4fda936385576d84081037faaf916f3c0153f1b692f6525 SHA512 70e9c779bf38c710f9f1766284d4496f37c3dacfa1c125c1c69e174d9d9508c8b20410cd73fb9a40fa00ba8631b8b73a744a259c8a26af089d043e44ead44434
-EBUILD rosinstall-9999.ebuild 1562 BLAKE2B d03e0d878eeda41789e124c2e2e864703c8759f0fda98180a68bf27497a1010f00d6e49c13efb767a4fda936385576d84081037faaf916f3c0153f1b692f6525 SHA512 70e9c779bf38c710f9f1766284d4496f37c3dacfa1c125c1c69e174d9d9508c8b20410cd73fb9a40fa00ba8631b8b73a744a259c8a26af089d043e44ead44434
+EBUILD rosinstall-0.7.8.ebuild 1558 BLAKE2B cf67f6eee320c859894140beee43f0103205b41fa4cb2dfdc9bca324def123bb9474f54625d3977456d03dbb4899eaf0acbed42ae92bbc9f955246a588b99de4 SHA512 3315066a2c14f10d443f52ae9237f0c49a92cfb3477e98921262f0b32eb3bfe44db545f9865fc93c286ab4f05a73c0a784e13bf1330d0adf053275f4203844d1
+EBUILD rosinstall-9999.ebuild 1558 BLAKE2B cf67f6eee320c859894140beee43f0103205b41fa4cb2dfdc9bca324def123bb9474f54625d3977456d03dbb4899eaf0acbed42ae92bbc9f955246a588b99de4 SHA512 3315066a2c14f10d443f52ae9237f0c49a92cfb3477e98921262f0b32eb3bfe44db545f9865fc93c286ab4f05a73c0a784e13bf1330d0adf053275f4203844d1
 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 b1f832de970c..98808ef69d7a 100644
--- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild
+++ b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
index b1f832de970c..98808ef69d7a 100644
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ b/dev-util/rosinstall/rosinstall-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
index 7c7bc0bf35b4..d7052ba5445e 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 1075 BLAKE2B 7604cc0dc1c57aa1019145eea59118ea2f72f68d6368fd2eae76ca3e0756863c5b1cc98bcdce563e130f2d6ccad7007c249b2f078e0c83d06c61cedc958ace62 SHA512 2753e4a8bb5e92d92da880f154c468eb3bd3d2e279a68d60949d399fe8f9621067eb88749bc9433f6f1093866f4a8137b3cc23368870a5efe694dbe2ec7d7283
-EBUILD rosinstall_generator-9999.ebuild 1075 BLAKE2B 7604cc0dc1c57aa1019145eea59118ea2f72f68d6368fd2eae76ca3e0756863c5b1cc98bcdce563e130f2d6ccad7007c249b2f078e0c83d06c61cedc958ace62 SHA512 2753e4a8bb5e92d92da880f154c468eb3bd3d2e279a68d60949d399fe8f9621067eb88749bc9433f6f1093866f4a8137b3cc23368870a5efe694dbe2ec7d7283
+EBUILD rosinstall_generator-0.1.13.ebuild 933 BLAKE2B cb16793afbfedcbc020f21c98f825a5f152c0e2db8be75e0c5e8f1d82312383bbb4a5c96935f52e0e245e6c68d7d7cf20926c05831b677804cceb31d8923cb7e SHA512 018c7d68e9bc203b1ec2a631af4888ef78d7feadf3516ea7fe038c9474b215e82dc53d472e98d8c69a7bc614db714af46413ca7a5f7ce81d5b447994b83b32f9
+EBUILD rosinstall_generator-0.1.14.ebuild 1068 BLAKE2B a7bc13ba3b7c02e9a71137e0c4e642434e816a3e15ac621f7e7bc857dc7845c894cdd5924d42bc7301e2cff21c75a8de718aad32f3779a77e627473ed016c90b SHA512 8bc8d38ea513650a6cd2bc951e67fced9bd2b10e446189fcfaba110a1ea60c65182dbb53a17e5b453fc2b61dcfca9e28f8dae025afe17c976dc2fe162c56a68b
+EBUILD rosinstall_generator-9999.ebuild 1068 BLAKE2B a7bc13ba3b7c02e9a71137e0c4e642434e816a3e15ac621f7e7bc857dc7845c894cdd5924d42bc7301e2cff21c75a8de718aad32f3779a77e627473ed016c90b SHA512 8bc8d38ea513650a6cd2bc951e67fced9bd2b10e446189fcfaba110a1ea60c65182dbb53a17e5b453fc2b61dcfca9e28f8dae025afe17c976dc2fe162c56a68b
 MISC metadata.xml 353 BLAKE2B 26692ca3eb76500607275909a9c86bc88f7c80114e7840763136902a59dddc8f23dcd766f821aa5beffff9419d39a48e18682f86c8148df7d640977c9b30ebcd SHA512 a681a9f31c4cf06a775ef57f7a942c76d0e8873c4c854fddaf44df0301f3e14bd836727e6816bc74f0ced9e54dfd9335c376c47b8af2a19455c42a3f6ed38a18
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
index da54789d77fc..bffe8ab6f375 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
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 7376d3a404f2..c29af060ec6c 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index 7376d3a404f2..c29af060ec6c 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 8a497b46862d..843f6f90974f 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -2,5 +2,7 @@ AUX rr-5.2.0-c++14.patch 791 BLAKE2B 6e13ead39239a2ec2cfd0a7c9537b7780ede7fdacdc
 AUX rr-5.2.0-tgkill-glibc-2.30.patch 1076 BLAKE2B 52fbe716a4830197800d63eac91188abc45fb55936c1580d965ec0864b06a230bd9e2f13036387cc17ec583bd87c580ae29ea53f9250ac0eb5439c8af629ee30 SHA512 f6d21968118499d4fc1f2d6437904d225a767f36738e859218606c13fe641b74a6eb778170e1a99fa89d5cbb915bcef4294d2c4f71f4d1a8a3b76bf261d079a2
 AUX rr-5.2.0-ucontext_t.patch 1936 BLAKE2B 11f032058be13960f090a851c09e4612d6a2574d6e54c583d1c7741468810c10b38d4e2a5b24496f8c1a6505bcbc47a6f8fa326ae7853f623d71cbe2b6f1fad2 SHA512 4ee8c1f40926e591e98b268461cc0e5eedcc3d5493bed2ebeedbffcf8745fa7899ed076e7e75cd4e4bfdb413e673795a8ed76f0ef00c68170e992d3b07294c95
 DIST mozilla-rr-5.2.0.tar.gz 1168734 BLAKE2B 2f15c4ec4a271f930334577e98b14e37d2a0eb7cd3443e7110d3562ac4ef30c310e6448a588f4e31f2943a6d4ff0af006cbbafc50722543436fcae3bdc8e453f SHA512 4465985f67e9812b62b91ac7942105a9f976faf0c0d7c352a99a638fe6bdfde024f939b3daa922d431c7fc87118ae4d9d039b00345760fb547c349e8737dc168
+DIST mozilla-rr-5.3.0.tar.gz 1343557 BLAKE2B 80ed2feb52fd34b424193902c02408443e5ae943a34d3fe8e75c4c813042c6dd7f39571924ce94aca558ea5f1630f9bda28bea9d5f7e2d429d772a85d3e3e7ad SHA512 6ae37a3ced0c001208fb981abc18f02b912a2851564955dd8da364cb30d9580ea6c91bedbef6495da5d082954d4f261eeaea81df1e9895b4adf948e9998f4c2b
 EBUILD rr-5.2.0-r1.ebuild 1450 BLAKE2B 640c129935a43188cee50dd412ccf639081f2cbda491c93a6391bf0da58474af6abf899e909a100ca8c485394a62f6b494e476f36ce58f3b3f70c4f76881623b SHA512 b1228db164e3e7c56b3092c76b8d018741d1489889a5df5fa4a02b485f7e45d05f3336bc96b8b0cd997b14d82c96895e88b1d445d5cc95e549f24bd9404c271c
+EBUILD rr-5.3.0.ebuild 1330 BLAKE2B 0d78b1912e5649d49369f25e367b6b6e07e40eae5d45fa7bd37a3464dfce20cf0bf6f54420efaf57b302db65d4486fee71c55fc507b27df9637a84e0a748a6bc SHA512 48057aeb3ee5ec4a35920a332b7ecdafd979cf0c48c6eb8bd193a17ee441a9c0ec3592f24f8f979f60d8d57ff6a0ee6e383ed7bc17fec4158d63a24622bce786
 MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a
diff --git a/dev-util/rr/rr-5.3.0.ebuild b/dev-util/rr/rr-5.3.0.ebuild
new file mode 100644
index 000000000000..10707860b4ae
--- /dev/null
+++ b/dev-util/rr/rr-5.3.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake-utils linux-info python-single-r1
+
+DESCRIPTION="Record and Replay Framework"
+HOMEPAGE="https://rr-project.org/"
+SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
+
+LICENSE="MIT BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="multilib test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	sys-libs/zlib
+	dev-libs/capnproto
+	${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	sys-devel/gdb[xml]"
+# Add all the deps needed only at build/test time.
+DEPEND+="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		sys-devel/gdb[xml]
+	)"
+
+RESTRICT="test" # toolchain and kernel version dependent
+
+pkg_setup() {
+	if use kernel_linux; then
+		CONFIG_CHECK="SECCOMP"
+		linux-info_pkg_setup
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i 's:-Werror::' CMakeLists.txt || die #609192
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		ewarn "Test suite fails under FEATURES=usersandbox (bug #632394). Skipping."
+		return 0
+	fi
+
+	cmake-utils_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS=$(usex test)
+		-Ddisable32bit=$(usex !multilib) #636786
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index 6ffd448e3c7a..524ae315c07a 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1,3 +1,3 @@
 DIST scanmem-0.17.tar.gz 220489 BLAKE2B b1ae07f96fd736e9ca6a5d55ad2d6b06b7d0dc4828915e0f2adaa2d58b053d9734ccd7425fb5391289249f838773cf3f9a81dbe76bacd42f41203d27dcffed05 SHA512 6d74f3d1d3492d41cabc342cfd1189815536dcbd57857d8a92e05c5dcaebcb9b1df886aee706c56eaf3344737070ea0fe852eef164ef3fe7907f66c626d8523e
-EBUILD scanmem-0.17.ebuild 1085 BLAKE2B 6845287ac7ac73c9325552fb4d7d103b287a80c1c16fc6c43d263e00bb0f6c79cd19530204408a1124a7196603503c6c0752eec0c9ed7fe6809a47413e270a86 SHA512 849fb77928c61c5b0faf2a04096df8df71543f2f66eab498ca002f8237947c143d40a25d5ea6ba2967a8eb4d546706c628e0bf88a3a06beb2e70d669ad26295d
+EBUILD scanmem-0.17.ebuild 1083 BLAKE2B d64d1e2a4e1302e1db7899afcd32188423a9892560e15bbca5b7391955fb3390bc9fda4425441b39249139b0a0c931324bea269d0e817a3a8848676171231bb0 SHA512 440b52c71c42b5287fb5246d2c1bfa459a69e976d2c31fa3cbf65939a9269f7b6c8ee17deb4e0865338c01c819c7f70499cc72bfc24768ae348ce2ae9410daf7
 MISC metadata.xml 317 BLAKE2B 6d3e5903daa28fe65c109b4a75c8e143a90b7a99095353bc440d41566e9f942f0e415b5561b220bf23fd8e1e0b658d298a6d49d8a442b66042b129c6ee60057f SHA512 44f1ccb76808c4bd5c2bdade165d0f32d68ca07fbec73b2c074ff5b486cb69df2b23cb619d590b5a15d1adfe2f444f2b91aad3f238b29c752aaad97b3a5616b0
diff --git a/dev-util/scanmem/scanmem-0.17.ebuild b/dev-util/scanmem/scanmem-0.17.ebuild
index 542361fbb188..394918a7c74b 100644
--- a/dev-util/scanmem/scanmem-0.17.ebuild
+++ b/dev-util/scanmem/scanmem-0.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit autotools eutils python-single-r1
 
diff --git a/dev-util/sccache/Manifest b/dev-util/sccache/Manifest
index 423d53a05970..59ff6aa7e288 100644
--- a/dev-util/sccache/Manifest
+++ b/dev-util/sccache/Manifest
@@ -194,6 +194,7 @@ DIST safemem-0.2.0.crate 6450 BLAKE2B 44598e47fa6185ec0890b4ba6d0e7b5f52f8892875
 DIST safemem-0.3.0.crate 6947 BLAKE2B 1f3e86944eda42c890a5f5792b7e0a50fe6574b1cbb077b7f08aca7dfd33e26deb0fccb3aa96056de3d637d014658b682aa47b523f0efb1f8145af7bf34ce3a7 SHA512 c7d56204b29e9c0fcf925ccc43a2c910f6cd74d232c500b61996559a783ced3938cefa058128d72759e94edea683bb8922ac5ea631d16e31b58de093d6650b0f
 DIST same-file-0.1.3.crate 7078 BLAKE2B 175390d4c7cbe5b98b27b6d23adcef78beda50277f0035eb58d630591023fff92756e928d2089e915e166c5da6a8b1d5b3184e82576eab5145c1681d46b4e953 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c
 DIST sccache-0.2.10.tar.gz 242187 BLAKE2B cbb6e7673cbecb855c2126f5e5938866097fc57f05e24c74538112b887071e87f63cae864982d7b153f862711b6014e33e1a7145e6d01300123f2031e01d128a SHA512 4f4c051e93d937bae42739d9030dddddde48af59d66c69256172ad660e8d6135c64a77421174b98d304ddff9949d33a04e84e05c255ceccc73cd9cab32663989
+DIST sccache-0.2.12.tar.gz 244128 BLAKE2B 7d20af625ba954c950e4e54f789b3f755178b73d700453361a2a9c8603aa89a6044bd85dcb7895837cb2898ba3adbf5167bb023857b439e73c164cb70f924994 SHA512 1f7495aa7c0749c4bfbd85a88a304a6ed18cc9bfcd341f0f1a668a743ae31d355bc8c5b3199b048d8bcab3ce8e9c8b844a609e4c3009d4e5497dd080aa881a45
 DIST sccache-0.2.8.tar.gz 229658 BLAKE2B 95a9f7f3adf72dfc49e344de10e374e80e09d0d0ec91fa913da06f8c068a3e4632aecf30a3349ae02ebaa5d3984d5342258842656133fac77db33e0aaae7f75b SHA512 3469a50339892ca2495f5655a1bd9fcb21a60bd01384c6851789e806902d95d605a941b1a09e0172eef663bddbc7d32fba3afc9ec76bd2a27f32acb1b7b0a35f
 DIST sccache-0.2.9.tar.gz 239624 BLAKE2B a8b91e71512cf37c4d51fcfab8339345c8c4c6ab542422228f0b573220b2b5256d54c8347e36c54cbe39b6c3b5f7ecea3606b52564dc21af0a143bb2cf49f7aa SHA512 289109338913c935752e9bbcd45b7bf4ef48be03b5a7d92c93ac220b98f04338ff562030cf126f80bda8db41e83b1103e6c2bd55caaeef4d7804157f4f685080
 DIST schannel-0.1.14.crate 38833 BLAKE2B 8825f6325f65c5aa4031a2260c4c54ad2a65634d2ce349bf6c31fc10a76f539dfe58d4de1e04fe6e48e885fabf5f720f5b4e4625f4a511e96c7cfe9837c901fa SHA512 550623a87f01c3c6181dad44d44397f172aa07c1b262a78d6eb38ca0676d68bcb8f231970c4eac87e93286225e17acae09551b07128c43b576ea77caae18c0b7
@@ -298,7 +299,8 @@ DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbe
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
 DIST zip-0.4.2.crate 25852 BLAKE2B ea5e0e32ec66bc0b5bc0f3cfec4c81aa1c8c9dbf714ba024b9d609c2fe9b2cb0b11f9f788e74eb03a1764cf819c51cff6a637ab0580b52031841c00785b9d010 SHA512 84bf51fb83db91d0f6151e7ed4fe59cfcac5dacaa4da58ab09e226a48b14287275f121cf6302b29c693dbcb16e720fbccce7d6d986364ad5d403715235ed98e4
-EBUILD sccache-0.2.10.ebuild 6394 BLAKE2B 2fa1b79a2be1df52ea221cebc80df0a1aafcdc57d94cd87fbb56845823cb1f252d0582003a1bd7bd40a4156befb4dbaffe6793edd8f1d5194fd1e60b9e54ed43 SHA512 152d04c8e9afd0858bc773c3a50bc5ecff8dbfbdd9c285976624e0d67efb16c2a5eb978322fb7ffcd625908a647ffd5352305406cf122654c7afe1109c7f9940
-EBUILD sccache-0.2.8-r2.ebuild 6419 BLAKE2B 9c0405202cc4146003c4852188b365689d25a2c23703131d9114bd2f83817d83d925c384916bce0c49077b0442ecf010f793dd48c1305f79cea49937f47b8c94 SHA512 3e1ab2fc36197abffed8a8e9d646055fe1e459e3659efa2954c82516fb4a3ddf2dc5ff6a6517f7c127a4d63189f96d424f9d2ea4e7f7edbd204d0e3103037acf
-EBUILD sccache-0.2.9.ebuild 6393 BLAKE2B d71659395cb9313b4c7ec1b1402b963b4950ed9d29fba63f99095d344fdf5d5474618c2165831660c19437a98b4e518b548de27bd34cec59f82cde6597a5286c SHA512 2d13edf303a22d84b6480008a099c15e5058d2e53a20b448dea1b06b2d9f2ccb57564035079765bb98b0919b5f05fa650cdbeef75c0a6803b47d8165b4ac0648
+EBUILD sccache-0.2.10.ebuild 6385 BLAKE2B 1cb01844ad67be510d683986031fdd9ff2ebadc0c4bbb336b4a907adfc048ffd33780a14a39ea46c179a64e319476631c6978c47de8c0baf9434e32493125d3b SHA512 afd2b6d84bc62241dbe7db9f8d25cdd5984a30bf1a2c049ff570dd56c884a24a258b423a95491e9520f9605c504a30abccbbc5dfd47fb035d01b71c5c52b9ce2
+EBUILD sccache-0.2.12.ebuild 6406 BLAKE2B 51319706337caf471192178c230ea417652f9d9a05ea3f7e994b8a9e3839d4b5a3c72ae67782169686ad3eff3b300db1c61f88b521ec45b87ae3f7a56ee990a6 SHA512 6a563d57b7a2df6c6643478110ab7816e7f0dd80488ba594cd10429663d38637ce8904fee19c208cd54d8c529a0e20d626ba8d752be5978e20ebe8312384e369
+EBUILD sccache-0.2.8-r2.ebuild 6410 BLAKE2B 68c04331d4560a815560418e08272fc2d7958f2e983810a0b03a9f2d9bf939c2c300cba05ce5b644969092bb13074480d013ef71617077035e4b2f0af57499b5 SHA512 9a64917751abda6eb695e2d34a041f29ff6edb89a32b88054500ef13eb8132ef5a4cd78971d24567b1630f948b0cb8a4ea5b4b3e73a427e6d04a8231081a71ee
+EBUILD sccache-0.2.9.ebuild 6384 BLAKE2B 780a57ecc794e77a245aaebd04c4920fbe371d62907709d82f6598a6349b6aedd48cbaf8e14cc0ce411d93beedb38aa7d8087d11f72433b82a19b2272fdd540d SHA512 f4fc836e377eb8ea415b3b809de37ebb231f2fca274c3691c8525b7abd9838f0d338f258eb35e92143e9c76f9005d2fc28d45066de6223c95781819882981fb6
 MISC metadata.xml 1054 BLAKE2B 13d8f1062d23ea96ec26e52b27c8a3b4a47b3e3f48e06b2b4ae39bb068604556ecb76f3319fc2578babc10cd235ed0ab5a28722b9cbb0a776b8a35d60dead4ea SHA512 2f8a4161a99a060d4651f195eb459173f0e02bf3dd72371611b94408c8cb2f8e7537004a0b9d90cae461cc0ba8e1531a80823db6734cb8241ad57737fd50b5a5
diff --git a/dev-util/sccache/sccache-0.2.10.ebuild b/dev-util/sccache/sccache-0.2.10.ebuild
index 09322dc521cc..79d25139c158 100644
--- a/dev-util/sccache/sccache-0.2.10.ebuild
+++ b/dev-util/sccache/sccache-0.2.10.ebuild
@@ -331,7 +331,7 @@ src_compile(){
 }
 
 src_install() {
-	cargo_src_install --path=. ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+	cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
 
 	keepdir /etc/sccache
 
diff --git a/dev-util/sccache/sccache-0.2.12.ebuild b/dev-util/sccache/sccache-0.2.12.ebuild
new file mode 100644
index 000000000000..1cec922e072b
--- /dev/null
+++ b/dev-util/sccache/sccache-0.2.12.ebuild
@@ -0,0 +1,359 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needs itoa-0.3.4 for tests
+CRATES="
+adler32-1.0.3
+aho-corasick-0.6.9
+ansi_term-0.11.0
+ar-0.6.1
+arc-swap-0.3.6
+arraydeque-0.4.3
+arrayvec-0.4.7
+ascii-0.8.7
+ascii-0.9.1
+assert_cmd-0.9.1
+atty-0.2.11
+backtrace-0.3.9
+backtrace-sys-0.1.24
+base64-0.9.3
+bincode-0.8.0
+bincode-1.0.1
+bitflags-0.9.1
+bitflags-1.0.4
+buf_redux-0.6.3
+bufstream-0.1.4
+build_const-0.2.1
+byteorder-1.2.7
+bytes-0.4.11
+case-0.1.0
+cc-1.0.25
+cfg-if-0.1.6
+chrono-0.4.6
+chunked_transfer-0.3.1
+clap-2.32.0
+cloudabi-0.0.3
+combine-3.6.3
+conhash-0.4.0
+core-foundation-0.2.3
+core-foundation-0.5.1
+core-foundation-sys-0.2.3
+core-foundation-sys-0.5.1
+counted-array-0.1.2
+crc-1.8.1
+crossbeam-deque-0.6.2
+crossbeam-epoch-0.6.1
+crossbeam-utils-0.5.0
+crossbeam-utils-0.6.1
+daemonize-0.3.0
+derive-error-0.0.3
+difference-2.0.0
+directories-1.0.2
+dtoa-0.4.3
+either-1.5.0
+encoding_rs-0.8.10
+env_logger-0.5.13
+error-chain-0.11.0
+error-chain-0.12.1
+escargot-0.3.1
+failure-0.1.3
+failure_derive-0.1.3
+filetime-0.1.15
+filetime-0.2.4
+flate2-1.0.5
+flate2-crc-0.1.1
+float-cmp-0.4.0
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.25
+futures-cpupool-0.1.8
+gcc-0.3.55
+getopts-0.2.18
+h2-0.1.13
+http-0.1.14
+httparse-1.3.3
+humantime-1.1.1
+hyper-0.11.27
+hyper-0.12.16
+hyper-tls-0.1.4
+hyper-tls-0.3.1
+hyperx-0.12.0
+idna-0.1.5
+indexmap-1.0.2
+iovec-0.1.2
+itertools-0.7.9
+itoa-0.3.4
+itoa-0.4.3
+jobserver-0.1.11
+jsonwebtoken-5.0.1
+kernel32-sys-0.2.2
+language-tags-0.2.2
+lazy_static-0.2.11
+lazy_static-1.2.0
+lazycell-1.2.0
+libc-0.2.44
+libflate-0.1.18
+libmount-0.1.11
+linked-hash-map-0.2.1
+local-encoding-0.2.0
+lock_api-0.1.5
+log-0.3.9
+log-0.4.6
+lru-disk-cache-0.3.0
+matches-0.1.8
+md5-0.3.8
+memcached-rs-0.3.0
+memchr-1.0.2
+memchr-2.1.1
+memoffset-0.2.1
+mime-0.2.6
+mime-0.3.12
+mime_guess-1.8.6
+mime_guess-2.0.0-alpha.6
+miniz_oxide-0.2.0
+miniz_oxide_c_api-0.2.0
+mio-0.6.16
+mio-named-pipes-0.1.6
+mio-uds-0.6.7
+miow-0.2.1
+miow-0.3.3
+msdos_time-0.1.6
+multipart-0.13.6
+native-tls-0.1.5
+native-tls-0.2.2
+net2-0.2.33
+nix-0.11.0
+nodrop-0.1.13
+normalize-line-endings-0.2.2
+num-integer-0.1.39
+num-traits-0.1.43
+num-traits-0.2.6
+num_cpus-1.8.0
+number_prefix-0.2.8
+openssl-0.10.15
+openssl-0.9.24
+openssl-probe-0.1.2
+openssl-sys-0.9.39
+owning_ref-0.4.0
+parking_lot-0.6.4
+parking_lot_core-0.3.1
+percent-encoding-1.0.1
+phf-0.7.23
+phf_codegen-0.7.23
+phf_generator-0.7.23
+phf_shared-0.7.23
+pkg-config-0.3.14
+podio-0.1.6
+predicates-0.9.1
+predicates-core-0.9.0
+predicates-tree-0.9.0
+proc-macro2-0.4.24
+pulldown-cmark-0.0.3
+quick-error-1.2.2
+quote-0.3.15
+quote-0.6.10
+rand-0.3.22
+rand-0.4.3
+rand-0.5.5
+rand-0.6.1
+rand_chacha-0.1.0
+rand_core-0.2.2
+rand_core-0.3.0
+rand_hc-0.1.0
+rand_isaac-0.1.0
+rand_pcg-0.1.1
+rand_xorshift-0.1.0
+redis-0.9.1
+redox_syscall-0.1.42
+redox_termios-0.1.1
+regex-1.0.6
+regex-syntax-0.6.3
+relay-0.1.1
+remove_dir_all-0.5.1
+reqwest-0.8.8
+reqwest-0.9.5
+retry-0.4.0
+ring-0.13.5
+rouille-2.2.0
+rust-crypto-0.2.36
+rustc-demangle-0.1.9
+rustc-serialize-0.3.24
+rustc_version-0.2.3
+ryu-0.2.7
+safemem-0.2.0
+safemem-0.3.0
+same-file-0.1.3
+schannel-0.1.14
+scoped-tls-0.1.2
+scopeguard-0.3.3
+security-framework-0.1.16
+security-framework-0.2.1
+security-framework-sys-0.1.16
+security-framework-sys-0.2.1
+selenium-rs-0.1.1
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.80
+serde_derive-1.0.80
+serde_json-1.0.33
+serde_urlencoded-0.5.4
+sha1-0.6.0
+signal-hook-0.1.6
+siphasher-0.2.3
+skeptic-0.4.0
+slab-0.4.1
+smallvec-0.6.6
+socket2-0.3.8
+stable_deref_trait-1.1.1
+string-0.1.2
+strip-ansi-escapes-0.1.0
+strsim-0.7.0
+syn-0.11.11
+syn-0.15.21
+synom-0.11.3
+synstructure-0.10.1
+syslog-4.0.1
+tar-0.4.20
+tempdir-0.3.7
+tempfile-3.0.4
+term-0.5.1
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+threadpool-1.7.1
+time-0.1.40
+tiny_http-0.6.2
+tokio-0.1.13
+tokio-codec-0.1.1
+tokio-core-0.1.17
+tokio-current-thread-0.1.4
+tokio-executor-0.1.5
+tokio-fs-0.1.4
+tokio-io-0.1.10
+tokio-named-pipes-0.1.0
+tokio-process-0.2.3
+tokio-reactor-0.1.7
+tokio-serde-0.1.0
+tokio-serde-bincode-0.1.1
+tokio-service-0.1.0
+tokio-signal-0.2.7
+tokio-tcp-0.1.2
+tokio-threadpool-0.1.9
+tokio-timer-0.2.8
+tokio-tls-0.1.4
+tokio-udp-0.1.3
+tokio-uds-0.2.4
+toml-0.4.9
+treeline-0.1.0
+try-lock-0.1.0
+try-lock-0.2.2
+twoway-0.1.8
+ucd-util-0.1.3
+unicase-1.4.2
+unicase-2.2.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-width-0.1.5
+unicode-xid-0.0.4
+unicode-xid-0.1.0
+unix_socket-0.5.0
+unreachable-1.0.0
+untrusted-0.6.2
+url-1.7.2
+utf8-ranges-1.0.2
+utf8parse-0.1.1
+uuid-0.6.5
+uuid-0.7.1
+vcpkg-0.2.6
+vec_map-0.8.1
+version-compare-0.0.8
+version_check-0.1.5
+void-1.0.2
+vte-0.3.3
+walkdir-1.0.7
+want-0.0.4
+want-0.0.6
+which-2.0.0
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+ws2_32-sys-0.2.1
+xattr-0.2.2
+zip-0.4.2
+"
+
+inherit cargo eutils
+
+DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
+HOMEPAGE="https://github.com/mozilla/sccache/"
+SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="azure dist-client dist-server gcs memcached redis s3"
+
+DEPEND="
+	dist-server? ( dev-libs/openssl:0= )
+	gcs? ( dev-libs/openssl:0= )
+"
+
+RDEPEND="${DEPEND}
+	dist-server? ( sys-apps/bubblewrap )
+"
+
+QA_FLAGS_IGNORED="usr/bin/sccache*"
+
+src_configure() {
+	myfeatures=(
+		$(usev azure)
+		$(usev dist-client)
+		$(usev dist-server)
+		$(usev gcs)
+		$(usev memcached)
+		$(usev redis)
+		$(usev s3)
+	)
+}
+
+src_compile(){
+	cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+src_install() {
+	cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+
+	keepdir /etc/sccache
+
+	einstalldocs
+	dodoc -r docs/.
+
+	if use dist-server; then
+		newinitd "${FILESDIR}"/server.initd-r1 sccache-server
+		newconfd "${FILESDIR}"/server.confd-r1 sccache-server
+
+		newinitd "${FILESDIR}"/scheduler.initd-r1 sccache-scheduler
+		newconfd "${FILESDIR}"/scheduler.confd-r1 sccache-scheduler
+	fi
+}
+
+src_test() {
+	cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+pkg_postinst() {
+	ewarn "${PN} is experimental, please use with care"
+	use memcached && optfeature "memcached backend support" net-misc/memcached
+	use redis && optfeature "redis backend support" dev-db/redis
+}
diff --git a/dev-util/sccache/sccache-0.2.8-r2.ebuild b/dev-util/sccache/sccache-0.2.8-r2.ebuild
index 21a6f2c2688f..3cec993ae5e8 100644
--- a/dev-util/sccache/sccache-0.2.8-r2.ebuild
+++ b/dev-util/sccache/sccache-0.2.8-r2.ebuild
@@ -328,7 +328,7 @@ src_compile(){
 }
 
 src_install() {
-	cargo_src_install --path=. ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+	cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
 
 	keepdir /etc/sccache
 
diff --git a/dev-util/sccache/sccache-0.2.9.ebuild b/dev-util/sccache/sccache-0.2.9.ebuild
index d1941557a46d..9995856c3628 100644
--- a/dev-util/sccache/sccache-0.2.9.ebuild
+++ b/dev-util/sccache/sccache-0.2.9.ebuild
@@ -331,7 +331,7 @@ src_compile(){
 }
 
 src_install() {
-	cargo_src_install --path=. ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+	cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
 
 	keepdir /etc/sccache
 
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index c73d0ccd4368..2498b9341f2a 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,6 +1,11 @@
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
+AUX schroot.tmpfilesd 91 BLAKE2B f731cf3cb0037ec35f8144d2667f3a12fbfcef088454d165cfcdc63d34f433eb7abc9442917c0cccaf48b66cab028db0b04edbd9d1cb2864d257213fe54fd3e6 SHA512 381d715e2a1443d0115a6fa35cc7d43205a1dfa432f40e4903d944c219b8f5f0b076fb93c90c159f1f7edd5cf8a8766653a41e168940da92bae0b186c93eff96
 DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
+DIST schroot_1.6.10-6.debian.tar.xz 76576 BLAKE2B 719c994703df8fb391b3a8c8f83a5afea4247b4f817e16317b6ed0ba7ec0f962d669c4d50a120eabdd9054b1a31bb58cc426324108cf77fe5b1aec0024bc03c2 SHA512 44177da262c0a8a511534aba964196cdb5a8a7ec094727122954638c29cdc9b80ef0a1ffb709c4841918effb44fe2c0f8912ae87cfa9e4696dbbe9f55adb1211
+DIST schroot_1.6.10-7.debian.tar.xz 82524 BLAKE2B 664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5 SHA512 ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
 EBUILD schroot-1.6.10-r4.ebuild 3783 BLAKE2B 6c8840c351a7b42d165c18da51ec73eeab354852c7af75b7a7cc80d3173d02750df3ede79e4ea50ed2136f0696555a95f463d87eb1bc63421f8c8555b0407043 SHA512 e2e410cc7f218c190a09f1515520f7ee40b72ec088e3739576dd05f0ece0d16d24a2bd004f07a0f64f2bd42794ab4cb58934ab69a145e8e5b14e8e0b46c8fe28
-MISC metadata.xml 535 BLAKE2B d75765d4d0f53fbf6469382c1c55285343ce910b13c50997b7840cdaf1f4735af9411f76b18c048db9309f98e63906388836e15cb9cd47ce2c6c437e80220aaa SHA512 1b2ee12df6e663938c1dd3de76ef2597d82f179b3ad8bfea277094a132482b57bb5241a2001919c4b1e94c5569786f2c1d03e3aa567048a0eeaadeb483e93d1f
+EBUILD schroot-1.6.10-r5.ebuild 2783 BLAKE2B 7147a31fcd4e67a4170cefc1294361106cd747a34bad9621301ccde606b1bf284ee606e6c7d3f795e329304424312edd5212eb3711d549378225938a2f284ef0 SHA512 62c2abb5407c6964327026b09ae2a3e918074c08a1b1cf05fb78465f067f2b3b95be1e7f24390d0600f4fc9d0053db3e1d0a682dc8adc0bb4097c1f8f87ee5ac
+EBUILD schroot-1.6.10_p7.ebuild 2854 BLAKE2B ba3181eea961e4f64c1b725645118164741cd4b3851c6364cd01557d065b7654bc8cba95f4deb73c951732e1acbbbd58a0b5d12b473db78d3d040ff5876e2963 SHA512 a125c3a9047d81d40242d0cb5c807a4ac7b07510ce05eb4bd1b567a5efaafa89c7ec0bdc17a7002057b4502f5b17c6391a1fa76c83aca6c51d9e11aa8d51264b
+MISC metadata.xml 615 BLAKE2B 8f6cde0f4bd1d00fed8330dd097b9ce0de021621af06aee3534e9cdaf79ae9353c27d831916d4e53ecfe11f264a3a9111001aff469471d75e1c51a04d55be4d2 SHA512 3ed685c418e1f8aa15d1a50e695aa71c2c2d48888a0b888a06d830c40a617a804d3c2c5f0f0ff14cea4206aee821239b63df273ccaf7452246112c931e6a923b
diff --git a/dev-util/schroot/files/schroot.tmpfilesd b/dev-util/schroot/files/schroot.tmpfilesd
new file mode 100644
index 000000000000..0c91363a9da9
--- /dev/null
+++ b/dev-util/schroot/files/schroot.tmpfilesd
@@ -0,0 +1,2 @@
+d /run/schroot/mount  0755 root root -
+L /var/lib/schroot/mount - - - - /run/schroot/mount
diff --git a/dev-util/schroot/metadata.xml b/dev-util/schroot/metadata.xml
index 2cca4eb6a236..ff1941a852c2 100644
--- a/dev-util/schroot/metadata.xml
+++ b/dev-util/schroot/metadata.xml
@@ -9,5 +9,6 @@
 		<flag name="btrfs">Enable support for chroots using btrfs snapshots</flag>
 		<flag name="dchroot">Enables the building of a wrapper named "dchroot", replacing <pkg>sys-apps/dchroot</pkg></flag>
 		<flag name="lvm">Enable support for chroots using LVM snapshots</flag>
+		<flag name="zfs">Enable support for chroots using ZFS shapshots/clones</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/schroot/schroot-1.6.10-r5.ebuild b/dev-util/schroot/schroot-1.6.10-r5.ebuild
new file mode 100644
index 000000000000..9752f1064497
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.10-r5.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake pam tmpfiles
+
+MY_P=${PN}_${PV}
+DEB_REL=6
+
+DESCRIPTION="Utility to execute commands in a chroot environment"
+HOMEPAGE="https://packages.debian.org/source/sid/schroot"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.xz
+	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${DEB_REL}.debian.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.42.0:=
+	>=sys-apps/util-linux-2.16
+	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	sys-apps/groff
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? (
+		>=app-text/po4a-0.40
+		sys-devel/gettext
+	)
+	test? ( >=dev-util/cppunit-1.10.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/debianutils
+	dchroot? ( !sys-apps/dchroot )
+	nls? ( virtual/libintl )
+"
+
+src_unpack() {
+	unpack ${MY_P}.orig.tar.xz
+	cd "${S}"
+	unpack ${MY_P}-${DEB_REL}.debian.tar.xz
+}
+
+src_prepare() {
+	sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
+	eapply "${S}"/debian/patches/*.patch
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dbtrfs-snapshot=$(usex btrfs)
+		-Ddchroot=$(usex dchroot)
+		-Ddchroot-dsa=$(usex dchroot)
+		-Ddebug=$(usex debug)
+		-Ddoxygen=$(usex doc)
+		-Dlvm-snapshot=$(usex lvm)
+		-Dnls=$(usex nls)
+		-Dpam=$(usex pam)
+		-Dtest=$(usex test)
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
+		-DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
+	)
+	if ! use nls; then
+		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	if [[ $EUID -ne 0 ]]; then
+		ewarn "Disabling tests because you are not root"
+		return 0
+	fi
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
+
+	docinto /usr/share/doc/${PF}/contrib/setup.d
+	dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
+
+	newdoc debian/schroot.NEWS NEWS.debian
+
+	newinitd "${FILESDIR}"/schroot.initd schroot
+	newconfd "${FILESDIR}"/schroot.confd schroot
+	newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf
+
+	if use doc; then
+		docinto html/sbuild
+		dodoc "${BUILD_DIR}"/doc/sbuild/html/*
+		docinto html/schroot
+		dodoc "${BUILD_DIR}"/doc/schroot/html/*
+	fi
+
+	if use pam; then
+		rm -f "${ED}"/etc/pam.d/schroot
+		pamd_mimic_system schroot auth account session
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/dev-util/schroot/schroot-1.6.10_p7.ebuild b/dev-util/schroot/schroot-1.6.10_p7.ebuild
new file mode 100644
index 000000000000..37c1dd419a13
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.10_p7.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake pam tmpfiles
+
+MY_P=${PN}_${PV/_p/-}
+
+DESCRIPTION="Utility to execute commands in a chroot environment"
+HOMEPAGE="https://packages.debian.org/source/sid/schroot"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
+	mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.debian.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.42.0:=
+	>=sys-apps/util-linux-2.16
+	btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
+	lvm? ( sys-fs/lvm2 )
+	pam? ( sys-libs/pam )
+	zfs? ( sys-fs/zfs )
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	sys-apps/groff
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? (
+		>=app-text/po4a-0.40
+		sys-devel/gettext
+	)
+	test? ( >=dev-util/cppunit-1.10.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/debianutils
+	dchroot? ( !sys-apps/dchroot )
+	nls? ( virtual/libintl )
+"
+
+S="${WORKDIR}/${PN}-${PV/%_p*/}"
+
+src_unpack() {
+	unpack ${MY_P/%-*/}.orig.tar.xz
+	cd "${S}"
+	unpack ${MY_P}.debian.tar.xz
+}
+
+src_prepare() {
+	sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
+	eapply "${S}"/debian/patches/*.patch
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dbtrfs-snapshot=$(usex btrfs)
+		-Ddchroot=$(usex dchroot)
+		-Ddchroot-dsa=$(usex dchroot)
+		-Ddebug=$(usex debug)
+		-Ddoxygen=$(usex doc)
+		-Dlvm-snapshot=$(usex lvm)
+		-Dnls=$(usex nls)
+		-Dpam=$(usex pam)
+		-Dtest=$(usex test)
+		-Dzfs-snapshot=$(usex zfs)
+		-Dbash_completion_dir="$(get_bashcompdir)"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
+		-DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount"
+	)
+	if ! use nls; then
+		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all $(usev doc)
+}
+
+src_test() {
+	if [[ $EUID -ne 0 ]]; then
+		ewarn "Disabling tests because you are not root"
+		return 0
+	fi
+
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
+
+	docinto /usr/share/doc/${PF}/contrib/setup.d
+	dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
+
+	newdoc debian/schroot.NEWS NEWS.debian
+
+	newinitd "${FILESDIR}"/schroot.initd schroot
+	newconfd "${FILESDIR}"/schroot.confd schroot
+	newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf
+
+	if use doc; then
+		docinto html/sbuild
+		dodoc "${BUILD_DIR}"/doc/sbuild/html/*
+		docinto html/schroot
+		dodoc "${BUILD_DIR}"/doc/schroot/html/*
+	fi
+
+	if use pam; then
+		rm -f "${ED}"/etc/pam.d/schroot
+		pamd_mimic_system schroot auth account session
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index e4c54f110f32..fa97e4feb49e 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,21 +1,13 @@
 AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d264915a10c4c5908de98719c9a73c37f5f7de32824dce6df32a0884c4aeb53658d05cda5dbb9c6102ecd6307c085719d4e568c2 SHA512 07fa387b9ad50cd1e92495a414973acddac8c062827858b44867ff1da0560c1493d29992fe4ac2c6de8eb37ab218967df9a6d9ffa2cb26be772324a637fadbcb
 AUX scons-3.0.3-respect-cc-etc-r1.patch 3381 BLAKE2B f7003c4fc7b054dbbfe4f185876470cf04461fd1a408f44bbac2967c9e709e7f16293dcdaf2042bda811610ca65e3007dceb0f8764b7ac2ea7675e901159d097 SHA512 054037a917a8cdc57fbca940a23699bb6ba55554b4753774df7d0b5102e0468ebb770910727f96ade949e69a6db94f2ed60e84061bd3967ff2366724980eb129
-AUX scons-3.0.5-jdk-include-path.patch 878 BLAKE2B 7fb21bac419af3a74c6323d02082fedd80221102f87d87781bf2eafac1b877a96e11b992016b97556e24245faee85b67bfd75dcd4f5aab9b9fbdacc4c37788a1 SHA512 9cf4b31387c6630f7a6574913966cfdf355885d6f1e0c5d74951a5e69c187a768931db097e8178db0ec73201b0062a5a9c8c497cec30e9cdd6170c49610c35ff
-AUX scons-3.0.5-jni.h-include-path.patch 875 BLAKE2B ff8e4fc290dd3afc2593fa56d737f3fa1867ae02e7f128fc6316cb2c272db9e90bb345b243a29462dcdfff60f03c75f7e4106713367c988df5f406989b4005f2 SHA512 443297e374f053c0dbc66df50a53556bb3bf68ae372bd8f2150bd4ad21ee1cae22afd24fca62ce528e1d82ca13b8856dc20685711685e89aae144a14315a9ae3
-DIST scons-3.0.5-user.html 1130793 BLAKE2B 24bf6d5d566fe3c06879b797a77df5eda738246ddf5631ee3f0f49c3c44a53916a8cd5bd075bcffa350e1b5c99f53f81f229d4f74bcc871572a02a0dfafefada SHA512 1b9c965fac6b792e049ad1975e104d40ff6b99fe4bd247aa375955daaebb46e2ed42afb8484dad652df71b695b7db2ee92df34dc0f1d3372d55fad0d27c4b78d
-DIST scons-3.0.5-user.pdf 2562305 BLAKE2B 48c206386f163a2779b27ede1b77783067a695e7f59255473343ddd3a19c4d39ceb7c7e5ccf819f76eda9282f5fb8d36bd0250a4a18f5e9d1a65fd3148276173 SHA512 443855ecddd1bc56f06b150da5d7b276a4dfe5ff8c5376b3c35b73f8281a89583308ddd138e120e33f67afa2cdd1b9a1366a533306ba4dfa460f439e4a2f33b4
-DIST scons-3.0.5.gh.tar.gz 5510846 BLAKE2B 64489a9335a9aa0e2b58a78c6bba613de41d7035f03e8b5b1c1db8aae92e54808f1bd5ad4e97b8481db0f5276c184040663ec31d7307c30a6b092c860c0bb1c0 SHA512 afd4e3d5a76c009f7a3f55934c2d479c611df5713fdaf60aaa9860fc685f95a314bbe54df92fcbca3570dc9a5b244dcf08bf63ce0cef837c3767a37628abae02
-DIST scons-3.0.5.tar.gz 655236 BLAKE2B 1ccd35e393b3307e0be830c2a5491712cba59fe476dfd9c461567288eb76a42e10ca1552ce7603facb66caf5c0b82583c563bd2342b9d7c68c8cabbd0317467b SHA512 0477038b014674049f12899b64584d44a85283d521b2422561e42020a5ae296a5af005684087c3ff410ed3fcbdcc5ff61998bc429eb29513f2a864138ffc4945
-DIST scons-3.1.0-user.html 1133694 BLAKE2B b7a208668db2303e873f5e7f09b9ad92d5197801a63ff392b086e0dbf1baa9c19d8208a6d9718aa7869e320d85cf3fcd5f24c5fe41dfded9f4a8d21d4bbb9b63 SHA512 731308886a660770aeb7b17020e99cbeb736a0bad8e138ff2363ea5297866445325daa4802ee051e0c01720aa73856163fb9da2fe5fb11077b9a2197e0c24323
-DIST scons-3.1.0-user.pdf 2564059 BLAKE2B 989469fd21e8989acf8e7ca2cf2c72dc584a3e708743e357fc2bd55173dbf64d9e2795706bc585975e8d86c754e1e44947feedf5156fb2b66c9f5402a9a015c6 SHA512 a92c4590a06ef2f4872e06db6d20bad333c5983b43d258574847d36976522888d6424781f43142b44abf4f8abc6f501b9894c476a9d1497b260d42efd48d8e8b
-DIST scons-3.1.0.gh.tar.gz 5528270 BLAKE2B d56d02f7d4550af8df42b5c5f8fda02a92ad6aedabb44e69bd46cb4ecf0f0de6b86a8f1ea65e9c4e5e57430f47c9ec7f354d366e60569b4c414bb15d4e52cc84 SHA512 3894d17bca02b9aa5426c70d894b8ecfcf3db2b20254b848209c31d8413a8cd1c2a7b2a87ef9bcfe5555980beb2815f62cdbe185098a64ae8b3506c41c867463
-DIST scons-3.1.0.tar.gz 661528 BLAKE2B deb3b8b4d22ec705674be3e2f84bb35b4726d5f7c082a341d2319d471a3302fc89bfdadc7545f0f4cc0c321c67301b364bdb5723a1d10374eee636b486197092 SHA512 b2d61e364bcff29027a7ba70e2a74186ab136b00f147ff358701aaf68f47134e18e24c2a9cb1ff9ec0fb4fb73ffa21e04043157f2b5cd975aca7fc91c69385ee
 DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34fa16bec47a58972b97ba28f9a88254b419b4d2edeb2d920e70cf3e0c739df5357956c8586e5377afcd4125ba0a8 SHA512 bd00bcdcd01b192a42110ec65cdb906963af08f5bbc9d5e61624b5b5b1a667b115b099ce2ef71444a8998171a5544f4caecf3acec9715876d4e9e5baa581e60d
 DIST scons-3.1.1-user.pdf 2564248 BLAKE2B 702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4 SHA512 0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594
 DIST scons-3.1.1.gh.tar.gz 5528538 BLAKE2B cbb13a0ec9c5ade9b965592f012af5a3ab5253a3c30a049da499631ff58fc1201666209316d9fbcc8f0a715b194327f3cebe5a50fde01635fdb0304b8fbbb2f6 SHA512 3347a7ec5c6c7b596c0d51bb4a9654b971734736febe3834df0f40e7839e1f0578dafeae838d5ddd9f3319ac3d17b6790666fa1602c30480eba25122355179a5
 DIST scons-3.1.1.tar.gz 663878 BLAKE2B 095d5f45885ac12937066be247194e70d33e8f5dc0955e7d693c4b0d3a4b61e776bc1d64cd00ebc89d1e85a7992747b8f448255a76c1b6c2d9df8fa173967711 SHA512 2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54
-EBUILD scons-3.0.5-r1.ebuild 2912 BLAKE2B 701e8e7f2a19608f170b03c09f50253c74c154da95580f127dc6d28c434770227f7fa6a154fede155eda571eaf7f0a006330833c78addc5fcd297b3374218458 SHA512 a5b05f16954ae98c5eb1e749480bec23851741e29adf357a560317e58d7e16e40e64ff4d2b92a0f15ee7b2e241d940dd80dcd1f61b0e43acf312d04ae686b890
-EBUILD scons-3.0.5.ebuild 2090 BLAKE2B 1453fd6a734ce773bbfd643fbf896e56e7e514fc1787a54f169f957ffc71614c772116bc545d83ab426b05e0e6464d4fd85e2b2f983cd75a152c5f246218ae16 SHA512 1aa81365b512652a1bce0e009b0549bda333a8d692d1701f196addb5b1e69994af307ccb2aa112dbdfc96b9bd031ac965f188d22500de9dce3d0c463e529a646
-EBUILD scons-3.1.0.ebuild 2643 BLAKE2B 7e4ca6a988170c68eccf2815ac92edf56eecdab56d8e2871271fc81139a72dafc70382a578941d1ac3efae29ca166ba37242d40cd78df5e8b2032997ef08a455 SHA512 0a29ed83e313087921ba30bb7b2d9a2c183ce84891614fa0b0f429fdcafeee30092fac6517aaa1a5eba085e171660ca9e5c329af686ab961012da2d3312622b9
-EBUILD scons-3.1.1.ebuild 2634 BLAKE2B 6b3a2283772fe1e261641725da4bbd0efe962631d3444af10d6e854310dd26c71c9d978fc11571577a5761060b5d6d30383cacbff652a6fa81d7054bc36e0c6d SHA512 feabad95d2bdf583959100f69bca5d3873fbf902c679a4201e5187c7a36f2259588b4fed03ce149c7c0f901ceedf85963cdb26288eca61e7cc1b6b515aa8997c
+DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be3f21c1c90cfa6602b344c52c704f021ed8e611abaf2e24ca06c5116e79fb78ca724c9920186cce35feccbac899d SHA512 a13ed1157f6aad25acbad6e1e3d2c0a16a14dd1d5fa369ba27777ca30eeb31ce37c735c1870c80f7343f0f98a4305fe1ef7c2b679cf2cb9c0d6670f34a3aeba8
+DIST scons-3.1.2-user.pdf 2557502 BLAKE2B 1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321 SHA512 9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169
+DIST scons-3.1.2.gh.tar.gz 5534888 BLAKE2B 63e8b069cfddfed6a2ce8bcb7816b51b1881ca7a1a3e552f2eec5ecd1deae80720b0acfb711ab17067efdc9d0e4aea696e9f4eee6b374071bfc60e7bb79cc58a SHA512 b096501ea37e62f596f16b46b4022ad7979f359b10849d4c5fa17731a6c3ec34e0890374de175a8aa7539ae677777142ccf5dfae39a74696efcdbcc00e89bccf
+DIST scons-3.1.2.tar.gz 668298 BLAKE2B 14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203 SHA512 bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33
+EBUILD scons-3.1.1.ebuild 2631 BLAKE2B be8064d70cc66ca5365f35ff219a2ae9cfa19b1388bcd7acfdf1960e8174fde42bcd616f763722304fb1ebbb865fc438a901e5b687391cb212033095a6a4fbf5 SHA512 bfb40c1a8b05ef701e8898426a6997bf1b5b7e8a83913dedcba1215b58868e02fb64855221706115a56afbd374a0fb2f6bec7536bab9e1c4fbdf1a0d80410a83
+EBUILD scons-3.1.2.ebuild 2710 BLAKE2B 4d12988ec715903909614b9159b7d10d249bd88cf10667349ce3b77afbb1aff78aab272f2077786fb5cd5c8960d6790cc195bcb420b4ee5fabaac576bf5a6d00 SHA512 8644c357e42df186a2709c0c90a550fd2c678cc7508e81c3380d8c2effae7f2a05e3284a1ba6a03caec0afef7b01c8eb667f15477040438207d92a39a42b2629
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch b/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch
deleted file mode 100644
index 708447592fa8..000000000000
--- a/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur old/scons-3.0.5/src/engine/SCons/Tool/JavaCommon.py new/scons-3.0.5/src/engine/SCons/Tool/JavaCommon.py
---- old/src/engine/SCons/Tool/JavaCommon.py	2019-03-27 02:16:32.000000000 +0300
-+++ new/src/engine/SCons/Tool/JavaCommon.py	2019-06-04 10:44:01.000000000 +0300
-@@ -403,7 +403,8 @@
- java_macos_version_include_dir = '/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/'
- 
--java_linux_include_dirs = ['/usr/lib/jvm/default-java/include',
--                        '/usr/lib/jvm/java-*/include']
-+java_linux_include_dirs = ['/usr/lib/jvm/*/include',
-+                        '/opt/*jdk-bin-*/include',
-+                        '/usr/lib*/openjdk-*/include']
- # Need to match path like below (from Centos 7)
- # /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.191.b12-0.el7_5.x86_64/include/
- java_linux_version_include_dirs = ['/usr/lib/jvm/java-*-sun-%s*/include',
diff --git a/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch b/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch
deleted file mode 100644
index 818db02279af..000000000000
--- a/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur old/testing/framework/TestSCons.py new/testing/framework/TestSCons.py
---- old/testing/framework/TestSCons.py	2019-03-27 02:15:48.000000000 +0300
-+++ new/testing/framework/TestSCons.py	2019-06-07 16:13:48.000000000 +0300
-@@ -742,7 +742,8 @@
-             version=''
-             jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Headers/jni.h',
--                        '/usr/lib/jvm/default-java/include/jni.h',
--                        '/usr/lib/jvm/java-*-oracle/include/jni.h']
-+                        '/usr/lib/jvm/*/include/jni.h',
-+                        '/opt/*jdk-bin-*/include/jni.h',
-+                        '/usr/lib*/openjdk-*/include/jni.h']
-         else:
-             jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/jni.h'%version]
-         jni_dirs.extend(['/usr/lib/jvm/java-*-sun-%s*/include/jni.h'%version,
diff --git a/dev-util/scons/scons-3.0.5-r1.ebuild b/dev-util/scons/scons-3.0.5-r1.ebuild
deleted file mode 100644
index b8f27f5dfd17..000000000000
--- a/dev-util/scons/scons-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)
-	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
-	# add Gentoo JDK include installation paths
-	"${FILESDIR}"/scons-3.0.5-jdk-include-path.patch
-)
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-	else
-		mkdir -p "${P}"/src || die
-	fi
-
-	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/},$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-	if use test; then
-		# addtional fix for Gentoo JDK installation paths to find include directory with jni.h
-		eapply "${FILESDIR}"/scons-3.0.5-jni.h-include-path.patch
-	fi
-}
-
-python_test() {
-	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
-	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
-	# unset some env variables to pass appropriate tests
-	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -a --passed \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib"
-
-	# runtest.py script returns "0" if all tests are passed
-	# and returns "2" if there are any tests with "no result"
-	# (i.e. in case if some tools are not installed or it's Windows specific tests)
-	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED%/}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.0.5.ebuild b/dev-util/scons/scons-3.0.5.ebuild
deleted file mode 100644
index 7f7185c37050..000000000000
--- a/dev-util/scons/scons-3.0.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)
-	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-# unresolved & unpredictable test failures
-RESTRICT="test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/},$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED%/}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index d27486f19793..e98a6472fbb1 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/scons/scons-3.1.0.ebuild b/dev-util/scons/scons-3.1.2.ebuild
index 363c4a06dd55..4ba4081a60b3 100644
--- a/dev-util/scons/scons-3.1.0.ebuild
+++ b/dev-util/scons/scons-3.1.2.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
 DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+HOMEPAGE="https://www.scons.org/"
+SRC_URI="
+	https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
 	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
 	)
 	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
 
diff --git a/dev-util/setconf/Manifest b/dev-util/setconf/Manifest
index 7d35cb5e316c..3b993ad2e782 100644
--- a/dev-util/setconf/Manifest
+++ b/dev-util/setconf/Manifest
@@ -1,5 +1,5 @@
 DIST setconf-0.6.6.tar.xz 12620 BLAKE2B 2882c50430a65e6947135808f87674c19bb8a57d0f5ecbb9d3e316b203b359bb79503b1e68931bfac04e52d3d0686fc11f0c74aa4d84797a0d44f8989c26b4cf SHA512 28f62b4dbc5883763cd11480ca059dd8ba120d6dfd964bbf1746ec5cb23fb0f0fd949249f77673d150cb6abd0039ff6f34d79ad744f8abcc765e0af37fbb85ff
 DIST setconf-0.6.7.tar.xz 12700 BLAKE2B 9dd3625f3fa2345ba6f9cb21fffae770a257928c2287e1772f92d831e9b6c09d8c5b09118a146b6704bb5003dd02fb0793ecabc7d8a2410f4f3941bd687b3a14 SHA512 8b247de9f7ac06f77e6251e95c045886cde5b6ca21b0152cb6fdc1456381aacd9051d5221c9fc8149608555e14f85ee2b51acbe65f78d129b1c8b732e093236d
 EBUILD setconf-0.6.6.ebuild 825 BLAKE2B dfc3a1db922cac2b04b22f9cfc91c950ba671ad50babc0ee5f3c6b8661aa238b962c11b3122191544cd1a4430eaa9f85ff3cee4a79c9d05cd1fa7f3477776c43 SHA512 6bb53533220f833457ffe5eac1a45f70d0d52349d3f9a9af9778fd167d057764d0f7b812e9b732fab164a167b916ca07aff87c8944437a4f23e62f4a25d28675
-EBUILD setconf-0.6.7.ebuild 835 BLAKE2B c319ee13af74dfbbfc9cb87cf81547ff1e8800b84ec375f339f714597d859aa2458b275e5e62722ddb4e797ad8627d51776eca6fc170b0cc4bd84107723a1548 SHA512 019b4457fe1805e5209c0d0daac5696c30bfb8a7b314135f056d3e2150567e52f9b20e656977dcefd12f1b5614a4ba531fd2a50b1278cebdfe0c5e289182b658
+EBUILD setconf-0.6.7.ebuild 831 BLAKE2B 75a94f3a8fa6308ab4767b5a07e0b043470d153aab25b0138e527eff9c50fa959f217cdd83406d485f08eb0e692b7b4065a4f17b948ad5343ac19a6d862e1525 SHA512 ac2e0048ee8a9fe52223a26f7edc0ae06716344c150117f876e0e955bdad67bb85a5574b022bf6bd74d03fbe993c6afa36453df9d4f7ac5238342242bd03699f
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/setconf/setconf-0.6.7.ebuild b/dev-util/setconf/setconf-0.6.7.ebuild
index ea8a2e4fb280..80a45d7339c7 100644
--- a/dev-util/setconf/setconf-0.6.7.ebuild
+++ b/dev-util/setconf/setconf-0.6.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit python-single-r1
 
 DESCRIPTION="A small python based utility used to change configuration files"
diff --git a/dev-util/shelltestrunner/Manifest b/dev-util/shelltestrunner/Manifest
index c3a507937645..65974dfab10e 100644
--- a/dev-util/shelltestrunner/Manifest
+++ b/dev-util/shelltestrunner/Manifest
@@ -1,5 +1,5 @@
 DIST shelltestrunner-1.3.5.tar.gz 21428 BLAKE2B af7573a16159baf5dbcbedc10a454b1f09875031cc9d619b287aeaf507744a2a1dc5cde8ea509949097b5364b5b9ac9438705e58d2d08647e5fa6c4eccceec37 SHA512 f0cc03c41fe176ddfd0e498121f5ebafda721b93e9a84f320b445bf797022545e1046ffb3814e2eaac72f0975a2a11fb1de5e0a007c5700de028e57ee66fa093
 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.9.ebuild 1397 BLAKE2B b59eb984a85b37accd82f6817c93feb7186308913a1d0c79ea70c08e6c49637832b92df7b72d66b1bcf760abdbe28250ec236161e9a41b10de01453c92326ef6 SHA512 2578e83aea10803e869f4fcc35006db208c088fe81dd73e64a29df330774715e1fd03ddc2d68a8efa28d05b991b87f25f9d39ad87e9817513cbd8f9f5985850d
+EBUILD shelltestrunner-1.9.ebuild 1424 BLAKE2B 7a8585896b41fe1680bd82550aca07c0e44b75f0f8ccd4e15d72848c6ed46d1fcf0441253b799ec6dbc80e9e35d99189f07fcdbe40eb18a3632eca22b184e1c2 SHA512 7771d6a5ae08f580506a249185f991dc0ee8b1af80e5985eae77f2a7d33053189e8de88a1c2f427d849353bc1776dcd78476e57e5595b20395c60c903fef357d
 MISC metadata.xml 635 BLAKE2B d6582231d4828a390bf96dd9c75dfebc87ef599a2e659f281bee36ac2a1ca3cd73702e38518e47343753766caf772180f19c97b1805f236993d4486d2f15ea2a SHA512 a398308f38fffe954bdcb052e6b22997442c2a303896790c643e3e95cc38976f2d5b8fb9d08a713411fd5ec0aca2d2904a5a388276d69ad132e8780115bac6f8
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
index 59969639f34d..578af97cf823 100644
--- a/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
+++ b/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-haskell/cmdargs-0.7:=
 	>=dev-haskell/diff-0.2.0:=
diff --git a/dev-util/smem/Manifest b/dev-util/smem/Manifest
index affc6230e482..b27414484801 100644
--- a/dev-util/smem/Manifest
+++ b/dev-util/smem/Manifest
@@ -1,3 +1,5 @@
 DIST smem-1.4.tar.gz 15733 BLAKE2B 6c097c10625050a9d3a133144054d9791bb0ae2f498335398889b58c243b4477d38aefd8203a0483016647a6a72b4bcf4b9af23c241c0e87494614ca6cdaeade SHA512 2740b9ebede8e742e3d01f5f2e7a77a4d3ed04bee78585a904d07c299ea5a77be135dd5b6626abfdebcf2742b9004035443d3faeca04ca9b59c603f74708af9b
-EBUILD smem-1.4.ebuild 790 BLAKE2B 8d7be570517876bb0c43a4dfbf02361e1ee8996be9b5e9f0e47eefcfa26bfe0dc4effbaee8096917bcd6db5bc5edc45feb070cd43f3de6e92a03cb5be67f0dba SHA512 888639ed02045f15d2864277b334279255f650992ff66cc042b1685b5cf34964e4926636b70b12064ea727409d3a85bf9fa26d63490af747858796ae88b6e358
+DIST smem-1.5.tar.xz 16016 BLAKE2B 7c7e5dae6b047780275eebe2b9ec4fb06b27b8d3d2e70fc50c07136c18d414d7f51203760ab3bca98906c6566633c908dd18a7a8c390339850d80ad1ffe7f188 SHA512 8f3f5447060e6d857c3eb59ccbebbd62f18280f3993b31e55369b31ea74bc0e54109fd6d3f7088a23c48af050ff67eb738efceb0adeaff1dc7466f50efd9bc82
+EBUILD smem-1.4.ebuild 789 BLAKE2B bc6ee383a3445c9e35d9cf4b43e3f1dfab07226cb027b344611fd5ef372608a8419dddcd9a355a981309be13532bbba398f18247060317bf6ed9608112b7063b SHA512 28c2b8cedaf1c6ee66b2cada67f636dd5ad79a6b032ff3523b3a9db53af9900f86af91789f2e6cef82f887af5d7e43f48595178b8965f84df57c44308d498642
+EBUILD smem-1.5.ebuild 771 BLAKE2B dcf0652e009dc86b694aca4c2bbba6b8392d2b89d9ee7272e4e84d100a6b43252253fb7a5134efe06b6dc040f753ceb8989bcb288401403ba1087173af64fda9 SHA512 8054eca0bf752de1e2021ab2fe65d3982595bb14a524f2bd6a641e217bff3027b12db136569b798e4f85af4ba577366b9995e3887a719f49bab82ad99cf79efd
 MISC metadata.xml 887 BLAKE2B 97eada233bb3bbc6976a34ed5e2ee6b80e0c17e36d7617b2bb109194183878fde46e59a2c38bf84216673850dc21814edf27ba24f189bd03c0240a9c3eed60f1 SHA512 6bb126678342abd8ea5b5c6b4091ffba18d28494db92715d8f2b7dbd363df48d6265579c52340d1b9514b0422b4fcebb0b2f4a9efdfea5e040bf047a1576e478
diff --git a/dev-util/smem/smem-1.4.ebuild b/dev-util/smem/smem-1.4.ebuild
index 410d64cfa06e..d7bae6128dc2 100644
--- a/dev-util/smem/smem-1.4.ebuild
+++ b/dev-util/smem/smem-1.4.ebuild
@@ -13,7 +13,7 @@ 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}"
diff --git a/dev-util/smem/smem-1.5.ebuild b/dev-util/smem/smem-1.5.ebuild
new file mode 100644
index 000000000000..d536b2ed6a3e
--- /dev/null
+++ b/dev-util/smem/smem-1.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+
+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/"
+SRC_URI="https://dev.gentoo.org/~conikost/files/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND="${RDEPEND}"
+
+src_compile() {
+	"$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -o smemcap smemcap.c || die
+}
+
+src_install() {
+	dobin smemcap
+	python_doexe smem
+
+	dodoc README.txt
+	doman smem.8
+}
+
+pkg_postinst() {
+	optfeature "for chart generation." dev-python/matplotlib
+}
diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest
index e90ef157f48e..ca80b4aeb00b 100644
--- a/dev-util/spec-cleaner/Manifest
+++ b/dev-util/spec-cleaner/Manifest
@@ -1,5 +1,5 @@
 AUX spec-cleaner-1.0.6-pytest-runner.patch 348 BLAKE2B 4bdb0a4db5eb581f826f14452c980381756945985e9d45c09f2e7b16fb7f2367e7781d8a1b7b69f02e2c33cb1527fbcd437462cfed9061ca9ed4edfe4a439b9a SHA512 d971124da1dc1b8c93a359bd139bb6fa9226b383d0261a18f2f821a857872b6fc501649f66f5ad754c17e0f86c14c43eba59f25b9f99e804f76ccdcb973bb0ca
 DIST spec-cleaner-1.0.7.tar.gz 450429 BLAKE2B 7ec57076f13c526ca10524a3852a26ddee4581137357dd593312cc1b55d908311c9146ac2b9c0a5f0ea491a2e1cec8b8a3e5dba25467881f656d43872bd69f5f SHA512 705fc3b9d5b927a64bd19bbf6c826464e40ec6b3cc97cd032417f8e4debac721c7e5f0c99e02fafbb5ce3454424a8b398a7827779b0a308549955ecac33d39c7
-EBUILD spec-cleaner-1.0.7.ebuild 1001 BLAKE2B d5327ea117af00cb9c914b05b8033e04c08b6f117f906e06f1f57f6430a088befa784fa23467f2f068863c29f8f2da1cd4a3380d0e4850ae842c7ef01d69413a SHA512 9f61b512cb09bc665efecb0a41651a475325dbfbd1325cf03b99b5440fc307be2de267572d17bb22c527c88ab2d22a712457100c14a496fb84e9384cc51c2728
-EBUILD spec-cleaner-9999.ebuild 1001 BLAKE2B d5327ea117af00cb9c914b05b8033e04c08b6f117f906e06f1f57f6430a088befa784fa23467f2f068863c29f8f2da1cd4a3380d0e4850ae842c7ef01d69413a SHA512 9f61b512cb09bc665efecb0a41651a475325dbfbd1325cf03b99b5440fc307be2de267572d17bb22c527c88ab2d22a712457100c14a496fb84e9384cc51c2728
+EBUILD spec-cleaner-1.0.7.ebuild 995 BLAKE2B 6a57408f00f419787335ce4bd5c8341cc109f50b377c342482eba22b1c1632f918a4ff25eef43bc31c4c6b2992c34172afce0c7f58d877476a7cb91b342c8e91 SHA512 c6b4bf8b544624d599250658fdaf3ef2cd8fa7635d5a4f8f2287366e650b80e8c32462915d373353a785fe725c8e09d7a89745e68443bbf727690b7f6a4dcd95
+EBUILD spec-cleaner-9999.ebuild 995 BLAKE2B 6a57408f00f419787335ce4bd5c8341cc109f50b377c342482eba22b1c1632f918a4ff25eef43bc31c4c6b2992c34172afce0c7f58d877476a7cb91b342c8e91 SHA512 c6b4bf8b544624d599250658fdaf3ef2cd8fa7635d5a4f8f2287366e650b80e8c32462915d373353a785fe725c8e09d7a89745e68443bbf727690b7f6a4dcd95
 MISC metadata.xml 450 BLAKE2B b091afea0453f996442347131d337d2cb516a4a5e08a98e0b0ab4a6f2cdd19f7d4d284f02a9fecf35590998fd3143b9151c3cd6632c0bd7148374d307b0a28c0 SHA512 6f10ea61bcc2e9982fb7e1383959f36c77d881a495a9251819b47d168114272c5f26b7e5bcc80657f5d8a79ec18e0a1e7c54201fa6c773bc64d3ceff2a1ddc3c
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 5ad1196c7df7..1a01126a84cc 100644
--- a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
 inherit distutils-r1
 [[ ${PV} == 9999 ]] && inherit git-r3
diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
index 5ad1196c7df7..1a01126a84cc 100644
--- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
 inherit distutils-r1
 [[ ${PV} == 9999 ]] && inherit git-r3
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 50ab00fe972a..c3deac090575 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-headers-1.3.4_pre20190302.tar.gz 333676 BLAKE2B 7ac46ed9d369164d187564e12438001ebc77c912385b4ef8a5de4ff26942f27ce88486f980b69111e804c6aad5a7f4724913833f0dfd6246bf070dc5023df7df SHA512 d1e6ce59764ad03228cc12fedb1e16fca8c3ab5827882e1f3dec9c3d735125dddbd06fa4955ac3358bec2de8211164511e2d16205f175484e070b2bd87262c51
 DIST spirv-headers-1.5.1.tar.gz 369998 BLAKE2B 7ad91a93d2704baeff9d8dd32c67f4a7d428bc174122a37e1a405865ca8f1d9dfbf6b1d096092f8b2e83610679ddb8d311fb7823411548976c9fef3929449df4 SHA512 6ed09d1b825ad921bb988f260a236c82e9755ca3904a2ac130cf82d876a0de087d8d5f6eba01e923fe565c93a8e3eb46346bba21c64a664598a43063e5e5108c
 EBUILD spirv-headers-1.3.4_pre20190302.ebuild 493 BLAKE2B 855f966aa9be178e9c388a89d6cb7dddd27e398736013a3614c8b2737c3f6261afcf679c1288e92b67b3aef06d35ebb8ca08e455168056dc6b31f41d04e5c693 SHA512 d5a29abfd52149e6e07527055aaad89b879eb91b82c2333ee0b0f05da31c229893487d0de07a012dd487f370de45c34a410db328408e67b039ba4e5071e37fda
-EBUILD spirv-headers-1.5.1.ebuild 495 BLAKE2B 636d80e626f12f3af790fdeebadd530c64ad6f905902619e8f4c3c02c909e7a85f0ae0dd717c70de514cdc53c2ea3519118edab93788a9a0e49dace9c6ec6cc8 SHA512 ab131971a7dfb3da0b8ff950ddae77f3017e75561403f988e00abcc0c0f4cac3fef293b9f961dee2923f176f6ce739a983e100789272e5bd88937296d327a499
+EBUILD spirv-headers-1.5.1.ebuild 493 BLAKE2B 11ce425013c40fca04d20bceb1fd89d125b1530d4865dd7a70e892ac435efb0975473d2921816f3c765192ebdd7d0804d8f8101460fc8adc0c61deeef38d1dde SHA512 d5d5d75cfa975432a5536ad0620a2f5cafecdd47545690541cd243caffc25ae99ea3c0d4d066a86d83a5220aef9b33fbd673d875464f8d8ac01195a3b30a0a72
 EBUILD spirv-headers-9999.ebuild 355 BLAKE2B 087edb2619bceba7e57db82dac834c8d04c2718e81c2fdb56a501f64b21329e66b4e73928b56f21cf705c1abe8627db4b757bee5e6da9faf7998935acf3c84d1 SHA512 b92a326f90e77d1da661f0107c9b5acec51bc14553dc8a8512c6b44345231db97765a40c0b41002952788e1691a8280b5fc898f3d0fe718375522fc182b8abb6
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.1.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.1.ebuild
index 360226753f52..9c56063ff85a 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.1.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index be54ea7a5740..cb6f386e8872 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -2,8 +2,8 @@ AUX spirv-tools-2019.1-Fix-vertex-instrumentation.patch 4948 BLAKE2B 72df8f60ee8
 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
+EBUILD spirv-tools-2019.1-r2.ebuild 1227 BLAKE2B 6a072ed2374b461b452a03e42788b49c14f115e1078f998da4ccbbbadec5c0e6d5d382f069a9ace5aca4f1f476403864b6242bf6bcfb9202d7a29daf5591bb7f SHA512 83616b6255abcca571256073584c34bc88034b45166a2439ab4f3eb2c4b09b2e3b04c9ef5b1ff6b856b0f1cb33cd87bf005cd72653e7fe9503e6421a1e691c82
+EBUILD spirv-tools-2019.10_pre20191027-r1.ebuild 1252 BLAKE2B 854ad0a061de98d4a072eac34d2247fa2e1fae6a8136c3654538780124044b97a50ce89bea04dfc2dac86ba9b3b30b98aa290d0a9ac010b8560e4ce3b37987d4 SHA512 e434df1d41e0ab3ee2184ed19aebc2c429ff107f1fcd170945f0d16027c0a5acadb1d190b04d001229d236e8d0fbd246bac81786e985e548169949687fc996ff
+EBUILD spirv-tools-2019.10_pre20191027.ebuild 1162 BLAKE2B 7b634ddccc286df56f6eb592ba83b2459faff9844658f18dbe39c5dc1116372fffbf1e648663105d8a2dc727a254d52d55dc4dca72a7f8cc8aaa49e3af54ccc6 SHA512 779a439855055b5eb594b48f32da06905ef5bc762aca1322fca0f5c9043c68602397b6df341bbaec2efe8cbd0cf624617e569b4cb169cb5557d63ccac7cc2ae3
+EBUILD spirv-tools-9999.ebuild 1098 BLAKE2B 3c609f34d268c8f31b10757825c002c4aa35ee97446ae8b83a603b08b29c425ae4604ab916173beb3afaca464621c75edc24013a55964b2b6c36a2e50ef447d0 SHA512 75b5ec8960a1e056757f574a3a676ac725f5fba39c74ed05e6e985f1aeeb4aacdc32bbc64bb3777cc279f76353f0876269fa4904094570e7c339f8fe8cec5200
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
index d7c14d9817ca..9c2530ee05d7 100644
--- a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-multilib cmake-utils python-any-r1
 
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
index 6949158877af..aa67c91c8c22 100644
--- a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-multilib cmake-utils python-any-r1
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/${EGIT_COMMIT}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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"
diff --git a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild
index 9a8715e9143d..4706f482cc77 100644
--- a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-multilib cmake-utils python-any-r1
 
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 1b5e6e1f0090..0d2943714b8e 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-multilib cmake-utils git-r3 python-any-r1
 
diff --git a/dev-util/squashdelta/Manifest b/dev-util/squashdelta/Manifest
index 78e27259007d..8d0a6d3e2899 100644
--- a/dev-util/squashdelta/Manifest
+++ b/dev-util/squashdelta/Manifest
@@ -1,4 +1,4 @@
 DIST squashdelta-0.1.1.tar.bz2 78504 BLAKE2B f9aa13b3af35bd97650b31fac718837763b73c2817548a3fde75841993092d717ea78826a3e29d472290d4f9164f8cfcc9f9999613f199c21251080584dbd9f7 SHA512 efe90831e412ed6627d44390054dc89339e85bcd3be452f16fb32d00989bbdc9480dbefcea624941b4866a686a356b0371c33de31903afa70af26eecbe902844
-EBUILD squashdelta-0.1.1.ebuild 783 BLAKE2B 6905a7965dbd483b95770ee99d820dd2a813ff2502e686417d8805ea8e7227da4e52dc4f6cf6af1ae803171367b0d9570800efe440fdae183193db41a755d8d4 SHA512 0c7a13325141e16c869744174c448b4d1a8656dbb9e25f540a6397c69d5e970d400ca5fe7531ddeca8aaaade21fba952b382a16c6fd1bad8bec657da56a06e32
-EBUILD squashdelta-9999.ebuild 812 BLAKE2B 87a425b61222a714e4a4868d5c86ca37ef58c1840137214edb349b1fdf3b94175ee65ece4252be5af89f992b5be4675c2f6b3e92b2133e974b0fe0427bea1748 SHA512 d3551e272526a4c105623bce97879012d998fe57d2bf31d795d9051da3427a7900916f0f8b90d5a725e45fbf3e1282413c13eb32c6eb0ba2faf6ad6fcc799ee0
+EBUILD squashdelta-0.1.1.ebuild 775 BLAKE2B 380c011966dd9c065031c1f415695e639d93714767f68cd94af41fe41612d371ad560efeaa9ef397847826f7eaab4a8be57cb7797fd36ad82bb6c4db555c291b SHA512 bae17dae24389d9334fc987730440835f525cafe46f6099f7f396895f569461525caf1b14a07dfe55e9095258b29bc96400fa0df4f10b67d099e46767410c208
+EBUILD squashdelta-9999.ebuild 808 BLAKE2B 6240a018da041f37e708b819b5624fc1f28595f921c73db988cdd481e4b6efac951690489c9478f3b142e60f0a718b1bd18bb63687f8d22edd0a311cc6e29057 SHA512 bffd8c45745d33b66b440e76fab1ee8c94e59a581d0ce0233526c7b46fcd03c14ffef61dad6b3eec21700d71d6b5a61eb0ad5112c8f983e04a2a458e61217088
 MISC metadata.xml 511 BLAKE2B ed694fc6151e4965dd07c0f9970339340e26c4a813ccd2077a8eca039934d6a82ae7be0be97279887de58c15070cc5e3ebc94a7dd533d1fa7ab0e273ae39bbcc SHA512 2faf5a923e1912bddff4074ec8871cd0b9990d397e83e6d244774a8f9d8445423b0ea629b424cdfd9b8a10e012bfd588c0792408e44770d0a403f5ea635db154
diff --git a/dev-util/squashdelta/squashdelta-0.1.1.ebuild b/dev-util/squashdelta/squashdelta-0.1.1.ebuild
index 9883a7ef38f0..ea0756376a3d 100644
--- a/dev-util/squashdelta/squashdelta-0.1.1.ebuild
+++ b/dev-util/squashdelta/squashdelta-0.1.1.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Efficient (partially uncompressed) SquashFS binary delta tool"
 HOMEPAGE="https://github.com/mgorny/squashdelta/"
-SRC_URI="https://www.github.com/mgorny/squashdelta/releases/download/v${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/mgorny/squashdelta/releases/download/v${PV}/${P}.tar.bz2"
 
 # uses public-domain murmurhash3
 LICENSE="BSD public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="lz4 +lzo"
+# SquashDelta does not make much sense without a compression algo.
+REQUIRED_USE="|| ( lz4 lzo )"
 
 COMMON_DEPEND="
 	lz4? ( app-arch/lz4:0= )
@@ -20,9 +22,6 @@ RDEPEND="${COMMON_DEPEND}
 	dev-util/xdelta:3"
 DEPEND=${COMMON_DEPEND}
 
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
 src_configure() {
 	local myconf=(
 		$(use_enable lz4)
diff --git a/dev-util/squashdelta/squashdelta-9999.ebuild b/dev-util/squashdelta/squashdelta-9999.ebuild
index fd19fe305141..af4bc7cf66ba 100644
--- a/dev-util/squashdelta/squashdelta-9999.ebuild
+++ b/dev-util/squashdelta/squashdelta-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 inherit autotools git-r3
@@ -15,6 +15,8 @@ LICENSE="BSD public-domain"
 SLOT="0"
 KEYWORDS=""
 IUSE="lz4 +lzo"
+# SquashDelta does not make much sense without a compression algo.
+REQUIRED_USE="|| ( lz4 lzo )"
 
 COMMON_DEPEND="
 	lz4? ( app-arch/lz4:0= )
@@ -23,9 +25,6 @@ RDEPEND="${COMMON_DEPEND}
 	dev-util/xdelta:3"
 DEPEND=${COMMON_DEPEND}
 
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/dev-util/squashmerge/Manifest b/dev-util/squashmerge/Manifest
index 28c4f47a9f2d..95a90b074e72 100644
--- a/dev-util/squashmerge/Manifest
+++ b/dev-util/squashmerge/Manifest
@@ -1,4 +1,4 @@
 DIST squashmerge-0.1.tar.bz2 76678 BLAKE2B 01e1a286081af8ac4f19c0c40c206f5d41c287b612e48750a6900d2a182dac31fbf1831e5e85891366c2edce6851f3d0128eda22b2e01f3b45594a06ee656b8b SHA512 a12e78d79a3f212a65c0b979a1ca3de9532ebf33f891ae2fd216425cd044a6f3357496e9f37bebc53a067aa592f7a1eecdeee653929eb443426e48fe342c7683
-EBUILD squashmerge-0.1.ebuild 762 BLAKE2B fa7ffc72dde14fee3a9ffd1086f2ebfaafca66a13b628ffa0c8eef0f80ee0f27651883d05fe127f0fdfcacbaadca58712429ec4f3ff504ffb1337113974cfb65 SHA512 45c8283e5b02e98cbd071d90b0b859d685c67ad13005846a1b3aa979e70d0e66e14b9e49ec299dac3118f31dc1d19eb9145c04937c43afe040d0de795252f66f
-EBUILD squashmerge-9999.ebuild 758 BLAKE2B 0d11cfa67239e6d928cd95534728a9574437f8851780969dec850feede9462b26431a960041311ea88eb548c0f365af1ea2aad9731f478a6414ef62cbee3aae2 SHA512 f62e8b4ff613c37a7f0446fdd24939cef4c40a1f836fce827d58451f2585166054d2220344f806e39f6fc4e3ef18044b28e8187f1a3228feb00b22fbb34a267a
+EBUILD squashmerge-0.1.ebuild 715 BLAKE2B f1c20fecfabf47d62348aa73589207ffc362e268e8d30abd412bfee856dfd5418f68afa4935b1d33d2c1dff27eb5e9906ccf89a40dbf404452748608278fd5af SHA512 f5e16d4ad89335e85e6e431ee076508e757772c5a0f09d770e11a420d4251b5b0e263fb00a0c36e085321c7494a5ca55d15eed75656b357e896cb4adfa2f1a4c
+EBUILD squashmerge-9999.ebuild 754 BLAKE2B 2e352dca7242fd06ff0b858b176bb5dfb5fbe33ada66818d1dfd6827e5b3dfd9898c7d5e737a1772baf2937b3f282e40ebba5959d8a4d7b37e4b7eb67bcecf4a SHA512 2f9df1418b4d79371511f12fd7a6450c2bd3f6672a50a40bc2406e9a867ee9890834e81434e35ab2f0539a09fb725266c71964db5fc2d5c16d2c32b53013e4f2
 MISC metadata.xml 511 BLAKE2B 47b35730a38890b46d8f5b7eb5edb2f3825cceb5f14d662f2c0751a93ff0bbd1411ad6a12983caf5726791cc4a32ae0bc42e1a955970c1492c6679ddde89ffa4 SHA512 c9a260116a954e182965420724da8099b6b01857ba27895fe209308f8d1c0231cc468ca43794139abcae7bb2c403af339d21b98b193f40bfdbe23ae24efc119e
diff --git a/dev-util/squashmerge/squashmerge-0.1.ebuild b/dev-util/squashmerge/squashmerge-0.1.ebuild
index b2b4863ee107..b85491ed9427 100644
--- a/dev-util/squashmerge/squashmerge-0.1.ebuild
+++ b/dev-util/squashmerge/squashmerge-0.1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="dev-util/squashdelta delta merge tool"
 HOMEPAGE="https://github.com/mgorny/squashmerge/"
-SRC_URI="https://www.github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="lz4 +lzo"
+# SquashDelta does not make much sense without a compression algo.
+REQUIRED_USE="|| ( lz4 lzo )"
 
 COMMON_DEPEND="
 	lz4? ( app-arch/lz4:0= )
@@ -21,16 +21,13 @@ RDEPEND="${COMMON_DEPEND}
 	dev-util/xdelta:3"
 DEPEND=${COMMON_DEPEND}
 
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
 DOCS=( FORMAT )
 
 src_configure() {
-	local myeconfargs=(
+	local myconf=(
 		$(use_enable lz4)
 		$(use_enable lzo)
 	)
 
-	autotools-utils_src_configure
+	econf "${myconf[@]}"
 }
diff --git a/dev-util/squashmerge/squashmerge-9999.ebuild b/dev-util/squashmerge/squashmerge-9999.ebuild
index 14b136be6184..3c0238bf3d47 100644
--- a/dev-util/squashmerge/squashmerge-9999.ebuild
+++ b/dev-util/squashmerge/squashmerge-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 inherit autotools git-r3
@@ -14,6 +14,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
 IUSE="lz4 +lzo"
+# SquashDelta does not make much sense without a compression algo.
+REQUIRED_USE="|| ( lz4 lzo )"
 
 COMMON_DEPEND="
 	lz4? ( app-arch/lz4:0= )
@@ -22,9 +24,6 @@ RDEPEND="${COMMON_DEPEND}
 	dev-util/xdelta:3"
 DEPEND=${COMMON_DEPEND}
 
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
 DOCS=( FORMAT )
 
 src_prepare() {
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 8e5cdaa5a003..ed7a6e6d591b 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -6,7 +6,7 @@ DIST strace-5.3.tar.xz 1572708 BLAKE2B 808bc7afc6c70137c44d0f5a47706953bc7c02143
 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 2327 BLAKE2B a754f1f9d19d5c6ec44ad4f9a520adc043a7ba8cc2418472b26312b837ef6afcddc785d787e307531b197270fe437e534d40602feed822975bad0d38b6300e67 SHA512 0846c6f10bfb715cd27d1805cf06e38ba07d1a8ef87ee8c256374468326959a0fb6d4ad83ba1c56c2911a0aa8e770c1352f7038ed636eb068054ad23d8feebe0
+EBUILD strace-5.3.ebuild 2326 BLAKE2B aa1914d8379ed519685b8b779c62e52c2e260fd409163eb7c774d9858f2be592298ce7990d146851aa3fd2082d34499afad6d2d960eee473200c6bc32bfa3dcb SHA512 c25c7cf8caed9df280f1c2a29258d8c983d6e034bf4fb3e8d55c30f312f72e76b6151663b8991c4cb949eee17e809f37aacd65c56da406f4dc40cf5f534db398
 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/strace-5.3.ebuild b/dev-util/strace/strace-5.3.ebuild
index 24e31e77299a..cdfda1bdee3d 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/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 0946b7e95d22..d623528f124a 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,7 +1,9 @@
 DIST stripe-mock-0.34.1.tar.gz 340357 BLAKE2B 127d39b01bbd883141c75e63dc5e0b8834dbc86f375058768072b3de75d3f9e3fabebdfdd9d872c51ad52fec3e2057ae342887c25b496b987d64652c93b204bd SHA512 c9e35867c44bd7d127f91d0f668d39ff67ca9bb2937428f808122555360a77b91f9f5d5648478dc2c4fc04a7b9195fed0a927868fdd22b852022ae2fe0f1e695
 DIST stripe-mock-0.47.0.tar.gz 371383 BLAKE2B 0d619e62c9d071cd0706f0deeab5cb659d994f02df87fc638e319b346cda83548bec9a6068814b7c17a8f62e8f9c2206003bd62f66f844e8f38ee96b10f099fe SHA512 b387556526eea8b02fb3df74b345f5447bc81d7cc9e7f9fe9cd59dfdef7895bd31c882bc3c96c6815c69cc1e1fc3bed8390beb107ecfeb79e69aba4bc115a17e
 DIST stripe-mock-0.63.0.tar.gz 453992 BLAKE2B ece5c4b4141fedd4dc896e5505047c1138a27cea63b4df1ce96b12a41e6e4ddb636ec181bcd1063819a0aa0247302171181d86bd962d0a2063289339c35105c2 SHA512 0e23493808643326e91599620c481130df3b2c50f1d39c64f9f404c54708f71a61a48630f0e3cf4c924e53d29f21d442be5323925fa0096c3bea3e1582676578
+DIST stripe-mock-0.78.0.tar.gz 465275 BLAKE2B 2c55ebe41d378d633288cd667a86db4713f2598de1afe4885a2622f591eb93ff2f3db581d056227a8cc7e3b84bd834e3290e351b368247ed4c564545eedd5374 SHA512 a05ef71c231ce0df37494f4e18b42e6a6ebc341796b753b06704503017fceba7cd2fc2cfaa4764a85468df3f4e65a63fb12fe5841cca3a114e47c33f410c478c
 EBUILD stripe-mock-0.34.1.ebuild 586 BLAKE2B c5a8b5a51422977d7f20767635f8d38be41e94646d83505e497f5835e8bd840fd2e4901ab9055dedd10e54955ddb7e48e426fcd07a64f8e8609a29eb033c9374 SHA512 dae4370ce29be9afc9077be16f9cb942121d7ccd744538e398e16ca3c2807ae2907441b7361627bd6eaf5c87406d0b81c980322b94498421d2e89d84e25ea2e3
 EBUILD stripe-mock-0.47.0.ebuild 586 BLAKE2B c5a8b5a51422977d7f20767635f8d38be41e94646d83505e497f5835e8bd840fd2e4901ab9055dedd10e54955ddb7e48e426fcd07a64f8e8609a29eb033c9374 SHA512 dae4370ce29be9afc9077be16f9cb942121d7ccd744538e398e16ca3c2807ae2907441b7361627bd6eaf5c87406d0b81c980322b94498421d2e89d84e25ea2e3
 EBUILD stripe-mock-0.63.0.ebuild 586 BLAKE2B c5a8b5a51422977d7f20767635f8d38be41e94646d83505e497f5835e8bd840fd2e4901ab9055dedd10e54955ddb7e48e426fcd07a64f8e8609a29eb033c9374 SHA512 dae4370ce29be9afc9077be16f9cb942121d7ccd744538e398e16ca3c2807ae2907441b7361627bd6eaf5c87406d0b81c980322b94498421d2e89d84e25ea2e3
+EBUILD stripe-mock-0.78.0.ebuild 586 BLAKE2B c5a8b5a51422977d7f20767635f8d38be41e94646d83505e497f5835e8bd840fd2e4901ab9055dedd10e54955ddb7e48e426fcd07a64f8e8609a29eb033c9374 SHA512 dae4370ce29be9afc9077be16f9cb942121d7ccd744538e398e16ca3c2807ae2907441b7361627bd6eaf5c87406d0b81c980322b94498421d2e89d84e25ea2e3
 MISC metadata.xml 591 BLAKE2B 0ecadf3b61979e117b020d78ffa50f7fc9ca8e7d36ef9b403b76063849032187dd7b86c1f44f877504874a100989079b238d0d046f5dcc2c9a74608859c2e1e5 SHA512 6e5bb363e28b92303a6793b4605a970253bb6263c2045527d04b21566aed05f6a51002a0af575e37cc644b9c3e0c2b384dab6cd04fe2ae531881054a901b48c4
diff --git a/dev-util/stripe-mock/stripe-mock-0.78.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.78.0.ebuild
new file mode 100644
index 000000000000..e3231b8082cf
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.78.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_SRC="github.com/stripe/stripe-mock"
+EGO_PN=${EGO_SRC}/...
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT ISC BSD-2"
+SLOT="0"
+
+src_install() {
+	golang-build_src_install
+	dobin bin/stripe-mock
+	rm -rf "${D%/}$(get_golibdir_gopath)" || die
+}
diff --git a/dev-util/suse-build/Manifest b/dev-util/suse-build/Manifest
index dfd419efd4ec..095042e6fc3b 100644
--- a/dev-util/suse-build/Manifest
+++ b/dev-util/suse-build/Manifest
@@ -1,4 +1,3 @@
 DIST obs-build-20151105.tar.gz 231249 BLAKE2B 76a61f986123644e97d5242a0280640d897cc94d1a4e459a422f4e86d0d09406d11d91cd9b848f6d53ede03a9d9ffeeffb45b340b4573fad998efae16b5df2bb SHA512 7b6be4a0d6cd82501c05e41e2a08fa2ad30fe28f28ed72d06b2e4acfdb4d5d6759254291510e8797d214e6330d5c186a85d0f104454d0cde2221d94451bbfb23
 EBUILD suse-build-2015.11.05.ebuild 1469 BLAKE2B 1f8ae0633d828132e824abb493813409f756d0393b136da3198e1ab8386184675bdb602dbba0f735acc0ce3662770a466197ec09d9eeca735ad7ed7792f46cd1 SHA512 cf34d0f099035833b5bbbc066086ae5c457b60b3648bf7478a6d0f6f25f687738c8658f595fe23f501d3c1297b95825b8c7f116ddf9b03689c46d97b52a21c34
-EBUILD suse-build-9999.ebuild 1469 BLAKE2B 1f8ae0633d828132e824abb493813409f756d0393b136da3198e1ab8386184675bdb602dbba0f735acc0ce3662770a466197ec09d9eeca735ad7ed7792f46cd1 SHA512 cf34d0f099035833b5bbbc066086ae5c457b60b3648bf7478a6d0f6f25f687738c8658f595fe23f501d3c1297b95825b8c7f116ddf9b03689c46d97b52a21c34
 MISC metadata.xml 425 BLAKE2B 3894aa3ff4e5a4c51e12fe846f9039ae16f953e8989bef521842ab5f2006727fb93b0025dc8410187323308fa3d6f7c0796dc724a2d1b92a0f488d6e4ac2f262 SHA512 391a7281dd299c3f9dba4cfeadbcfda0d95074cd06e7fe37cbe37d8c1b883eccc45d0e1f0b461422805b0f4ea745cf91d01eb68aa392da0222fc004bc1827f5d
diff --git a/dev-util/suse-build/suse-build-9999.ebuild b/dev-util/suse-build/suse-build-9999.ebuild
deleted file mode 100644
index 15f352f1e641..000000000000
--- a/dev-util/suse-build/suse-build-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/openSUSE/obs-build.git"
-
-if [[ "${PV}" == "9999" ]]; then
-	EXTRA_ECLASS="git-2"
-else
-	OBS_PACKAGE="build"
-	OBS_PROJECT="openSUSE:Tools"
-	EXTRA_ECLASS="obs-download"
-fi
-
-inherit eutils ${EXTRA_ECLASS}
-unset EXTRA_ECLASS
-
-DESCRIPTION="Script to build SUSE Linux RPMs"
-HOMEPAGE="https://build.opensuse.org/package/show/openSUSE:Tools/build"
-
-[[ "${PV}" == "9999" ]] || SRC_URI="${OBS_URI}/${PN/suse/obs}-${PV//.}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="symlink"
-[[ "${PV}" == "9999" ]] || \
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	virtual/perl-Digest-MD5
-	virtual/perl-Getopt-Long
-	dev-perl/XML-Parser
-	dev-perl/TimeDate
-	app-shells/bash
-	app-arch/cpio
-	app-arch/rpm
-"
-
-S="${WORKDIR}/${PN/suse/obs}-${PV//.}"
-
-src_compile() { :; }
-
-src_install() {
-	emake DESTDIR="${ED}" pkglibdir=/usr/libexec/suse-build install
-	cd "${ED}"/usr
-	find bin -type l | while read i; do
-		mv "${i}" "${i/bin\//bin/suse-}"
-		use !symlink || dosym "${i/bin\//suse-}" "/usr/${i}"
-	done
-	find share/man/man1 -type f | while read i; do
-		mv "${i}" "${i/man1\//man1/suse-}"
-		use !symlink || dosym "${i/man1\//suse-}" "/usr/${i}"
-	done
-	find . -type f -exec sed -i 's|/usr/lib/build|/usr/libexec/suse-build|' {} +
-
-	# create symlink for default build config
-	dosym /usr/libexec/suse-build/configs/sl42.1.conf /usr/libexec/suse-build/configs/default.conf
-}
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 6950ab2b5a50..ff3a5fa64f91 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,3 +1,3 @@
 DIST sysdig-0.26.4.tar.gz 902181 BLAKE2B a7ac38be2f7a3d7e4f4fdec6a2fbf5305a8224ee27352da70f509139ebefd14616f84c7b8860f50d2546819a94deb1117034bceddd22128fcf25386b835274f2 SHA512 f56f5d0a522b861df4803bfdafcaf8db3fc9c0e751d06c321082757f6828a210cb86bab4550a3b35bf6412f930e44ab0f5cf709a30651c57dd7064a68e273a88
-EBUILD sysdig-0.26.4.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
+EBUILD sysdig-0.26.4.ebuild 1818 BLAKE2B adf4b596e5301a650745609b547b47012c4de89954ceadc5a0d8f6399c25ca50c1c1458f323572a340d833119b00f791a9e62aa6b9b2ed70ffc8d89c59ebbf32 SHA512 6ae75c8dbe947fccf2db51e98ae1f96ec9c9b1f99d9dc8878e44c3a4cb02cb9006f3b2d0543dfd1f504ae25224b2a2099df8b15fd5fc1c9dc6ecb15f5ca09e7c
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.26.4.ebuild b/dev-util/sysdig/sysdig-0.26.4.ebuild
index 2d4c0de2f51f..682c84607cc2 100644
--- a/dev-util/sysdig/sysdig-0.26.4.ebuild
+++ b/dev-util/sysdig/sysdig-0.26.4.ebuild
@@ -7,7 +7,7 @@ MODULES_OPTIONAL_USE=modules
 inherit linux-mod bash-completion-r1 cmake-utils
 
 DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
+HOMEPAGE="https://sysdig.com/"
 SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index c172f1992fb0..b5ef1792dff5 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,6 +1,4 @@
 AUX 3.30.2-elogind.patch 1055 BLAKE2B c25d6b83d75d8155ef09d1aa5cdd8dead79a1fe796028cec79166e24ae8a579af83c396c7f4e91948a56bb2215cb180657728c35d84ee8ed09134d4ee72a17cf SHA512 6ed6fcf43238378486f430bf653cc6f209f6bd42136e14f0888b8b190a63058bfcec8777a6df0f1f454b14ef91c6075d342585a8c339a11604ffc3e712057017
-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 2223 BLAKE2B 12c03c2a1ea0a43e3445a1ec80eb95d5f2132eae1128d003fa4e004f30797b3f9d741ced16262a61240f0483361b8d620abb33e272651b201568a39eeda07453 SHA512 26a2a6ff561ac905236cb494517b65d70e6682098e043166e8ad274adc25452e9b75ea36c8cd1651972b80b31b5a84730186007f286180f34bbad51a41cfa0a0
 MISC metadata.xml 886 BLAKE2B 31416bfe6eb56d58ae1c1953d19cc59ee0cff0c0aa7d6c28f6b95b7b4c9038ea9a8af5025e64f29612b6b919953671eb4940ff60d6baf1c79b8d33bdfae2beff SHA512 5514125c6a2dcb55a06bc81e52bb6c94a804b0dc41ce7d7c83e9ee94f06ddcd585716c12887a6428e1afe3a9268cdc4cd0596d7a036de08f0e70ae3d6366f502
diff --git a/dev-util/sysprof/sysprof-3.30.2-r1.ebuild b/dev-util/sysprof/sysprof-3.30.2-r1.ebuild
deleted file mode 100644
index 66a11836f9bb..000000000000
--- a/dev-util/sysprof/sysprof-3.30.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson systemd xdg
-
-DESCRIPTION="System-wide Linux Profiler"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="elogind gtk systemd"
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	sys-auth/polkit
-	gtk? ( >=x11-libs/gtk+-3.22.0:3 )
-	elogind? ( >=sys-auth/elogind-239.3 )
-	systemd? ( >=sys-apps/systemd-222:0= )
-"
-# libxml2 required for glib-compile-resources; appstream-glib for appdata.xml developer_name tag translation
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PV}-elogind.patch )
-
-src_configure() {
-	# -Dwith_sysprofd=host currently unavailable from ebuild
-	local emesonargs=(
-		$(meson_use gtk enable_gtk)
-		-Dwith_sysprofd=$(usex systemd bundled $(usex elogind bundled none))
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	elog "On many systems, especially amd64, it is typical that with a modern"
-	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
-	elog "debugging is still possible thanks to gcc4/gdb location list feature."
-	elog "However sysprof is not able to construct call trees if frame pointers"
-	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
-	elog "for the libraries and applications involved in the profiling. That"
-	elog "means a CPU register is used for the frame pointer instead of other"
-	elog "purposes, which means a very minimal performance loss when there is"
-	elog "register pressure."
-	if ! use systemd && ! use elogind; then
-		elog ""
-		elog "Without systemd or elogind, sysprof may not function when launched as a"
-		elog "regular user, thus suboptimal running from root account may be necessary."
-		if use gtk; then
-			elog "Under wayland, that limits the recording usage to sysprof-cli utility."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index eb4f039f8f87..f1f1f0e6b440 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 2640 BLAKE2B a1732ec5da7f4cc5d4b855013810bafe254f81bc7efc9414ea4a1f9d163954aa1771801c3bbf979e48842fae4fc66b74403556e5694f0476af9c674876b72a6c SHA512 b341ea05eeb3b9520f6053a14d79e66129444e0180c4efa5986b21a2f76f61ee8d3ee729e56b1d50f64b84cc9df7955a185a047221666e3437ebaa600f5b7ce5
+EBUILD systemtap-4.0-r1.ebuild 2636 BLAKE2B c968d9e81e25b531c7832038bafd61dfa6ad3ef569f27c2b0b2bd51939f315de8183e7e280f9e946ba1b6c56bc4a6894197ce6ee089e21e68ba3518e04565ef8 SHA512 f693fcb7df968a5c0ac4745a9483fc33aa22fa754e875fd123225f1fa40b1fa5c1eca8c6674513bd21c86a8b289c30027332d59d9f618bb43d0eeea8ac4a563f
 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 f81fccce44c7..2a7d055dc2b0 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit linux-info autotools python-single-r1 user
 
@@ -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 8bfb211c6aba..b15f13469e52 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -2,7 +2,7 @@ AUX umockdev-0.9.4-sysmacros.patch 599 BLAKE2B fa261c73cc873ff2aadfc721cdd24dbae
 DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8f6642744849ec3eb85866e4cbce6399679a873b730beddfac2f4bd7572937df4a3db2440ec1bf929849f928bdc6 SHA512 e9086777bb13dbd79b629dc68555d19fb8799720dfc4548926b87d032d94212814cb9e1de10e26f5940a9b5db9a15f62a594f3baf0050ffb9ea30f1563db6d6c
 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 1173 BLAKE2B 02b72e1df2b3a58d122bf33d3ec730bc3313aabffc8a4475634b151a0398be324eaec8729f88fab6b5cd2570aa37b206debd97f2df0c4b61e726995aaef8a2a6 SHA512 06e7c9ed0f148cac8312e0fb1c620a6b01132d2ea7fa645b48141fed2c599bf8be83ad41f18394f6dce67afbdbd55f0b5d3e2390b23292cf8551925476d11747
-EBUILD umockdev-0.9.4.ebuild 727 BLAKE2B d7ab0652bde1b589e13ccdfb884f1bf97cd5536873638b9292b0f2a2409727f59a98ed79e01460a0f9252cedec348eebbeef9999e52ecf296007498290773263 SHA512 4fde96e58a65b16dea1a0502b0347a78693773c44e185c3f87b1c68b863ae358d70105431116f882ca38818a19ce9febaa7e5c47ae2ccdd5e88560906328cb64
+EBUILD umockdev-0.11.3.ebuild 1034 BLAKE2B 589e674984d981478e38547eeb04bc69e56667b6747e2a23734d6942cb29588679c677ede17252ecff72cfb7091c97ff6c9fbaaae253cc6953c04143d31da528 SHA512 f60cc5d48b4e6f4f4e1f730a13fe935fb9480cbee61f43480d64de17af0353b79a071b1f61c53f419794cbb77831297754d670150f5941db2efb513d399512cf
+EBUILD umockdev-0.12.1.ebuild 1169 BLAKE2B 3174bf2be83164aa8c1cb5ecb6eab68da576d23d0327ed09f0b6a57c711f51e90b058e6c7e8138bcf9badf474fd15048c85ed3f5550b0fb7a5b2b42c1b660dc5 SHA512 12906cca30dcce8ee3c08e783428a79403ec3490d0832aeffe284021d7a41a02c0c0a132d85ea487fe5bdd703faf2e6583c46b506a3e5b0908f85736e7e9fe61
+EBUILD umockdev-0.9.4.ebuild 723 BLAKE2B 429f95763cb1f393e74273598a26f32e9c3c01bbe32b9cd1ef3c3929499c504b5c9c91d3b92ba4357cbd9b9d8c22d125269c1e59b88eabae870a7d0ef37c9a1c SHA512 aecba648af8462ec81f65d565ba1b0e5aa45834c18d2fcd0e22979509aab2344913294238961a28815e52c97ef793322ea6959dd93feeb03177883e6c01b7d1f
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.11.3.ebuild b/dev-util/umockdev/umockdev-0.11.3.ebuild
index 3b6f95571010..3d52cf6d2c80 100644
--- a/dev-util/umockdev/umockdev-0.11.3.ebuild
+++ b/dev-util/umockdev/umockdev-0.11.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index 1fe8c46289cf..b9da4873d6c1 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-util/umockdev/umockdev-0.9.4.ebuild b/dev-util/umockdev/umockdev-0.9.4.ebuild
index 07743116fe0c..0b6c981d4548 100644
--- a/dev-util/umockdev/umockdev-0.9.4.ebuild
+++ b/dev-util/umockdev/umockdev-0.9.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-any-r1
 
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index 6b98d5732329..9f2385ad69ee 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 1342 BLAKE2B c2eb0b60d26f486102b8b40d853a0d0d6f8a67ffa81df45e7d93b6e38262ff9be02acbed0303238fe49c07d541119c61c942a81ebbe97e1d23036769595f883e SHA512 c9cd83fdd23b8b7111d4c8733a44a21fbfd3fb5cdf37f3c051d7d6090782b33fe941edebcdf5fb77018c55a81ff91f5c2a43d5c5289c2ccb4753cb6ac28b2bb6
-EBUILD vint-0.3.19.ebuild 1008 BLAKE2B badbf8251e1c880686e073ca408436e729e969859976160dbc7b3144844590b9a43bde89d56e8a0c56a571158030432edca08c53460f1094c6699450f47051c9 SHA512 d8c3ec17eed7938e5a65449c4074c8e3b017ca9b162a75fee57b830065a44529d457e3a03428402ff51dab7d95f882ae281f18ecf566169beac4cf4d5619664d
+EBUILD vint-0.3.18.ebuild 1338 BLAKE2B 750be9348f76ca1df4376b40f778f9c049fe5c15bef2625d434eeb7f7426296677c0569ab8d15ef4b4c79fa837f4266c2293b805f46c4c877359e889087c82ca SHA512 8c921ced87aa1173ba61da4c9885654652b053d8d0880818c3cd515321b067c84f947879d1fe85c2a7c57f59e3ebdc6b1aba8e2696e671ec848d2c6490dfd5e0
+EBUILD vint-0.3.19.ebuild 1004 BLAKE2B b7e151566e3939d1c9deff717ae243676c38000ac07f71b5bd252ee97389a08ae38cb421f15503d1388946221a1872fe9d9b449617e37f6a53f849ad600b46b3 SHA512 2e832b6d523c3f2fcbce88cc8363e4fbf857a493263d0913a5030412d525d784e0f9ae31ac3db39bd0c8b6e00cad11c666424775d78b2849061cd648ea6d2dfe
 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 1b732f39b0a9..31bbe3b8b535 100644
--- a/dev-util/vint/vint-0.3.18.ebuild
+++ b/dev-util/vint/vint-0.3.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/vint/vint-0.3.19.ebuild b/dev-util/vint/vint-0.3.19.ebuild
index aecd0e282e6b..b91fdf6bce9e 100644
--- a/dev-util/vint/vint-0.3.19.ebuild
+++ b/dev-util/vint/vint-0.3.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 92f1c096aa7f..7989ad45874d 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-headers-1.1.114.tar.gz 596033 BLAKE2B 707b820ab37e7de92540196c181dea7a0ef1461e15f2b39f4a8355f265ec8d422e69987f3e49f210b8e9f8ebe20f99a682805b2c9b94755f94d2a1b2213b67d5 SHA512 6da91d7207575437f4322ddcacda25f85910266012625a2485124d8dc7d91d88386cc8d93ae5ded4f9e7d862b7139573118df550022ec912a5b2685048cbc6ce
 DIST vulkan-headers-1.1.125.tar.gz 662594 BLAKE2B 7cd18b74ff804ed02df3378485f0783332bd09bf898769c48ded20f7a6495b5208cfae3616de401e17ffcec30421b48222520dcd90b03ad83b548405fd8a656c SHA512 355df13347aaa3b32ad62185810c20d1b2f358525d9d8036f6bc7643e7505a25c087a51e05fa7b0758e4ee63221bb39d01d6e14bfb7f99a53cb2127ca5db5d67
 EBUILD vulkan-headers-1.1.114.ebuild 627 BLAKE2B f3f2eb31d94953b415ae94c4ca5ba2b45eb65d348645c66f55c8e00473f861a30e85779d27f3413fc9fa4ab59048f7ca0f9aec958c8551b3980f30099e72fd7a SHA512 bcb14b626aae1c5264ac3eb708ed4baf62a591b55ba97a24308dee64b19517b7fb197b978b84f9cc7eaeaf48078b37c6b30b3800298895f999c27b3a676194c4
-EBUILD vulkan-headers-1.1.125.ebuild 784 BLAKE2B c47201396af371bc6882a6159441906242ea78af661f237c6267fb830d48c4a6ff63f129e94d979dc727778a0517c9b648fc2b79a7bacd6aeaeeb746762520c9 SHA512 e9a29f6b59b818b9fc2645a7cdce3703622aaf1e7791b9c9b83946bf7d9f95d262f94b56e095528c5a101f854e190677e0c0f2a1cb595e926a5de24be34da5c9
+EBUILD vulkan-headers-1.1.125.ebuild 782 BLAKE2B 49f320ea70410aa14a127d2666749db5e7ee263431365c71443c2b6ff4a76e9e18b2cbc455b3b1f2f3b52410580aecf3137f4f9f8584a8503a83a3d4a876a345 SHA512 a1f6a9439e3f602f63086cb7bd27e81e31b936d43e1bae276dcbed822d22be9c524409b80141245ad2e248dd6ddc58199d7a6b43ecf29a46801c4684d00761be
 EBUILD vulkan-headers-9999.ebuild 784 BLAKE2B c47201396af371bc6882a6159441906242ea78af661f237c6267fb830d48c4a6ff63f129e94d979dc727778a0517c9b648fc2b79a7bacd6aeaeeb746762520c9 SHA512 e9a29f6b59b818b9fc2645a7cdce3703622aaf1e7791b9c9b83946bf7d9f95d262f94b56e095528c5a101f854e190677e0c0f2a1cb595e926a5de24be34da5c9
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.125.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.125.ebuild
index 4dfe2c54e31d..d30a6df369b3 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.125.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.125.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ else
 		MY_PV=${SNAPSHOT_COMMIT}
 		MY_P=Vulkan-Headers-${SNAPSHOT_COMMIT}
 	fi
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${MY_P}
 fi
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index f32eafbe21b3..4d8ac639ed91 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,7 +1,7 @@
 DIST vulkan-tools-1.1.106.tar.gz 611700 BLAKE2B 510ec1f759ae9657a57f641f3a74c87d82c181f6c328a2b682c89cf3a676ae03c59e4be96747b64f29be9ff3f7c5e00eb9ce7cd59d49ab2c8c3bc5e52f1915f1 SHA512 7ce80fe42032058fc7cf2462d2afe49e843f58c412c39338862805b3bcfadf5abef85043e2b21df92662c619bcd34271e2dda5ec9ed8ff9a4dcd74deedfa4c82
 DIST vulkan-tools-1.1.124.tar.gz 691639 BLAKE2B 6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422 SHA512 9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421
-EBUILD vulkan-tools-1.1.106-r1.ebuild 2237 BLAKE2B 7fb55b694f9fe0fa8c6b2ba8978e06b05866a7f977382141b5ae13519050e816741f77825ed9100649d84581a22bf700b21c583758aeeffea8555576a3416b8f SHA512 cd1931161a4fa56c6e8ebbdab0fa4ccb04f22ed42a54e753c25a9e3daa3d8f898a897174604882d812a8ba69f9f916ea79a0c83472e8925af54c1f8e39e0276a
-EBUILD vulkan-tools-1.1.106-r2.ebuild 2272 BLAKE2B a04e6131440f0f6c246636c14f1107433e3718380dfb9d4e6ed79a7c3d5df89f80921edc8bb565dfa1529fc63eef105ba0dfdad217b6e1126db40f0da8317193 SHA512 8f4ee978eca947e4838344a46b20911207a52a65b902bd5ee693c55a271287bb04177b27ce58e5a6986999afc86eb5613678ba11300779014e532fb629e8682c
-EBUILD vulkan-tools-1.1.124.ebuild 2285 BLAKE2B 77909d1d8d44e281b3fe984330b7e1c5c0d8391d87f1897287a6130a6a4afb97e78577d81edf0d9b1dea0ab29458d4da498bf384b6a5b55da1444c20b65b02ad SHA512 a2aa7fe9a5056cc1e2c4ee2a93602ff2d43d22021ef4e685c9babe33f4f70f52fe437878ab8ddeafc2b29e7aeb86532e217e076a2859d91bc84fc325ff9a7b70
-EBUILD vulkan-tools-9999.ebuild 2285 BLAKE2B 77909d1d8d44e281b3fe984330b7e1c5c0d8391d87f1897287a6130a6a4afb97e78577d81edf0d9b1dea0ab29458d4da498bf384b6a5b55da1444c20b65b02ad SHA512 a2aa7fe9a5056cc1e2c4ee2a93602ff2d43d22021ef4e685c9babe33f4f70f52fe437878ab8ddeafc2b29e7aeb86532e217e076a2859d91bc84fc325ff9a7b70
+EBUILD vulkan-tools-1.1.106-r1.ebuild 2233 BLAKE2B 5f374ad56b29a3b977bc4e785796dacd12c805053aa559ef0e46e4da0129cf68b619c1baa1f57a70a6abed1e733edad923cae0f4c2b9c9982d81b7bac830eb88 SHA512 ea189ce1558337126fea2474f200e6ca687f5ce67603b8dd99207d7c570adb2a4ac80c6564fd646c60067f34af4cb784d81a205d9b925be3492ab40ea82cb6f7
+EBUILD vulkan-tools-1.1.106-r2.ebuild 2268 BLAKE2B 0ca22e0f63996d1a4a73d8245f8e9e215ef65186f9a080fdc9b52c05d69f996e9236d0a26f62e956a81bbc99596f95870a1bfa1dcf68edf675b49ddbdb35e3df SHA512 e2c59a8b2c43f3ad1525862ee6cf1eb527e24362822eab64bf4cd1ffeefd5da9af4140f90ef00ac7281ce51d9e7c3bb079192548699bbb5aa904a7033da27a98
+EBUILD vulkan-tools-1.1.124.ebuild 2282 BLAKE2B 83f4dbb765d99ffcdc07387616afe11d942ee5b0baff8a148b64053b5127abb3802b5541fc785de0dd7b4027d387bf1964142c6cee69813ee590342210c3d124 SHA512 64a3f7984743bdd39bfc96c3176d653fe62dd76f4bb487d06393d2f6db5c493a5999dc982059eb786bbf1d71875e93acf3399376b0642e883e54d9c42d14e8ed
+EBUILD vulkan-tools-9999.ebuild 2283 BLAKE2B d3e5280ed64717625c861e32f363cafc628a09895922984a66fc715c9d8d8c5ef7e8a973229e2f17c1d86de86a2ba880c18481426518aee2fee3cdbb085fd035 SHA512 27f44d573ad6e67db4dec9145b4ea1f982a2f6332ee0a0b82da66d93031d4d91fc5c4e5f0b1383a4406654c47bef18f5de2b201916f9a50885bb6cffaee1f2d5
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
index 4b5027533226..228672c2ae9c 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild
index 924b70dd8d81..3b24b766484d 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild
index 3c0376f76251..90eebbb22ff3 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="119e7c3bbae122f6cc5d778d068fb91e0e85d6a9"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
 fi
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 3c0376f76251..efa4fdf6c443 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
diff --git a/dev-util/waf/Manifest b/dev-util/waf/Manifest
index eb726165e03a..7b767ce0a98e 100644
--- a/dev-util/waf/Manifest
+++ b/dev-util/waf/Manifest
@@ -1,3 +1,3 @@
 DIST waf-1.9.14.tar.bz2 631021 BLAKE2B b822cfcee033846b075baad98c69833d54563a23075704acdf6c140b08cf4c5e263465b618830ecae979eaf741f83a849f37d714c18cf355b49a62bc30214904 SHA512 5b7e556eeb3ceec83e81e9b849786d7921aa06e443aa2fb5f288e3fcef6b05b3a1a6aa4ebcdfd0bd345ea3166980cb926cbea2260a229613bdcb2def86fb5816
-EBUILD waf-1.9.14.ebuild 999 BLAKE2B 5fecf055b4bd7af239e8218e99c70f0785fe4a6482d1d44ef9bdbb0e4b65cf1494ec8fa5c1a9b301c71d436d04efc3da1acd6e2bb73b01a6fcd09f7500a9307b SHA512 54b965e757c45f444e800e705565aeeb24165bf17bc90e38a747beae13174e667b7563b517d58e64a6866563e3dd26c3cade87141a52e571ce4fa78e8fee00c2
+EBUILD waf-1.9.14.ebuild 986 BLAKE2B ff23cb6fa397002e03ad78db5296b10411657ac5778b58573cedbb1ced64499029cc82bd136fd541d6e0e8ce8e2901e778bdbf4ec2de5a3919d7a0e8ab1c7f71 SHA512 4c9861d26af558d87e6157d6663a46942e6622681df99884f80d60ba9715a108b2b3c0ebfdbefc7f26847e1e8c85da1e5e92af4128205c5bc10d95691e6e6293
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/waf/waf-1.9.14.ebuild b/dev-util/waf/waf-1.9.14.ebuild
index a8c8f22d29d2..bfd0852f26a7 100644
--- a/dev-util/waf/waf-1.9.14.ebuild
+++ b/dev-util/waf/waf-1.9.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 inherit python-any-r1 toolchain-funcs
 
diff --git a/dev-util/wasmer/Manifest b/dev-util/wasmer/Manifest
new file mode 100644
index 000000000000..79d81064f29e
--- /dev/null
+++ b/dev-util/wasmer/Manifest
@@ -0,0 +1,165 @@
+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 arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
+DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
+DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
+DIST bincode-1.2.0.crate 15433 BLAKE2B a0940c61c37b09308ce58be6137cf05a351081e88ff32a14af351fdcb36998c2f4d260b80edbc03115c67534b35f422e25961fec3d2c1bf6963be0179ff8ac11 SHA512 9b599115ff33531eaad003e2c928e83211373101a5ad6cac0dcc09af0b97a0cb157abfc432c1a8c68f303e07732ebd6e0ab776c771250356da9f50187e92b1d9
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST blake2b_simd-0.5.9.crate 33575 BLAKE2B f5bd6efad39b7727bdf033bea9796eb0eb24ffdcccf9d9682c22942a5acfac6c566377f635e3030d2ec9cea05129632627c1906031a1c395744c787354e4948c SHA512 cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e
+DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
+DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
+DIST cargo_toml-0.6.4.crate 7356 BLAKE2B 4e6eb03bd62f86598a1675a4c4c693d3599f098c2995492cb4ffdecb0640b4803dadbd3d535fc59ceaa9181de62d4a575e0e37aee5572bf16529a1c0726eedee SHA512 55540e282b0097ee337013f93fe87f38755206fc48ee0b5629dceef415d6bb038d55f886272bcfb2b305817fd1a47fc97930ed1036a003f93c8c22369cf7bf4e
+DIST cast-0.2.2.crate 10318 BLAKE2B da2f8327bc3c2d884bcfaad9d4b2a79e009d060501be98cfe344598da66306940134c28f96eac39578ac98cfc26fd754b68707fa17adab233b371a79eda8a54e SHA512 7b0e860a3c6c809799a9fc733bb0303cff819bc2b884cf77e1517aa9824c819c259edda7793be2fa5fa6573de4f07c0ff95f90a03d0d38c5905260e291ff9786
+DIST cbindgen-0.9.1.crate 129676 BLAKE2B 12315522938e941c4a53033f276f6065d6e19ba7cab3ce8aabb17b2ae5fe0c7231e51be33828434d6ca039d79c9414fe8d310a12b07ef1c544ed9b5d8cee74c6 SHA512 0e32563db42363dc82e8aca2f36bdafcdf0ec9156e7238937295c9369d306c2bfa590ea7a9afd61d8b915fc383bb7af8bbb78cde71f6ab30b0c576262c74232b
+DIST cc-1.0.47.crate 49645 BLAKE2B 39771b601b37a9695a6d49e6d7bba2fa97ff5c1fab11a1a94115d5427a3bfb57cb1501e6b29fe64aa331942a99a9ded88fc8fe21693be697fc7200d919a4e448 SHA512 92bfe74600a43c9d59581641fe0d2aabecb6060b3cbcaac8c8e0fb4f0a21f1099d2887c7b00f205e6c5e972b7aba50e68c360dbcc1090aba942a30199e3cd86c
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST cmake-0.1.42.crate 14266 BLAKE2B eab3de3a5a482f58dcf72809f63109605d71e1376e4ae2695345abad556eab86fc946c080602671b748fc79e6757478b5b4398a9985128d6189d5fa13ba8a89d SHA512 eb91ecb665924e433369bac77060e44950cefe73eb250463b0e0346e58b6545114e39f995f24c8dea2bb663db2b177cb9f1a8646b286906b3060effd6691e4f7
+DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
+DIST cranelift-bforest-0.44.0.crate 30852 BLAKE2B 6eff4fec0cf9548f4f32e602d7bf0620d7c6705958ba0d07745391107e0e53ce93792acb2beda2c3180b7653113071753dfc6122a56ca5b2c84a6fa3e6aa74ed SHA512 2770c06c8b9d6747ba4319acce9c67023e4dc84afc68f701470b1658ef08aec5f25221e5534560b0afff711bc045e428f15c1b77b7271cb5b02ac8fda0d7b216
+DIST cranelift-codegen-0.44.0.crate 323814 BLAKE2B 3d9c3f561e4009817fd2889c6e141f5d2f720e53b24013bc61c1c48a49a0168210079e3760426e974e886d933d14f5926eef0a7da1e8486dfccb53acd9610017 SHA512 e8e18180e7952161a376acaef6279204e06461c5382064a30b08607a623f09d68ace8b2af9cecf229c2040f1e8c93a630ba2fa11e245bb7ee4b0b0a61d976137
+DIST cranelift-codegen-meta-0.44.0.crate 151983 BLAKE2B 9fd0f17da4e2a5263ee424e9184bc7e91101591224ae246d5644557f19655677bcefd67752da215dc2ecf4b7fbb3408c21b366add8541c7515964bf2b2381ac2 SHA512 b10e6e3c62b311b14291088ae87ac53695833026183575f2fa8da368d71645eb420c46b6e0a7d4bc22a78610ce7e406fc127a339b8a5d057b4e9ed88737466ea
+DIST cranelift-codegen-shared-0.44.0.crate 7742 BLAKE2B 14b8084a125ed99c8bc8f0bdf8d77de8c5c3ba6ecad69997462d7aefe2425d1c76e9aaea74918faa32e3876053f64efacad9dee086787c455b1be02f6dd64c5c SHA512 293520237fb2282100f50b27553585088bd15941ceefc67d153e873153b1e300ea1ee8b565f797f51aac3d1bc69856a961c22230a7a83d6ea0cdee32707b1010
+DIST cranelift-entity-0.44.0.crate 24256 BLAKE2B 829e0854f7edb945808e588b5b970f8d2f557760987ea803729515b22341b1c1a1a4d15bc25469b224e0ae150cd8cc1cacfd6e30516fdfa670a5f5fc4af81ba9 SHA512 718975ed9f1f831c83f95b83e274db859d82ae0e7d4d307950cc341e2f17cb4951df03ecddbdb9f7fde12bf039fb3082589a28f59506479240335932a7a61c57
+DIST cranelift-native-0.44.0.crate 6759 BLAKE2B bccd10b5b2b8613179255f1b2aab9e6f8654f6499ef7513eb1c9ac9a61b8310841d24edbb69d94846579212a92be2d8fb7bf103a1f99f09054b41343d0c6957a SHA512 6eebadc694a56aec858996a61e262211b0e62f6c5c1c7802d7aeca63e0eb75e60622aca38768d90ecc5589d8ef6d6bcbdc580872e6d650560903c6d1e698446a
+DIST criterion-0.2.11.crate 78216 BLAKE2B f60f4e833ffceb391c95d3eca65aa81a1c3b07c4220eb1a401dfe0e53b49d7ecb8e71159271bad090773a48ec5121ff1158f648b8ff7bee88d0faf957ea6f6d0 SHA512 b2bbf3053392db8fe74b6da9da25bcf2eca5b4c6c72e393f485c4cd9aa978cdff88383d95562e0cc542497aa8e71f45f2c315441b0e1d486d842d34066929cbe
+DIST criterion-plot-0.3.1.crate 17097 BLAKE2B d22112f69b7309fa08100958a88ae9616c2fc15d7e456274252f8422a241123aadc1dd008d101f403dff5738f558210d5b2a71d91bc288af0bb0e4f99c58c6e2 SHA512 52b95d4e8c9909324547b00eb4ae98c274ce22a8494730f117c5530f3cfadd600aa22484730489c5e5202dc248ef40502a9768f172d5303919e430bcc0625b5c
+DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
+DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
+DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
+DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
+DIST csv-1.1.1.crate 890406 BLAKE2B 51759338676d882ea1ec0f953ad6b67b2c29f0a5fe77c0bd316f3f3c92f41b6c325f49e631c35498db8bd292fe118e1c44cf016fbf73f9f16a79e2528b0e8811 SHA512 de89d7243b24b0b85c4b6520f2ada446e32561d58e9bb116d76bbd0465a647825e8dd0125f3d693ade5b9f5f41ad2c65016d958c9c3112cbadec92c26947e9c6
+DIST csv-core-0.1.6.crate 25593 BLAKE2B 9784db836f17e350f2500e90d0d9d73d20274cb8b0c11613db0d1094eebeced4230c11df1c4c6fd15af59b444fb081c7b1103481b765a936ec582a9ca980e394 SHA512 91f46405b7b8e214d918ba1bd00e866bd05a7296b8220d2041817d53feec05b62d12fa19142ebab1cc7e05518f1353f6560b2811877c5e3d3dd94f7f4d50a9b8
+DIST ctor-0.1.12.crate 4740 BLAKE2B ac7ea1286f0757f310a29d18077c1dd02289fca420e955be2bf6758c58781882bb974c0b332d3d40df22714a0f8f4412c213df9112d4e0a016019543f02764f3 SHA512 b73f9b9470c75aab8368accf179dbc42ccc0530f5e18ceceef6f2206bf1d9016862d578f720ddc97dac9a52cdae6da019599cacf06a44a13817d1cc0390a4b75
+DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
+DIST dynasm-0.5.1.crate 102339 BLAKE2B 460749bcc16b4dd860df395ac4d4341ce28a1dfbad03325492a812e09f4146d8936d0e7197a548c781ca14245d96bec49b21322d95b1c70ec03436d671d1f4a8 SHA512 787f1400094781d74ad97d3324f42a4a590e5cd7411d80f344c48f0863b611a40a907ce9219bdcf0ca5372e8fe90ce8e30f33cc35ea91d1ff150591efc4fff91
+DIST dynasmrt-0.5.1.crate 15850 BLAKE2B d69a16f2abf2dccf130d75c29f805046c76d942db06f4d3a143f7adc94365a90bd0094f70d22a2895a6c7959e054ac383d345d8b964713cd6ef2223ca9e705b6 SHA512 762b2d6844c1c6477c03c63f607522360907a50e1d66122c46aa32ff04ff927a69999c334a46b5f27b41a3075386e34d30587db07cb0b61af43f5d24f0c76f3a
+DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
+DIST enum-methods-0.0.8.crate 10127 BLAKE2B 35ca4579a33d787155f4de2a7847360d49bc67522027ef41daf420bf2ced64ca35c9df15459bf7fce9a7b9b4e653fb2aeaa1b2c229c677f4987e441732fd38f9 SHA512 b59de357086288c1f4b6f4ab6788b2f7b956afb911ff0481d9652a92a9b0a49b60bc8595a304c2e2a47855481b5229140437f8866f8a9e8266022189ba9e9d2c
+DIST erased-serde-0.3.9.crate 20561 BLAKE2B 1f2512d148a17ac48196d90a6c5d08e0aca3c54facd8b15efdcff76112b26e1a36801cfb57c0902acc8d9e0ab34504016689f7e49565961511300cd33c471938 SHA512 8226554d5606088dd11f68414e10e822b54caee6ec051fde2267be41de1f06485a47639e910ac1d8a32c72c3212738734dd58aa6958a0f0a96c8c178bf31f3af
+DIST errno-0.2.4.crate 8486 BLAKE2B 4d23c0a68604bd4fbbc05a557b3d449bdcb56b54d8506e9641f6d2775b41db403f93cf34ea7c446f4a2514ba7b2ee6570cf2029150f44d466d3e12102210bb20 SHA512 039b7bcaed996bb6f48b28aaf44e7008d4b2f6b08213542aaa5fa82e3be87f29e9bc17fdefbf0f159473d292f37464d6888ac8da0a9aec418b1be2de7e2eeab7
+DIST errno-dragonfly-0.1.1.crate 1370 BLAKE2B 8cc4cec5a33af40aa3578ed95d097acf532f3a0a774c653111763a955c90682089f65ca422bf2d22e1fec1a3a053860a0cffc5b44d40745042d167cdd933ded3 SHA512 04d2db15d92ed8e770ff4fd0e200c78ee9235d0f856c163373fdc3fbc063e01daa91f958db212b977c49406e2287dda34e98901f1b1516a6a467ea2cc501d074
+DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
+DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
+DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST gcc-0.3.55.crate 37262 BLAKE2B 3341dc7136c14fa822a67fdeb72f7ea50b1264823e695e189d69604b8b8cce898ee2d40d8a536d0f520f5e190576afde16afa5d9cbe0a2c4b8600cf50bbd1447 SHA512 b045b60cf65c1deae44e4f40d0f511dab05c82be5065390dfbdaf5b51ee2d0653c3a6d8d1e7606e4bb6d234adfd22a8c68bde724406f3edb4bb6366617d46a86
+DIST generational-arena-0.2.4.crate 19112 BLAKE2B 2e1e638461a8dc650037691488170c6da293083067787a0db81ed411b3cd052d2947ec0facc29856fb93dfc28568d4e198656bda1d45e79f5404466330bd4b6d SHA512 c0260114f37ac874ab407f17462d9b4da863e03612b73cb99652e9373979b5e9ba8319a11b95abcb808a65a57aff178fe015d4b8153a38e48db6b365bbd539d7
+DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
+DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
+DIST ghost-0.1.1.crate 11605 BLAKE2B eb3e9b2f03b479578350813b24293965ceb51d0c5008eef4627068fda38ba1ffcc3e1a750c410c0512f9832e49caf4211cf8bac03f53a43c789941ed6c65dbc0 SHA512 7cebfc5bd4908a57266ddbcf29aba948fcdefa0a6f72947f8bba80a50634516f3ff054fea8d7c404c7ce987e2b689acb05b99108b033f39d2e6768bc7e28bad0
+DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
+DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST goblin-0.0.24.crate 146434 BLAKE2B fde5fccc7ace8f426978aa48d9cd57483d192d4e4c9bb2c3f299348e45a0777f369fbd876a3c4e6a1533dfdc6c21a19e748535236b6a165335d740c910daf998 SHA512 22469aa14a9ba749b2499cfd1b7fff8fd2f62e08c4307f8d15324c4caf090838cea75ae8b9338292c582280c6131fb8c3ec0803523ca97b2dc8f86c3c434b520
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hermit-abi-0.1.3.crate 6741 BLAKE2B 0a7edada6e7c834fdd20b804237d29558b9b413ab99b538de5647e485d36864749fba6b8f46b4a6de4c620cdaa2d711bcc6759b53f8d57438ec5c9b78da71ea8 SHA512 ca85d69192ddd2c1cf0f12d6abc7eaa70a71956df5b55aaf1d3780c6e40207c33bb188a92a5f4769478c4ce13bd93cfd6b4134a21e245781b4ab4e3cb3eabe87
+DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
+DIST indexmap-1.3.0.crate 47086 BLAKE2B b05b127c459c3107123037e6044eed24fa58bba492b230ffb9df7b8bb84f6c86f2241e87afa7c43e133957845b1092d7450534ab74b507eb187b0e509045f18e SHA512 41c933a78a5cd5e62aac2c4c8aaf20bd3fb394b9fa41fb9c59a69afa9b4039dfab82b3d1fb1b0c67f28f0cc7657cea6310db126dd4d84e3473d2c231fecc2331
+DIST inventory-0.1.4.crate 10140 BLAKE2B cf8fdc1ae6972d58b8797d2b20ba1b75a92b3f33cf5cb9cd1b46c39efcbd3e6e5ba4107da1f35294b22aeedb2beef78e76ead1b6eed35e2d132cfc54b7aff8e7 SHA512 647875cf9a1cec8051ca47f3457e9390e5b920845669377c2aa65e55284a31380e0c29e93d578227252dd52b32b5d8df36ecc3479fe58466f208d0ea3c2a74e5
+DIST inventory-impl-0.1.4.crate 1806 BLAKE2B 016e9c8f2834e1a54d5240391252d99a75e47e950c28033d5c437380bd05d1a28c4cdc2c0619e14c16404d772f8785a5f0f2f7b47cefef1edd9664a172af26dd SHA512 da152696a465465f088556a95a718407d2e8e94cd6f71d274d8e660fad3eaa2f299249f6cf5f3a2f4dede43ef3a9b283f21766d136a38396c8a4354cf0f65812
+DIST itertools-0.8.1.crate 89098 BLAKE2B 4b8a68d1ec9e1d15cb5b8fa7bea628b241140b4402c5f2a9e165b2d845d41612237d5181446e0969b2ee23d920aed90236b5a70cb3c48000e4f85c655b5e894f SHA512 b72127032011eca5475552fda55d6c2a87c56e5afd486d2c05296c0117ce3bc48799fc23da6ea4f17eab79bbff2940ade38207dc8a2c4e62bab12f6092b4e188
+DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.65.crate 439610 BLAKE2B a6390172ac5a76bb13860ffe0793a40fd6a74c7947c164ab1a033401473caaf77cc85bd578a37411d5f40bdeb13358a4810ac358a76799b24f7b797b2bde9915 SHA512 a5df4f7efae9dfdedeb140e3fec545135c7533f665f4eec61f071d01f40a2079e104c6a837c2b385aac4b306e4ddde34aa857fabb4a7ea7d7780159bc0b83c40
+DIST llvm-sys-80.1.1.crate 41677 BLAKE2B 79d048d3c50962c6b7a4c3773d3b938bc0c446e3ab0fe7ce92b5fe7da0aff822cce20dfcdfb24d5cc01746d13d1338e1e44449d86a53821ead4ce8f475a39d1b SHA512 5a523cffb314c573f291035d284a71a1c6cfab40cb7e83c582d89eb8a17d207d6cec6d3df95d20da4cb8c6493d0404f4255e446d4beda70ef6cb422afd0214c0
+DIST lock_api-0.3.1.crate 18060 BLAKE2B ebfdef093ab9f1baa78b71b9f80e53b18ecd498ff9171f49ea84fbcd7f24ca564cf5d77dca30166759b3e4ce22d1a6cb5edcb08b0e33bd120cc9bd25d271094e SHA512 2180d07e06be22c02e4133b5436c4805ec791865a775a5deb7bcfd54130cb759b02a31e081d082bed418b066b9bcdafd36edcf44b5ac58120d1a6d2956fd9bdd
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
+DIST md5-0.6.1.crate 6574 BLAKE2B 10b0f6d84aa5d90da374227d3aa5ea606e9ca41e711b7847e4290fcdd787a74fddf0ac516795d0654a02f331c131386c29a95532bab8a72c958587699992dc09 SHA512 b2d399ee2e7f0777ab891e356b1010a4cdd4a5c5b7013e59289cf4462ca7f744066f26ed97921988f913ce3de340db3514f47df5858fdd57d6a0101fa51eafb2
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
+DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
+DIST nix-0.15.0.crate 188640 BLAKE2B e217fc7329cbf49e53f1770da4e4eb15fa84718c265e323cd43b5744aaec2686d3ab93fc8cd52a585341588ee1c76f3d3bf7e25b0a8cb0e876111d12fee3a3c8 SHA512 1b65fcf1701939b85a95dec1483c3ee3e86bcd3ee65b175cd9ba0fc951220594ed9368dca082ef0da566463143d7234a275c15d6b66a724beab128b287c26b3b
+DIST num-traits-0.2.8.crate 39965 BLAKE2B 58b2c432e8523efd95724e01ed80d61b2c4a798fc451e1c7257a392f78617d0ecbab9b1c1d799dde8593cc69f1dbf30d2e966330766992ebd43d8626926f12ee SHA512 a3019e45744245837b2f146ab4213746c93a1ad701958dd418272af89451b843f9b643eac673c1397f6079da7709c7e9ff46e0e829a4cf6092772c9d77bbc534
+DIST num_cpus-1.11.0.crate 11776 BLAKE2B 00d57b8a05807837fefc6596463d6bd3e7815833189142b361f932fc25c78c7910c6d6c37ba43a56201f4ee0f3a27ee9ade7d00f22dc05974aba683273f5e8eb SHA512 b2a04b41c3f9aced42e23fa16db872afbb0a456b22b967e98826d22b4866da066633903d4a29d6e4af810513238062846c82e38989c74aee4607255c09929468
+DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
+DIST page_size-0.4.1.crate 8379 BLAKE2B 248eb460a1537a5b416d7377820eb029a77d8736792e4a7a3ba16af50863445f5a992badee9208810ca1521d1e5726e919f745491e0ea56d547654321dd42540 SHA512 c2814fa76f6575aeb32990cb7d844054b54d55910e50616999352f95be2aa7443bb0dd1960538f1ee405307416e9dd82aa15c692ae7662595ac8f508476a2d47
+DIST parking_lot-0.9.0.crate 35170 BLAKE2B 3de9050c5dbbc7a0b98a5cad05dd485142bb2a22e65216a20f6e87deb6d124b4502cdb3837dbdc992ff5ea62c67e1545bab269237988832d365fba265149d245 SHA512 148da5edc08da3b27bfcc94a1c0578f228ccfbdf7a7a6f3aa73ac34e290d795f4169553bc7c2b20227e095e8ac75446db51979b595e4d77fa7c76f743138a331
+DIST parking_lot_core-0.6.2.crate 30598 BLAKE2B 048e87b1a785da927afc368290c2e1dd762d98239d862a1aad4850d9498b91e8d64c399bfda0586c23f02fd8839723af1d5e2ef3e714cd932ac11a111b978543 SHA512 5de5d9cac290d7d6e6a3e1fbba2784cce8b4ed163481e1cc6ec36498884b5e3cf0225c718551289be164d1a4e192de390201a083560898e4a42a4068661c0689
+DIST plain-0.2.3.crate 10664 BLAKE2B b0ea38fcf6d4f4e3ff91d572b5639f01eac4f19b2c451d27bca49d994a07c6f46118cd58a1b86b3d2a61b7ac9e17e8236f1cc98414738d8c86086d37e0fe4d35 SHA512 6909e4b4b4a0a49e6a226d7393b121ec04beb8a13b1652c23337eb09b3c2e5f202b53a7663dfe7828dcb32c3d18135b514e9a982967c188e127a63b6cbeda252
+DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
+DIST proc-macro-error-0.2.6.crate 7963 BLAKE2B 702391b17acb0daaec650e39033e563683cf7ec7c6339402dd288807bbfbe534883bb1dbe9f79eca660cce2e1327d04c24786d78bc886061897da23da96776ae SHA512 7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d
+DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
+DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
+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.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
+DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
+DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
+DIST rand_xoshiro-0.1.0.crate 14829 BLAKE2B f1c416dbd614d810971f98d86e8ca816621920e3ec3adc3300ef808ddbfb7aa611779ffc0b386dafdb3f95a0d1a6858a27b9aa484c100fb8a0a7abc9bf41c38e SHA512 56f11cd4d287ad30c945c725dd1bd33bdbaa334d50b02c9aa7eb63cc8e29c7cd2bf189eafbf97ad8386cfd0328de2837f8341f811ac5375f82af2186db7f2358
+DIST raw-cpuid-6.1.0.crate 35072 BLAKE2B 259b89da2314476d33f5b18f0592d7b24172609b7cd1b3a3c4ae87e5d1489e528379d50ba8705db0b05b98028ac5b8f51386dcb7f4bfa4bc5b9fc062ec0779e7 SHA512 d8183555b462e6ce76da33f62e420d30860c50edbb4fd62b52aa0ab9af37a8b8fa2ce697a8aa80e9c858e1be99083e278b78a4782bebe56cbdc0ef8fdde1f948
+DIST rayon-1.2.0.crate 144769 BLAKE2B 9614fb6db62dec788da66305bd84a5bc2d3793921ca343a924443abc97ab9e5e113b50506d65f5e219a64bda4759b8f6eca901796746b026b03a1761c80451e4 SHA512 351f7ddd2600001ef9655f290b743034402a56dcb04a25ac25afeaa549da5e399a8be72cd318d3d4a558d1a190bca7ce03386f3320e9909db48d9d1152154a52
+DIST rayon-core-1.6.0.crate 62221 BLAKE2B a7cca9fa19d0af21752458b58e22268dae9d8078d338714e30eec59e6b53dfbb717af9a919795828a165b42c8545414aa969875d216021632b7435304b8d72ad SHA512 78f231633fb2382fd38a89b967f5a2f38e611293a19db342039e63fd0c7cffd33a78d18b8f0788089b157373ebf20eae0c88365be9668f48abc3a390130be36c
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
+DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
+DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
+DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
+DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
+DIST scroll-0.9.2.crate 23522 BLAKE2B 48de922d9348708c63c8d83f1849aa903ca78b5988b6bb5ff56ccc1e28677922bd2eac2a7cdf1bafd5eda9b1d460d89c3f732d4b4dbd5696eff9a91df9efb7d0 SHA512 6fd5d72267b1b2840a524f2177f92d240b05b35bc345f2018569c692af8c1deda35fae25230d4652132b3003d740abb4d395aa26cabf958c9544cc5118e335fe
+DIST scroll_derive-0.9.5.crate 4314 BLAKE2B eae8b18aa6e35cc1c003870974b64114817415a4d1e45da6068e11c5132003cc9eb2ce9b538d02709fcc7f137a6c6b1058e4d5f2cdf5b443127eddc55523a81b SHA512 8db648782f4235a0eba142d37e5b60a999874b74c57009e10f4f3bca2a4f26d8eaa0cae4202b1613a98d6e70830b6d2827fb5aa6cd08c510c78079e8eb6b8ccd
+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.102.crate 73356 BLAKE2B 1ac078a443f6afc7bfb31f485f1dfab71e61a8978981a88184b79a87b1b238afd1317dd1825f27fa59c762b98d68322ad9d9ea17629f639ed3c088b556ab180e SHA512 76ba1647a896aa907448e496392359c5de727be14b85352d84e6271ca51da77cbcfc99ff77656eb5897e1a99b1e17aee0cbc35ab4b13201a14b8b2a38ce6b6e8
+DIST serde-bench-0.0.7.crate 4421 BLAKE2B 4326fac6cf462da339c8ff29b88e66a197e477042282c1d71b6c453f261be9130ae6d612003d2276af2ce8d8f4520c5e151c6610e0d2e199e8c425d7499fc88b SHA512 00a230c494f0204c3e278000c18783ec8a85beda69f604684c55788c5932211777973c31b21de75765185bc526edf4e0a461171c40fb96420a373b5912eaaa08
+DIST serde_bytes-0.11.2.crate 9983 BLAKE2B d8b2f0b35911a83ecf5b50611d4f37d0f1d2bd6aac0952769525d2311e4c6c2b1733ad52c42ffd0ca7cbdcb70fd5a026a8e67571c31868eb4d285e2acf6ae926 SHA512 ada69e07bfd19739fce25612958db2a398803f5cff89998e6b902defb0ea8f161b43dfcf4a756503a8e5d54fb751f50ea51778e163c989b5fe4320679aa3bcd4
+DIST serde_derive-1.0.102.crate 49693 BLAKE2B 814ca6dc47ddaad2276a0c2ec8f3be9be4001c57294c350f54c86774df7fe6d92404fd4bc5efd87bee2e15745b2b0760481a81125df2e2a01eac5b958599d5d7 SHA512 159cf3b0c9c38fb82ffdf923e9d80abe58eb155da182aa63d7cf94a66507cb533071cb87f89d027c556a08d7560ca5e91e20267341ba0721aefa88b307fe9182
+DIST serde_json-1.0.41.crate 69870 BLAKE2B 328935ee765889b82cd88ac7eab921e279ea8ad41445a8344b194605e1571b30b6204add7dc4de1f87994d8162428eaf4d825e9744c9971349e8fee19507265f SHA512 63ac513a4813a65962d8f63476ce8e63ce71d1e6643da7443d774078e4a743835276c50c04ce535b2e43251383c537365581838a0bd5d4893a644e396eeec55b
+DIST smallvec-0.6.13.crate 22760 BLAKE2B 83e573aadf1742122bbe1897bee09867d9225624474cf8c9a1bdd087a8e69eecf9567e8bdd2bcecdc8cc08f5f4c4f081bcf718ab062ee399c9a09b7f8c54948f SHA512 497e1a77414d545b44f099a69529c6c9a8be8cbc80a84bdc9e85428263518e6949b81498b9ce6ab2795508b1c3beb5e7e5aaa3623bbed2c041f8c3f4a0adfe33
+DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST structopt-0.3.4.crate 41301 BLAKE2B 9a7883faff72d748dccaaa888d37b6e2a9b1a9b1fd7aacc9958f9a96dc8df54cdbd722af57117f3b58680e41d9d812ed4513dcd01c5894912823ac1e10e62476 SHA512 90ccf78031f0c6d1071e1e2925e4b0444760ccb45b611190fe22a653943d4337da88a6403b18a869c97cf956744d220427a01996321a62918a1fa66fbe64cc64
+DIST structopt-derive-0.3.4.crate 16500 BLAKE2B b5c30c0f99c368063ad31fb30f80e87a14ef5699e365d6721b7bae80059a89ed78f9f149c4e694b0b61ddfd2681bfba997d5b94f6739de4afd6fbc5a42c0e3ec SHA512 8cb0a6e0173bb94747a9c7176134ded12feeded597bb8e027ce08e8d5b3200db3cbfc68137c96ba691037195bc634417ce83fdcf30f68dc43b8fd93e2ee974bb
+DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
+DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
+DIST syn-1.0.8.crate 191978 BLAKE2B 9c4f925cf437c8baec1d0bc347454096124e996f1c26ef27fbb0ccbef087ba7a5eb780f4e1f87037568e93c7b7fea2963e2782621c0ab04e5c33ef98349e97fc SHA512 314229610133a1c1db1d60b549846e7b9f9c50ac345ca59d6fbfb263b828653be7fac0f56fd88312162138d85b915dc994ea651c1f9ac591c9c56c53a1738093
+DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
+DIST synstructure-0.12.2.crate 17501 BLAKE2B 6344ece1be98a941be9107bc9a29ff30b635fc8d65f1d2c33a36d1e8a68ffffebd5e1ef946cf43b2d13d41d92f65069368b25b63fa77b968eda75ca89b53221e SHA512 63c1fa9fc1daf63cd259f0f14a29678bd989023a3798bd356010685e45b1a866df7f5a6a743648f9c3ce53eca88f4c0ea05a74c7a5051b48adcbf3dda7988efe
+DIST target-lexicon-0.8.1.crate 18961 BLAKE2B eccb6c4b43e3acda5a20cfc7c4cc90d6a953d29ea76f125d774a857ea04581778800e009cfd551c4db6f4c3ab99a837f78c1180d24bb3299942efaf6925edff6 SHA512 d662d77620bfd1be63e3827acfc4041fdfbd8f4b5a30f1448ee016198822f5e7c2815af730cd625ab0a37cefaf2632073d03438aeb3930c0f8a492657b33d495
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
+DIST tinytemplate-1.0.2.crate 24614 BLAKE2B 503faf7917be09f1b061f23375cfc4f0d819aaec54ae8c9873d0f9afbd8598229639690260e81d4298f9873890405091821776e78ea904eb6c0684dc49e9c0df SHA512 e6bfc944f3174d4162bf27a80fff2c1e83aca0c9d936fe469c39077b02ede8c9b7e41d145a048cf2cc68d1efbacc919ad1a0708757b7a49bff4dfe4d51675ecf
+DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
+DIST toml-0.5.5.crate 54805 BLAKE2B 2b319f37165164793866bc4a470ed99447fdccb59242c94e5311906dc764f54131f2bc14921caab56bf84706d12800fb26a58210e3e58728f4076edc9a66e771 SHA512 8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33
+DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
+DIST typetag-0.1.4.crate 24183 BLAKE2B fc17c0a40c8fa4f4df111156c1185e7d0ad2d7e7624e16a494670ead3c2a889efc97064b32e8093fa24b3f2262d9e4a1eabf4ad4bc1ad54a9480c3df2578bd8c SHA512 2207065e68a748b0d410c8e4d56195eea15d63e6ffd3c312d01ff9ca557e63b0a905398bdac49d501bcb8175c886739ae6c6efdf31f8d583def3dc6d3c586924
+DIST typetag-impl-0.1.4.crate 4333 BLAKE2B 5695a7f3cbab35bbf22a877bfd08302046f08b61e3d73e9e0b85c7d0fb5c86d2e58aaa359c8f1a8da52c0d5d0200415b822587987e279691e2ad676ce657337e SHA512 d3abc3a35528e598f08662c958cb9a17009fec61b28019be79fbfdeebdccffa92eb5bfddccf435e7f6b86db2fba71c177e270f115baf552474022db4e0ff0ce3
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
+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 vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST wabt-0.9.2.crate 18385 BLAKE2B fe242c8c1b6be41bf2108d6b1e1a2bdf68c1bc762e295b9c6fb7d160fa1f978c6a02b052f236729c64aed39ebacade2dea4ea24d30148a21345cc4037ceebfcb SHA512 a4d4ed163991d9b4426a623150eb9c08b02d6cd3e8afdf7124793082755079ffd8f8df0b46a301b4c7848bdcf960612a30b08c1044b88b536786bf0f7cf64662
+DIST wabt-sys-0.7.0.crate 2330587 BLAKE2B e56178aa24e17e5b964acdea364d38049e05282e35e8f25151480dba43a775c1ed46fdcb2ecbc2a86d6bc9f2bb3cc0ee8af2a48fd784fa9321babe6090d91ec6 SHA512 d907063a6915e6e9df484c39b81e12f0f9bb2162ba43151de6b6f43cfd59e061867d540669a6cb36138643fa3c71f17492542cd156cbdfed9b61a9a361fe6b2b
+DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
+DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
+DIST wasmer-0.11.0-git-deps.tar.xz 5696224 BLAKE2B 406a477a2ff91bf42cc4f72aa04949b38db49bec142dd4cc9ad30270c6f311f862f0fa6cbc50b7317efc0c65daf9d235e5ad0c1eeff809621c82f2156c815168 SHA512 bcad8ba613cdea430fc9e26860a6bdaecb58d18bdb7e851259aa643603bb456ac18d7fb5cbe7bd3b97e7d7905ecd5415660cd81c79c8fe4c9b0792d868c3d001
+DIST wasmer-0.11.0.tar.gz 12188261 BLAKE2B 484666a73608cc6e373769d8ec3498d5f01886c55d4225b8aa7b03c5a6abac38ead9f652e9be481865e5d50523f48bd776d7ba35cfed398d2c7e567eb07dc679 SHA512 ec98b60b27d1c1d450ba4e375b36831bacf90c085d3ef1a48ffc23ea97efcb4ec54e45e97c16c3b742bd86b67278660db0f227dd2fed9e8b58b612c91a930b15
+DIST wasmer-clif-fork-frontend-0.44.0.crate 31131 BLAKE2B a98eef814df6e4186f2818fbcf9db1a46595f198c725e449810f6c805dd98a0fa51110087f253a4f4ab8b94e17c9bf4af1ef5de4d35141ff0e572c8751ffffc4 SHA512 02290bec5cc0a2126bd00dbcf628a3695172b011447b4e249e5896b13dae596369145976b60ab6a77de9fd108ba30a2c052cd9669ec642e279888cc3555f09fc
+DIST wasmer-clif-fork-wasm-0.44.0.crate 37579 BLAKE2B 1704a26b21117e866d0d25a6e4d54ca3c0aacdd66bfb1fba95052a68313cfa33a8f6c4d329d5edecee3ec53dd08e27443846d5c4dee76b60c48dcb19d3646410 SHA512 ef1bbcb578932faa4e157c5e787840cef8a44fe1ad39a7e601751a25a5fdf4c083db57b5d285535026d7476b0f8d495e09f75299df9e68e8ddb0d93896e057b0
+DIST wasmparser-0.39.2.crate 60213 BLAKE2B e3dca21bdf831f95b261394b49d39aecba152ebf79ba59e525ea7a758248dfd149c8583de2bad6f9139213675e99400c0f3267d3e5f143236a3dbbe0ce76b971 SHA512 c934884cbacea6302f6ae8518d660170ea13ef6f645084d14b1b856d718d8e2b86b0de10c52dd0789bc8055b5536046692e854d4a87931b1f37a219dcd4caf93
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+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.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+EBUILD wasmer-0.11.0.ebuild 3361 BLAKE2B 5a2819d69b5da8369ded91fb77a0feed2e7cfccae802b0ab1402703d91b040d806d354ab18c56051c4b7be4f2dfc97af5ab947d30b6da3076aa22699eeeb86fd SHA512 bf1948c4a0f598656158d17baac16497555194122158813a0fa3d4b80f360bd1f5efb8a1e88706e30787a512279cbeb20e4ae3313fac86602bb0b1da8a20c027
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/dev-util/Orange/metadata.xml b/dev-util/wasmer/metadata.xml
index 007aaf442ea7..c36c37139fad 100644
--- a/dev-util/Orange/metadata.xml
+++ b/dev-util/wasmer/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>amynka@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/wasmer/wasmer-0.11.0.ebuild b/dev-util/wasmer/wasmer-0.11.0.ebuild
new file mode 100644
index 000000000000..336e379622d8
--- /dev/null
+++ b/dev-util/wasmer/wasmer-0.11.0.ebuild
@@ -0,0 +1,196 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.6
+ansi_term-0.11.0
+arrayref-0.3.5
+arrayvec-0.5.1
+atty-0.2.13
+autocfg-0.1.7
+bincode-1.2.0
+bitflags-1.2.1
+blake2b_simd-0.5.9
+bstr-0.2.8
+byteorder-1.3.2
+c2-chacha-0.2.3
+cargo_toml-0.6.4
+cast-0.2.2
+cbindgen-0.9.1
+cc-1.0.47
+cfg-if-0.1.10
+clap-2.33.0
+cloudabi-0.0.3
+cmake-0.1.42
+constant_time_eq-0.1.4
+cranelift-bforest-0.44.0
+cranelift-codegen-0.44.0
+cranelift-codegen-meta-0.44.0
+cranelift-codegen-shared-0.44.0
+cranelift-entity-0.44.0
+cranelift-native-0.44.0
+criterion-0.2.11
+criterion-plot-0.3.1
+crossbeam-deque-0.7.2
+crossbeam-epoch-0.8.0
+crossbeam-queue-0.1.2
+crossbeam-utils-0.6.6
+crossbeam-utils-0.7.0
+csv-1.1.1
+csv-core-0.1.6
+ctor-0.1.12
+digest-0.8.1
+dynasm-0.5.1
+dynasmrt-0.5.1
+either-1.5.3
+enum-methods-0.0.8
+erased-serde-0.3.9
+errno-0.2.4
+errno-dragonfly-0.1.1
+failure-0.1.6
+failure_derive-0.1.6
+fuchsia-cprng-0.1.1
+gcc-0.3.55
+generational-arena-0.2.4
+generic-array-0.12.3
+getrandom-0.1.13
+ghost-0.1.1
+glob-0.2.11
+glob-0.3.0
+goblin-0.0.24
+heck-0.3.1
+hermit-abi-0.1.3
+hex-0.3.2
+indexmap-1.3.0
+inventory-0.1.4
+inventory-impl-0.1.4
+itertools-0.8.1
+itoa-0.4.4
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.65
+llvm-sys-80.1.1
+lock_api-0.3.1
+log-0.4.8
+maybe-uninit-2.0.0
+md5-0.6.1
+memchr-2.2.1
+memmap-0.7.0
+memoffset-0.5.3
+nix-0.15.0
+num_cpus-1.11.0
+num-traits-0.2.8
+owning_ref-0.4.0
+page_size-0.4.1
+parking_lot-0.9.0
+parking_lot_core-0.6.2
+plain-0.2.3
+ppv-lite86-0.2.6
+proc-macro2-0.4.30
+proc-macro2-1.0.6
+proc-macro-error-0.2.6
+quote-0.3.15
+quote-0.6.13
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.3.1
+rand_core-0.4.2
+rand_core-0.5.1
+rand_hc-0.2.0
+rand_os-0.1.3
+rand_xoshiro-0.1.0
+raw-cpuid-6.1.0
+rayon-1.2.0
+rayon-core-1.6.0
+rdrand-0.4.0
+redox_syscall-0.1.56
+regex-1.3.1
+regex-automata-0.1.8
+regex-syntax-0.6.12
+remove_dir_all-0.5.2
+rustc_version-0.2.3
+ryu-1.0.2
+same-file-1.0.5
+scopeguard-1.0.0
+scroll-0.9.2
+scroll_derive-0.9.5
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.102
+serde-bench-0.0.7
+serde_bytes-0.11.2
+serde_derive-1.0.102
+serde_json-1.0.41
+smallvec-0.6.13
+stable_deref_trait-1.1.1
+strsim-0.8.0
+structopt-0.3.4
+structopt-derive-0.3.4
+syn-0.11.11
+syn-0.15.44
+syn-1.0.8
+synom-0.11.3
+synstructure-0.12.2
+target-lexicon-0.8.1
+tempfile-3.1.0
+textwrap-0.11.0
+thread_local-0.3.6
+time-0.1.42
+tinytemplate-1.0.2
+toml-0.4.10
+toml-0.5.5
+typenum-1.11.2
+typetag-0.1.4
+typetag-impl-0.1.4
+unicode-segmentation-1.6.0
+unicode-width-0.1.6
+unicode-xid-0.0.4
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+vec_map-0.8.1
+void-1.0.2
+wabt-0.9.2
+wabt-sys-0.7.0
+walkdir-2.2.9
+wasi-0.7.0
+wasmer-clif-fork-frontend-0.44.0
+wasmer-clif-fork-wasm-0.44.0
+wasmparser-0.39.2
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.2
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="universal web assembly runtime"
+HOMEPAGE="https://wasmer.io"
+SRC_URI="https://github.com/wasmerio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+https://dev.gentoo.org/~williamh/dist/${P}-git-deps.tar.xz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="MIT Apache-2.0 BSD-2 ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+	dev-util/cmake
+	>=virtual/rust-1.37.0
+"
+
+src_prepare() {
+	[[ "${PV}" == *9999* ]] || ln -s ../${P}-git-deps "${ECARGO_HOME}"/git
+	default
+}
+
+src_install() {
+	cargo_src_install
+	einstalldocs
+}
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index 7343064de18e..88f026e13391 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1,7 +1,4 @@
-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 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
+DIST wstool-0.1.18.tar.gz 80595 BLAKE2B ed90fc5c63ab5d775dfb49ddacc6da6e285aeb5078cf471c0d504659a9e322fde27797e4d05fd56dff4b9958558200cf05e46cf7ae71fd1231ab63048e668808 SHA512 fda9c679183c605048ed024a57b07fd2d9b644978a3e4ff89c3716b74d8e4ba0124779bcdf88a75fdbbf47c765b7ab63db7c84a55a6e1744fc6f955649590c48
+EBUILD wstool-0.1.18.ebuild 1439 BLAKE2B 2e5c6f6e82d521725e123726400d5c5c962b73328d0898d37d30ea7f3ee0c4d7a7480978e03e257cb4f00bfd6717eba92ce17abfb457dbc7ead3bad0c61c5c45 SHA512 cef1e8c8dfc9f26526944b7d917ac6e3d2c53e050dc7985379b741ba43ebf90c2456d183971243e2b61d594edab2f9c3031ff61e57046acc4f37224b463d4910
+EBUILD wstool-9999.ebuild 1439 BLAKE2B 2e5c6f6e82d521725e123726400d5c5c962b73328d0898d37d30ea7f3ee0c4d7a7480978e03e257cb4f00bfd6717eba92ce17abfb457dbc7ead3bad0c61c5c45 SHA512 cef1e8c8dfc9f26526944b7d917ac6e3d2c53e050dc7985379b741ba43ebf90c2456d183971243e2b61d594edab2f9c3031ff61e57046acc4f37224b463d4910
 MISC metadata.xml 329 BLAKE2B ffdb449cef2fa449771425241f9a03b49d915bed8abc73329586e9a2873e41ac669e4a347ed6f2cabc92b7132a741d5fcc79f13a9d900f7fced17fba322c460c SHA512 7bedf1430c3a2e5a8c98701ef48ce3a97ac59bebe3d42e19da193480c97ef0b2020916c7582f4083ebbf361b5c66b17ad1bfa7889e8aa62d3c945ba8dcf5b62f
diff --git a/dev-util/wstool/files/prefix2.patch b/dev-util/wstool/files/prefix2.patch
deleted file mode 100644
index 934443f98707..000000000000
--- a/dev-util/wstool/files/prefix2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: wstool-0.1.13/setup.py
-===================================================================
---- wstool-0.1.13.orig/setup.py
-+++ wstool-0.1.13/setup.py
-@@ -26,18 +26,11 @@ def _resolve_prefix(prefix, type):
-     # issue: https://github.com/vcstools/wstool/issues/81
-     osx_system_prefix = '/System/Library/Frameworks/Python.framework/Versions'
-     if type == 'man':
--        if prefix == '/usr':
--            return '/usr/share'
--        if sys.prefix.startswith(osx_system_prefix):
--            return '/usr/local/share'
-+        return os.path.join(prefix, 'share')
-     elif type == 'bash_comp':
--        if prefix == '/usr':
--            return '/'
--        if sys.prefix.startswith(osx_system_prefix):
--            return '/usr/local'
-+        return os.path.join(prefix, '../')
-     elif type == 'zsh_comp':
--        if sys.prefix.startswith(osx_system_prefix):
--            return '/usr/local'
-+        return os.path.join(prefix, '../')
-     else:
-         raise ValueError('not supported type')
-     return prefix
diff --git a/dev-util/wstool/wstool-0.1.17.ebuild b/dev-util/wstool/wstool-0.1.17.ebuild
deleted file mode 100644
index 44cd350a809f..000000000000
--- a/dev-util/wstool/wstool-0.1.17.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/wstool"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Commands to manage several local SCM repositories for ROS"
-HOMEPAGE="http://wiki.ros.org/wstool"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/sphinx
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
-		dev-vcs/bzr
-		dev-vcs/mercurial
-		dev-vcs/subversion
-	)
-"
-
-PATCHES=( "${FILESDIR}/prefix2.patch" )
-DISTUTILS_IN_SOURCE_BUILD="yes"
-
-python_test() {
-	# From travis.yml
-	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
-	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
-	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
-	# command to run tests
-	nosetests --with-coverage --cover-package=wstool || die
-}
diff --git a/dev-util/wstool/wstool-0.1.13.ebuild b/dev-util/wstool/wstool-0.1.18.ebuild
index 30a7bd56fa00..6dbe2958bdb9 100644
--- a/dev-util/wstool/wstool-0.1.13.ebuild
+++ b/dev-util/wstool/wstool-0.1.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES=( "${FILESDIR}/prefix2.patch" )
 DISTUTILS_IN_SOURCE_BUILD="yes"
 
 python_test() {
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index 44cd350a809f..6dbe2958bdb9 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES=( "${FILESDIR}/prefix2.patch" )
 DISTUTILS_IN_SOURCE_BUILD="yes"
 
 python_test() {
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /dev-util
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)