gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /dev-util
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
138 files changed, 1956 insertions, 709 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index bc0fb189ce4d..206c33e81ae3 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/artifactory-bin/Manifest b/dev-util/artifactory-bin/Manifest
index 90d25bbfa3cf..182d7a4e03b9 100644
--- a/dev-util/artifactory-bin/Manifest
+++ b/dev-util/artifactory-bin/Manifest
@@ -4,4 +4,4 @@ AUX initd-r3 5373 BLAKE2B feb7f637c644570225c589767753c27db59b10971ffe5f7886dc94
 AUX server.xml 516 BLAKE2B 6ed7e14de91fc1f7a9da25c8caeae4bbc25b783d84a321e69bcc897e5ef68002fa39bece886522f1833d9d4352dfa8391ec1d8c90f0a816beefec70b6afb8a05 SHA512 2c16207cccf29a3733e9759b0eb20d62184de6f91feb8f49037501e62f77ca09aefcd7a95a1544441318ac6a3577a3c366fc12d490726268233658581a64b91c
 DIST artifactory-6.3.3.zip 98166641 BLAKE2B 33d760bc0f763ba0d8e091ce5484b3a90df4e57f291ea7a96a69bed13579c3c17af0005f95dbda847b2ab428d7dc36ddbee594d008f6e3badbb04e45c3b5dd89 SHA512 12f545d5e66b70e35d8b9967baadcfb503df7457bc48957a80b38d447cc9f024ce8f33b2463da65f5616161906bc64652fdd042446c5e8615e24ecc7f23a527b
 EBUILD artifactory-bin-6.3.3.ebuild 3333 BLAKE2B b4b2b3e09cc1f1c253895e37c1109b87b0042edf3ab8410210702ca538faff877521d6def8752c85fac81a16ad6d11d657c813c66565e584991b10976b2393f4 SHA512 66c34128ea8ba08e17dfb88adc0a5ab3520077b8cb4b7127763d68069be34fc126ba0fcda833b950a796ffba421a55a5d2ad1c035e17672e2c17a856824cb345
-MISC metadata.xml 279 BLAKE2B 6e75b275009b71b76ac58588f1283d30718a910a3a6ca8d289ed313645a0a16683d8a308ed9129da37967f3a903b692290c0b03c3a7441098632a32fe9a74641 SHA512 2948e82a333d27863551e8e4d0f1943c53da2e5eb72ce8128b0b90b5a07a011d32fa0108eb9f91d7e2b14e108c11ba36df3efe3e196df9c0abd1fe862e087c97
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-util/artifactory-bin/metadata.xml b/dev-util/artifactory-bin/metadata.xml
index fff2f58633f6..1b2becffa26c 100644
--- a/dev-util/artifactory-bin/metadata.xml
+++ b/dev-util/artifactory-bin/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-  Respository manager for Maven (among other binary package formats).
-  </longdescription>
 </pkgmetadata>
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 11d3a0406861..c8fdfbf1a8fd 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,7 +1,9 @@
 DIST aruba-0.14.14.gem 172544 BLAKE2B 085a0a030c5c4d1527e80ce004adeb80fc8a9eca8507211acaf49d947ed412aa54f1319104833a8fbb76d3ce5b77e84b35187234ee97060b51e8877519ed6249 SHA512 612b742bdf89e0272714d709a772eded1c61c654977bb58f7e6e5ef5a8b29dece848bf3c70aa6bc566e6c2a75b3e39e637fa5e37f869fbf4bf3d0997257df9f7
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
 DIST aruba-1.0.2.tar.gz 132977 BLAKE2B 762abef412a62e91931690a0a56ee1b04868c9f446f79e1c282e15c1ded1faf609d480e7fb032b09c3230e2d233b3cb0e09a58b2950c7a138f486c34339b8a0c SHA512 ff9161a94627e1bd123c00a0c3dd8624034b10741867d60c85264322e4ae5f2226d585d361fe8f2229003c187a1dff38c4278c359f018ca28cef1fd6efd26aa0
+DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875350b5f2ec6676f6a6167e9bbc6b759c8cc0a29a6774877d3ab2f1c95954d83dbfe3e79669cc8968c1c533ec SHA512 ff89846b805267e2a4bff394c8285b9227d40a2cd93a7ca8fdf8cd6d38a3b2144d5e96b0bd1cef94714df630ad7a779d609e05585c671371124b400130f3b3b4
 EBUILD aruba-0.14.14.ebuild 1746 BLAKE2B 419b70985f18519c23aab2e13b006d867a19ae534fda30c9a4ab88a3df18bab5a38b74b5614c8fa00f1577acca27b90ab260c05de2da8700133d33c71edbc97f SHA512 84eb8be2f99c0e7a65a61450ed56ddf632565da6db96e1b10e5cd5dffeae24f476a765507a2e57fffa22a7d90447036967f66cd346bf03c7151c5797d6118140
 EBUILD aruba-0.6.2-r2.ebuild 966 BLAKE2B 5ac0fb744b55ea1931dfb419839b292bdea1a3191b2e2fe0d4cc913d4cd4cbef2829e581b40df28d7665e4cc5e8dcb9af43c8df8851b698040fe5af72b9ca357 SHA512 e58618308f98b565f103de437e5b2d4fafd1994dca8e3c9654300fe2dc474259cf7cb7c009a67cfd0c4d3c9b6846351a4b6807950756f6fab760e2f237843437
 EBUILD aruba-1.0.2.ebuild 1922 BLAKE2B f7d9aa054e862cf7aeef26a322a067ef8b279c8a96a472471aa0dd2a027c0e06d66908ede4730ccfeeec07c76dcc52657a497f7040d9b83104a60cee83d4f032 SHA512 e8451f0ec7ec1c9967dd0046050eb01b96ce616c55fb50ab98705595ad4b98b747df4be1c468da45163c710398d2de2b253d3b3ff58f042153f45e30664bc311
+EBUILD aruba-1.0.3.ebuild 1955 BLAKE2B 0b36d1b42e8a9cf1ca22a19118189f2a8bcd5291cf8e4626d2de1542fa3352a0e9c2a777394f93b7bc92888debfa32673863a52137c8077cc0b97040eeded385 SHA512 25587725ee21665a2d36bbae4eae8e836cc96f57b95b974a7dd0f0ba0e9a8a8b520451e1543d80ae335d1ad6ab00b681beb67bc294e71ad0160dcad5e732053c
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-1.0.3.ebuild b/dev-util/aruba/aruba-1.0.3.ebuild
new file mode 100644
index 000000000000..c0e124af53d9
--- /dev/null
+++ b/dev-util/aruba/aruba-1.0.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="cucumber"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber steps for driving out command line applications"
+HOMEPAGE="https://github.com/cucumber/aruba"
+SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+DEPEND="${DEPEND} test? ( sys-devel/bc )"
+RDEPEND="${RDEPEND}"
+
+ruby_add_rdepend "
+	>=dev-ruby/childprocess-2.0 <dev-ruby/childprocess-5
+	>=dev-ruby/contracts-0.16.0:0
+	>=dev-ruby/ffi-1.9
+	>=dev-ruby/rspec-expectations-3.4:3
+	dev-ruby/thor:1
+	>=dev-util/cucumber-2.4 <dev-util/cucumber-6"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	# Remove bundler-related code.
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die
+	rm Gemfile || die
+
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/Before/,/^end/ s:^:#:' \
+		spec/spec_helper.rb features/support/env.rb || die
+	rm -f features/support/simplecov_setup.rb || die
+
+	sed -e "s:_relative ': './:" \
+		-e 's/git ls-files -z/find -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid features with minor output differences
+	sed -i -e '/Use .aruba. with .Minitest./i@wip' features/01_getting_started_with_aruba/supported_testing_frameworks.feature || die
+	sed -i -e '/Failed detection of exact multi-line output/i@wip' features/03_testing_frameworks/cucumber/steps/command/check_output_of_command.feature || die
+	sed -i -e '/Create files for Minitest/i@wip' features/06_use_aruba_cli/initialize_project_with_aruba.feature || die
+
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	RUBYLIB="$(pwd)/lib" ruby-ng_cucumber
+}
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 87788535cf53..d5b6c3e2bfaf 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,3 +1,5 @@
 DIST bear-2.4.3.tar.gz 49933 BLAKE2B 2a91c30d81f9d0e58a25458579f6b0c867c07d2e532bd2ed29305645e152bd564156f708c4a07a683577412b3fdab1f106685ecf1ad88eaad2f33f0bc43a5baa SHA512 a4690cfc9938d8752ca5c8322ca4c5039746ade059e4459e7f3f91b2bf3d36ea691a5d855cab7a4e7ad8ff76478c48c4394593e069a1cf8396ead41017421753
+DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
 EBUILD bear-2.4.3.ebuild 1634 BLAKE2B e0adf19fb18817851269ce6ee51bc32a91ecadeded8245ff8febd2e521f5cb5a3892b862186e2bf58d893a6ea63b9fde70868c338563b3347518b186ada5ec62 SHA512 80713166f3397724f34824d1498ac338b6b5cfefa39b6dc323f190e01dfbbebee031c2ada1186cfe493006abd7a9294f3d70c66583c31db7b1bf0b154acdc0e0
+EBUILD bear-2.4.4.ebuild 1633 BLAKE2B 4669f532814c4f22c80c642a95e8793ab0b58a84e0ecf651168e098ff33f0e4ec55e0a0579beddc342d6fe2cef077ded616088d9f785b11ab8d36acc80840676 SHA512 e17b6bfbe52c00cacbe4a3115e62e6976a111f93d8b40b9db99e77e70d3fc626de713dc67001ec51a7bca8e9ea5c05f8ad29add91aa99311f8e277974f3330db
 MISC metadata.xml 914 BLAKE2B 791cac2c9a3850bc49848ec8f6ff889a21802ddce6937783afccdda45045b3861f0c79e44028ea6df18f046c5fc1b6ad89ac1a940afc9e4d6607507a12933382 SHA512 a7b29ce47f3c9d91f2ba5d1abf5975d64a9229619737b75d38d54b3bde860a47a859e6de7a959ad67cba21b2a0ced8a9fbaf508c02cace63c4090afbac2005ba
diff --git a/dev-util/bear/bear-2.4.4.ebuild b/dev-util/bear/bear-2.4.4.ebuild
new file mode 100644
index 000000000000..468a104719bb
--- /dev/null
+++ b/dev-util/bear/bear-2.4.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Build EAR generates a compilation database for clang tooling"
+HOMEPAGE="https://github.com/rizsotto/Bear"
+SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="test? (
+	app-shells/bash
+	$(python_gen_cond_dep '
+		dev-python/lit[${PYTHON_USEDEP}]
+	')
+)"
+
+RDEPEND="${PYTHON_DEPS}"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P^}"
+
+src_compile() {
+	cmake_src_compile
+	# need to fix it now, before tests are run
+	python_fix_shebang "${BUILD_DIR}"/bear/bear
+	python_fix_shebang test/functional/tools/cdb_diff.py
+}
+
+src_test() {
+	if has sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=sandbox\' detected"
+		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
+		ewarn "Skipping tests"
+	elif
+		has usersandbox ${FEATURES}; then
+		ewarn "\'FEATURES=usersandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
+		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
+		ewarn "and will fail without generic cc symlink"
+		ewarn "Skipping tests"
+	else
+		einfo "removing unwanted/unsupported/xfail tests"
+		rm -v test/functional/cases/{end-to-end/scons.ft,intercept/cuda/successful_build.fts,run_pep8.ft} || die
+		einfo "test may use optional tools if found: qmake gfortran"
+		cmake_build check
+	fi
+}
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index 447263407e33..b55afa2fe25b 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1,3 +1,3 @@
 DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
 EBUILD bustle-0.5.4.ebuild 1636 BLAKE2B 0c03d3dfb08c5b9b79b4df1685103cbfefb1c6dd3a2ac1b69fd0a5f026e847df00ea23278f308287624cb3a4212d17a430e525bb7bbb89eb48fc4184b66c36dd SHA512 c86f830a373349f256ab367617f0bd4ef460a843f6fc37f5ca8aa147921a45e211b3e2a025a23a2e43e2efcff278caed4e6335c2f2fdaf668d823e1a731cb264
-MISC metadata.xml 502 BLAKE2B 3ab482910acd7936501b8c519d2da5c286d493a04afc6d5302989ca5662a4f166d84142489789cd5f5ea4071b5a5e54bc9d0586e6e6fe273f3f2f6f4c44149b8 SHA512 834e9820081006344e30580673ccb789750d1af67807f908b21fc5fe0cf1b8554b32b446aa592c52a1dd26e4d36f2f91c3cff569b8c4797ded9c5c6ea1bfa65d
+MISC metadata.xml 414 BLAKE2B 3a5af672c3f0594e7e2f3ee824e57f2c30fee5929dea367867e4a4e5cd8a3fd262ad1fc6f9b3af698f7e6bbe0d595cad7905ec161dd29dde679fc26d4066d2c9 SHA512 cf9665a6913dd717aee86974c51d519cc605a94de65c54cad33e00c8ef1cb7bf286ef081b0b0306a396f2122c7a16f7a93b9ce76e749b8b0bceacb7fcc92ab9a
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
index ff21ef6ead63..00f0a89d7391 100644
--- a/dev-util/bustle/metadata.xml
+++ b/dev-util/bustle/metadata.xml
@@ -5,9 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Draw pretty sequence diagrams of D-Bus traffic
-	</longdescription>
 	<use>
 		<flag name="interactivetests">Build interactive test programs</flag>
 		<flag name="threaded">Build with support for multithreaded execution.</flag>
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 55b051b60a77..15dd13862396 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,7 +1,7 @@
-DIST byacc-20190617.tgz 799465 BLAKE2B 2baf34b20da049b3b1d2a569ec6b5470fe4935c9b13062fc58e6c73de6cbb1823736532686d4c9c083771432ce1caccc369c87070b27d59e9cb7c5c5bf1391c9 SHA512 79d04d7aa976e8b4e1bbd69f75ac1f0dbe005b1a7b072ce5ef75c877e8ece043e4adf48645c10ef036ee02de639b56b9befebb34f6e46cac1a59f8f641cc7cc8
 DIST byacc-20191125.tgz 871913 BLAKE2B b779fd05a98bc794544d84568720979ede374c7c821f3883e2568dd97bb2ded2dbc85471f5dadb7aa2953d9cc9665f4f1f18b77717aa63eae0786f70683fd9b7 SHA512 ef35ec6a294b07c71958dbd7106cc9b4a99d0eb45336d71c2763b3861a2cf97ed1de7f8c242a5eeb2841578711ed4a0bd874b7d6ac5e63db7f1d418847767c7f
 DIST byacc-20200330.tgz 872217 BLAKE2B 870ac1eeb439c96875e343223925414115b500d5b22ccdae9d7b30830ff6805d18d5bc43ec6f7ae1237ec500cfa1693aefad6e9607cfcc74188b541abfd16595 SHA512 df8cc1aa550d633ab547a13a4f091d8c940a9a67b52dc5ecacad5b005fd54c3ceb1269593068c1a7949049e85b6e6eea20cffbbf4b408e049fde75c0ffe51f07
-EBUILD byacc-20190617.ebuild 615 BLAKE2B ab2446c14262888052f7d370a0c2c104eaa7430ef9b95a4c19087e3bf074b995261e5a9428c78e865a6e203cafeae1b747a60ecc4bb946418c4febd617f244de SHA512 4427ce8d462725709c15b6ee87fd47918ba76a71cffd2a74d531eafa5a57b90150820f67e400d17c5953a0872451a8e069a283705f7ee88ae3771cf90e4e8dcb
+DIST byacc-20200910.tgz 871242 BLAKE2B de0f63b9edfb9451e23d7693daaea59f2661305a6727cd8e986c2557e513ca5dda8f0008d05b5c8f35a153a309bc4b02ecd6f45219bb553f928c9da11b616130 SHA512 491bbde2d5b0fdf2ad57bec5080112ad7c12ce3830b5e14f2289092aad1addae6edd4698368a9c8d69219a95ae5fa47eb32a95a2625841915297972591bebea3
 EBUILD byacc-20191125.ebuild 615 BLAKE2B ab2446c14262888052f7d370a0c2c104eaa7430ef9b95a4c19087e3bf074b995261e5a9428c78e865a6e203cafeae1b747a60ecc4bb946418c4febd617f244de SHA512 4427ce8d462725709c15b6ee87fd47918ba76a71cffd2a74d531eafa5a57b90150820f67e400d17c5953a0872451a8e069a283705f7ee88ae3771cf90e4e8dcb
-EBUILD byacc-20200330.ebuild 624 BLAKE2B 8828020e31c2c22c33929d4c89d5d87fd8597b78835f12868e92cec5617e7c4ea56490a801f76494c6800e69da806f8ca19dc3f5f09bedc3924aa9abf15d7ec0 SHA512 ef316d3081e414c934fccc62c4d47da6950426484a16b7a283f2a59eaae38ab0e1e67dc5ca13a3f1bfea8844b3f70af9b7b188ae4fa8df21942ede1f6425fafc
+EBUILD byacc-20200330.ebuild 619 BLAKE2B 8df1ca9b6ac91893cd91a0a60613d6369505872210a1ae049e1967f90c150c3a2cdf9ca86965fd6e340a68d839b89709805cec611b21009183800c848f66ff6f SHA512 e35a49806801d08901fe443159256d8266776a0a13f4b9efe5bed1b0745aded2c65fd1d8b80632687d6ea7e9930e528899affcc7a559bef31e2f2bef48f57d2e
+EBUILD byacc-20200910.ebuild 624 BLAKE2B 8828020e31c2c22c33929d4c89d5d87fd8597b78835f12868e92cec5617e7c4ea56490a801f76494c6800e69da806f8ca19dc3f5f09bedc3924aa9abf15d7ec0 SHA512 ef316d3081e414c934fccc62c4d47da6950426484a16b7a283f2a59eaae38ab0e1e67dc5ca13a3f1bfea8844b3f70af9b7b188ae4fa8df21942ede1f6425fafc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20200330.ebuild b/dev-util/byacc/byacc-20200330.ebuild
index dd0f7b254f65..7fd51f86ae7b 100644
--- a/dev-util/byacc/byacc-20200330.ebuild
+++ b/dev-util/byacc/byacc-20200330.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 ~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 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/byacc/byacc-20190617.ebuild b/dev-util/byacc/byacc-20200910.ebuild
index 5a73d932b404..dd0f7b254f65 100644
--- a/dev-util/byacc/byacc-20190617.ebuild
+++ b/dev-util/byacc/byacc-20200910.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 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 ~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/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 79f6d21119bb..62c3d45744e3 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -2,7 +2,6 @@ DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 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.14.3.crate 165874 BLAKE2B 0155bccbacc70a2f8173117dde46c3bb48e07d0a0616b53ea56cade436cb6da1aa7106a82bf4ac55954cafbea1790f9200bdd3132032d3306ec755be0bb2f05c SHA512 abce798aff93260c28b0717df5fd25cf24b3eb89c9d05df4832d06169ec30db8e1c17a300f88087c6fbd4414a6aae6788e162dde838aac01c499afcb145c8461
 DIST cbindgen-0.14.4.crate 172123 BLAKE2B e86fe619d824b25884570c7a34bdb6ceb3d4906b2309a3c16b29b46284f7bd855991910000a54605eaf2786ce4f570b647a469a2d02831919d9c0a17feda694f SHA512 1d1dfbb159aad25ecbe77368ced803a0cf219a00238364d95b1866f371912e10932e9a6ccda7acd8541b270b1880bda4a29af095a8d83b79a792e31d1ce2bd78
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
@@ -37,6 +36,5 @@ DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a8
 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.14.3.ebuild 970 BLAKE2B ebc12682113ef7cd06974b72bb5d45ad3005475e3bac615d061efe7a3b3493a2964633f3a77d2691ce0587835f552b924572fdc7803fdd33e67ae44ac9647ab8 SHA512 aaf99043f26afaac6bb138bc0cf5dd66c6f4eaf2568c17988f77e9ed93a5ff3ee4e36fcdb3ce71897b00b7d94a1f012b53faf86ef342a10fc2b6fc5a7befab15
-EBUILD cbindgen-0.14.4.ebuild 973 BLAKE2B d4b703a2fa4022ee6e8c683c73a6c29ef9b4de3aca7bebbe36f97deb8d7165b79dcce230ad0cdc9a1cddf14c0d933464e33c4d1b3a07378d0434765c4f96254d SHA512 f73de464787bba6289cf8eb24c0a77714b20de3fc3d5d4af36a00f39d5bc9f4a76f1d763811fd63afd9ff3a9b07abdc3a5b0b9f1cef6bca2a1a6584d8aec9023
+EBUILD cbindgen-0.14.4.ebuild 970 BLAKE2B d0cbb456166176364597e1cf4c6c18462cde7d19e9ac739b9d3896499d208d3404f286bd0991e355a059343aac487286436f04166d4da530848337bb2153f55a SHA512 9bd99c488f96fd7c779dd3b0fd384812368e79ffc8dc590c8982408161201804781b8ef6c66c8ad0af9232f2683387dc34a5a839f069fac835a7ddfa4170c67c
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.14.3.ebuild b/dev-util/cbindgen/cbindgen-0.14.3.ebuild
deleted file mode 100644
index 21e250b26fce..000000000000
--- a/dev-util/cbindgen/cbindgen-0.14.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.14.3
-cfg-if-0.1.10
-clap-2.33.0
-getrandom-0.1.13
-heck-0.3.1
-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-segmentation-1.6.0
-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 ~arm arm64 ~ppc64 x86"
diff --git a/dev-util/cbindgen/cbindgen-0.14.4.ebuild b/dev-util/cbindgen/cbindgen-0.14.4.ebuild
index 0c1282478263..3762d45e04b4 100644
--- a/dev-util/cbindgen/cbindgen-0.14.4.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.14.4.ebuild
@@ -51,4 +51,4 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 4ca605066fec..5c58dd3770d7 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -4,5 +4,5 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-3.7.10.tar.xz 353792 BLAKE2B d7c06ee55a79afb4b72cdc20ec3d6413a5417301c63a0c822a4f82e6b9542c7a9cdf9f1bbd60a4698c335fdddfadcb9d674bff02c6dad1c2df9932212fdf6477 SHA512 64b0d42af7fd2dfdda65668b04dbd16807a22324e336e61f6c6a91c00110fb535c7ac9062a9c14c924a7ddaf42247f69a43d83dd0fd187ce3b0737158b5bb8fc
 DIST ccache-3.7.11.tar.xz 354160 BLAKE2B 46fc5d65d6224bb796db7632b35ccca1089e5fed36eeb2ba231cf4c1aaa94be10bf0504f6ef565ce11673e527e09dee64583a764062ca7fea38364d790dd8cc1 SHA512 47b71b3ab4b89bf9b6f6d15941c22d2207b369922f51f9a8fbf4e86554325053dccce669e1c1ed3c0019a7e0a3d610f399e52d3fee68b56111aa7c1b24132c11
 EBUILD ccache-3.7.10.ebuild 1522 BLAKE2B 6c21b6c5782c39eafb043fd6fbde0dec69ffa7e58db5c3efcf51e066a3ab28ab02f16edef5b74db3997e6bf7a43c6790ce81c581fc76ebacb903ea1b9d0c5534 SHA512 1e8a2bbdd0fdbae5923329ef42b2af631c586b883ef9dc610a856744d18d762dda8eb693b8e2d043138bb1b1ad63b3fe7b7250a601f8e82ee1ddeb01b31f5c1c
-EBUILD ccache-3.7.11.ebuild 1533 BLAKE2B e3b04c0e8f8cdc875860ab040bcc6006d1fabfce96d5c05024c86507fd38901038c6df5aa07f434305c79b2663cc0e945c2e18705da5d7265a899a22e66b099d SHA512 c1b0dcfb2b1f6138f747ea633acf407e3746bb6307bee636b91124223571c6c332178b446c9b4dc483c3b169babb19f4a697bdafde323c2745d7c185e6fde778
+EBUILD ccache-3.7.11.ebuild 1531 BLAKE2B 38058178daa852cbbc37d5a34c088fffe552c7d35c9861125cb4a7d1e7ee298a685bde2407fa7ec719cb484b0e1fa377cb9eef93330d2f5dfcb2a003b774755b SHA512 513d185664b3a4e1feb46ddc6141f0bd391c0cc4d78c204cc47db67a6e044a9d61fe5b3926fa335e3f50ac40f594d0b93c7ad9c4e2be7a45626fd02082b89540
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.11.ebuild b/dev-util/ccache/ccache-3.7.11.ebuild
index 1bdf81b4437f..383e4b0afac5 100644
--- a/dev-util/ccache/ccache-3.7.11.ebuild
+++ b/dev-util/ccache/ccache-3.7.11.ebuild
@@ -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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index 12dae384c9db..439fe3b94f5b 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,6 +1,9 @@
+AUX cgdb-test.patch 2132 BLAKE2B 7308e2817a0956382a2949baad003ff0adf10989825170fcc953979d9f39da245584de4245d4d86b81e9cb74cccf11628ce3448a736cc3e89ae6e9dfabc3112e SHA512 8c5dde409035134ee75115c99a9b257a6c711750fbf662478d33911a015cccf4bf1a1ee6ec9d72d7075b0ce6dfae98a30ec60f4d2447f958ba322ced71be203c
 DIST cgdb-0.6.8.tar.gz 435115 BLAKE2B 31efcd8740dc0a0354c8d655cd7b77b18b25842dc39d1de42a92917305879394b425d7a7b0e555b368fc6a67f535fe9244c3fedeec9105c3622ace313b24c8c8 SHA512 ef3d94820bb5a37a8d7fbac48c8d144e0ac73c4f5a9d25bea33f2c4390080bb2dbdc5e7e21a5ef8a4980515cc48d80f140f7cf1f90eebac3f8bf1cc6168585ea
 DIST cgdb-0.7.0.tar.gz 319980 BLAKE2B bfc62f9214f6726e5df081119e85ccdeaea9a2310a9bb7a1746525ab998ea94ec1181efd3a1986ec0d33103c2f2b888e4d93c4ddaa4a996db4e47b0173c3b67c SHA512 83aeb919e96cd0981d8fe5cdd257df3e8d8bfbceea720ea66c1773b28c9f0ecb0e303e0585206c55242bc4438d505e328d43b4991c6ddc4e4202e048558c30d9
-EBUILD cgdb-0.6.8.ebuild 892 BLAKE2B ef7e3c4ec0ff5128fd4dec999ffcd69e664ef16c568cc1855480db95ba082f59520da9761243cb6fef5945d30e28e7788b05b1bc92774242fca4034a054d2df5 SHA512 7e1b93b4b28beba45f71231a7065e9c8280dd93093477095c2a353cebf98323cc4dcd5ab4a59aeefddc4fde2f34ab9abe0c9d2c2a63473afd8ac71401fd4eb39
-EBUILD cgdb-0.7.0-r1.ebuild 1348 BLAKE2B 370d58da127c77a5f3055aa2787d92e090e400fd5c0a65131d75432ff1643e7a429e2698fe25396dc909b817e3e30f41ebfcbfa335f1f0397fbbe331dcdd47bf SHA512 1b8823bb18b364bf8be2e51c096be21c4e4358b08738645a88f3ca064ae0a96dc0a8d3c789d75cc4e42ae1147de5f42dc03dac5bd07e4fcc2334ca9c540be196
-EBUILD cgdb-9999.ebuild 1348 BLAKE2B 370d58da127c77a5f3055aa2787d92e090e400fd5c0a65131d75432ff1643e7a429e2698fe25396dc909b817e3e30f41ebfcbfa335f1f0397fbbe331dcdd47bf SHA512 1b8823bb18b364bf8be2e51c096be21c4e4358b08738645a88f3ca064ae0a96dc0a8d3c789d75cc4e42ae1147de5f42dc03dac5bd07e4fcc2334ca9c540be196
-MISC metadata.xml 290 BLAKE2B 38e814dac08e7716bc4b409945fc84830d105653cd97287c117db96ba3abdf392d3e198961e274b610c0cc5b4264506dd045144043504463db18862e44ad5c10 SHA512 dcfa0921f991440a235d30f0f768734899cd9382e0c5c83508e1547e76797fa9f3a46c87fea4706f3ff5caff9e73ac7fd21c0026c51e90930f38353f22591011
+DIST cgdb-0.7.1.tar.gz 314768 BLAKE2B 767a57d071fa4e3c75d231a1ec879d871669fcda9c733d157d380fa525dd321f1deb68d7ef7f424b3f36a115043a0a0faae271f24746f934e288ba7d9a4e7fa1 SHA512 050c7bad963d51c1a2cb309530319ca77e9d236f419fb0abac4ab5030ff1068d799fa626959a8b3036321711de98bddf40d264bf9367ff5697075e30ca8168c6
+EBUILD cgdb-0.6.8.ebuild 893 BLAKE2B 6fb0c64d243360738b7aabcaf1b1427712f1028d4ebd6c50c64726a6071328c09a68791d9c4857bb22c1c174ff950d0f1b987e5180e51681dc5c50679ceed2da SHA512 3261342f77bfc9b3e9645de231a90d8dbc5844a95fd8aa6b49635d18682cce8ebf5fd5b46baba389f2595c1b187f98e240f829f2f0ce0f80760c1cf5be5e8ef0
+EBUILD cgdb-0.7.0-r2.ebuild 1438 BLAKE2B b646c5214ba5fe56ec5271908124e34d2a94c96823a7976be221fe9376753fdb4031caa492408157e7ae1991bb9ea34f61317ab6c14c385a43159cbca4e937f6 SHA512 5d077490c5249c8e83f8f1aab0f44d43473c2ac2e8fe971a7dff1dbb902b79c43ac360e2c248ba6c72802506d2811f9eeeb58c2ca8229683f3bd92e0c2b72b83
+EBUILD cgdb-0.7.1.ebuild 1429 BLAKE2B e8aea700c70a6511490f613a85c694a6d51c624458945761c905612afc62f4519f2388ffcb7f7452d717f9e8c67dadd2e8db99ce995b79864a4125525baff0d0 SHA512 362aee2e11eec03646c63592a4812beaccfcb0613bf60e0cd0dd6b8a43e480e6d5ecfc99592b9893bb2c44f478689feec6dca47f78880e288cc19b83e8826497
+EBUILD cgdb-9999.ebuild 1349 BLAKE2B a3924926eac8f279e57ce6a247e3966626e62a5fd8b6e6b30ac333f663ff1611d87b8e4b5a39c80324855d203b7fd129c9b66d73fbbf94effbd2932f585437f8 SHA512 47640224adfddb21d6e19bc9d1b3dadd30d93981bbd820a098f96f47801c0a0f668c392fdde0b70f839bb0173f0df58c6582ea4604bccd7cbc2ee8afa1f8bd93
+MISC metadata.xml 491 BLAKE2B 6f0b7012dd97eba9ad20c893d489f2793c1381da6fb86e24c6259dc54244632c09be3b0f4ce2f8259e43d86d2d01546d0aaa565982bdc13b575742b1716d66f9 SHA512 fe06ce409d20619b30f9f4cdb28acc77edd1964d7177accbd3c9597d7930f1ec260847112a12e5184acb835e436c9d30a100c4613ed54b678c545dc8d3824a20
diff --git a/dev-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild
index ddd55558fcbd..c38d3ca1e868 100644
--- a/dev-util/cgdb/cgdb-0.6.8.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ fi
 inherit multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.github.io/"
+HOMEPAGE="https://cgdb.github.io/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
diff --git a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..b2a19f371e8f
--- /dev/null
+++ b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="
+		https://github.com/cgdb/cgdb.git
+		git@github.com:cgdb/cgdb.git"
+else
+	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+inherit multilib-minimal
+
+DESCRIPTION="A curses front-end for GDB, the GNU debugger"
+HOMEPAGE="https://cgdb.github.io/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		app-misc/dtach
+	)"
+
+RDEPEND="
+	${DEPEND}
+	sys-devel/gdb"
+
+DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
+
+PATCHES=(
+	# Bugs: #730138, #678006, #630512, #682386
+	"${FILESDIR}/${PN}-test.patch"
+)
+
+src_prepare() {
+	default
+	./autogen.sh || die
+}
+
+multilib_src_test() {
+	# Tests need an interactive shell, #654986
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
diff --git a/dev-util/cgdb/cgdb-0.7.0-r1.ebuild b/dev-util/cgdb/cgdb-0.7.1.ebuild
index 5a8f52e6edac..9b0c032ba93d 100644
--- a/dev-util/cgdb/cgdb-0.7.0-r1.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.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
@@ -15,7 +15,7 @@ fi
 inherit multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.github.io/"
+HOMEPAGE="https://cgdb.github.io/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
@@ -37,6 +37,11 @@ RDEPEND="
 
 DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 
+PATCHES=(
+	# Bugs: #730138, #678006, #630512
+	"${FILESDIR}/${PN}-test.patch"
+)
+
 src_prepare() {
 	default
 	./autogen.sh || die
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index 5a8f52e6edac..403e3567898b 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-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
@@ -15,7 +15,7 @@ fi
 inherit multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="http://cgdb.github.io/"
+HOMEPAGE="https://cgdb.github.io/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
diff --git a/dev-util/cgdb/files/cgdb-test.patch b/dev-util/cgdb/files/cgdb-test.patch
new file mode 100644
index 000000000000..9bbb1749828f
--- /dev/null
+++ b/dev-util/cgdb/files/cgdb-test.patch
@@ -0,0 +1,55 @@
+From a8a567fc46fca4ca10a23016e2fe9055669b9102 Mon Sep 17 00:00:00 2001
+From: Ian Dinwoodie <dinwoodieian@gmail.com>
+Date: Wed, 29 Jan 2020 23:58:13 -0500
+Subject: [PATCH] Ncursesw should link with tinfow.
+
+This patch is a response to issue #219.
+
+Signed-off-by: Ian Dinwoodie <dinwoodieian@gmail.com>
+---
+ config/readline_check_version.m4 | 24 ++++++++++++++++++++----
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/config/readline_check_version.m4 b/config/readline_check_version.m4
+index 567bfbd4..01e61c28 100644
+--- a/config/readline_check_version.m4
++++ b/config/readline_check_version.m4
+@@ -7,10 +7,23 @@ AC_MSG_CHECKING(which library has the termcap functions)
+ _bash_needmsg=
+ fi
+ AC_CACHE_VAL(bash_cv_termcap_lib,
+-[AC_CHECK_LIB(]$curses_lib_name[, tgetent, bash_cv_termcap_lib=lib]$curses_lib_name[,
+-  [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
+-    [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
+-      bash_cv_termcap_lib=gnutermcap)])])])
++[AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
++if test "$curses_lib_name" = "ncursesw"; then
++	[AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw,
++		[AC_CHECK_LIB(tinfow, tgetent, bash_cv_termcap_lib=libtinfow)]
++	)]
++elif test "$curses_lib_name" = "ncurses"; then
++	[AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses,
++		[AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo)]
++	)]
++elif test "$curses_lib_name" = "curses"; then
++	[AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses)]
++else
++	[AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
++		bash_cv_termcap_lib=gnutermcap
++	)]
++fi
++)])
+ if test "X$_bash_needmsg" = "Xyes"; then
+ AC_MSG_CHECKING(which library has the termcap functions)
+ fi
+@@ -19,6 +32,9 @@ if test $bash_cv_termcap_lib = gnutermcap && test -z "$prefer_curses"; then
+ LDFLAGS="$LDFLAGS -L./lib/termcap"
+ TERMCAP_LIB="./lib/termcap/libtermcap.a"
+ TERMCAP_DEP="./lib/termcap/libtermcap.a"
++elif test $bash_cv_termcap_lib = libtinfow; then
++TERMCAP_LIB=-ltinfow
++TERMCAP_DEP=
+ elif test $bash_cv_termcap_lib = libtinfo; then
+ TERMCAP_LIB=-ltinfo
+ TERMCAP_DEP=
+
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index b377d36dfc74..23bc220af49e 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">cgdb/cgdb</remote-id>
 		<remote-id type="sourceforge">cgdb</remote-id>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 0aaa7ef889ca..5d6e1d0a92ba 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -11,6 +11,7 @@ AUX cmake-3.15.0_rc2-FindBLAS.patch 1233 BLAKE2B 165307b41f7ebaa094e80adbab336ab
 AUX cmake-3.16.0_rc4-darwin-bundle.patch 1388 BLAKE2B bcb6c3d8e4f64ccc3e6ebf9ae906960075b3fb1f432925e07a711ac27321023033013e7a2e1d0ffc60dd464b775fa2537a49c73089861a2ce8f6316ddaa3d03e SHA512 7e0f598fe1cbb2c44b345091c102fb42ebff510ea7eeccdbe1fe0d65251127d823c37f2d37b073305679ed86fd48923566f1d62a7c9fb55df475d48891b4b861
 AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551ccea132e11dd8b468cfc7439e61763b5406860d952787d5957ea719dd48ec32ac8313d3209bed2a3423f5e40b8a2fcf04ae4 SHA512 1ea5e5e44c6a97cced30ef38424e24a3551d58c828d71d3b5994c265f099a3aa19174febfc2778eb688930432073e012557a79550d38b6b716e6b619d74a298c
 AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
+AUX cmake-3.17.4-uv-check-return.patch 1460 BLAKE2B 1cc26575dc1ad8ff9adea7ecf7f5ba0f4b2e16510c2ef3572baaf4f6bf771d6b4a1018000b78310b246e333c95e857851a40643609d997f2283486eddda8e8f3 SHA512 e79c6b34d433804f549b60a926bbbffaeba8506430225e284187905d7df5f522c29b8507bdb334cf30ce88414d326ee4476782731f36f1b1a48f64f9fa208aef
 AUX cmake-3.18.0-filter_distcc_warning.patch 842 BLAKE2B 8c9b02a251d118f2ac31fe417e10750e3f4b911891723b0edacea83bf2b6220f121e02c299655cd49ae5a019af8a747218f81d6ece6cda41aeb57d24f9385277 SHA512 91b795225313270449d6da12baa818382da4f6937795303c5cc894f3f38f03cb88d8fb3b774fb0b8ab9cf5cd344ebeda3d83f48ef8474093a8a0268d8f342828
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
@@ -18,14 +19,12 @@ 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.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
-DIST cmake-3.17.3.tar.gz 9470753 BLAKE2B a4c863e0cf7105eb47e1bba7641ab3431506f0a4f5c84a4de203cb996e629d1ee236d91ba5e1439f0123ab3c8b3871ef4e3b1c21940aa97c125cc7ab2a3f9873 SHA512 13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69
 DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
-DIST cmake-3.18.0.tar.gz 8970116 BLAKE2B 3eba331eaa6b1d85baa5898836fc6106f2b5fcb10af85121806c429f41d09d4fde49bf87ef833c0e538ae5ccdf994e9cc86efa39b571ebcd429459ea37205c66 SHA512 6cab76a792a7ed2120a50048312273b2870afef29351a3ebcbf76cbcb422f82be679c85211c19016a56ac7f63bbce6cea0478f491c973b8577e08168a1ba853d
 DIST cmake-3.18.1.tar.gz 8969366 BLAKE2B e5a06cf10fbd8ab2e300a0822bf94943acc48f6632a34471d361c9bc4bdfc952b7b3c4adc969712f84c4b7185f11c2393753a6313b3efbc6edc348ad634662af SHA512 e0591d5fb234f3e7b74d6d2aad44fbf3e19e69547bd428681ba6ad0461d4f3d2a154605808b4733531d2c66f0e91eb39a179ae0d89a37e92a3f20e9cae691468
+DIST cmake-3.18.2.tar.gz 8970663 BLAKE2B 10924eabbcd20bc3dc2cb6f2d619d824ed0a28fdf35ce6b92ed46d0d85320343d797b0c810aa90ab740477548e3390ed98ec5d2777f635920bff84eecb8e0531 SHA512 74915e643d09af1d8451e57120f2e5963f6fd34ca2cfa0cd573bd7f234924458105e7cc76952c022732de7566cd590141127b243933a564ac575a0dcbb8cc6e7
 EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60
 EBUILD cmake-3.16.5.ebuild 5911 BLAKE2B f124d2d41b33a9a76749ced21fac3717eb50bba7065500986fdafc445bef3f17bf6e1faac7e863257ad5d8f571e4bdf17c9e750f5b83163401b491d85a2319f7 SHA512 4cfeb2154bd96b1f146b508ed038158a8cb58ead403011054702c4bdc1e2d99e677baa1b7ee6c33c4b317ca4992718cdc352b55724e73bf8edc758d2748e2603
-EBUILD cmake-3.17.3.ebuild 5920 BLAKE2B 9c3179655159be70348bd187ea7547bc4cbd559dca58dc71d918c8a07d03c931f3b8eecf1c2ae59b30b395af428964d7628224c5eaf3330b849fb07efecec667 SHA512 5b836eba2801d193d33bc0a94bc848ee02db050bd6247e9b70df12c92c1fa55d776860d5eb4103c0f91be322fb6bf566c6cbb7e3bd8838c6f156d5cbdef0c972
-EBUILD cmake-3.17.4.ebuild 5920 BLAKE2B 9c3179655159be70348bd187ea7547bc4cbd559dca58dc71d918c8a07d03c931f3b8eecf1c2ae59b30b395af428964d7628224c5eaf3330b849fb07efecec667 SHA512 5b836eba2801d193d33bc0a94bc848ee02db050bd6247e9b70df12c92c1fa55d776860d5eb4103c0f91be322fb6bf566c6cbb7e3bd8838c6f156d5cbdef0c972
-EBUILD cmake-3.18.0.ebuild 5924 BLAKE2B b94bf93558ecf1c45029bda0d230e83ba4d5d55075a05332a525a049b42d15559158512c629f02c995a1e6e86ac052d4016722ee8a0a6afe3e1116355fbc5ce4 SHA512 c6245b76d735927d7e71defd7c8d1ba43ba087bd86d02bae8b583999974d8a4db3174082ec9309bebab83f79c320cd3fb21428d7cf67b4368788c25920405123
+EBUILD cmake-3.17.4-r1.ebuild 5975 BLAKE2B 9c31506c20c5e7e954baab9e53b81ee0a985bd9544a406d67b58912741ce7e5b643a422d932652ded3b12775d5a4fb68f8ec86b47d4a4e576b2166767966858c SHA512 fe3e879c4a1d3bfc4ee773d5a4d4449882669cd84def00ab61dfa92ba5ad3cc648953ef319f940ff558352023650f555ff98df6c0e34dfcc5839e1072ed81437
 EBUILD cmake-3.18.1.ebuild 5925 BLAKE2B af5d675ac72f28053ffe8dd35a2bf7bca792b872ee5cabb6f2b34f02bf37bbe5de6bc2dd9880c9f93faf25f5a955ba346c1399e35b8e434780b9121a3a97bf08 SHA512 280a555dd541ba38b376fa188c93b057c17c15bde8b6dbf02471ead0ec8d2588d2e41a25a5968c507da5cb18972b221b1dbb203bef487013b9b13d374f5c1972
+EBUILD cmake-3.18.2.ebuild 5951 BLAKE2B ea450b2ec3ff81c7942eabb42f0f6965c45642f97370958858d05fb9c4ccfb4e0bcd0a22483c95aa389e8f76f891d9a89a52179b8cf53fe6ba977ba79b82d398 SHA512 d494cabb9f6184a602a3eeb3f6a481917a162c8ed016f67376f74e6512c7def2bbffefd7fbfb6b779fdee3d85f86c4babc077155d6ef6b8b51ef9c449f6297eb
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.17.3.ebuild b/dev-util/cmake/cmake-3.17.3.ebuild
deleted file mode 100644
index a65d699eeb87..000000000000
--- a/dev-util/cmake/cmake-3.17.3.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/rhash
-	>=app-arch/libarchive-3.3.3:=
-	>=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? ( >=app-editors/emacs-23.1:* )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-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.17.0_rc1-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.17.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() {
-	# 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/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| 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_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_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_use_find_package qt5 Qt5Widgets)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_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_postinst() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/cmake/cmake-3.17.4.ebuild b/dev-util/cmake/cmake-3.17.4-r1.ebuild
index a65d699eeb87..3af2be355a2b 100644
--- a/dev-util/cmake/cmake-3.17.4.ebuild
+++ b/dev-util/cmake/cmake-3.17.4-r1.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
 	# upstream fixes (can usually be removed with a version bump)
+	"${FILESDIR}"/${P}-uv-check-return.patch # bug 726962
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/cmake-3.18.0.ebuild b/dev-util/cmake/cmake-3.18.2.ebuild
index 785002015913..ab16a6de18f6 100644
--- a/dev-util/cmake/cmake-3.18.0.ebuild
+++ b/dev-util/cmake/cmake-3.18.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
 CMAKE_REMOVE_MODULES_LIST=( none )
 inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
 	toolchain-funcs virtualx xdg-utils
@@ -17,13 +17,13 @@ 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 ~sparc ~x86 ~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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	app-crypt/rhash
 	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
 	>=dev-libs/expat-2.0.1
 	>=dev-libs/jsoncpp-1.9.2-r2:0=
 	>=dev-libs/libuv-1.10.0:=
@@ -66,13 +66,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
 	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch #691544
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
 
 	# upstream fixes (can usually be removed with a version bump)
 )
 
 cmake_src_bootstrap() {
-	# disable running of cmake in boostrap command
+	# disable running of cmake in bootstrap command
 	sed -i \
 		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
 		bootstrap || die "sed failed"
@@ -83,10 +83,8 @@ cmake_src_bootstrap() {
 			Source/kwsys/CMakeLists.txt || die
 	fi
 
-	tc-export CC CXX LD
-
 	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
 		--prefix="${T}/cmakestrap/" \
 		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
 		|| die "Bootstrap failed"
@@ -105,17 +103,17 @@ cmake_src_test() {
 	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
 
 	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BootstrapTest: we actually bootstrap it every time so why test it.
 	#    BundleUtilities: bundle creation broken
 	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
+	#    CTest.updatecvs: 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
+	#    TestUpload: requires network access
 	"${BUILD_DIR}"/bin/ctest \
 		-j "$(makeopts_jobs)" \
 		--test-load "$(makeopts_loadavg)" \
@@ -141,7 +139,7 @@ src_prepare() {
 		-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
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
 		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
 		cmake_src_bootstrap
 	fi
@@ -161,13 +159,7 @@ src_configure() {
 		-DBUILD_CursesDialog="$(usex ncurses)"
 		-DBUILD_TESTING=$(usex test)
 	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake_use_find_package qt5 Qt5Widgets)
-		)
-	fi
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
 
 	cmake_src_configure
 }
diff --git a/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch b/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch
new file mode 100644
index 000000000000..ab4a45a3ec1e
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch
@@ -0,0 +1,46 @@
+From 0fddcc1e5bd8e4672b09e2478edb72e5c0338f1b Mon Sep 17 00:00:00 2001
+From: Brad King <brad.king@kitware.com>
+Date: Wed, 1 Jul 2020 16:23:56 -0400
+Subject: [PATCH] cmake: Tolerate nullptr from uv_default_loop
+
+`uv_default_loop()` can return `nullptr` when running on a Linux kernel
+configured without `CONFIG_EVENTFD`.
+
+Fixes: #20899
+---
+ Source/cmSystemTools.cxx | 4 +++-
+ Source/cmakemain.cxx     | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
+index be799b0402..2f08b840cd 100644
+--- a/Source/cmSystemTools.cxx
++++ b/Source/cmSystemTools.cxx
+@@ -823,7 +823,9 @@ void cmSystemTools::InitializeLibUV()
+   // Perform libuv one-time initialization now, and then un-do its
+   // global _fmode setting so that using libuv does not change the
+   // default file text/binary mode.  See libuv issue 840.
+-  uv_loop_close(uv_default_loop());
++  if (uv_loop_t* loop = uv_default_loop()) {
++    uv_loop_close(loop);
++  }
+ #  ifdef _MSC_VER
+   _set_fmode(_O_TEXT);
+ #  else
+diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
+index 75280fb8a5..e0c17f8d54 100644
+--- a/Source/cmakemain.cxx
++++ b/Source/cmakemain.cxx
+@@ -717,6 +717,8 @@ int main(int ac, char const* const* av)
+ #ifndef CMAKE_BOOTSTRAP
+   cmDynamicLoader::FlushCache();
+ #endif
+-  uv_loop_close(uv_default_loop());
++  if (uv_loop_t* loop = uv_default_loop()) {
++    uv_loop_close(loop);
++  }
+   return ret;
+ }
+-- 
+GitLab
+
diff --git a/dev-util/comparator/Manifest b/dev-util/comparator/Manifest
index d73c9c8bd71d..e516af07051a 100644
--- a/dev-util/comparator/Manifest
+++ b/dev-util/comparator/Manifest
@@ -2,5 +2,5 @@ AUX comparator-2.12-gcc10.patch 793 BLAKE2B 0bab88fa6aeaf046ee4dc569aeb0d3344a2a
 DIST comparator-2.10.tar.gz 1463175 BLAKE2B 58d6bddc5f785de3768ed2c4845b75af03c1fd7f646fc15efaeec09878a72355c46c64f67866217994797193aaba6d4214685c7be89be9872620dce5930238e8 SHA512 b880f7a4a0fbfad44c53606c6d97509305d8485f0ab76b62bb0d1d1d6d4be9fb81e7a08326e78cabd1a9314e6efbf3a966eb6393e424f59dc657975a63ce2988
 DIST comparator-2.12.tar.gz 1463333 BLAKE2B 081251a0a3cb2f99d5b74092a46a868741049d27c367fc9bc3445d35fe01eaaaee75f7afd3674ecdc2569c2ac1ef2d5acd838a546aa307b33c977c4c8a91db12 SHA512 dc5acf3d5900e293e3f0188c0809bc99f2f18edb55df882b2e12e66bc655e7faf030b8daffdd2d175234b398e6a8c125ca6af615933c998651d7f1579734b080
 EBUILD comparator-2.10.ebuild 866 BLAKE2B d57e9166f9a0f14ad04c4c2f686198f866699f1ae0eae03a93e256c9d3195bd008844861000b4a45d4b30092be377110067152133d39d07195c3cce705f39682 SHA512 21ed08a933430f6044de705507a60b875786762f9ca413cef8f74814122aeac931676dedd04c3a1b32b7651f9a6f904e878aefe625d4b255d4e84c27d5da0570
-EBUILD comparator-2.12.ebuild 959 BLAKE2B be3cda316431033c0522d8aaa0afa03e346e4d4c55c7c87f943e3b0d24ade486810966edce18c78fbe0ab59d45cdab846dad8f6c8339cdf180e1a156ee33d904 SHA512 b9f3e309953fe815201eb4ceaf41e1cc7ac42e75073a424b0781f5233794dd8da722f48e4f1e08e474f73264f917a0552bfbf3c2dea2bcf89c216af8d33a02e0
-MISC metadata.xml 434 BLAKE2B 383d68cbb1192908d9a2dbf445852696f4f819564bb414516f8d15ed444ae0dba20ebd59ee6211be104e947dd1c78488c3abfc7a4a040d6fea0165cae853a287 SHA512 d499eae431272e1541f286cba5dc150442c12848469604ce6696ebc2f60f0b394c3376ebee5a5757e884f1372f732415bb169e7393f27c59a4d0faa57952d7e0
+EBUILD comparator-2.12.ebuild 958 BLAKE2B b028284f0f21d9dcf25acb133885eace8f7e730bd1b75644bc436ae7c10388104e3866740553b6f86bc9a83eb0c2a319675c9c88ae729e71277c8b015c5eca59 SHA512 19da391ed6b6867620190253209947daa19e91e491bf9ac6e57276cfc13387021e875f2715b4a5b6bff4dfc846e61198affdcdaecdf7ba97e70edadcf677cae1
+MISC metadata.xml 331 BLAKE2B fd076ee192291de68e11340e0f62ea70193b7ddf71484d602a836bc103b097253054f085ad49161f70e1dc197080fa902f93e498c07ef6e406dc7b9034070f91 SHA512 32c3410d936b566ab3f5c6ff890ba8ca7c66e3d61491ac74b0abafa5cd5f5d338e2064737f0421e8e31237f8bd424d84ab8dd668fe8db381c186604eba649e97
diff --git a/dev-util/comparator/comparator-2.12.ebuild b/dev-util/comparator/comparator-2.12.ebuild
index 8a10ee5518fd..8fa2b7883030 100644
--- a/dev-util/comparator/comparator-2.12.ebuild
+++ b/dev-util/comparator/comparator-2.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
 
 DEPEND="=app-text/docbook-xml-dtd-4.1.2*
 	app-text/xmlto"
diff --git a/dev-util/comparator/metadata.xml b/dev-util/comparator/metadata.xml
index ab8846bb689f..85c3f3c56259 100644
--- a/dev-util/comparator/metadata.xml
+++ b/dev-util/comparator/metadata.xml
@@ -5,7 +5,6 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<longdescription>ESR's utility for making fast comparisons among large source trees</longdescription>
 	<upstream>
 		<remote-id type="gitlab">esr/comparator</remote-id>
 	</upstream>
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 8a95479a7503..6f1286843815 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,3 +1,5 @@
 DIST conan-1.28.0.tar.gz 1135799 BLAKE2B 774f980b489bc2ee7973447829ac2f9062198ec85a1129e3cfcf34a490b969cb5c04546a8918b542bc15e429d75d8e7fe3bc29f9cd5c6cebb6f7270a921a47f2 SHA512 1366f37d774bcaeadaf27f459d9a3889424a21ad14cc0e59f978ccf77a2d4e1f3497e98533e325fe086735b9bdaee64fd2df6c228e62d7577533142ab28401c8
+DIST conan-1.28.1.tar.gz 1138639 BLAKE2B 91f277b88a2069efa3ad5f6209279888b4ac8cf5c359b7933ace6cc08c8b61a868dc8f7bb6a817fbdea378ce175229c91c9defb750326e2a5e31c4d6d528985d SHA512 b8eb4fe34b1614ebcb5e15bd0a827c5949e8588c6a04380632858e68eb4172361c96305154cc5a630254ed6236d7fd82e3a2c05962e312af3cedba41eac0a6e3
 EBUILD conan-1.28.0.ebuild 2467 BLAKE2B 49613a3e8404b0c78445740ee6951db73f6fa2c651a46e2c3e8e0ce3a629fe5b1c84417499c00587f1766f68718265f05174d01ba516d33344ace26793f3233f SHA512 4fce3d75d655146adfb2b3fdd7f78fb5e5890da4390941404bae5e355e9bfa34750b0e060875c18e7a6ba3f8d5bc240e6586755ab43cb0d9485f82ff6212e115
+EBUILD conan-1.28.1.ebuild 2492 BLAKE2B 06dd7392a0594cf52c95c37788311abadf0629d026161985430256543aee5dad5f6f8ca81b47865efa570018ce0e82d462b453780b89867db7824591f90da173 SHA512 d09b4e28a00989e0db65402bc02a6967cf12433f8273d7d994083ed94fbb7c871d57e0aec61bb8b44703b3a96d9d775af38dffe9f4a6f05d135dc24d15a6cd43
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.28.1.ebuild b/dev-util/conan/conan-1.28.1.ebuild
new file mode 100644
index 000000000000..48fdacaef94f
--- /dev/null
+++ b/dev-util/conan/conan-1.28.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/"
+SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# overly strict requirements?
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
+RDEPEND="
+	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/node-semver-0.8[${PYTHON_USEDEP}]
+	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.7[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+DEPEND+="
+	test? (
+		dev-lang/go
+		dev-vcs/git
+		dev-vcs/subversion
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
+		dev-util/cmake
+	)
+"
+
+src_prepare() {
+	default
+	# Fix strict dependencies
+	sed -i \
+		-e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \
+		-e 's:==:>=:g' \
+		conans/requirements{,_server}.txt || die
+}
+
+python_test() {
+	nosetests -v conans.test \
+		-e test_ftp.* -e modify_values_test.* -e test_pkg_config_path.* \
+		-e rpath_optin_test -e test_variables -e system_package_tool_installed_test \
+		-e virtualbuildenv_test -e scm_test -e test_git_shallow -e tools_test \
+		-e test_environment_nested -e devflow_test -e shared_chain_test \
+		-e test_toolchain_linux_0_Debug -e test_toolchain_linux_1_Release \
+		-e virtualenv_test -e link_order_test -e test_version \
+		-A "not rest_api and not local_bottle" || die
+}
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 0a86e8686596..84cc1fd14f0f 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,5 +1,5 @@
 AUX test_cli-1.7.2.patch 579 BLAKE2B 8a77388ddac5bf4aaf1f2f3d950318a8f3af582df9bca9004a6701c7347ff81abea25b0c33586153198906358583a2acf8e17b20248ad98215c44411739df581 SHA512 d5906423db6cf8254c411a5f33f4f0c6b9b2760bace1db5e131ac8ec47b740d5b78feb7caa450efcec6cfb05997ff8038fb9e3fff81585d9b64b455b492e5a52
 DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1a5293330b8162da0f31895b0c3a58a4e0f36d66bee3da328a6b0a59fb5bd917a2f3f6fcf7772a4c63db5cd0030caae SHA512 15cc145f143b4cac6e78b12e1c29e191d0c1c96b0187db05a4c8aac18310a5cb31d912073674ef4c01727c9b5a3b67f8c508842cb625db338b4034faa52a4a4c
-EBUILD cookiecutter-1.7.2-r1.ebuild 1303 BLAKE2B 192a2db32493ed6a064f404a20e46ecf5a682c757c31d8034c6e572c7fa56953d60ebcabdab35fc78cd6bae69a347f03b3ac8c78d52b561684d1b87088fac153 SHA512 bfad0f39c54948634045053dcef3aa92e7b1a7a212fdf5cbf1b552e46d34d0df388ace0aaea79dab53bf4bce6f242e98dc8d0d59a7c828c76bad525695b3e7ab
+EBUILD cookiecutter-1.7.2-r1.ebuild 1308 BLAKE2B ba82714c298195bc877edb8eb4d678fd4c86b5708d55bf35fdf4d198e11be225844a2ab7bba63e1b2082face6c40d5ec3c573e4f3c00da91ccb33c4f109031fd SHA512 d83e174a34fca78e2d1acb7362bca5a345cb9572a696eb66e745495c083a904e7e274cfa5dc8c6f481f89b30e9328995a689f9a891c4e27e20ae366fd63829ec
 EBUILD cookiecutter-1.7.2.ebuild 1294 BLAKE2B d84b3f46a9c738d5d98ae1a66d8ae591b4c402fd9cde74c8b089aeaea9da468577356ad7fd17c2fe618a13a4c283cbc7c79d78e345e4fb2041da05e70bbb1349 SHA512 6f2c0623dc4fdad071361c430edad1a18a2f37cdcd63db1bd165e9ab2b455a98c27a3c7b38b06cfc054b87e2c3e7e5e15a7b2a6326925f00740f3b4aad192c08
 MISC metadata.xml 329 BLAKE2B 3030c112beee6c6e136abcd0390ad47553f874ba5ec6f5d19d87f84d5c9d930ac71d2219c064944601a09bce7c9b71ce1257d1664070f749f4447e2549521bee SHA512 4c36a71c316a8f5b946668fc160685a293c25a292917baad1345fdbafa5108166cf50343cd5fd3627447b5af5a1cf40848488eb0085708b0ca032ba7c44d4101
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.2-r1.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.2-r1.ebuild
index fb9639ccbe2c..a50474701283 100644
--- a/dev-util/cookiecutter/cookiecutter-1.7.2-r1.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.7.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/audreyr/cookiecutter/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cpputest/Manifest b/dev-util/cpputest/Manifest
index 9a337d5bb0a9..25d5819e6068 100644
--- a/dev-util/cpputest/Manifest
+++ b/dev-util/cpputest/Manifest
@@ -1,3 +1,3 @@
 DIST cpputest-3.8.tar.gz 2722956 BLAKE2B 1da16c06d242703462dcaf9c6c26eb875c2622bcce4113fd0b990805d06ee7401a6776d2f0451eda49e7914caa59a5665a92387684ffb6dbbe884cf0fe07bd86 SHA512 a9592bdc9ffab8b42026ef2010f504e7e37d77fc2f197f89d23f7c9285a101059a0ec66418b914db0383974616d31b26addd1938fb27f45c3e7d9496ed0a0fac
-EBUILD cpputest-3.8.ebuild 524 BLAKE2B e8330768d2aae3363339ad0ec941fecd16a31edd17137b5b8f583fec8d05824acdd94d0d3a5bccf5784c1f15fa210e67349e52701cfcccab757c83dcd4a15a64 SHA512 50ef1efd5628081c17c8f99dd3071101420a5894dbb7d859ac447d662fcb813ee28e17c527623f7746e28f5257be70d850aecbf28aeaed44e48ad5563fceeb22
+EBUILD cpputest-3.8.ebuild 529 BLAKE2B b3dc56ad08d029b419d3e8b92841f3174a6474b7f804d09ec40b169fd56910095dadb1b1031266ff3740fb076850fa3c247ac0519f242e5bdc95dc2ee66955e1 SHA512 821a79f0e27f2c5e124e6fb98414dd34af57e4fb8dae12998ac438892c3e3b5e099c64b47dca26b1a0d53b29595a7277023bccf4d4983afd0e6020b9a5d928d1
 MISC metadata.xml 249 BLAKE2B 67563a054eb11e858f51664b12ef99626bb7facd85bf2b520d81f3d9cb3cbdfda23ea18f48099df41e6e696a6827d4b9ea87165d8296d74a94b4d07181f2ec9f SHA512 d80d51464fcbaca1ca6bafb02f89caf99c6cbcfbd5450bd3b8c7d62243aa88c89070349002adf95565571f114e5b90d1b7d605fa501a7e95565800987b9c0f8b
diff --git a/dev-util/cpputest/cpputest-3.8.ebuild b/dev-util/cpputest/cpputest-3.8.ebuild
index bf75b32915a4..dad5aebdc6dc 100644
--- a/dev-util/cpputest/cpputest-3.8.ebuild
+++ b/dev-util/cpputest/cpputest-3.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index 18fdebcf7a5b..ccc790cdd700 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,4 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
+EBUILD cram-0.7-r1.ebuild 555 BLAKE2B cf4380728e7aceeb7e2a52e2e2d5102b289e44cc88f721b4eac45a7ebbb4019c47e64b71021da025e7beaf3ba350d7866b06a1dafad3eb0a61811580ca138133 SHA512 c5a46597469d3578dc34359b491935a02a5dd401d8cb84bdf27d7c07dfc276041a3b083c89fbd50eac6d2a1e1e31cae12febcc5837ee27819263210620f25c21
 EBUILD cram-0.7.ebuild 554 BLAKE2B b11475873e0c1cd559b2c00add897090be0df365c5fd3d34252f04e03b662c514b1ed94ee3e22f1fc6e9632a38571a90fa2bee12781140c24730511518523adb SHA512 03338800aa66add5162a030f4cb8a7d8a4e1d911c421197784540d1f7761233c2d048feb850668e050714ef87a16f675242dac1ed651129d18f470c6580eb63c
 MISC metadata.xml 613 BLAKE2B 4e970afed6540c9f375c79858c297326994950a3498b51fde64aff6bf4262e6d73f1c77ef5ca621be1ac4fab79b2e4bde73e914869726a6d8665d291f854aea2 SHA512 6dffd4dc26817f9ff558ab98deb4b0097fbdfd0394291969b817d2edf1caf108d46d0188919d77e54942a35689c564f2948d627e30e5fc6acb403e8d7f6998d9
diff --git a/dev-util/cram/cram-0.7-r1.ebuild b/dev-util/cram/cram-0.7-r1.ebuild
new file mode 100644
index 000000000000..008e8aa0cfd7
--- /dev/null
+++ b/dev-util/cram/cram-0.7-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Functional testing framework for command line applications"
+HOMEPAGE="https://bitheap.org/cram/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" "${TEST_DIR}"/scripts/cram tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index be5c1e7ee361..5725fa06e4e3 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,4 +1,6 @@
 AUX cutter-1.10.3-python3-config.patch 1240 BLAKE2B 8b08b4a86f20196f42931ad8a36de42aea662b634c08911e762253303c3efa90fcf6f42582b23e273b5ed0761ef403b15b3270fe3d56506def9d398af2a7335e SHA512 44ee6b1b75b8a0349144ed9094fd5efc42f22415019583392910dfe0aca263d83192558e70b87945ff8c35f2eca988a4b5f45ab9f3f1bf1ad6f793d0510a4c77
 DIST cutter-1.11.0.tar.gz 1990964 BLAKE2B b996a3e4c55b3077a8aa54b3df5517d270410ab81f8a111865dc89dc6e61f2712ebd29c10be37a50d9bf143b98916bf48c5df9ed1bfaf936af714d4a12687052 SHA512 a69efee672fb0e142ac6c1fae287c463ec1e777a2ec6b604f412fd0c21b0614d2f05a289beb4602af70d6446f0a6263b353dcbd38d41a6466ae2cdbd14e0bea3
+DIST cutter-1.12.0.tar.gz 2323732 BLAKE2B fb40444b60c19f88dafb9447731b91031ad764359121b835ae03477bf52f17d12d1a0b651059072b6ffb7bf811d4493b3746ab9c48d8f09257b5338130edecbd SHA512 3d8dd9cb6f9e69f41e295795f3d1b7256c071abafd04bdecd619817b8fd04396770f69df753701ffb376a358f0df9bd38dff6a344df4e5ca92163275ad670531
 EBUILD cutter-1.11.0.ebuild 1010 BLAKE2B f32a25c06b13e03d1078c4e0ffc246f9eec070122e64d00c374a3953e1af59bd2aa7de296e12c9409e5c26f443fc7f478250624b4f6d915b590c0e0b34b6570c SHA512 538e627e00f896a81b52aa695ca6cfefca46c26561c8a78061554380bf03fe5d56250b1f65d7f571d1df49bd189d6cea5b7900c21c46d95eb5cb8b72c0719dba
+EBUILD cutter-1.12.0.ebuild 1005 BLAKE2B 238558e08802b077aa33e8aa5e6f8bd94955e289540379442bbd8b75e6c94e5b75764ccd5aa8c4c3693171fe97dc4a580e35eae31e81431bf4c43bbe4afafeb3 SHA512 bd275d96efb425990c87e5fd44ef47373ec8fdfe512c10cec01801ce29c8b442ec38c4656110ea0c1ba54d3ebe0fa7981f6792b5388723608af5de909419cea4
 MISC metadata.xml 451 BLAKE2B 1a4231b3e9d5deb080440e506f8395949488870f5565d44e579f1262efb62ebebd9acbb2293613ecc85853f0a469d322bd06c2aab2ae4a1c0a5e5e5218a3ac36 SHA512 39e84ad70a516e67d6f0491dc78cbb1479713bc2444d2ef751d34a33d26ae4db1a44de553fadaad6b3dce5b9fb1d3e8b7cca1001be25198d24f042ac8441e2d0
diff --git a/dev-util/cutter/cutter-1.12.0.ebuild b/dev-util/cutter/cutter-1.12.0.ebuild
new file mode 100644
index 000000000000..3526c69a068d
--- /dev/null
+++ b/dev-util/cutter/cutter-1.12.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit qmake-utils xdg-utils python-single-r1
+
+DESCRIPTION="A Qt and C++ GUI for radare2 reverse engineering framework"
+HOMEPAGE="https://cutter.re https://github.com/radareorg/cutter/"
+SRC_URI="https://github.com/radareorg/cutter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	~dev-util/radare2-4.5.1
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.10.3-python3-config.patch"
+)
+
+src_configure() {
+	local myqmakeargs=(
+		CUTTER_ENABLE_PYTHON=true
+		PREFIX=\'${EPREFIX}/usr\'
+	)
+
+	eqmake5 "${myqmakeargs[@]}" src
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 59637cb865b5..eb15c128390d 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,9 @@
 DIST debhelper_13.1.tar.xz 530828 BLAKE2B 582dccdad50a51907d2565fef34fefeebf79360af31691ad0c332bb04b12a2165af598a3d35088595aee3653ca27f049e22669236ee48376ab665ea7423c6d5e SHA512 8160a31a857c9e548e0c5527eb4c86fb5c452e5209a741c7a4600f03a48fd5b46fe07c4d1c64ad11c3af3b9f2e1d67df2d4e9d773bc432d6147540dab015e977
+DIST debhelper_13.2.1.tar.xz 541428 BLAKE2B eb377a09fe23aef159c6a8309c1a63df94be2a1dbf313af32868f9a01e394438c98f02cbd18077cf22998e693c171244e42d33fa503e591030f4fe4248bfbc53 SHA512 38b52b03b65832a33260a7b0d1f08e6079b60318964603ffa0729cb3f56adebe81dbfb82a1785b019100e697cc6b13c212518c4608c0bb2018500be328157b0c
 DIST debhelper_13.2.tar.xz 540400 BLAKE2B a1734ecbd92eadc3f5fbd0b118ffb4c6b697b157c39cab7626bd734adb80c6dfd0061298220c5d5c7a7fff412a1a52490e7001c8d634596dc41389a7e81c7a74 SHA512 07fd1f32975a9d84940a15140875994d30fe4bc0a40b40fe83a1ff9a304121167345194802691326251490852e601c388cab5cd02c000a4a6768edd1259a7bbc
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
 EBUILD debhelper-13.1.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
+EBUILD debhelper-13.2.1.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
 EBUILD debhelper-13.2.ebuild 1530 BLAKE2B 39d9f9b5772bc7806940fe0bf8f14e265ecbe9fa1a9a68e09394ad1ea6396a14b9562346f79a340c7ed3d21e54a9245720ddcd102449958554ac1e2d86f4e28a SHA512 b838f7546ecddbbecf8f07c11f0f7a92c69069297173c080a2fce21fcb06d525e0d54900698b005fc2f5f0b819ed5808f71d2ce1d4a16c66adbee7eb43cc6d7e
 EBUILD debhelper-9.20160814.ebuild 1530 BLAKE2B 8a4529891546c0553fc545b41c0721ab899ff6f62ca5b71e8950c306bc5bdb6f9971fec6534c3b4aa03270154290e6e41b91916deb67a58f6a5fce24c57cca9e SHA512 b466001b990d497caccfdbbd88cd6e28e2e55e399923b33d1050bf667d7a050ccede8c4c2bf2df7460177d4a2094247e2ffcfd34c29d580f40ab432e89a96525
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-13.2.1.ebuild b/dev-util/debhelper/debhelper-13.2.1.ebuild
new file mode 100644
index 000000000000..99dca21e93e2
--- /dev/null
+++ b/dev-util/debhelper/debhelper-13.2.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+DH_LANGS=( de es fr )
+IUSE+=" ${DH_LANGS[@]/#/l10n_}"
+
+NLS_DEPEND=$(
+	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
+)
+
+RDEPEND="
+	>=dev-lang/perl-5.10:=
+	>=app-arch/dpkg-1.17
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+"
+DEPEND="
+	${RDEPEND}
+	${NLS_DEPEND}
+	test? (
+		dev-perl/Test-Pod
+		sys-apps/fakeroot
+	)
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	tc-export CC
+
+	local LANGS="" USE_NLS=no lang
+	for lang in ${DH_LANGS[@]}; do
+		if use l10n_${lang}; then
+			LANGS+=" ${lang}"
+			USE_NLS=yes
+		fi
+	done
+
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	local lang
+	for manfile in *.1 *.7 ; do
+		for lang in ${DH_LANGS[@]}; do
+			case ${manfile} in
+				*.${lang}.?)
+					use l10n_${lang} \
+						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
+						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
+	done
+}
diff --git a/dev-util/diffuse/Manifest b/dev-util/diffuse/Manifest
index 13c0bccb34c5..3194641289ae 100644
--- a/dev-util/diffuse/Manifest
+++ b/dev-util/diffuse/Manifest
@@ -1,3 +1,3 @@
 DIST diffuse-0.5.0_alpha7.tar.xz 531124 BLAKE2B e97b8dd1b24253c4049dd4dc0f185049f030163945d822c3dbf6763f14eff270ed6bea82ae55b6cecaaa0f90976aab286db53c3f69d54f708e403832f8b2b1c1 SHA512 280d2c3c698affbf91b0e25ba658133999ea9b0199d8c165e2cef05210386f0fb3ff8611710903c1a3cb13aed01a648d04b3b8b13227f96803b74adbebf62adf
 EBUILD diffuse-0.5.0_alpha7-r1.ebuild 1414 BLAKE2B 472e1cc2fcf4ba492b00a74c25dffab8f2db7fc28af51208cff12a8072812dfe0d5ce6d4c862e6692a2641716dd0095b53ea74f426567ac601ce2d7919b8ebd9 SHA512 957ca0ff76bf1bb0b9fda46e67df07cf0360accfd0254ae027f1d7bf78da9080cff2a0302194a6a12090de9feaa144368742736be05e990f41a6e3d3152e5e91
-MISC metadata.xml 408 BLAKE2B ab54e1b8b37a36b5b8e83d374b0ccc2468ed23a7a1a5fc855e41a748e7ae85c6fe85ecffda1f941b1e803ba0eb5cc7829984a2c520f6aecdd383f01c4a88bf96 SHA512 9c4f4f53b106582296f9cd3cd52e86587f0fb4767e01b0bb0464a19ba9aa0badd27f25b4438e1693313b685293c4db652a81c60c338e8673717a5a8ad6791458
+MISC metadata.xml 323 BLAKE2B cc8163e0d9562747e2d52729e8298b38ba93b077f3b6a387a800c4720d52ad90bc13482f4120ba9ca9a41ee65e15e2ed2d52b81c41d9906c0ee2b677d4c67b8f SHA512 327c3e242485b96d7923358eb647b5a711d87b6b75c0cf76f01b6118b5b9a3436b0286de1e390a07a76d78d752b701a51319f5c35e24af2160dd6745521d965c
diff --git a/dev-util/diffuse/metadata.xml b/dev-util/diffuse/metadata.xml
index ef53d12f435f..e98fdf4d5c1e 100644
--- a/dev-util/diffuse/metadata.xml
+++ b/dev-util/diffuse/metadata.xml
@@ -5,7 +5,6 @@
 		<email>grozin@gentoo.org</email>
 		<name>Andrey Grozin</name>
 	</maintainer>
-	<longdescription>A graphical tool to compare and merge text files</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">diffuse</remote-id>
 	</upstream>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 5f1e1bcc6f69..0e3a8cc26211 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -4,6 +4,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD gdbus-codegen-2.62.6.ebuild 2043 BLAKE2B a55f20184ac1bafd3aa391b2d0c79ccefd5c6dc64f7c4619ee505f16f645c479fda199e6c54cd41ac666c5e68ab9431109f642655250b3f16f28c1d8dffc6da6 SHA512 9ad9a9475d431ba44a913f2b0423fa35623105d87ec8eb583b9eb0c67aa8358681b8d7ef1f5856e6c15d873bb29d1d5397788e44ba2e6bd5fbb734c1c503717e
-EBUILD gdbus-codegen-2.64.4.ebuild 2205 BLAKE2B 872daa764448aa62fc772b093925a728e93753eba5fc5f744a538a54c9bd768327c39c8213ccd4345b82c4d10e850a408be4a376d34245ff45aa6969bd0bd3bc SHA512 693855710cd8d6aa0bb0df70357b45766e195411f736184583e4185dcd5bfe7b24dc5fae334923b81501310c0edf07defd715412c7689adc1efc23bcc53240ef
-EBUILD gdbus-codegen-2.64.5.ebuild 2206 BLAKE2B f6cab1cd824aa72b64d40ae59e79cff49eee6ad65c098bf7c9258be0da87e1626be8fd3a1ee5e9a498f22b11c8cb90dc594a06e9df8bde42eb4261e808d04be1 SHA512 dea65adcbbfced76a579f37225154d7963ff10e118421accf2aeee822cc3c064fdb532ae4374e55e03c99819278488b18665f0868903a919667ad9da9988b4c8
+EBUILD gdbus-codegen-2.64.4.ebuild 2203 BLAKE2B 0a90d086b969979fe5a05fdc64b2024e40a1ab7b324511d99938b9eba2411fea9143e065425d35d6ed4d51ba35aa8c038931087149fd2ad342e99219d0a26586 SHA512 6203b819948ec11d8f7c54720fb486d02bc32c2cf03485d8000ae7769238fd81885d5cec4b04a8afe613635329923779b2a31457cfd89035e9b15ba82899aeb0
+EBUILD gdbus-codegen-2.64.5.ebuild 2205 BLAKE2B 872daa764448aa62fc772b093925a728e93753eba5fc5f744a538a54c9bd768327c39c8213ccd4345b82c4d10e850a408be4a376d34245ff45aa6969bd0bd3bc SHA512 693855710cd8d6aa0bb0df70357b45766e195411f736184583e4185dcd5bfe7b24dc5fae334923b81501310c0edf07defd715412c7689adc1efc23bcc53240ef
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
index 63279f3aefd2..89884a3a7129 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
index 6832da6eb8d9..63279f3aefd2 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index d7b948685826..8d0ae21db1c0 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.22.2.tar.xz 3550008 BLAKE2B e1217e221b36938937c57ae465a3707eeadc52bc9127b3af2fb6514e572676e3e284811d5332876dce110fd321e2bb33b9ac8b0afbd97dd747725eb73309dc15 SHA512 cb82684423ae055bc8e84a8705529ecdc72957563f444633c2c5c24a922130de84c212537323b6ed259f0e29349b52dff608822610b87babb8fc3cb468a5f4b0
 DIST glade-3.36.0.tar.xz 4466808 BLAKE2B ebc93c9471225782bcbcbafc4a475638e77ad763d607188d95e8ac77b3de70f76fefe963027bb6b32ae71adeb1daafdb1a2c98363b25030d83f20f767613f68e SHA512 c984613ade26e3fe68a700a48cccadf5ac96eb716a6e90aad36f3de684faeb607d9aaf112d74a048cd33e222a02388ee6583ca915648486f0259cc805e16d243
 EBUILD glade-3.22.2.ebuild 2315 BLAKE2B f928f40ffcbfe130cfa95f66efc38c25ee98527d1955863247c0c725ec0a73c1d487b15706764c80c7d5023a9afb3c46fc68469e9bb21d17186d988c45560511 SHA512 ef69855f9ad86b60e889b571ff0d7dff359eecccb547b8be85d4717b0a1fa7c0c84a990909826c953ce62916b3403b062bb9eb58807f727579e4923c1da0f11a
-EBUILD glade-3.36.0.ebuild 2296 BLAKE2B f1744eef85a5784f8a0d96519318a0d45a63e7ae408c9c71969120d0e2a33efc7d37280a86565f890daf98c55d73f3e0274070b0f7fd64f82a60c01b50c1a305 SHA512 910a5666241e7fd3fb7884fc4fe676003e836e5e4aa6c6ca41032def599822f5a9aa4259b43e884a25707921e1e1eb8624fc79ede94cfb3ac6456be641832b0e
+EBUILD glade-3.36.0.ebuild 2295 BLAKE2B f25eb520062b263521bb5f36d500593a3d5c93b7c9404744a4acfe506b3d37e0b1203dbe170a78056031865f92785932adc0436a9f7af1a148ec0623aed76d7f SHA512 bf1f9cd681f6358c9e5f2eb4d7beabfc9192881dac89a8b14d6fe85d10583d8b56136f10d7beccf1d1c41987f1d5ede0e98d88da601fc19e33487dc9835c43a6
 MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.36.0.ebuild b/dev-util/glade/glade-3.36.0.ebuild
index 61320ab48fd9..f9cb7d282148 100644
--- a/dev-util/glade/glade-3.36.0.ebuild
+++ b/dev-util/glade/glade-3.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/12" # subslot = suffix of libgladeui-2.so
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 
 IUSE="+introspection python webkit"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index db9784f11e97..c2dd7a2db025 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -2,6 +2,6 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
 DIST glib-2.64.4.tar.xz 4779456 BLAKE2B 2ff69c794689c97011103459cb109e6ca7021db20a605cf3942f57e7b73eda9971034b8f65f03191f357169affb278dfa9bff309b4ca44605fd5a0ba0d135d2a SHA512 f21fe33068a5cabdbfef54ef635b3f810b389416c3b4b66ae4975e84841834f7b7640d2518d52cb7341641af5761919eebd5e7b25bd2946f3bdd002c4902b090
 DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
 EBUILD glib-utils-2.62.6.ebuild 2390 BLAKE2B 6160cd993d8ea330b68812082a1e14c6d9c64e4adc2832bb68693e8a8eacc7598541f19e049a7601027b5fc1624485dcdc9745c7095b07d3b004a99a7f612d44 SHA512 4840e214e3283609722803ac6e52b015cce5e1f74168e318bf78bd0f0d2e7332f35063939c843ed39d03b0c9822a6aa738183bd0e0b6ea1067aae5c6b2a57a03
-EBUILD glib-utils-2.64.4.ebuild 2394 BLAKE2B 038afba03a85892f5cf5a4ff3cb6e1a1f4de412987be28a8852c7f31028027374f9ffab2ab2088148fd2a282c9040c248900ab478eca9b75337f829d229af86b SHA512 b81197d03d0b477ec54541524492b2d7234eb4817f3e7e5664ea7b844367789c1610bf92a4979cf291a7ac3002a4a988f10270a224e239807cacd4f98f5768d4
-EBUILD glib-utils-2.64.5.ebuild 2395 BLAKE2B 658619493709c26c3651bf6375d5ed4b82b4120184412bbbb52f092acba10953cc57554fc2717f3b18a3cf28f536a634605f4e7d86c55b2173df5bd9c91d5eb4 SHA512 a5e0acd2015b1df3332e632494cf24f2ed9bdbaa6791ac2e3f8ac91fe6ff61f4614f4183e6fd6786f5bb893f94e1945d5b654c131853abe4b3b0d2f56720d985
+EBUILD glib-utils-2.64.4.ebuild 2392 BLAKE2B 476a8576c9fefdee405d0b50dff35b0f8a129bfafee709f76183a2fc291571f0979d7e02a4d0eaaa03e26387c42eda2b5af41293bf7ec5edd3ef816998a98b61 SHA512 68a0504dc5838d35df675774b5f862e7c7cde323f3060576f0200469d21134daf84404618844ea501812d081a9826e9f9b42aacb0ff5ecd3149bacd24ec9fb69
+EBUILD glib-utils-2.64.5.ebuild 2394 BLAKE2B 038afba03a85892f5cf5a4ff3cb6e1a1f4de412987be28a8852c7f31028027374f9ffab2ab2088148fd2a282c9040c248900ab478eca9b75337f829d229af86b SHA512 b81197d03d0b477ec54541524492b2d7234eb4817f3e7e5664ea7b844367789c1610bf92a4979cf291a7ac3002a4a988f10270a224e239807cacd4f98f5768d4
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.64.4.ebuild b/dev-util/glib-utils/glib-utils-2.64.4.ebuild
index bdb4ef5fb8be..9ca1d0e8da9d 100644
--- a/dev-util/glib-utils/glib-utils-2.64.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.4.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 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 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.64.5.ebuild b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
index 4c5e6f0ff472..bdb4ef5fb8be 100644
--- a/dev-util/glib-utils/glib-utils-2.64.5.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 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 7970c28d3a67..d7f3799302b6 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -1,10 +1,6 @@
 AUX 50gtags-gentoo.el 183 BLAKE2B 242ceb0370227a6c0f1ee23477aa3798e0e8580e59849a8b47623697b6bfc1f98ac4b3f57ef0fb9a9269215f7f2666191907072064c4e7a4450fce5fc59c9724 SHA512 5a7b4e3eb4ee7ce479766a01dea5f82ab7499e666130b869c8f61ec9dfa69250b4b98357f6eb3d1b14da0348eb2c7d77ec0146d1e85996254a8fd7eaa3f3ff05
 AUX global-6.2.9-tinfo.patch 2047 BLAKE2B b88b65679f9b6ed0b96ca236c1918c3238baf99bdff8c7a45f85f982923d82341f23fc961cc4d61ee9269900b48e2d726ab57482e9635b035cf621e27da0f72e SHA512 f5d83716ba2fde29ad5765665d00b4d2a5b4c8d6351cd6ca9d8c375a6c953f795811e156c0cdb28549837c72abbe2c2bef9ad4cb419e7043115c50858b831698
 AUX global-6.6.4-fno-common.patch 946 BLAKE2B 8063d13db0942c0face6fde1411b96f352d706a85a4cf9f4b5c1eac43f6855e4c914166df2da8d01521a73f2d05b20df65aa25f6a3b965379346d2b523c8ca88 SHA512 f2579cbe22a4c97be0e7ccbf945b9d509bf22cdfa064e6e9fb6182204edf6085e97166ef3f771fe65942505259aa9b42b6c164c644ae95bba8d1e11f1319e0f4
-DIST global-6.3.1.tar.gz 1369634 BLAKE2B 8d93222ccbb4a45c0b9f114cd84b342b3f6ab99f7e0bbc18bfe00912ecd53f606be9d32fce1570e027009fd1fbe4752f03dd19c183dfda438d67a329808a6b45 SHA512 83becd6cda06f8da17ea0c701bb135523ff48cec73b233d24566387d11a35c0b42f410b62753838e2b364a5a485cac033b4aef1159cc6f4cdeca4a7b6c5bb4d6
-DIST global-6.5.7.tar.gz 2940567 BLAKE2B e0c692e09f9f7ea64ecbe47e18691efd3c641f28826e19751fb812690cd9d64a53af03055de9ec8199637da46dbd6084fec16380d7f295c83ed77553a8e301fd SHA512 0d33f718839e5e00bdd6d042b415a69c5e1f232d843610870505f8f20635b445810149b1b84ea8b77881f5f64814783ebe3cdcab2f84b8a085223b64293a9045
 DIST global-6.6.4.tar.gz 2988969 BLAKE2B 784087537094d27c10d1f2bc992e799c35ab6ce3b86e041c31279e6954b203e80676b3158ba95e7957456b75a213d70998aae9047836cd4d388212236f05a081 SHA512 cb4ed451d3aaf47c4c59cdc3f74c97d3171108177d4846b5dac843589710e66d87c9d7bbe080c3770329e8e40105ac52dcafb4609257347593cca4d94711f483
-EBUILD global-6.3.1.ebuild 1625 BLAKE2B d1428e4ff5cd8dbf4929d330e556c285a7d3efe7c5c831900c1aaf6c38130147c18c242caa220ba554b43cfcd526af18b695c82eac9d79bbccf82188a7b6af66 SHA512 c7c6d734c5e35ef30f7e1c20a03dce49386d71af80ff3580e4b844afd3abfa2a1e6d1941198f08dd3074b52b5dadf2bb5bf080acac298179df6660005a46183a
-EBUILD global-6.5.7.ebuild 1633 BLAKE2B 6120fd297353f710d91eedf03241552852567b73ff4a1b52e39f49538202961b930f07a5adcb41820c2c817f09b7556982fd2801aed4f332e43d2036bad95775 SHA512 4978e3550ca324412c01ab67264b8227ef35a7fbc0f5719b98c0b77db8f8cc09aa7420097aa3890bbd0f6b07b88a262886d4717c482c669d8d52a28adbfd52d5
 EBUILD global-6.6.4.ebuild 1697 BLAKE2B 91fddaf844d76a6b68f3372cb78992067b4c5c552c4dd8bdf375384cf0346382becd9da6de7cabf5358271c3c0df1573d27e4bec7d8625ca68df35bb0e01c104 SHA512 39a8ae3a8b7bedcee0bb9ee7a490555d8640cb098da23042e5d3b81967f2711bdee8ce8631c02a2aee3e6f3864022f4046793bf47f9c20ea628adc9e176c67fb
 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
deleted file mode 100644
index 9d48ee787d89..000000000000
--- a/dev-util/global/global-6.3.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools elisp-common eutils ltprune
-
-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="|| ( dev-libs/libltdl:0 sys-devel/libtool:2 )
-	sys-libs/ncurses
-	emacs? ( >=app-editors/emacs-23.1:* )
-	vim? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${DEPEND}
-	doc? ( app-text/texi2html sys-apps/texinfo )"
-
-SITEFILE="50gtags-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-6.2.9-tinfo.patch"
-	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() {
-	emake DESTDIR="${D}" install
-
-	if use doc; then
-		dohtml doc/global.html
-		# doc/global.pdf is generated if tex executable (e.g. /usr/bin/tex) is available.
-		[[ -f doc/global.pdf ]] && dodoc doc/global.pdf
-	fi
-
-	dodoc AUTHORS FAQ NEWS README THANKS
-
-	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
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/global/global-6.5.7.ebuild b/dev-util/global/global-6.5.7.ebuild
deleted file mode 100644
index 2b19aa0f759f..000000000000
--- a/dev-util/global/global-6.5.7.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune 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
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index ec90709a8b43..c5ace0c630ea 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -3,5 +3,5 @@ AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f348
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
 EBUILD gtk-doc-1.32-r1.ebuild 2340 BLAKE2B bd2c6091b9237fe011e29429bf7a515d3e9149667fd8e553319d04da49f0a8983dac1a3aebf0f5aa7df589e03398f1dcbb816fc3381cd10cf2f8da328e4afbd3 SHA512 e70e382d6f2f73de8a9205055f9766b1b18318c4707044c595f6ea8b4f75a53afe0f09c7cf5774a8820ec234f9b31196b2d1a2fa18be6cf6112cb35ea05f8368
-EBUILD gtk-doc-1.32-r2.ebuild 2555 BLAKE2B de99db9ba3bcfc3f3f4cc3a0bd68bc7a88d9c1a8f3c0f8e0d5f5d9d16cf5e0725d567a3bba66d1528eafead52b0c6c29a5be37179ad83c152f45e6171a35c468 SHA512 83f0c15490fd51d68798fdf9cb19adbcc7f3b535fcaa4dc0643e80052eaf750e984d793cd84ea2f5e81be96ef722d670115f4bd5000d4b854e64e485962c71eb
+EBUILD gtk-doc-1.32-r2.ebuild 2553 BLAKE2B 6f61412042686035c1bee011016aa814a35a9af1071d783fafbf6da5c277e0af41463dfaff1ac4c9fed4034f5af9126b88f15b67f0bf4659fdae80a188140a54 SHA512 b5bcc057ca0d04ed452b97a8bc73df0cdbd4853c619cb1a6b65d6a406e0631c1e85b243df688b9f7c82f1fbcd56cc2c8c84a15a13192aaeec52403e406453052
 MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
index 0c76a1b5fe4c..a772e4e095ff 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 
 IUSE="debug doc emacs"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 8b1b91e0d188..fe824f963844 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -3,5 +3,5 @@ DIST gtk-update-icon-cache-3.24.20.tar.bz2 91769 BLAKE2B 4fb1d4e06117924377e2e3f
 DIST gtk-update-icon-cache-3.24.21.tar.bz2 91918 BLAKE2B b9cf0f944f13c3280ad615a6453e8fe80424b481d66af7bfd98826354f124f67c3a75afece07cd38cb8722eb1beeeb23b1cb7e23ae8d68f2dca195a155c69508 SHA512 207449dc92b029f735f40cf4e9cc59dd02103bab7c382a69feb7162873e2cf7b1fa6a7ce818533888305424667795da86be55e5befc89f8bfc8809d6aa6cd92a
 EBUILD gtk-update-icon-cache-3.24.16.ebuild 894 BLAKE2B c3534d66ac52481507d5a722eba0b98eb780cc18be33e18e336228def9d67d0a41a067507e83d3cfddac74c57fe2d33f26f1caeca77565f64a1a6197e0c664df SHA512 a3173194e30215c653e2d10fc7e864c2a9f70a35f0bd0d8e3e72d5eed8e8f98552de249bd5c4ff59320fd4bd0be7aac90896434ec7b70a44de12e3c1afb899dc
 EBUILD gtk-update-icon-cache-3.24.20.ebuild 897 BLAKE2B cd9f19dbdeb333e1872d0a7a2b4acd9f6051e0577dd81cd840d5e1e917f558f2ac93bb46f16df39442a1fb3a7d4f79d0f6032510ae1a5e0d421e931d37ba2ef6 SHA512 01b6d21fe354433e574ed12d598df809ac93fb6098a95e93935d8ecf7fde44b54565fdd1d7ec548779e83a70e7c45b33673d4a7ee286f1ebeb68626ccd0ef2e6
-EBUILD gtk-update-icon-cache-3.24.21.ebuild 899 BLAKE2B 42cd08d6f19bef4f1516d010b97a2052f95e8c7ea4875f01baae65ae3fa0cd893c2963357fd30cd2a782b43c0ad1cdaece14bafb684c67ec4a1628a4fb74727f SHA512 8987bc5966d4fea8f66e97c17df39567ca6714ade5d7d55828a9e0013ab5dba205da548fb36f1b73cb911478b1fdea9ef6aeab0269adfca888a423b379c473e6
+EBUILD gtk-update-icon-cache-3.24.21.ebuild 898 BLAKE2B a9e3cbbea413340ea543d66bd2410952141541a1b18ee08279b3c8a01dbdf63137cfa198346081742a94b464de335846b26a8564200edeb046ae3482ec58f4ff SHA512 c7ef0b03df2b25164e23ff2e0ca0ff41adecb65b4c860acb6ab09f0557b249a235e62a663fad9f105d21d8cbc1d5099f4385d7f512c2b5096db98bc753b20d80
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
index cd65ce7a6215..d2d9dc11c043 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 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/howdoi/Manifest b/dev-util/howdoi/Manifest
index 01c6633ad723..332e0585a9b1 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,3 +1,5 @@
 DIST howdoi-1.2.1.tar.gz 13112 BLAKE2B 33492547fab53085aebff295202e8ad88d41850503155b944f38382137d6ec8fbcd4f6050583b16c01c3701683ccf18c6929c525b5d8f34bf6f2ed9410668f36 SHA512 83af30118087105392ddb95b05d9e7442f5ee5df981faa9143770dedb8927c164a4f30f37ccd219a826340f0f8cd81fc5eb9a3b12e5d3956786294699b6e2f9b
+DIST howdoi-2.0.5.tar.gz 23910 BLAKE2B aace040311845cd8c958d5186ea804a9b0d746694563e2acebd2dbc5630ccbeff66c8a1848245b0f4c127ca611218a0b56e4051d6991e8cd796017a8b5022c46 SHA512 5ad8a99758774c28b26afe5a5ee0f1d2fd6f8ea1afcae5f29b3a02ab3c25758b8cd8aaeccd3afd10a3d02495c6616966cad5da03327c94979e89fc3c601bd367
 EBUILD howdoi-1.2.1.ebuild 613 BLAKE2B eb1915c84777fe6f247c2abef28ae2130648c377ed539bb80b984f19b7eba421fe9cd3e097c2fc390810d0a6cebf7f68286a6f104ed6c354d963e49595f14808 SHA512 cf39a6512968c9bf70684e59421471ce8cc7b5958a94588b4a2462761a216eb4133b9087ff9d48bd2cbd4983e55834996022d76115dded1a5c8377581add7dbe
+EBUILD howdoi-2.0.5.ebuild 655 BLAKE2B 9db2a97feddd4f5460a4bdd4a62861f1aef99caf76602d34de731b586f44e62080e3eeae7b77f57b715e01c5dd2f8a027733cedb48a08dc8f33108bc10af3949 SHA512 56a487f4271914cf55c3267ab705e2ea620b6e10ff550bb87f7f4800eabdc64560ff1f26323b72cf06b2db430c0b897de07d2b047c6ca237d4c09a1323765478
 MISC metadata.xml 343 BLAKE2B 34cc8c4f7372fc0492d8b328ccae1b94946bc5593d20a181d6e32d3fc8e79471f517eea7509cf32172ef55092d898ed65350167d465b22bf127f62fbab6dc1c5 SHA512 f83f432490f25508a138dfbce3a67a120937fa12fee712cbdda9302d238805f3bd18034cc52d473d28b990221bb73748c9305f31cdc9912aed91a79f86386efa
diff --git a/dev-util/howdoi/howdoi-2.0.5.ebuild b/dev-util/howdoi/howdoi-2.0.5.ebuild
new file mode 100644
index 000000000000..c7dca4f4594c
--- /dev/null
+++ b/dev-util/howdoi/howdoi-2.0.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="A code search tool"
+HOMEPAGE="https://pypi.org/project/howdoi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cachelib[${PYTHON_USEDEP}]
+	dev-python/keep[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index bf593f6d38ed..f64290de2ef2 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -8,4 +8,4 @@ DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679
 EBUILD indent-2.2.11-r1.ebuild 1231 BLAKE2B 89908894927dbcf9a423998aca2f3d5052a6912bad1ff67a68dafee6bd651b402a388873dab797efb196c2a4cb8208b9a0f259b0b1af5be64ba16267885e9571 SHA512 1ddfa9c9624bf7409a063fbf2707a095e120f64c3b2a86abd86ad0e8b9b2200e0a2ba2cf7bacf221d3d9c1553fa71971c94ff4e19bc59fa90ee87bf198177fa7
 EBUILD indent-2.2.11_p5.ebuild 1392 BLAKE2B de097169420daf098c4a3a1f88cd973f0047bc282e3ae5e08be60ea27c18eef908d91d44d418b395ac79af0c6caa4f4fc742a4423d7f3162c5e9ea37a7c77af7 SHA512 9b1b34cdc5fbdc205fa448ba9ddb47a313c2842eb6f0872078c0b1769fe98a8fc491f6b2d4af4c425dacc1f105f2dbe88eb1b27682d339f9cc98185ea1fede1a
 EBUILD indent-2.2.12.ebuild 1123 BLAKE2B 042021ce75527202ed59073fbb4810152ca10955b49baa3ffa0bb874dbea56aaa284a0d1864f02ca0c604a02d328cd74ff6622f6bdc98d844ffd227a541053ef SHA512 cc85dba62c15974d85fe6d3533fd579a394d1b60dd4706b5222f370a204a3a7e2e6dbd61115c00a66a5f9aad8a0817a4492abce0cd4cff062f2bc337502e264f
-MISC metadata.xml 371 BLAKE2B f331934c0c8063b13ae4e4290894da6faa7e6f135d1684b7a621b4199b13304496866e7eea31a158a2a0f36ae29da184bca16020425799a6542dd6d213e1b36c SHA512 c3859c430b4d976869789476e59c66bd2967802748abc9a3f53395d170114c21ca11e81c6046fa160ad31d422188dc92f63c9df947ac75ef31bcb1965a7f5dd8
+MISC metadata.xml 240 BLAKE2B 64fe413f69832b5396b621f50bc6f618ddea15ddd4044ac76da4557d7dc0d963ce6ba36c0d1c0a8911af48fd71a6e84c4981f15ac7bad40bbd801e52b568a23b SHA512 25affa2d6d2fe48707ae81553343451aff9797885b4232e73973a29d4cc1d28a937d024cefca49f92383f01eb8cb811546cd2334cbb78f8e66f1db1f63ff4572
diff --git a/dev-util/indent/metadata.xml b/dev-util/indent/metadata.xml
index 88f8d1f6a593..f9f8bbfd9405 100644
--- a/dev-util/indent/metadata.xml
+++ b/dev-util/indent/metadata.xml
@@ -5,8 +5,4 @@
 	<email>jer@gentoo.org</email>
 	<name>Jeroen Roovers</name>
 </maintainer>
-<longdescription lang="en">
-Indent is the GNU indenting program. It is used to beautify C program source
-files.
-</longdescription>
 </pkgmetadata>
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 4d4182497b9b..71a4b9d1054b 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,4 +1,5 @@
+AUX intel-graphics-compiler-1.0.4111-opencl-clang_version.patch 1567 BLAKE2B cef900deb559e251e7fce91b8b8558e5eff846d5bab0153edb6d01ee29bdd0fd4c8dfcf3f3d732a23c357eebb119a4b833205f6e8526ef612069cec165395bf6 SHA512 984a3f26bd16d2d2db0608338f498ebefbbadb6b75552d3c3eaa0fea3456bf52e5ed0c57bedbd144e1d72bf6dea132fb21fe0d8cbca008ddd6b5456352143942
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
-EBUILD intel-graphics-compiler-1.0.4111.ebuild 1663 BLAKE2B 5bf7753c427356e80cf79221fedee6dbb61670ac86269787bdfb37fa6b018eb0dfeb0925b7b127d44144e89784fef8052ea5f438df41ae4a3aa0b107c4b8b4a9 SHA512 a1501c953a613beafc2b22f763fbf515cdebea1d0b075cf77f1fedde12418a6a2c573eab71b7e847685d9b96a859a8e78a001ac14923656655516d45fb92c050
+EBUILD intel-graphics-compiler-1.0.4111.ebuild 1759 BLAKE2B 183287bc5e3d3f93406946fed4f96b76ca57c7aec205f03ef45257a17e2099235293e549e6a8d467dc0d15773b494093092121c6b7f8c76dc402cbe5f3766b27 SHA512 a7b1fed4d705a363debebee0e8ca847b4db5b4a17d423ddb6e78cf8f82be3ce06bd2c497545b4b7193605df35c234441585de2e84276d08f0f01bee5cec03acf
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch
new file mode 100644
index 000000000000..8996466275c9
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.4111-opencl-clang_version.patch
@@ -0,0 +1,27 @@
+--- a/IGC/BiFModule/CMakeLists.txt
++++ b/IGC/BiFModule/CMakeLists.txt
+@@ -160,20 +160,10 @@
+ 
+ if(UNIX)
+   if(NOT ${CCLANG_BUILD_INTREE_LLVM})
+-    # Get common clang library soname
+-    get_target_property(CCLANG_LIB_PATH opencl-clang-lib "IMPORTED_LOCATION")
+-    execute_process(
+-      COMMAND readelf -d ${CCLANG_LIB_PATH}
+-      OUTPUT_VARIABLE CCLANG_READELF_CALL)
+-    string(REGEX MATCH "\\[${COMMON_CLANG_LIB_FULL_NAME}\\.([0-9](\\.[0-9]*)*[a-zA-Z0-9]*)\\]" CCLANG_SONAME_VERSION "${CCLANG_READELF_CALL}")
+-    set(CCLANG_SONAME_VERSION "${CMAKE_MATCH_1}")
+-
+-    # Check if common clang library is newer than 5.0.0 version on which we have SPIR-V support
+-    if("${CCLANG_SONAME_VERSION}" VERSION_GREATER "5.0.0")
+-      set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}")
+-    else()
+-      message(FATAL_ERROR "[IGC\\BiFModule] : Version ${CCLANG_SONAME_VERSION} of library ${COMMON_CLANG_LIB_FULL_NAME} is below version 5.0.0 (where it's starts support of SPIR-V), please upgrade this library at least to version 5.0.0")
+-    endif()
++    # Workaround for https://bugs.gentoo.org/739138 : instead of checking
++    # the version of opencl-clang, have ebuilds set CCLANG_SONAME_VERSION
++    # for us.
++    set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}")
+   endif()
+   if (NOT CCLANG_FROM_SYSTEM)
+     install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
index 3bdf70d334d3..b5113c4912d6 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
@@ -27,6 +27,7 @@ RDEPEND="${COMMON}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+	"${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
 )
 
 S="${WORKDIR}"/${PN}-igc-${PV}
@@ -45,6 +46,7 @@ multilib_src_configure() {
 	use debug || append-cppflags -DNDEBUG
 
 	local mycmakeargs=(
+		-DCCLANG_SONAME_VERSION=${llvm_slot}
 		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir)
 		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
 		-DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
diff --git a/dev-util/japi-compliance-checker/Manifest b/dev-util/japi-compliance-checker/Manifest
index 3f3fea75c196..c2483963694c 100644
--- a/dev-util/japi-compliance-checker/Manifest
+++ b/dev-util/japi-compliance-checker/Manifest
@@ -1,4 +1,4 @@
 DIST japi-compliance-checker-2.4.tar.gz 80249 BLAKE2B fe3eca473d5c7a25ca8e4afb104e498b4c71cf0a0280ca4f5c98c1ea742883de0c883053359e4211e0e2781542b85a92f42ffd48db76d27e15eeb868bc80c3a9 SHA512 53ec4d67478627cc08bd98f76b3d6600e29e71752863c38ba717c7e40432081f32933cd0a68c51dbbd3179bcbbfb7d356996038d4068299a6e2ad2f4e2ff1913
 EBUILD japi-compliance-checker-2.4.ebuild 554 BLAKE2B dc44e2890c8b04eda68247cb3517ec8f54e15b175efaff8889afc8fdf62df621122a1e1143b638cdd2c724ba120db486b5c6536210937c21b20fbc773e385354 SHA512 72763d0c4a9d0e16fa61a75e6d1002ba7169ea378f57da77d23f3363badf3f605e2e8183eeb554039719711c73dda6f8b375e7cd6c26ef32f1eb393c58d52d61
 EBUILD japi-compliance-checker-9999.ebuild 557 BLAKE2B 3036673a42db22c19f02eee9fed557d74f0bde8dc54204f808f701d5d4fc4293d9fd9f6ac2d4fb9e36e05ddfb58be2e6f6deabcba6f35721f039bb93c74bc1a6 SHA512 36f27964ea2cc3466409df0111895596904fa31b62fc63feec9a8a4b318c812540a642950471a10b8f9f0904f0bf959f20aa88b8b401c0ffd8d6035877ddfcc5
-MISC metadata.xml 363 BLAKE2B 7dd162522e60033c2014dfe0c628d802c503f64aa1340ed80b56b968e423fbfd61c404e5da1dcec7f70f61995a760608201242dedcaa0122b679bc8e1047b20a SHA512 341d151d67d28ffe0f6dee2b8bff016b4d50b19c1bad166d3b816b947322602483b47a165644a25e54cce0a349b497a945b241b6dcc74be784b1377ecf22846a
+MISC metadata.xml 259 BLAKE2B cc3eb94333328d4d431fb6969d066eeda1f5648e7315c1ffe26541b13b47d29dcf18a06e6db3c4161e46f3e4d80c180b35a2f5ca0fc96d8f14a9df296e09b1d3 SHA512 b8d5b9abd721fd3014b59ff8f80651b0603b4fe4243373b7f285ab666f7e23819acfc9d3456d8c0c5581d57075079c937c1416e88e90accb67c2670d22a0a142
diff --git a/dev-util/japi-compliance-checker/metadata.xml b/dev-util/japi-compliance-checker/metadata.xml
index 30007d86dcd9..38c9f44afe86 100644
--- a/dev-util/japi-compliance-checker/metadata.xml
+++ b/dev-util/japi-compliance-checker/metadata.xml
@@ -5,5 +5,4 @@
 	<email>fordfrog@gentoo.org</email>
 	<description>Miroslav Šulc</description>
 </maintainer>
-<longdescription>A tool for checking backward API/ABI compatibility of a Java library</longdescription>
 </pkgmetadata>
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index e573a7e98f78..816da60394b7 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -4,7 +4,9 @@ AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 DIST jenkins-bin-2.235.5.war 66477424 BLAKE2B d4917468af085358c98bd5cfe9c31232584a18a74d01e962d594dc2ea3db75d4efabf411dbf568837b56e8230d831f3c88ea4e54f1a965f570772265989a9be7 SHA512 2c9d720dfb87f68dc57e5b2b750d2cbeb24efe65decfee13f4e96b578d3b460e0e00e713a90ee9a32dc1e5c2976455f3598f1c023a279da50b0622284529487e
+DIST jenkins-bin-2.249.1.war 67394283 BLAKE2B c63120bd478d6cdc772935445c37e222ef274f5108023e18a598fb131e380aa5fb17baeab7d7d1cc0d01b776cb5693d28e0f2fa1d48b253ff490e66f0131cec5 SHA512 19a7d0e496b257c9b2c0d7862cff2c9c6221fc87cfa8da6064d316c4fb81a51a10f67a4fb10d30ba645c5f97346d440d45389a8de13c7854474fc816bf23aaac
 DIST jenkins-bin-2.252.war 67396384 BLAKE2B 6476b03a8dcc73f61f151c6187ebd275ed3fb8f352478e0e135406d9dcab150a360ba6b7b9a8ca82d0ed24e5294bd77755497ba7ec9df72b0487f8341eb9d9e5 SHA512 c9a0b1676155f66e0cfbc97762c663ce4d968d2be296e03aa29d4670dfcea6e432340bf424076951c268b28766fbba84efaff397b2ba50fadb9ca04f5bb52236
 EBUILD jenkins-bin-2.235.5.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+EBUILD jenkins-bin-2.249.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
 EBUILD jenkins-bin-2.252.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.249.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.249.1.ebuild
new file mode 100644
index 000000000000..8ab8d5db213a
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.249.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 86c8ab8b9201..7176a02e2954 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,3 +1,5 @@
 DIST kdev-php-5.5.2.tar.xz 1060684 BLAKE2B 682b9f0aa479849966e125e789bd53c4747b050a8d6be287082ffaa3ea496d9b29e80070c96869ae546ab37cfb996922f9ce715c4c7de66f97b1a083f2ed1ace SHA512 5f92f2183af50ddc27c36065eb927d26b01b9f350e2ec8c3cf4136b1ab7c7933d77512669d71ae6bbf6c0fdf044987773427f37bd5bd96a9cf143038147e7709
+DIST kdev-php-5.6.0.tar.xz 1063760 BLAKE2B 72b3a6e77d6f569877687490f654daf79c14e2f7b374aadabbf54d7cad129c15051e72d816073d961582efa33d8354c51b2d3efa77a930ed2c81db4c5cd6668c SHA512 b6838e8eb44df1a0b2d94503c28636ce36dd63e91a8476b1f523b7457f1f831987eb3d079cbb7ed629c5c8143cd6a6f5832579ab7dc38f38162198c2cc068cdc
 EBUILD kdevelop-php-5.5.2.ebuild 1237 BLAKE2B a4870331cffa24769de5a8399cd2b90d76721e2c64b81a693164a04b28b51b5593deef87e5a1fcbd92fda9c8501dbcfaf38f8d5c60db36ede9d20d747c1810d9 SHA512 25fb5fa92f563a0b420eb1cf268cd79bdf56e33f482de93034f3f91fc9376ed426bc9beea36d1a82fb496ee998a5b9c1a4aac01eec7a7b4fccd5c1934d9d3c9b
+EBUILD kdevelop-php-5.6.0.ebuild 1267 BLAKE2B 6529609b0ad11478f4518c5cd8bf150c001b85461e0dc047311bce1b97629ed7bfe5085f75b2af0979ae2ee8c3a0345f2be6e37393ade3e776bc4cd63e65bb1e SHA512 1502bc787557c5fa6b2dbf388b9b8044486b6db73d98510364ea831c872b44a5edeeb3866aeac42895010f22ade4f05e2b88c399210abc4ea4605d4262df2631
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.6.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.6.0.ebuild
new file mode 100644
index 000000000000..e795d53fbb99
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-php"
+KFMIN=5.70.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+IUSE=""
+
+BDEPEND="
+	test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	ecm_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 8890dd347ddf..7ca2039e007b 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,3 +1,5 @@
 DIST kdev-python-5.5.2.tar.xz 1076188 BLAKE2B 87ab49aef61459268c947cee543bc8eb0b8729f3e4f798c1de4b06b8db6c3d5920c23c2b9ca4e4645edc323b15392d418058a314f164f803e2f65eb8fd2d9ecb SHA512 2558e4ad7485abe8473b703a3d80a1faea9e4152eb7be314ea8c3d46c841f457983206b1bc55f454496b81a468a2f8718086e1b0db3e9e880c50011407e7866e
+DIST kdev-python-5.6.0.tar.xz 1069480 BLAKE2B 0ceb8c1a4bd279b621844eb94eeecef4272b13e77764afeb6403d8a757d6873caf2cc5ad5a1a1eef901365c90dc11298bab21274b684c6b49c8e55388c9504bb SHA512 c6a866a563f3304aab860f66d752a617f8a0822c2e3b0f4131b8e8603f2ed86b5141ad308f967ffc5e9458693f389281a8918feea9fc584d7b4213fa265479be
 EBUILD kdevelop-python-5.5.2.ebuild 1248 BLAKE2B 87a2468e90fe316b7ae048b260dd546af28c8020a5ec0d151f2880d82e5928ef0d70e1a9f27e6eefb61320c526fefef3afbd5a4d99fc8441f0f98decad76819b SHA512 27e09b1304f54c736c676416f512e13deaf36d55cea2aa972997ad4e6e06cf633478bf7401c48ff796a15aff5179a7faee4f019d491074f33f05488e88b89791
+EBUILD kdevelop-python-5.6.0.ebuild 1278 BLAKE2B 1ce4f12c5d65b32bfd530d022e923836d884196c7af648057e0aa92df5cd46280d4da4f42b698f4582e815a8e2e28016597bba91518142053ac8a1ddfbdf6c41 SHA512 9800b1f2dba10a5fb941c431b9aa484b7c55dc24f602461bcbcb14f8d456ab0e44d7757d0b953d271f47ba339088af342a542df01df4a45830bdd845110f399d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.0.ebuild
new file mode 100644
index 000000000000..c28ff73f8873
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.70.0
+QTMIN=5.12.3
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 314b3c57b030..6857e2fb60d9 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,5 @@
 DIST kdevelop-5.5.2.tar.xz 7049088 BLAKE2B 93df5c982b8e141a5027b5eeddce55a4c4b915fa5f6b36b71c0125820ffb6692db1dfe3243b4b0333be01658f0d44a0767d9e63ad549a6bc54b0e19c42c215fc SHA512 d4e0b3369ed4762beea18e43275c75b801fa4efd8265734a6b676e579f17408dc5ace4aae1b8f7eccbc70e88f6d80ecaecfc4d2c633f77f80ad0b9d066995ca2
+DIST kdevelop-5.6.0.tar.xz 7116544 BLAKE2B c548c695dab41c93aef31549bd479f1ca832a3fac9cde044523bf590d536473f36a87521ac678d37008ff451c091b843f65ccce154d9b1ca59efac2b48a81515 SHA512 c96a79d92972d606778d76f74f9dfddb9a0da9f41b462ada1a52842aa14306ad3cb183cda8103a9a3cf56d0dd5c1f18d5fad6b65cd8ae42f2fc407aaa6dc88f7
 EBUILD kdevelop-5.5.2.ebuild 4359 BLAKE2B 966aa4775d2bc00c8bdd88b90fce198ebc72b2b5d13f043739d71f7b602dca401686b14f251528fe03c76f6e80fd190242c3629bd30324cfd71f1bef9ee394dc SHA512 e105de2cd8514c35ccf551a6dccbeb10cd72b4e46892b9f8fc6ff534cd850914d3fde9a5b428e02b0185d160e4e5000c6258bb6a63bf9c42e3fb89de60812cf9
+EBUILD kdevelop-5.6.0.ebuild 4333 BLAKE2B c652afd42d3c24b1c2eb93c69b8407104e10a1bc362cd5b909d33b79eb5506c93c0d044133924b446222b960fe16a73f193ba814890b07a43feede53ca467fac SHA512 fa09c51affe9acfd57bd59b56a18e5c26da2fd2f2355132fcc8db751eb49e5d7a73c2d9baf8b8296edf66380899f1cc5cfb6c0bb0b57d056670e6f334081a541
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.6.0.ebuild b/dev-util/kdevelop/kdevelop-5.6.0.ebuild
new file mode 100644
index 000000000000..5a3edac39a3b
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.6.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KFMIN=5.70.0
+QTMIN=5.12.3
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://www.kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5/55" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
+
+COMMON_DEPEND="
+	dev-libs/grantlee:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qthelp-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-util/astyle-3.1:=
+	kde-apps/libkomparediff2:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=sys-devel/clang-6.0:=
+	gdbui? ( kde-plasma/libksysguard:5= )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		>=kde-frameworks/krunner-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	dev-util/ninja
+	kde-apps/kapptemplate:5
+	kde-apps/kio-extras:5
+	>=sys-devel/gdb-7.0[python]
+	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
+	!dev-util/kdevelop-clang-tidy
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local clang_version=$(best_version sys-devel/clang)
+	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+
+	local mycmakeargs=(
+		-DLLVM_ROOT=${llvm_root}
+		$(cmake_use_find_package gdbui KSysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(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)
+	)
+
+	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if ! has_version "kde-apps/konsole" ; then
+		elog "For konsole view, please install kde-apps/konsole"
+	fi
+
+	if ! has_version "dev-util/cppcheck" ; then
+		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
+	fi
+
+	if ! has_version "dev-util/heaptrack[qt5]" ; then
+		elog "For heap memory profiling support, please install dev-util/heaptrack"
+	fi
+
+	if ! has_version "dev-util/clazy" ; then
+		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
+	fi
+
+	if ! has_version ">=dev-util/meson-0.51" ; then
+		elog "For the Meson Project manager plugin, please install dev-util/meson"
+	fi
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 5af385408521..1f8fe63b11a6 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,8 +3,10 @@ AUX 0.54.2-prefix-dont-strip-rpath.patch 1118 BLAKE2B c28bbb0293c2d15a493bd09c90
 DIST meson-0.54.2.tar.gz 1691270 BLAKE2B c1ba552b5d56e0b6b73de46ec6bc90fb520665688d2f5c809baf84749d3bb1dec1fe0131136e1539369fa666ae2427c8fccd5928cbda0b8e3e1edb4a5dc8abbc SHA512 ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
 DIST meson-0.54.3.tar.gz 1690919 BLAKE2B 5d71731fb33397f470e2440d4d45f828d28d56351843a35b575f8b386f0b1c90faf654289e22ba7c2c4bf6c3be72d3dc8a2257d4a688bcbf9a1f2522394e7728 SHA512 2e62bf992bf337ae5a01f7a0fb842ea0cefcdbc81f5675235e41d8182f37df2e003b0a8a90d650c6cca4ff79898f7888474f75e5103a48d7ca14f51a024e4f2b
 DIST meson-0.55.1.tar.gz 1740517 BLAKE2B faec7973d00e13d82268f04b4dd28888d5196df72db1a63c388d23e03195fe18f54207a7f62dd920f53b6001e08e036950db391656d7074ef90df76b93bcfee3 SHA512 172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889
+DIST meson-0.55.3.tar.gz 1740465 BLAKE2B 7d121f5d2bf487ae3c38be5ddccde6900134b9d0ea47868aac5625449e18a1a97ae0012849b795187221632cd3ac343097ef29b282753a1e8bd871c393d5c0e8 SHA512 afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae
 EBUILD meson-0.54.2.ebuild 2338 BLAKE2B f2cfb920c655509b00c6c5639fc772a049ea37e1f362e8ec84bef7d5920cb4b4be7e9048d02d38597ab8b0f60afecf589b6f290828f2f456bd237379f4a21067 SHA512 193e2c013adc68da916b0cc57650131757adc2e33c5d91e3db689e6af4ccb386d0c1f669f2a2f402bc062a3adb990baacbfc36560c5185205bdb54ae8956e783
-EBUILD meson-0.54.3.ebuild 2408 BLAKE2B 6f9f7267cc1e3ea124d26c812b705e31c7c5f14d48eb33c08a73e9a4c81a0b9163297540ab6d877b4878376eadbd530d454023735639ec665aac551e0fd1b4ac SHA512 6e4d00a8dac31eb9a46c5424a8c92c3d5275321aaebf77ef1d6e0fe548ff25f9a6ec0d2ad44cdb8a34c9018a565ef7d7406953114737b92ff88437ee3b96547d
+EBUILD meson-0.54.3.ebuild 2406 BLAKE2B b69982946ae8b15e8ec94c47628eed80d023d9a2bc39f902081c9038f05470a5507bdbd59d5c8506d7d5bc728cb5104eea96c64d6f7ce20ae12522d0e7232a15 SHA512 8512e31a567adbf1f3168a76d24d469a3e9b01f3a8dc986388020ba9f37ae77b690517587182972e5deac514fd75fd80f93f874efda97e54e183a31889fb29ac
 EBUILD meson-0.55.1.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
+EBUILD meson-0.55.3.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
 EBUILD meson-9999.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
 MISC metadata.xml 423 BLAKE2B d1d1b815b9d2fabe5aaa28b469272420bc1eb0c070de7431ec0d7bc7202b00ca216e6a347e0ebda22fd079d9f0514734c0e0e345788a7e00c8f1ad594259b4a8 SHA512 5c03d82f2fd8009680d4d98c3f62c10dfddb2d66d03e8f9d9ad8e417d0359e43f77ecca067735b31b63ceb778fdcc508196e99d793990286234ff21892e4dab4
diff --git a/dev-util/meson/meson-0.54.3.ebuild b/dev-util/meson/meson-0.54.3.ebuild
index 684f4a28639e..26328b22c3d9 100644
--- a/dev-util/meson/meson-0.54.3.ebuild
+++ b/dev-util/meson/meson-0.54.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.55.3.ebuild b/dev-util/meson/meson-0.55.3.ebuild
new file mode 100644
index 000000000000..38ccf9179e21
--- /dev/null
+++ b/dev-util/meson/meson-0.55.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2016-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" run_unittests.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 012fd13a9107..c6f0400a1411 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -6,7 +6,7 @@ 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.10.0.ebuild 2690 BLAKE2B 6a3bd2d13339dee121c2b148e6166b847e3eb3d9bb31bdeeb25a35a08f31146190a72deb5fdaca63fc55bcc1f51cdbb27c5f5a1fc808d37a9da1558656a93028 SHA512 e634ddf1cce3ad058da654c0c5cd40c68baee208774104aed919a98623cc80c9022a2f56552f968d6eb3fcb041b74da2e350477d6ca1a5faf299b1a017a21432
+EBUILD ninja-1.10.0.ebuild 2688 BLAKE2B de89a2e5709267a583808672c0129878ab4e34291f481f6e1e847e6e7aee997319c1fb19756ad165c0cf4fd3632e07c564fa05642e044edf2ef4c962eae36dec SHA512 54e7ed51457c7dc0da4f484aa129991d0b4d599b402838ddbe026392a5c1d0dea6d8087a7c2ab306881269fd4ac19cfbaf96caee0d9fcb0a195b5b7af404faf6
 EBUILD ninja-1.8.2-r1.ebuild 2650 BLAKE2B 381a358380a18d9b59da3d2850661bf47b5b8ab7a5c01a2a553b3367a5b39f1a590d08ad91ac2191e26755799ec60f8596d69db46be57cb74470fc33de1ccb85 SHA512 667d8163314f2625c730ffb4d1960d162e5c90a20c0b754657a0db5e6ca363171cde8558d4ed452194d75a10849a8d05c0c494ed94aaf8bb855537eda92cbe84
 EBUILD ninja-1.8.2-r2.ebuild 2650 BLAKE2B a4ae25652a8e2f60818dee56c7cea2c05967e0f3a4e6fae5d0f0fbbf05f253e174b2ed6fb85b0d2e0a9bd2bca6754fe82eafb50c38e1f51cef2fda616cbe464f SHA512 2bd4dc83bf719baf14d4eda839415519a8d6ff3d320830475091b3bd7ca12cc9204637a46f2155b40c9c4a87bc58f747f56f534547ba24b7306772004bd54a49
 EBUILD ninja-1.8.2.ebuild 2511 BLAKE2B 511fb24bda7d2bc511daa86d9c76217b54eeeeb2744dc9050d4c262e999ff496c91cf2800c3bc849e725f528e9d394238a38905aff48e63fbf8a17e2aad5ad6d SHA512 1346570be8d9ad9152130fdf3ed54c223ef48a6c1bf6469f34a24bca0443302fa71458d5777d479893958dd29ffcd37feba8c8ed51eb93e2120a0d0761d372a4
diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
index 5ad8565bdf01..e44e4f5c6299 100644
--- a/dev-util/ninja/ninja-1.10.0.ebuild
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 0a6b13b59d65..87e27db7648f 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,6 +1,7 @@
 AUX binutils-2.34.patch 5670 BLAKE2B 20cf23c45d94d9c71f5fb5c432e832d8db53f6428b7f2849ad3f5854de36e371addd0883174eed4537b66367dbbf842ca557ae7842561a9f643769191929964a SHA512 be14f319c3e1c7486534e91e1dfb88c853148d58435ccf2ecef5e8ec690f20adea1edc48f3b6c88e900382d2dc342319ee28172150682bf1cf2a3e6fea9a1f4b
+AUX musl.patch 632 BLAKE2B fcaff5d665639ee365d51171024b98f58a431668dc36e829267ca7773b53b0efd1557f3e2366110685d673e2140e15855bee4220c6306a06d9ff1358bf6cbfd2 SHA512 fb9515de16bfa621fbb2f83a446b976ea8c123f779c2955a8740234310fdca66e1ea005d1c5a643b785ecf3797f658eec1a96b673b3cb534a55f30b182444a72
 DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
 DIST oprofile-1.4.0.tar.gz 1557625 BLAKE2B fe1a725b713da0e06d3876c52f001163965c1b0dd8ccbb271ef6924525ac6ca342d55172c06cc21681b441c744780d5cb523be08562952c5916005ec67734221 SHA512 44c0ae55d20d623ea8b4245bfe3e208813dbb8778d7e320378ffe70538ef6af1a6ddaf5d110e29751c216879543f13121dd71cb320023205622b3f0cd6b157df
 EBUILD oprofile-1.3.0.ebuild 1710 BLAKE2B f8e293e267d697ac5032aa086dcee205a86709b2c26b9ae730e105cd5b2045aec0550c6672ff8fc300c203d53b5d1bae26cdf1a310cd0226f60a58aaf38bbdcb SHA512 b0e87f0a90f21f35cdc9dd21b32d0a93e3bb26ec7517a28669ae5b7086a3d597c1a64f6ca117cec1625cdf239a191c4b028388ca7f3e5ff24fbbf695a55e1234
-EBUILD oprofile-1.4.0.ebuild 1966 BLAKE2B 2c9809cfd086ab38c5a35dfbcc2b132b28e779f421e145df3d8d864fed781fa3abc02915ec30c62ab672ba7f130f80b557bb846f352a54fcb7ef73622af41ccd SHA512 b241793336ec5f6761ed8c5893410cdc66c0fa78c971e5188646a911aa5298b7b9a2ba8be59c9103f34819051046526921a5f378dc2b48afd0ee1de074e2fa19
-MISC metadata.xml 508 BLAKE2B 6568a105deae028206c3dc0e7fa1a4fbe76eef58a4af5ebec47ce8af093803dc5b74f120a25db38bbd7dbd7b17b44a301ca4af27a5da99fbc91e90e7b1fffd9a SHA512 fe94dcd0876d1f7bc500bb02a0fb1bd998c24f84ebb483f28629ea87dfe507f8fb74d2b8847e9d1a938f45f8cc6b0776f431184cfbd38273d32b5f35c97b00e4
+EBUILD oprofile-1.4.0.ebuild 2016 BLAKE2B a56ddd9a7058c6b897f77cc8c79c719de5a524f2094250dcfcf421ffaf81334fb8ab578c86475910a1ec7e432c225244361f5b88f42d77ed9d153d20ec96f0b3 SHA512 b92c6f600a90796cb8e69e243d97f89ffdc256b2348e4bac6de959af6b7ddc28c011debe860984e92ec552bde930caecb7396936878cb5fb03dde0e686aa9b96
+MISC metadata.xml 423 BLAKE2B 18e22d9fcde7236f7aacf9513bb12e7ae4a7eb07445b1b2c56b563a816b02d600722865d8460e810ae0206632b7b52703cac1812aea9626dcd47fd173d4b8cc5 SHA512 2bc1c9012a9f410cc206abf7b5471c1f8b3adf214241ab3ce1da36f34597a2ccc309ee627582c766d1988440a21e8df7a90668691fd57015b6cdd4db34661f22
diff --git a/dev-util/oprofile/files/musl.patch b/dev-util/oprofile/files/musl.patch
new file mode 100644
index 000000000000..985eeece7bd8
--- /dev/null
+++ b/dev-util/oprofile/files/musl.patch
@@ -0,0 +1,23 @@
+--- oprofile-1.4.0/pe_profiling/operf.cpp.orig	2016-08-08 18:03:27.000000000 +0300
++++ oprofile-1.4.0/pe_profiling/operf.cpp	2020-09-05 12:45:55.237558495 +0300
+@@ -860,9 +860,9 @@
+ {
+ 	if (remove(fpath)) {
+ 		perror("sample data removal error");
+-		return FTW_STOP;
++		return 1;
+ 	} else {
+-		return FTW_CONTINUE;
++		return 0;
+ 	}
+ }
+ 
+@@ -897,7 +897,7 @@
+ 		return;
+ 
+ 	if (!operf_options::append) {
+-                int flags = FTW_DEPTH | FTW_ACTIONRETVAL;
++                int flags = FTW_DEPTH;
+ 		errno = 0;
+ 		if (nftw(previous_sampledir.c_str(), __delete_old_previous_sample_data, 32, flags) !=0 &&
+ 				errno != ENOENT) {
diff --git a/dev-util/oprofile/metadata.xml b/dev-util/oprofile/metadata.xml
index 99119adc69ca..37347fcafed4 100644
--- a/dev-util/oprofile/metadata.xml
+++ b/dev-util/oprofile/metadata.xml
@@ -5,7 +5,6 @@
     <email>bircoph@gentoo.org</email>
     <name>Andrew Savchenko</name>
   </maintainer>
-  <longdescription>A transparent low-overhead system-wide profiler</longdescription>
   <use>
      <flag name="apidoc">Provide doxygen generated API docs.</flag>
   </use>
diff --git a/dev-util/oprofile/oprofile-1.4.0.ebuild b/dev-util/oprofile/oprofile-1.4.0.ebuild
index e881632d5f3b..485fdf66c1f0 100644
--- a/dev-util/oprofile/oprofile-1.4.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.4.0.ebuild
@@ -20,7 +20,7 @@ BDEPEND="
 CDEPEND="
 	>=dev-libs/popt-1.7-r1
 	sys-libs/binutils-libs:=
-	>=sys-libs/glibc-2.3.2-r1
+	elibc_glibc? ( >=sys-libs/glibc-2.3.2-r1 )
 	ppc64? ( dev-libs/libpfm )
 "
 DEPEND="${CDEPEND}
@@ -46,6 +46,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	eapply "${FILESDIR}/musl.patch"
 	# bug 723092
 	sed -i 's/==/=/g' configure.ac || die
 
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 9e9acdccb643..9135135b85e6 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,11 +1,7 @@
-DIST packer-1.3.5.tar.gz 9198704 BLAKE2B 210c824aa61fed8ab58ea6eed2a1804d8b144e7e20f0794721b2c282d066969d1193fc36b004bb7d31d8a2b19fa609e673d05457653bf8ad694a142563e839cc SHA512 becd747b43c8a9c0aa93d1d723f2e2383e9f2adc19e82653142ea13080aa393750cd3fdf86fa259af21af6b6417bf023e7e482402dfa56d347720fb740ebe906
 DIST packer-1.4.0.tar.gz 9794922 BLAKE2B 2e1d817e0a3f549255ecd8693d6d99b2e45df2e8fb0acc128f03bd1448f28afa865a0849ccf58e9a562ef50b901ea86efd29fe29747c126aa98c05456638719f SHA512 d2dbeb99d1fe44a427d2997eeb4ff6ae66bdf2d7f8f08e2105f8614487a6565b8bc263cf8aab8413520783a4dde18d150aae6c69db171fe1cfab3ee1bd0a0743
-DIST packer-1.4.1.tar.gz 11279518 BLAKE2B 7b1b966af8cac73826fc8f5a1cb39183fd2ae1d3b7da6d7408cbb7c3342a0fd2ba84cf1df89ea9edc41353c0bbb6c874347745a91c3eaa1a742521c79500f21a SHA512 4038990655eecf412be9dae9edd09a300543a3b0b841c982631cb48f4905388f9dbf26a9b0ac3cb77628d1e650600b7d3b89a1694f746dfdef086a621078cde1
-DIST packer-1.4.4.tar.gz 12811202 BLAKE2B 7a59f0252ac3d8158d64806e54fe459fe154bdc11b67539e4a39e7c79273bba6c5814cec0128c177a51e48bcf9172692d3eb3c7e789b768019c329c111fd5a0c SHA512 c4d2ca049b442fbbc65214ae75f5c85dc87b09eac8711891c4678ff3b2a676d00a051c08448a7a99b7a0977d4a04ad8bc559fd09885b520e6a8eb2dfc33ba50a
 DIST packer-1.4.5.tar.gz 13705057 BLAKE2B d23527e8bb0104e3f0206f5a82eb93fbe15a9542409bcce13cefd49fa83a47c0262f48e74ff951990211de9f85fc32efd41bbd4ed286b3462aed86df68afebc8 SHA512 b2a3ae27612c78fcfcb2ac655437faf2cff6e587fd10033b39ddaca8b92b634b93ecd0ae7e3ee43253ee716a2c0f7da532b3ae0ce33c59d1d3896f9187d9a657
-EBUILD packer-1.3.5.ebuild 790 BLAKE2B 017172611fb382cf7c9f3f374c404de971d09f68cf44202bf05180fce8255b321132a91e5cfa7d1d7bc517e8b59849e9bed6cdde4db4244eef07993f7f87212c SHA512 4b2aa5d90c965ad271c688565bc1e37cc0e91b7222b8d33a7f6d9fd271e60a5721f31e496df7cb921c0fe3546678fbe9da5cbecaa3609415566a98eea1456a9f
+DIST packer-1.5.6.tar.gz 16037500 BLAKE2B 9409aad981b3494a442fc6854481853494b12b74532ed3ac8d210d4e275a8f4f18bfb6dcfd7c36c4e97b3d5ba0263155fc8f08592b0123705c5d341d9183e6eb SHA512 993f54a1bf98abd5bc450bafaf202fbbfbad009b661d49783ff82cba9891b8556340801680c0fdc33b90396a3101a2ed93a11798ad51c10d7bd5f81fef4f5a31
 EBUILD packer-1.4.0.ebuild 792 BLAKE2B 98101308b1243d57463057ac8be281bab376eb32c5b78156f3d00645335a5de62b71e3422fc14b4c8d4b33994563773e47970a9c671e4341c28e77e731680a0c SHA512 0529bbe8e372bcc7e89ceb7b2f3b3d6a14122d1b1c0276dde64f230430049c3c41f1d443df65ce1413713abf138d7f0eeec81b91909ef92aa675dc5facc59135
-EBUILD packer-1.4.1.ebuild 777 BLAKE2B 6123da351bda25d983b0032e68d842954ac3468b06b85f71070c8021b83644a39a3ae9ab13b7dd9a3849637170613c3ad8a0c9693dbb487905ddf5e9311ec081 SHA512 70a934dc3fda8efffe92a17a67e024c2831859fdb4e5e0f2732017866b296afee87280fabf3ab8c26ab5be86418b4de15366d07b9d6252f0eb53ed93e2a6d96c
-EBUILD packer-1.4.4.ebuild 674 BLAKE2B 8a7aaa2252962053ab87a9c7c7aca766b7dc2328b74f545f55e04136bae9289eb3786cc42b1291578ec6eb2554e3813f6fec426246ddcb5cf7c2a19cfeacdc0a SHA512 0bb54a2f36020864c0ccafed3f6aa525a414ab9cdf3ad6417a6b791af6cfcfa2d7b6cbc1089275ce6a2368cbf5887fcb80a343e4d85fb184de657bec5a228951
 EBUILD packer-1.4.5.ebuild 674 BLAKE2B 8a7aaa2252962053ab87a9c7c7aca766b7dc2328b74f545f55e04136bae9289eb3786cc42b1291578ec6eb2554e3813f6fec426246ddcb5cf7c2a19cfeacdc0a SHA512 0bb54a2f36020864c0ccafed3f6aa525a414ab9cdf3ad6417a6b791af6cfcfa2d7b6cbc1089275ce6a2368cbf5887fcb80a343e4d85fb184de657bec5a228951
+EBUILD packer-1.5.6.ebuild 674 BLAKE2B e434094f73b06347d1cba9e315290b26a2f6f32bfea078bcf4a657ff8769f413bf3724cf4fe12e439e5e162644d870cfdd282601b297bd195748a9a69b5fc579 SHA512 7088a701f7a71c9080a1d236d56091118d135b8f833fe998cf571ec95d931d65701aa86370b2cfb5d0e0bd0df56591598ab7fb893330e0577dd1af98d708ca8a
 MISC metadata.xml 1176 BLAKE2B f8f5d6f67f36e87602efd3164c84c7d80c163bd7b553c5aac5f9f846245a8caea124bee79387e2dba1de5a70c0b745bc9cc7d5cc19fed22b0cd1259e71bfddcc SHA512 415e3c1e6c1de9a9bcd5f5aab462ec0c11c0540996aea140411b4784e7966a030170000ec95c9d67e710f57a5f82264e1335c97bd46a8a195dd4700b15db606a
diff --git a/dev-util/packer/packer-1.3.5.ebuild b/dev-util/packer/packer-1.3.5.ebuild
deleted file mode 100644
index 8cae3f47d007..000000000000
--- a/dev-util/packer/packer-1.3.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-
-EGO_PN="github.com/hashicorp/packer"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-DEPEND=">=dev-lang/go-1.11.0"
-
-DOCS="README.md CHANGELOG.md"
-
-src_compile() {
-	cd "src/${EGO_PN}" || die
-	GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
-		-v -work -o "${S}/${PN}" ./ || die
-}
-
-src_install() {
-	dobin packer
-
-	pushd "src/${EGO_PN}" || die
-	einstalldocs
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh-completion/_packer
-	popd || die
-}
diff --git a/dev-util/packer/packer-1.4.1.ebuild b/dev-util/packer/packer-1.4.1.ebuild
deleted file mode 100644
index b5901c6d82a3..000000000000
--- a/dev-util/packer/packer-1.4.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-vcs-snapshot
-
-DESCRIPTION="A tool to create identical machine images for multiple platforms"
-HOMEPAGE="https://www.packer.io"
-
-EGO_PN="github.com/hashicorp/packer"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-DEPEND=">=dev-lang/go-1.12.0"
-
-DOCS=( src/${EGO_PN}/{README,CHANGELOG}.md )
-
-src_compile() {
-	cd "src/${EGO_PN}" || die
-	GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
-		-v -work -o "${S}/${PN}" ./ || die
-}
-
-src_install() {
-	dobin packer
-
-	einstalldocs
-
-	insinto /usr/share/zsh/site-functions
-	doins src/${EGO_PN}/contrib/zsh-completion/_packer
-}
diff --git a/dev-util/packer/packer-1.4.4.ebuild b/dev-util/packer/packer-1.5.6.ebuild
index ab0e1cbcd571..c1237d3214bd 100644
--- a/dev-util/packer/packer-1.4.4.ebuild
+++ b/dev-util/packer/packer-1.5.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/patchbin/Manifest b/dev-util/patchbin/Manifest
index 33957993ef65..a6865045eae8 100644
--- a/dev-util/patchbin/Manifest
+++ b/dev-util/patchbin/Manifest
@@ -1,4 +1,4 @@
 DIST patchbin-20160208.tar.gz 9713001 BLAKE2B 4ce3c5d43f7b0a909b5058b3877cecef68f703d803bcb6a4e4b7e907dedaab98cbe87f33a5211a318f8146e9ef4753da18d58b3cbc8e4ff715b58d82227ad7b6 SHA512 eeb5c4bc708cfc3a065568ef233297586c3bb3d497c6bf3ace52b8337b5a5d127e607f668a6f74e3be892e8cfac96a046dea3646735c4404efedd8760572353a
 EBUILD patchbin-20160208.ebuild 1008 BLAKE2B ab47ce4a15474422f0f286214c14aa830ffd1e000c69dcaacb2e1623828c8f00181f04036d88c65e90f958ae95537b488fb224119121f81ac0a29b9f7a0fd95b SHA512 6718f909bda5a9e5b626f6837c26361af47322860cb47b9b87de8a52296d4a3c2b629c352de59dd364cbee9f1d433becf0ffc784cf46f6aed60255cf047307f6
 EBUILD patchbin-99999999.ebuild 1010 BLAKE2B 85063233e51b7c5a4abd5b45dcc41a64aa81cef9ddfd41b6bc8ecad93ff8017cb12b66d1e0f56f5d516399117e6c9ada0e2806fae11d05bdf223d3fd55804100 SHA512 dc867d5298c24ee84b815cf7c875e6adc430d14dce274343f3814b3b5fb0525a9a32308465f87133ad29e7c4d17088b525f9035f9245e543a0826b0a58ff480e
-MISC metadata.xml 528 BLAKE2B 566d71b86021dba9948978378279d2a4c95d50e4402c31c3da9bb3e1ab50d1d6148e104e3e3ea4c688a2bf1f720f3c4379d3eefc2eb57d316d9952d3f1e04409 SHA512 d15966f28c81025fd34bc247fc2f3f4ceda3c7dadd23f28487c80fe3155666665b9dd451e59356cd6bdcd30197be9a0439ab5c0b9383ab655870aa9033d58d94
+MISC metadata.xml 444 BLAKE2B 5f90f435bd40ef6a4850e446570555068201e16125a3f8ecee0e8b1bdc5a4394d53c6bd773be20fe79cfef9eeb3cf62504b5e8b5999479d875a8e3aa81bdaa0d SHA512 f26b1774c72115b0b16a90279350861bd38d6e69a35c7b8fb1cada3082ea988b1ce187d8ba8f31dbb2386e7e7d6c75fe26dcf88286d733aea883bafedfb84a38
diff --git a/dev-util/patchbin/metadata.xml b/dev-util/patchbin/metadata.xml
index 1f33891b2670..2a8f7808b841 100644
--- a/dev-util/patchbin/metadata.xml
+++ b/dev-util/patchbin/metadata.xml
@@ -5,9 +5,6 @@
 		<email>NP-Hardass@gentoo.org</email>
 		<name>NP-Hardass</name>
 	</maintainer>
-	<longdescription lang="en">
-		Apply binary patches without git
-	</longdescription>
 	<upstream>
 		<remote-id type="github">wine-compholio/wine-staging</remote-id>
 		<maintainer>
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 781354af29a2..524f94c45fdb 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,6 @@
 DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136
 DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
-EBUILD pkgcheck-0.7.6-r1.ebuild 1403 BLAKE2B ff59f3bd139cd02a5f39510c62f4a76e364e6e76b13d93c6f8a40938dd68ae1a8631b4b1369d829e5123951d42fb1d361ebd6fadddfc9a5432b08bbd75ee2ea1 SHA512 78d3fa064184d94b1bf6a026289b6595ca7f7262972f44c07a9e85b2900d6267dfde9c8fb304778f2be010411ac7652da7185d47df0ff2368d3e478a40d705e9
-EBUILD pkgcheck-0.7.7.ebuild 1407 BLAKE2B bc83dcd07125125157e16576be2e4e6e34e46932b35a91dcaa7cb5fcbd2bfb2409e7bc4c8a5bee8625585b5f675255fd616e1824e2fe4f48e4d17d8f4832f58f SHA512 e2bb02ed14cc6edf66ca20b473bcd90e24e5c5582717fc4a6abadf42fc91fb93f8003ddd19d75b53e7d9151a5cd6bb7f95580594f92d5b95e5329126638585d2
-EBUILD pkgcheck-9999.ebuild 1407 BLAKE2B bc83dcd07125125157e16576be2e4e6e34e46932b35a91dcaa7cb5fcbd2bfb2409e7bc4c8a5bee8625585b5f675255fd616e1824e2fe4f48e4d17d8f4832f58f SHA512 e2bb02ed14cc6edf66ca20b473bcd90e24e5c5582717fc4a6abadf42fc91fb93f8003ddd19d75b53e7d9151a5cd6bb7f95580594f92d5b95e5329126638585d2
+EBUILD pkgcheck-0.7.6-r1.ebuild 1403 BLAKE2B f6a2b5e3f48767803cac0a2bdc408d806d44ce89ea7213e86cfe8a664d02d6568373d8f2aa6f12fd10e2694de54581ac7c6e2977a3f7650781038e7a3c4938cd SHA512 a01fb30b90b0dff455ea53320fc2aec0d0610209107ce4adc8c71b85cbb551b89a939534967ca3c7bb0640879f821045030895b25ae2040d74371ef751313a01
+EBUILD pkgcheck-0.7.7.ebuild 1408 BLAKE2B 7cc007af37958c3d7d96bc2dc4479af747723f61c0a118e6935e7da42427a2bdbb92e19085fc1b377073c032d21683fb573da415a6dfd5ea894c023f2582e0fa SHA512 100691523a491b2a65bc7c4d4b160edc3feae89936d17e242df93ba65bd205850bae2a3b976978b050a20de6e82547aa18c6be232e733d9e17740b17c8fb2d1f
+EBUILD pkgcheck-9999.ebuild 1411 BLAKE2B f5f24d58e52919909b9b3fe9ef9f83d9a87e0cf86e5793b0cc5cbfb48236405f440f3fd2ec90dbf6100c24a77636a7af74b10cd7bea2a0547f4a823757acaab6 SHA512 9eb21a1fb70ddb97c087391785d168c567fc5be55eda21abb9c2573318e990cc28e93ab16710e64ba40051bb3a7cbe791d8a6acf5586aa0193d7bdc1370f0270
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
index c9a7b19354f0..840d6dec3bad 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
index 19f05125eb14..03d7a31bc1a8 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 19f05125eb14..2ef90f0d26cc 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
diff --git a/dev-util/pkgdiff/Manifest b/dev-util/pkgdiff/Manifest
index c16360fb72d6..45c2e9f2c343 100644
--- a/dev-util/pkgdiff/Manifest
+++ b/dev-util/pkgdiff/Manifest
@@ -1,4 +1,4 @@
 DIST pkgdiff-1.7.2.tar.gz 56592 BLAKE2B 6190a8c1e018766802e12234890629efb356680dee84afdea1f989bc91196edc5460c3af3cba5229116ddcafac81f728d1d4eb52f009f9dc5f711a7718f2b0a9 SHA512 2369488e9705280be9b326b07aa9ef0e211440921b9cce5c35560a14d1ad4ac0040eb54024a88a4a5f8f831208b43124c17a817a44840500b490c89bf877b904
 EBUILD pkgdiff-1.7.2.ebuild 608 BLAKE2B 0b6d09e939986db4346b95958244649ffac68dc72fb844607efc6129a214ff584c0eed63b185d7c760477f651178a7ace6c752fb90809a4e9b8ffa7df86250cb SHA512 e21aaf0b7fc5a9237ce6481e2ad61eb7a2a7b35b53738d536c227c72a23acc24e4efaa7ac079c1fe22400d82abd1af315f9c5f094523fa7c9bfca8a8516efc54
 EBUILD pkgdiff-9999.ebuild 593 BLAKE2B d3024438133dd4b606f0d2dd1bbc5ac6ebd08e8ed8abb6b8341a18122112a8ee6eec06d119e1a361eaba5f5f30685b7b0a06306093f99227724b8d2ea250f4bc SHA512 69f8c9f93e40cbed4739b7fbbbfd83b580e5e60c5e846c3d1fc67d44a903fc20ce1ec782b17dc78a42733c517e59ce0d243ecde89b4996ba2abecf29120275cd
-MISC metadata.xml 338 BLAKE2B 09bf599cfa91cc08a471c3d0c3cefaa623db3c2ce996f1a729a0e8d56239d90fcfe0276543ecd87210aecd9951a5c72603d8accf13adffd1d367181719eb95f7 SHA512 c27e02beec32aadcbbd329456a26cecc78de349422ada21067d8510eca159e623e6f55a44e1f6307cd81b5fb98d565c270d13f18dd3bb3ee6a55c4ce6347e6d9
+MISC metadata.xml 245 BLAKE2B c469feac4514d136d3fe1ac3febd7b4ff941e1beb4783293fa0741b2010faa1fc0be3689f0fc2b15b157e78912b294c775d6cb737c36c7cc22f49f134431d3a3 SHA512 dbe84aa81b15c725b68f1967b1165f7d75378afa586f628b061b534ae39798b8cab85d7de1d1d5719ee2ee717e2fad011d3889e1760c9f63c2029207aa069672
diff --git a/dev-util/pkgdiff/metadata.xml b/dev-util/pkgdiff/metadata.xml
index db10502b8ab5..d1051ee5c758 100644
--- a/dev-util/pkgdiff/metadata.xml
+++ b/dev-util/pkgdiff/metadata.xml
@@ -5,5 +5,4 @@
 	<email>fordfrog@gentoo.org</email>
 	<name>Miroslav Šulc</name>
 </maintainer>
-<longdescription>A tool for visualizing changes in Linux software packages</longdescription>
 </pkgmetadata>
diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
index 4378eae3476f..a93639bda2d6 100644
--- a/dev-util/ply/Manifest
+++ b/dev-util/ply/Manifest
@@ -1,4 +1,4 @@
 DIST ply-2.1.1-arm-build-fix.patch 1433 BLAKE2B 305bb06ce1e5516dc3868cd276edc94d89cb7c20866094c6947092048af2c090a29bae52dc82956cbf7f36e42e15d873c553948dade17f4b1f9d490bb8191ed9 SHA512 e7572e5e777e13b483e9123fc5c62d63f3f1a2c753d7dedce8de8d78a4c5baa9c10b45b0e31ba16a92b0e2af11e206662cfe815643f0a8145f8d79e388d536b9
 DIST ply-2.1.1.tar.gz 71578 BLAKE2B b63d0bd355985035b8d1c934c13982e21eeda0d710f40b8131562e9ef6a21a3eaf04960b871f5ab83d718ab1726450996988a2aef1a6fbd2e8f1a3c55db92beb SHA512 fdc66d752989a239e01d2746e6c56610c2c945fbeeff8f2a79be1db487a6cbba365d1bd1b553d25c43a3fdc3634ab96bf4a37ab4f694c6eb6eba82c35b37231e
-EBUILD ply-2.1.1-r1.ebuild 1110 BLAKE2B 973c3683c6d18eb918889d9e4ad1937d4e5a41994f3e7df0e00cd0c7cb8f6a4ff355ffda4fff22e2e0a3c0f2545beb2d0ebd293d7cfd8b5019ddec46c616a6ab SHA512 71d2e081753355e7eb08786a6d4ca9739d8b63b695dbb78f200c8ff65ae7201d72d84729b609906917f6e1d7746b12bf518ae8179f75becb9c0761be0a5b34db
+EBUILD ply-2.1.1-r1.ebuild 1109 BLAKE2B 24dcc519455d9575a3ca3367823c4bf36814f486eae96ad8d79b7ee5e865ac3a329046e3c7ff8bffc47c4fb3274089f0c56ef74f3682e4a0f34be026659a9787 SHA512 09ad3fde619012e5246c2f8b646a6d3639f60edd9d000491d7026f8fd4302775151b45b6b8a08dc2f9f93d44ce034de97387da3784f8d9e37ac92d30d34aef6b
 MISC metadata.xml 659 BLAKE2B dc960603c0d60aed83463b6e7b284faa759caf821a5087aeb320efe15b8a7af0c74d532b0fbe9ae67fdc6e0b07b9a5a5e9a04bc123fceaff615bb49408126872 SHA512 ee75ce0854893a75ee1bc8a2ff723e93ce4845192b7a16a5c1d217b36231c009fb1d07d05792b4fd8a700081b6f0d1b60786d1184c9b32289dbe8c6d34f9d563
diff --git a/dev-util/ply/ply-2.1.1-r1.ebuild b/dev-util/ply/ply-2.1.1-r1.ebuild
index 995c760e574e..b26a0a480aa5 100644
--- a/dev-util/ply/ply-2.1.1-r1.ebuild
+++ b/dev-util/ply/ply-2.1.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/iovisor/ply/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc"
+KEYWORDS="amd64 arm arm64 ppc"
 IUSE="static-libs"
 # Bug 733248 file collisions with sys-boot/plymouth:
 # /usr/lib64/libply.la
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 3485631d56b9..a94b34f9324b 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,4 +1,6 @@
 DIST radare2-4.5.0.tar.gz 8265716 BLAKE2B 5288b393eb40f0f9355ad44a102a768924775ce11d126477d89a77d4dbb885556371125ea9f54ce81216bcef25387b816ab679b99a2e6c31c7f48db13ccc4774 SHA512 84d4ffc28f499f4360f57f31ad1b1f4b2a14e7fcbde7198bfb9ec4a85ac6606ceb5b28602624d6419b14b1586afd50330ace6232a183d7bfb876fefe07ea7bf4
+DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
 EBUILD radare2-4.5.0.ebuild 1279 BLAKE2B ed2ae3822a315473903b7dc937aa77bc21263df3e7895caf57268059d3b32a41e612d08748b8b693a7b2c4e5c206b6bbb7e5546091063e2ae1c0bbfd4aff0813 SHA512 7754bfe01014c55e12a870fcd078748c8e1ee5ba2746f704aeff189712b53ebb295e0d524267abe7e667fd2f3e911061c05c8ad8fbd66be501a235298ec90330
+EBUILD radare2-4.5.1.ebuild 1279 BLAKE2B ed2ae3822a315473903b7dc937aa77bc21263df3e7895caf57268059d3b32a41e612d08748b8b693a7b2c4e5c206b6bbb7e5546091063e2ae1c0bbfd4aff0813 SHA512 7754bfe01014c55e12a870fcd078748c8e1ee5ba2746f704aeff189712b53ebb295e0d524267abe7e667fd2f3e911061c05c8ad8fbd66be501a235298ec90330
 EBUILD radare2-9999.ebuild 1159 BLAKE2B 60bd15815bc419615783ddd99a7a606c38cacc1c1727a32c1ab6c327172af4922dd1a67c226ad91877fe6a288b4a3240665e8832faa26aed06e18f6ed3577c84 SHA512 656e5f0b705f533d34ebbae4e43943c55d1b6fc8cb7abb808a1be8576719687993ef64aca6c134bd84fe611037d61bc985cfe5bc8c3074e7a93536d4f4721eab
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/radare2-4.5.1.ebuild b/dev-util/radare2/radare2-4.5.1.ebuild
new file mode 100644
index 000000000000..302e356bc8b9
--- /dev/null
+++ b/dev-util/radare2/radare2-4.5.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radareorg/radare2"
+else
+	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	# Ideally these should be set by ./configure
+	tc-export CC AR LD OBJCOPY RANLIB
+	export HOST_CC=${CC}
+
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 778afe1863aa..bb15a476c59d 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1,8 +1,6 @@
 AUX re2c-1.3-lexer-overflow.patch 1244 BLAKE2B d9f51ea520ca437f4a1cb9c9f788d0c5c76d48358ee2c9d8a821c40c53d7df8e34f97cfda0ccd17e4220600043349afb9d737a2444d58ece8d381f1d30807855 SHA512 19a9011c58107c136ef49a51a712125274f841f884ca76c5f2e25464b24c3a6477ff45752df20c5f508e21a2a55c7f4ce19bc6c7d9b7baecc07fced76ce87de1
 DIST re2c-1.3.tar.xz 1239280 BLAKE2B ae2a8fc323408dd31d39c352bd622d89d19178b7993618ea043bbfd32509fb7573d2b5b50663e100d24fc275fa479982cb1f66ed49638edca61f551fb653176d SHA512 c7084ab2399fb6b96cef74c1393715d90830f43b82b96af46feb71ef008c0215381c3dbea0b003ff810d869db6021e28001b9d588ad55c616642244b2da09c0e
-DIST re2c-2.0.2.tar.xz 1292972 BLAKE2B 65780a6039fda0adb5daed1020ed1b58467cf4f45c87fac8feb0ed1d6747a7a4136d307960279f3963dd3b2d4b3f67bd1040fb1bd5e09f4a5f8ac55335f9f28e SHA512 7db5bea3f3d536dfc9483edf02b6dfdc75565841d54c57795505c5a587b9b50bb588731aaebf52b08cc6e853848052869e4aa1d4b0cbf6ca7e020eae3d391e74
 DIST re2c-2.0.3.tar.xz 1288996 BLAKE2B 76913a79ad9c237843ccbe86dd05db755da19fc89351b64d6ece6a9a8d53860f1cc12493748fca5b7391cddff4f4668295fb2613c257c128870ea2e7163811ed SHA512 893c533e9847a6236d55ae65e413ddc48b7531b89f5552a3ad79beeac079317ceca4c35710f3c2d88a6de5a3c0a5070a24a8cffb1b4277578a41697ea0e3bf8c
 EBUILD re2c-1.3-r1.ebuild 772 BLAKE2B 9a1c3ec7e9b1ab137802f9e95003820792cf7da85eca0d9ab46f30afd7d2883ca15ef070691d4364b151247295fea16e702d01fb1209e1346787613491e44a3e SHA512 0e26075418517031ee56bc22909db4968e1c15c1fb8417a510cd43803257c5363ef6c574b3ee9dd34cc6985bd294e0202a6de4164ecc90e080015a3eb1180755
-EBUILD re2c-2.0.2.ebuild 782 BLAKE2B 813525125f547a6b03e601a7858eef30e694a6b7a3d3026f33ac2c9468c19ec911e07e0352c2e4d7d4db9823d78e6505a0d7c33a7d444c44cc111f245154ca73 SHA512 e42cb52c0288fad36c02f1e489eb40db3c8ffe983b079e8ae5f67cb00811e7a4392c9bc677f5ba664ad77c0580380cc0885dcfc6edd96364e5e2dcd519a9a414
 EBUILD re2c-2.0.3.ebuild 782 BLAKE2B 813525125f547a6b03e601a7858eef30e694a6b7a3d3026f33ac2c9468c19ec911e07e0352c2e4d7d4db9823d78e6505a0d7c33a7d444c44cc111f245154ca73 SHA512 e42cb52c0288fad36c02f1e489eb40db3c8ffe983b079e8ae5f67cb00811e7a4392c9bc677f5ba664ad77c0580380cc0885dcfc6edd96364e5e2dcd519a9a414
 MISC metadata.xml 476 BLAKE2B b2dad245e1cdcbb73e8b6e53442f7e9ec41337746c50f026c0fda68d57ebe10fb6193a26fcf9fca11e23570f44b104bd40d22fa1283fa91034f7cb792d436463 SHA512 e3018ee81606a018d66169cd142a17a34248587b77deb4baeb6daae6aca2d9a70095fb5dc2180d146043030631172f6fa17b3c8ddd5bebe85eebf6f3be79f9ab
diff --git a/dev-util/re2c/re2c-2.0.2.ebuild b/dev-util/re2c/re2c-2.0.2.ebuild
deleted file mode 100644
index 74c16e8376ec..000000000000
--- a/dev-util/re2c/re2c-2.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="tool for generating C-based recognizers from regular expressions"
-HOMEPAGE="http://re2c.org/"
-SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug"
-
-src_configure() {
-	econf \
-		--enable-golang \
-		ac_cv_path_BISON="no" \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	docompress -x /usr/share/doc/${PF}/examples
-	dodoc -r README.md CHANGELOG examples
-}
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 70e0f7612f6a..342b35c87cc4 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -3,4 +3,4 @@ DIST redo-0.42c.tar.gz 195232 BLAKE2B b24969d71b247d02642340cebbf325e2ae68d4893d
 EBUILD redo-0.42a.ebuild 1213 BLAKE2B c6d164192bb11fc89a85285e7ebfbd6b665be255ae93e66866fded161077350b6f2dd69c84ae8779bf4f1bb991d654b92bd7bc99753a1f9849a1c8723aa6e67b SHA512 a455891117bdd88c6bfca6952ffb13ebc27d7fe5a52d437356b1540a57e9dec0b54ae7fbdb50f86c305a280e10c9b2dc714011bf8780583dbf4d3c72f1dcae5a
 EBUILD redo-0.42c.ebuild 1213 BLAKE2B c6d164192bb11fc89a85285e7ebfbd6b665be255ae93e66866fded161077350b6f2dd69c84ae8779bf4f1bb991d654b92bd7bc99753a1f9849a1c8723aa6e67b SHA512 a455891117bdd88c6bfca6952ffb13ebc27d7fe5a52d437356b1540a57e9dec0b54ae7fbdb50f86c305a280e10c9b2dc714011bf8780583dbf4d3c72f1dcae5a
 EBUILD redo-99999.ebuild 1165 BLAKE2B 39a1599939c4273cd1fa0c7541c55c02667932f7c68787abd10be5379ced05c860ffb9f2e2d2b298321b61c98e2e7aac7bb4144ddcc1c6f6e43aaa8076aac8f2 SHA512 a13fb769e4ddc7ad348e5063b9042c638ee6b37fcc0a48e91c3452923bac0ec4f5db744c096a454fc8f71b3fcdf5aed6067d307a2727eb98b58f7d0f6c297356
-MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
+MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/dev-util/redo/metadata.xml b/dev-util/redo/metadata.xml
index cb9c806b559d..5ba62861f1c4 100644
--- a/dev-util/redo/metadata.xml
+++ b/dev-util/redo/metadata.xml
@@ -4,8 +4,4 @@
 <maintainer type="person">
 <email>jer@gentoo.org</email>
 </maintainer>
-<longdescription lang="en">
-Smaller, easier, more powerful, and more reliable than make. An implementation
-of djb's redo.
-</longdescription>
 </pkgmetadata>
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index 41df39ca9b49..9179872906c0 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -1,4 +1,4 @@
 DIST rocm-cmake-3.7.0.tar.gz 15833 BLAKE2B 1e111ba502aa7a63b9f3785c44cf622d60f6380fbd7c86720a99d04f1bfa52201849e1316ac3af33857d257f0438f5db083877d6b6769bbd9842fdf59cc7a376 SHA512 3381ca5603a198f00b5e74fcb55e5279f1f9a63df712048c7aeb0fcfc50b94c4e090c33fd27275d2dfb257b39902d233d30df9d2da6d0a3b0962a440b3249ead
 EBUILD rocm-cmake-3.7.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 EBUILD rocm-cmake-9999.ebuild 729 BLAKE2B 555a1c7970659c3f01aab1f0dfa1006ed501f2b43cab52aa0a664aed61a248f9d4b7d574b0897329fc83f2da0a0df9962a981781fd0b4e7f865fd457365124fe SHA512 19a51baf03e628c04712bd1b8b83dc30ab0a0c9fd7e332140e9a6f2123f50b8e2482047608fdfc96f24bf227211eccd50ab23144b22e1f60dd0eaae91c902be9
-MISC metadata.xml 468 BLAKE2B a05fff7df6fd53ff6793719b621d44ffec411b8c287a8fae36f6f07860cbbf819328bf579c8a0972d72fc6cbbdaee6dd628d4fadb9a2100e1fe1dc97911cb012 SHA512 2907497bd76b1a7f265c371fc55773a541647ec5c4ae42257a405bacc0b2839023a44b282719c0b9d4938e53eb55d5929679242219254db9ee728463d0b2a69b
+MISC metadata.xml 371 BLAKE2B 41c8b543a5928a1a337a4858ecb042011010df6e199b8c61cdbc8cb0f79e924cbd7ee8e7c2acf324d17d91176e2ef94b171f61faca35aef5469ad33326dba27c SHA512 ede90d9d5bbf97823fe93004207fd61a79dcea2651d00b5f520cb395868a17e238278cdd13113d1b2945de5ac9db9a1471c37812467dea201bf78fb662db58ab
diff --git a/dev-util/rocm-cmake/metadata.xml b/dev-util/rocm-cmake/metadata.xml
index a82bb12bfd85..66a5f09bd707 100644
--- a/dev-util/rocm-cmake/metadata.xml
+++ b/dev-util/rocm-cmake/metadata.xml
@@ -8,7 +8,4 @@
     <upstream>
         <remote-id type="github">RadeonOpenCompute/rocm-cmake</remote-id>
     </upstream>
-    <longdescription lang="en">
-        Radeon Open Compute CMake Modules
-    </longdescription>
 </pkgmetadata>
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 1819cfaaf08e..723fac75c5ec 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,4 +1,4 @@
 DIST rocminfo-3.7.0.tar.gz 15104 BLAKE2B 728ce471e52dadca8b59aa3196c2f75933650e3002335014accd7f8eada19d4936a7404f908d50747a0e51faa8a65764200072cf598f9d0855a3052db8290160 SHA512 25a6a9216366e310ece9db50a21bc0eb7741760a7b46fa1818ee102557000348f430f9269e2ba9e872437dfafcb31ac563476e2bf83a10705fde8dd5fc854404
 EBUILD rocminfo-3.7.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-9999.ebuild 794 BLAKE2B 8ba7a2ebd5a75e507089f0deeb49b1085175641bc0c53c0609d386f39a1d6f3d38a608703f59f798f2fc24ae453619d8154427e7bf4c02b5852b260b0d01c067 SHA512 32a8fdda420e1440df3a2b297d6030ac69c892e5be970d61647942be7f2be3c620c9fec5bfa179ec54c3af1eb1e19d51e2de82d2eeb5d2b62c57c945844ed2ac
-MISC metadata.xml 475 BLAKE2B c1ca0f1d0ec94ae012d3a6c2e5b0a896de75fae32ab8af40d2d0e8747544c15f11ce76cc45bd429d4b5b3b3abde5c896fed362641abf995c4bf9f10077e6933d SHA512 f84d5a379fc07d3410bf6cf946c91056295dccad64f100be02959d94e39eaa47d4fcfed84ea2bd596b2ecccb4ad3267bd86cd76b50d938b235655220fcef1549
+MISC metadata.xml 369 BLAKE2B 6549050343e744050fde68092a20018b058f5d2411b4f7dcb5ade0e7ea56e7f8f9f6a00040882f1384f01ed2f5b74a1d453c276c8d35aaa12021225f0c7c6346 SHA512 4b7e636a59c30446dfb02d82d80804706dbc04b464f7d7ce37340be1076a9723cb5ec164972dc07a325b69fefb1dc3026055fb5b87588b6b6fbaf4e9dfbc2ef9
diff --git a/dev-util/rocminfo/metadata.xml b/dev-util/rocminfo/metadata.xml
index c7439799c48a..23235857ffcf 100644
--- a/dev-util/rocminfo/metadata.xml
+++ b/dev-util/rocminfo/metadata.xml
@@ -8,7 +8,4 @@
     <upstream>
         <remote-id type="github">RadeonOpenCompute/rocminfo</remote-id>
     </upstream>
-    <longdescription lang="en">
-        ROCm Application for Reporting System Info
-    </longdescription>
 </pkgmetadata>
diff --git a/dev-util/rpmdevtools/Manifest b/dev-util/rpmdevtools/Manifest
index 7f455773dc36..34173fe32d46 100644
--- a/dev-util/rpmdevtools/Manifest
+++ b/dev-util/rpmdevtools/Manifest
@@ -1,3 +1,3 @@
 DIST rpmdevtools-8.10.tar.xz 94976 BLAKE2B 290044a511f77111487cef40b6b9bd706f0bf6b2b65681a931839f1fd00aa490c106492de35643c8a7218762e4e92c9bd44a42d8976472c15748d9ad94f0d5c0 SHA512 49f310d5cf1e709e8001ffcf2b17afa7f7a89ef9c8f805d694149a914c40626a08afe93b16d9ed41df1717d0bc97713c06a3b0e63f13fa53d978c6204bb05d57
-EBUILD rpmdevtools-8.10-r2.ebuild 773 BLAKE2B 49b979f9ace3472ac47c6512a706632cd2584d52bd2e509dfa3fc6409912a5ac07dc6e8af206acc888e03a74230ff68a5b8f4b9f2d1481e2b85ad78b96a1817f SHA512 4b17b0c67857de9e0545046293dd4ea1f902b530f72330d10c8cb8ffae64f8c49602de5623dc946ccad3381befc0ec50faf2086dbc388da3f6559c444d274852
+EBUILD rpmdevtools-8.10-r2.ebuild 779 BLAKE2B b44952742569fdeb7514f68cf42ef252b7c5d5050cd240197ca644dc7b8c888f35b12e41463774ad2e4103a73946fb296d853cb4b4a1e7c39479b8a8454c05a6 SHA512 9d75dbbe5faa94447d143724235fb16e3d07f1fe95720e5ba6af9a2355bbe3c02b1ec538c2b1cb2472c593459c7eadd7f1dfb3981c2013055ddb316f5cd45bb7
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild b/dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild
index ef6f0d811454..f94f3514a02a 100644
--- a/dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild
+++ b/dev-util/rpmdevtools/rpmdevtools-8.10-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="Collection of rpm packaging related utilities"
diff --git a/dev-util/rustup/Manifest b/dev-util/rustup/Manifest
new file mode 100644
index 000000000000..7ca801770fc2
--- /dev/null
+++ b/dev-util/rustup/Manifest
@@ -0,0 +1,238 @@
+AUX symlink_rustup.sh 2517 BLAKE2B 618beadda1eae620b4e2686a83042344e61c271242249e45a9485188ae50f4df8b0752f1a3093a1fab8aff183ada8bb8ea4c30a3bf72435b3f0fb52af8957e89 SHA512 9e55cc455f6672b2ef37860be1692112ab41f0d3263422f6005c68071d9ed30e66a09afe395292367cbb5a8b6c791457eb9082dadcac67b8d9264eff508f17bb
+DIST addr2line-0.12.2.crate 119767 BLAKE2B 5d012c7c0a0d8afd48f2148b5fb4ceb54f525ef1ae6e4f9c0ad228cff059b2e0662aabb82eead22db6ea284b5c430c8b8cc2aa0100a46d8d14009bd88b5fe24a SHA512 2c797f587498418c3c14d8ffc7eb79092532dfbb290b5371594e8dbd82a0979929ecb0b6f2cb615d0481a555cb1508b4220acb2db8076ea64fee0d47f290de6d
+DIST adler32-1.1.0.crate 5442 BLAKE2B 1a4d932402a584fa6edda414c0dedff4994afcee7bfc71f85f6e8b4568de835bb7a3eebad1b5ac0be7f59cdb0e5ce5dfa4444d2c59d5ecf819d2a6abbbd7ea37 SHA512 57e3b3812e2747470c63edf64e13827c96ef8dd2311833b7f616ec63cf57ce8967636ec4d57464b607f570df06f6f648214d12ddc567e761b2de2ab16c8a7271
+DIST aes-0.3.2.crate 84345 BLAKE2B e3e634fd6256bc52a8d0be5042dcc74651e1197eac17592378b9e78ea173eb02f8680b1408d860b3c278bc4eb22d714cc83788a321b4f88d272495811327788a SHA512 0dde257064659ae0d7b13d12e538f2cf2f35d2f3cac2f3e0cf3a2dba0a4a89bb78377e85382cf82b95e347f34ae3c27bb145441d50f20e595c069445560a9e04
+DIST aes-soft-0.3.3.crate 92804 BLAKE2B f97f9c8eaa2dabf99f410c821cd1af2a000dccde691bc9479d1ab1a43a87282e82cf8e2f9fa35c7a175dbc8a66464c196bb8fc762999b74e75a69e838005b333 SHA512 9c56f05d2e36da6e51e504eb9ef5de1ddb398cfe8ce025af0732794a62128613f2224a0e729b75b9a98a9d633e29eb1b23c67078769f33bb052e5abf0ce25a85
+DIST aesni-0.6.0.crate 100722 BLAKE2B 80c11882a77b0fe2298d37b87eb07f7c9f90bccb25409215f2d5b5a11d63a27308b0051ed6b4dfa04f0101579ea17b9d1f71f74ff4dbb8555d00d22941175d70 SHA512 f059f03d5ce2d98f0fc14dd3ab65ff87d748f80ac29f54d8674be56ca8df0650dc70e75b8496a2471d106830df59ae6a3662c1871bd918fe7cdf5a3726423107
+DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f SHA512 9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST async-compression-0.3.5.crate 39371 BLAKE2B c0e07a8fd56c8e0667729d49e41dec75394c8a355bb897bd080d54fcb4219b451f2c74b5a4d96f53c9b47cb64926d37b0ddabbe54ab96887a967158bbe91656b SHA512 2109ede9122c4005f1431103eb757f8827d26beecd7fb8be2e0d321e8fce273026afd462f8f10ef2058ed023a46d521861704cdf055f1eebe73680ddd69efd6a
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
+DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST backtrace-0.3.49.crate 69810 BLAKE2B 80bbc97714803859274f8d514209648cbb87d2ff29e317ea3a4b2e0d5184cc900e3e5317235409a16e3b6fcdf764c9aed42d77717f27643131c83cfced554357 SHA512 e85c3dde0b944f2c59909dc33902f20672a0bd1b8c6c941254af89be7573f3641a7352dbeca90bce89a2f9cf4242d78caceeeb889d3ee8857fd59a42889f2913
+DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
+DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
+DIST bitfield-0.13.2.crate 16479 BLAKE2B c34f150e135579452d5b6e13bac0fb4a3a897219660289c861646330f7050d19a10d041affe8d250bf314c35eb19ee519b1fa0dd12eed94a93a5e904b95380d9 SHA512 5ed9ad97913828d67b19d5f10a264592f4c03aba8e4ea791f7a20e61da79066daa1d5ce678c822d8f6f1d065a65a3aa6afec23980abd1da38b44dc6cbb96166f
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
+DIST block-cipher-trait-0.6.2.crate 7539 BLAKE2B 88e8ded059aad3badb2435ae62fa1e7a4186f313c7f9b8cb64db2a7103bd9d15f6329715be29923adce39bc02747508138908b1e24fd1396fc967156d74e7848 SHA512 7287445cb4139939397d7947d4a6b0a57b19085898603cf2cdb9a35935ec0cfc360f3af97f894490b14c96a624322571efb8dd98393c2c355e1510a95e068e49
+DIST block-modes-0.3.3.crate 11088 BLAKE2B 2d0b0caa293c35f07d78d603930f3a20603048fade74cf36a753fa8e5531b9a509a32ab42b36f3bce9a7f05fdf909d19900c9fc2b251c0a339a8d47730a28b82 SHA512 7a24506a559eb9d35b77935c23e4cfd160f988ee71d1c8f8d7c6e7d0b5533ade5d8121ef76bc08786ad7232f2ba50276983a44c8825468c3ff322fedff56b656
+DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
+DIST blowfish-0.4.0.crate 14781 BLAKE2B 18196691d2cedf4f8bd287114ac7efb172ae3accc666b90392570504d7348694d8a6e5802d47fab103b01c89ac19e0c79e25b1ef1ef618caadb0274b17f2387e SHA512 7f6dc4c3d3695f141074c6709f9bf491e38a45124fbcadc9204e15cca4a3af8628037e35b47aafe306c88c21885f8c8e972f966ca67380cf41282fd90b810e1d
+DIST buf_redux-0.8.4.crate 26608 BLAKE2B 32698d29b357c625ab663730cbf7717b91200a9f980d3c9107ceb5f8f83ca7f2514b9b5c7fd2b229e8490832dc78291db460fb7fba130cd61cdec8b42c33a483 SHA512 709095a4acadf032143225740343840d247b4dc130968e36447260343294b134af780604eb8214b9e6dce924e13701dcf7a9c7291340c3393a9334c8aaf5454c
+DIST bumpalo-3.4.0.crate 129102 BLAKE2B b585c8d682acf555cbe695dfe150074e4afb1620736f28b29567070e445a12293b460d3c85ff88979abfc74fe7453010ebbcfd64bb2b2d575258d51fab2b1400 SHA512 955e49eeeb803547092b58c086a2582e905578179d93500c1f55dd3fb7a65349f33ddc4c2710c0ee804abbe4e1f2afbdeb998533d362177298a86a4f9a8822a5
+DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
+DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
+DIST bytes-0.5.5.crate 46424 BLAKE2B 08cd9bff57f6f546bcc4df72fe9f2ad16a81c89e6141353b687518d2d3a3953b1aad0105a57f0245aad8aef005c2b5be58226f3b22516f0d74744a9f44d3ca88 SHA512 c16c4a3e4c2105a99bc30358b387f6f17de3e45f6a0ce98c3469ef3721bc7bc6732be2db6ac546a54a09f1e7442798296a58108620b67057a3e42e784c5c8351
+DIST cast5-0.6.0.crate 36532 BLAKE2B 7b0fb6597d74a087dc9c1e5ce854438ecdbf5a407b0ca7589677b5ec61e70921d2fd56dd0d41425eabc87e80660bf8bec5a9ab063cbbd68c4f5fa5b8c2725612 SHA512 409b34331c81204fb18969023db27d68de6c6283f94b7f44e29ee3f7c5ba746a71d2a614845eef7dc169efd7cb43f4e0ab227c64c2634789c16627a55e6b3739
+DIST cc-1.0.55.crate 52090 BLAKE2B 1ace1ad556b030d3d81dd9af06767acf6e31d00f3eabf5d72a41a537e4e984defdac4ab0d802cbf83dee3f726a9aefd9c87ed702fec08a0cc9ed1e1410544b40 SHA512 a20aa18cfba9ee0d9fa0bbf3117be6d37c4420ef45e1b01f5505b138ffb2b2052c9464f964c5c2881f93fd4c903cb3b78b4c15ed14ea27585351313f189d1725
+DIST cfb-mode-0.3.2.crate 8186 BLAKE2B cfcea04c0453340caff3b872b8a89e7074aa9c4bf0ec49ad7f3f4e45b79479e3d684e5591c23237536ec206477ae044f25b9d3c3322e3b48c62899cb245bd6b6 SHA512 8e6a864e876ae28f44d0a53f253fe3ebee3f63e6a21fa9acd19440287d14165f1a15d9b298e3978109d3cc7f5e89e93c54a979b3df8269fbd70bf96a999e60a4
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
+DIST circular-0.3.0.crate 4571 BLAKE2B 4e40382b5d7df5162993e307c55981c72de69689927c257a40e6f85510c398c897e0f99962e52d466f0d6dcf869ea181cd24ebe459d4a6a32edbe08997f00fd1 SHA512 531ecc0f996188d3479c36c808f66f85e9d9a9ab462ed56a2f957b99c49176e7209067eda679e8497c2fae9421e36447ea4e770905781204172f0d8492a5b22b
+DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
+DIST clear_on_drop-0.2.4.crate 14416 BLAKE2B d5392d9b361cfd734ae0d4a364c10f70a1f95121df353472696de4d907f3ae98fc7d12eeba0d8096178988dbf3bc5484f5e655c403252d10003a5c1492dcab1f SHA512 45d33bcdcc5cbaca852b626f9e6af1b63e019a56d7b299b92c429504075ae4dc279e686085eb7bea243857bcc98114b4fa05c91dd6128250528863d114554a0c
+DIST core-foundation-0.7.1.crate 25853 BLAKE2B 9d0ea528a59022567fcfb174163b75efcb088372cda40b5ba469304f6a261d723a5b6e7ef035f0edc9e9fda2b0d8893b511ca6b2d3e326f78f61b9dfefb23bc3 SHA512 969c9c04af9785faa89b9e9e7d725c8b0659a96bb3fe4a73e0cc057303e3f710376c8c294c52b81f5ec5070fe41778a20e605722981f2ebee2d350c2cd0bd82d
+DIST core-foundation-sys-0.7.1.crate 17166 BLAKE2B 908467224d5d17320737779d0692e31b3c13ec88f908b74c36a945efbcf0b4674fc2e2d6d62d3a9de4d6748435bc9796a124d65584ac782b0d88772d1bddaa48 SHA512 89dd9d787d7915349b08e5649e8d9bbeba8e517718d163008b9c4c6471ce274211e8e5127d69b557267efcbbda8189f8111f937994e6176cce2fd3fac1051511
+DIST crc24-0.1.6.crate 2378 BLAKE2B 11fee3c15059ae82dd5bcd3153127d2849929ef7df988fed1d0b01de56ad3b327e02c8142ae5a55e6399f7a5fd842b26ebe713b6bb153bd8aa3df4b78d50e5ff SHA512 942b1d17e97b8646f2f21f910d188b457143729140bb4ff15ed12c157f4e2dab52a04d4900164c85ec96806b19f17c8b1fb927cd8cfce5ce7a1451f0f642d679
+DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST curl-0.4.30.crate 83156 BLAKE2B a48fb97e1d784c4f6961c382ccfe58c04d60b9a2becde74875bbbd21eb9e45e54c34b52b433e0e5a3da71975a4a8ba830a12d7176853b707a008e831e60dd864 SHA512 d628da80603ab42e2c7151c478103f6c8226ece546b7eb84051a216e1a20f48201f39797d460dead601c02f4799cb6c425a57e69bacfa14bbf7f3b0ca6f44bf1
+DIST curl-sys-0.4.32+curl-7.70.0.crate 2842860 BLAKE2B 9e459b9b7072d26e18f834422f3be545fc2e8906518df406679517b22dee6f6ab8f4134da59b2b335ebdce99f07e76b1e8636c390566ef9b84f8dc29efa59378 SHA512 f5b1685afda8339a88637b118b7520a6d9c2fd599887054c9051ea127146a2cfc6f6e09493393e7028a0990ede5acbaa1456cf1422e62a3b2901ce4631657739
+DIST curve25519-dalek-2.1.0.crate 506608 BLAKE2B 3c0e1af8ad16cf93d12e1f2954760cbaf16f9e7b77bdc6dd08ed67b0c69f8feb9a02d53c26b7c2a4de43538137dc3e28dd63b4dda88013075b00afd94d854fa2 SHA512 980771514c90c6b6ec57f4a96bc84a361d6502b21ade66a3ad1cea49342894ac2977f4281b972a542137c631ad4ec96bdb102f77b695049ed71952cc3c7a649a
+DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
+DIST darling_core-0.10.2.crate 44339 BLAKE2B 3ab3762840aa869baccf1030617a2a534c5d63019deb7ec5848cf4f80aa6304307ae32c4425264f1fda220a502110549812112d08f0f60261b30731ee47335af SHA512 a0af8e8ebb8584973c20eac01fe9ae828744b5e86cbe268262f8710a2e0ad568bbc6cd051d5225cc536a0a1fcb1886233063c8c18ea16b45c47207ce64af89d9
+DIST darling_macro-0.10.2.crate 1919 BLAKE2B 6f07815ff5b333b6c34df08f3aec2e5af5385e60a94bf9d169701be19935d2a9292ec7396905d2caadddba38d3f70bc5e5c3f1167690f045b778b8fc8cb00985 SHA512 43a0e9091fe12ec986e229a73bc41e23b1815fecfe62df8eed74d2ef33f5c329c444f1568d3c966554ff0bb29220146ba8f30d1c2d77ed7dea9adea10dacd152
+DIST derive_builder-0.9.0.crate 38161 BLAKE2B 08bcbf8851ba813627a56e3f93a95f08a938e0cdd4f2a7971961eb5ecbdd3c96f6143214b49d8ae6cf6be166a934208ff7d0f768a3408868cab093872860e7dc SHA512 e56a01ed13420ac024be394883e5cf148f83ea74d2488931216d84cd2e8f00953e2d61f9b81d34f18be40bda055c02614baeaa89d5fbb9d3defe9ed314f2ef95
+DIST derive_builder_core-0.9.0.crate 18328 BLAKE2B b7a70372bf9300a2957927dc6bf45d64ff923552d2aff463e9811cf295d8bf300f8e3a03c73d08e1f727e91bb0eca2d34e332bd65a1b43506b9d486e559c879a SHA512 432e17868ffbbf6e776ae885eac33617ce06e5f1cb9610e2ced4f17a0d2aa46d3576ec3249f92275379d875cd90dd86ba4de882089ad620fe6497fcd301e4fdf
+DIST des-0.3.0.crate 40411 BLAKE2B 3a95c95e2df4c61eaaa6effa8123f8a17cf0d7cb7a0b239331b6a8b90d9c35f7d2733db52fe30007465ff828b17ee285f80dbaada7d9ca291bef45dd51c49844 SHA512 1f478ede25d1b8694ff8cc0f5c1ff154601492cbd53e6b82c7e2d00725f7151bc718ae779d66f7d829d632b7cdd58ff4b137ab010350ec0d1b984222e369f054
+DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
+DIST dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45
+DIST ed25519-dalek-1.0.0-pre.3.crate 27395 BLAKE2B f1a5971aa04d390569565113a092af692082b59712b5a76759dfaa3d9cbfe39eec47ffb3a351dbd907faac691d0dc588dc429841400ced0a4ce72355d11ed2ea SHA512 9f6409e66fea1414e5968669b5594750693379d06f0639e3089a747e348a43178f06a62e36fe7f32a3ac9ce8072c1935593e131f5463e9f82e7bc3a198a46230
+DIST effective-limits-0.5.1.crate 20558 BLAKE2B 1658c41474411937d3da1a189b909ab8611298128a14c598a56b8bdfc4361293825fac1f55ae09a11dfe95b645eab4a363512ece0f79b547adf66ad0533b98a2 SHA512 a30f9f79e6f6690d62b24ff15a11e6fe169204edcc88dcfd76a167c4853a599debdf8575f5586f9900d24e8bd2a751be4330fad3127ee2eeebe92302e022e07b
+DIST encoding_rs-0.8.23.crate 1403543 BLAKE2B 1ab7da7a4313dc3e0613a077bd9d036e91eec75913cb9b742879eab17e0af7dd76b69d7a17133f0c0c35a1f8c0628058415751105c95b63e2f578e9a57cbb71e SHA512 7036f64c0f26b3d993c1ffb64ccdf95a122ae93a9ef691f9903f90925b222b3aabaf379e951b5e9fc40726a1ed52ba54f3eededbc1e6b68385c99cf2c34d5ba5
+DIST env_proxy-0.4.1.crate 11256 BLAKE2B a8e3e4f8366a9a578da09903c1b1e9ba2c4e37700ec5600814c8a1dbff740a20dd6147bc1fbeed385137ce734477c734ba370fd6a824c64d571da374554370e5 SHA512 333232b0217eab986b4616061b1419e24fa95b55d6f58cbd3e6a8a280b1f8b6587ce5ae30cfad570e7cebb2327352c18b6a8ab27007dd870073308127d2cfe00
+DIST error-chain-0.12.2.crate 29761 BLAKE2B 2de434a42d2c62845b0d0801cdbaac09b70bf3a7d940b91814efb203aa686a31a77bb36fe12170dbf392cf0fd6df75b46eb0937214cd8c280cafde721e6535ad SHA512 1a64c6813f07d23b091fe3fb69b745711ffcacceffc2ad5e1bf76917ff15d48ba370d63c886441a96a8a88cf645224db46a279152ce6b76878bf8699fbcb43f4
+DIST failure-0.1.8.crate 37582 BLAKE2B 007652720edab76efca83ef23a6f29dfec2a8949e88f697a4609257d158d345ebd617577df9cda69a25cae70e02f96479f427ee3059362771a4a1459bc4bd1c9 SHA512 a8762c978c286f921ef9c46dd17f57656739b339656ad237f6fb43062a8b2ad97cb98b977ae04735312d5328894b45c512fe42e33a9bdc4ea898330816b7a884
+DIST failure_derive-0.1.8.crate 4950 BLAKE2B c068f2a122e1137aa8a31e3a3c4c333f1e66f1b93df144f5a07772167f9085241292b85c55adf33851c319a418bac19fd31f4fb22b87ebbbf2814cbc815b77b3 SHA512 3f11adeb616a2d57e1a33ec2a5eb71c79a5df7946a27b74acc7c89a67c5dc6d01222731b37b405e33493570a98c96c7d2c7b8535928d7cf82536bcd9f0df809c
+DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
+DIST filetime-0.2.10.crate 13880 BLAKE2B bc2289129c0d79f37b2589ee31f7bd9719c1aa97854c0c06f321a394202bb96e86b9ec8f8727735e4925e214e6c7f75d87578ab44530a123807b5b7eae7b1097 SHA512 45d1b6fd6017bd1a479a4e343b8651c8d426616cb68914c728456fae2a27bb1a45fafcafeb9a12c89c4eed835327e461bf92b80eed0f3a4e84b196b584b8698e
+DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
+DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+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 futures-channel-0.3.5.crate 29053 BLAKE2B e951124135520dd3306faed9355bebeca1ac2e2448ae1e8664751c026384d830d1aca8332690cc84c81be07c84e97c3321758dfc1f76147bf857d19a3043c225 SHA512 5d192fa5cbe1f175c578ba3f8c0bb0bff4461d2699babbd6a4ba22757abcc52b6edb854643da2521d7acd3f78269f3eec9328c2c19d5c984a8e02f071e249a67
+DIST futures-core-0.3.5.crate 13541 BLAKE2B 5eaee458fffdc57105e33c17e7d2b8eab82d05195a8333a42266241fbd1f772afcd0bc82adacb1799dd84dd60ee6e37e5130f29f945781d6130e4ded98bf6dd6 SHA512 5af82472f569d1d118f6f8c900dc8d1df58f1bcaee43273f12bc6e0c72a57141c797e5513f9a9d6cf969c7e4472b36bac0ce74435de10a76cc444d896cd779ab
+DIST futures-io-0.3.5.crate 8981 BLAKE2B e7d39b914ad50088b14a82d82658adf59af7df2732894bc595aac73173b33c0dd4139612c07c8ffa5edabbde8445d039f36050e34fe470ace5bbb0e299ed9597 SHA512 9573140f9ccee3e58d181d557f09314e13cc16814df06d6d99c2d95733512a2f046cbe3aee5654a9e461e4d76b2ca61f3d1d6b9040a06cbd12efd3754d3b774f
+DIST futures-sink-0.3.5.crate 7612 BLAKE2B 8068fb497194702c1dd2cb8612d4bbf5ccc36e3a8fef84870635b887cec0cc83fc1aee9b752c31c8e582a0863a6b1921c00a7007e4784c64b291658910dba222 SHA512 82f8d6004054ee8d799fea751cb4f0bb6d8f7b364d85780d16adc8fe0959d96cfaf49f4cd89d50818e1c9c24d0df17c8d563fe4a2e0ae5d534bb301fa90b17cf
+DIST futures-task-0.3.5.crate 11030 BLAKE2B 272de7f0a923bab04071b705b3b39683022538a756ccc22a8582f048c83155d6da12ab804e70cd32767c318b94f0f71ea0e7aa6d1f77491aabfc6ebae08f710e SHA512 9affcfe1c64ff66cef77615d39c2e69e40480aa7fb0d1a0b136edeb9533b336e3e1156bc0bb14120a812f0f8d3d3266c556d9f0e4eec147fdcc175b3183dba52
+DIST futures-util-0.3.5.crate 132197 BLAKE2B 07cf5f757cd9bc663266b18025efe200fc911c6d829bca139db4c5dcddce5f5e5dbe62968c6c7b328a63a5f23d0a232087e162f926716029ff52c24923bb7c53 SHA512 f71bd29e113fc8aa3795904b3130dd6f09076e6a19e52e34702973b6428a1834d300fdd3c48259e7f27fc1252dcefc80a4b104962fe7e6e4e536322d0aa9c5a2
+DIST generator-0.6.21.crate 28473 BLAKE2B 5f87df0528b8930cb7621d419b944301761d4a2f488f723e26697fc9e7f5acd3a2d6e138148ef734fd2865519958e19a492ccc0aa08fb189e7f1277c302f06c9 SHA512 d6da62cf4d37d22b250b8d27c364e870e22b9ff040dbafb5a3697244da7852ad6f4430b66cfb13f285728da5b180e048a918445022c1268ae393b0c6134ed256
+DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
+DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST gimli-0.21.0.crate 645352 BLAKE2B b32a76d22a63958f6007110d53e27416a4f8ba429a28dc5b33fafb424dee57adec97de558f016010c83a0259d49acf9ce99edb973583d071dc441208c2da8061 SHA512 6c346c622a795a855e01db47b85684f6a8b4ca8b41cac472e3b6bc9ec6afbab344df9c3b2451332f6264b7c93d4d05986847ad47cbc7e2ee3049da5a9d6265b6
+DIST git-testament-0.1.9.crate 9610 BLAKE2B 55baf44278ef3d8a5cbc2b422939153c8d5ceb7f33e342eac40888c2a1948d504db2b8a280e94a2c78fa953908e0b84b01e49688ea9eee2878a6501dc25793cb SHA512 a93a18ed37cee65c48f67c467895fcac92ae36aeec02f6b704a78d44a7e9789d6725c321eab67bf04460d6fe2e7bfb86e6e263c008694d35463490600f2e38d0
+DIST git-testament-derive-0.1.10.crate 6854 BLAKE2B 446b54c7d64bbcd5799bed6bd2a337f2f3612ec0c50490eb9a47b0dfcf33886a6f2aab8702be0b517befcff5728ffc723eeec09b3d6cdb82611340f94e8c7bdc SHA512 01ae8909a66eabe7e6012f8c32274e19291d76c36b17cf37f98bf590d9208897a2cfc11c4332d956beb198fc6c8c16da038b0e5ae7e57268e8e4fa661836f49d
+DIST h2-0.2.5.crate 157402 BLAKE2B 216863d7008a5e317d1c8ae8ead2521cb4b1f057bad5f20031d7b1969fd48423c315ee847b6600da4b1ad3ed44bbad985b95d9eba8dfd22c4cd54a805844dc6e SHA512 a762d0595469787994668222d415b2dee0b77cc61d7abe7ac463713b89a1223576900cb8da99046849cf45f7dfff1ebdc2f15b489de8b516f8017801ba52270b
+DIST hermit-abi-0.1.14.crate 9556 BLAKE2B 03b27536c3a8ce98d26321439ea6d0b14785fa4dc1666f2bfc6142f4f79d003393aae4fa0e351f6eb3cee6719bdf14e32fc6e07f5aa6f75916cdd20d3c1f5be4 SHA512 a3b5eb8462f47d9a0d7342d45ded3c22578cc19bca05ea0856daf04f263d88b0ca1a4f4c1daec14708282dbc39efcc11e100a3a7fc2bdfa73522ce5575ee7b8d
+DIST hex-0.4.2.crate 13385 BLAKE2B fb185e0888736515b8c1c4c00f831f1a4a7b2a04bc0262c80bb2425563b3ca8059fadeff8660ad738bcbb522d432dde98ed6b14aa1fb8c03cdcfec6ae282a55b SHA512 b37504fa6e41caa77c924b24893a7b505330aa8c39501b3ac283fbdffa9af2b89ccb9ae004ff415af1c813fb3da222dba62f17bb3b6210a259661e2312d099a5
+DIST http-0.2.1.crate 102231 BLAKE2B ffefa83d03344fbdbe2e41197c2df7663ba45e6795e7c8a0c503fd666fd0dfcd05976d85ec67685bcb8486b0fbc1a29ad98211a51240e0439aab8a670d976c0c SHA512 50ebafcec96555e04749b612e221521a09b3f04899f55b79c562e07bd0d3d0a5550cb50425d2d97cf6b8bbb64fae98b59693943cc27a5c52af132923d82460df
+DIST http-body-0.3.1.crate 5394 BLAKE2B 9dd7a35cd22d22060762e17f028e9353fd66fcdc81c0fcb2f0361dc7ac86bab18b89ba774f28e2e2b451aebd01a31b01029587a3d119c5a30ff176c203482367 SHA512 0c81b2d8512be3f07d5b08534d2a27424fd6abdf175e9bad9a657b9d95a48e2916c8713bea8de3154520c7ebd097324de246a1d2ca6595f2355e1c93fd9fe6ee
+DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
+DIST hyper-0.13.6.crate 138763 BLAKE2B fb32d13eb0cbf7d842ea7b725589eb41c32d6c0ea2ad0c1fee49e48c63304648c7801e7727d7c14e4a532ded649fcbc6a0144cfc3089a1d6e2e396d554d43238 SHA512 827b90db8252a7e29553785b03cf426e836d2cd0bfd9919cec3166b548ecab03391218d9874105ddd3f6e685d3f37cf48abb8cdb671c449d9a343829624d121a
+DIST hyper-tls-0.4.1.crate 14372 BLAKE2B cfca93661c400e43fa995a563e66839ce42d5459f7b438199878db7a952c17b9f1640b1f544e039dde8abe05c764607067fe8d4c49759e18156a9da73b345d96 SHA512 acae463feff83342d4c867bf9055e066223591cdc18f995e56ec9377c6c5dbe37864743899be3b79104a629c4a3247dbf5fc257f420f3e1acb2e28d09d46398f
+DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
+DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST indexmap-1.4.0.crate 47871 BLAKE2B 0e47e62cf08a796f36f6a9fd898e9cb8839549a1e2b7a9be96306d7108791b8c5577589f2f8917c0835a3539b9437d6579028af0bab7d470b3badc968b7f65b7 SHA512 fe5def4e8b1f0955de17566a63b91d46ac01f58319da53ea6cf1a67d81d85673c8d9284bbb6ea4b6ba0d74ac42f875d572f64ca5dc56db19d022d3ace1f1b77c
+DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
+DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST js-sys-0.3.40.crate 67022 BLAKE2B 362f285ee89d68b7ba9f9c687281abb12930de94df5475f088a7604787f4deb07384a27b2c9a75d638ed4ecedbf59c5680cadff6c0a8008b946c754dd20b44e0 SHA512 ccfb02a3f84218287af109079cf34d51d449ce246358c6f0a1e993e97c05a755cece7d18db91947ef9f165952f29adb849ab6182b9577e6df235cd72e02809c1
+DIST keccak-0.1.0.crate 5849 BLAKE2B 7795f1f9918d8723eab2b4e6dd99c371cf90e43699154356052fabdd1d4736765c13ccdfab51baf63088676d521ea674ef1b742f0ea8613049f0da2c46df4be8 SHA512 5514a50d52979ed616290309cb27d17fd1521ee89ff51131fc2cd2ab38bae2a22f00749b8de2ab75420d557c7400b4f59a9bddaa532efffb22a5fed5fbcdf65d
+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.71.crate 474209 BLAKE2B e380a6936248992b1b1f63ef0cc3d3de410d414bb19350a2327da3947ae0e8e700e82f0f4a802cc485e37571b3a6a68bd773f964496f572a721294623d135c1c SHA512 b6f6eebc42817107aa2f94d426154c2449a2558646414464a31ee9d9dcf714e641fe6613b95ecf9e751d77102c0cedb74b35ca1f76c6df2231a5bad168de5e16
+DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
+DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
+DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST loom-0.3.4.crate 53126 BLAKE2B f9eaaae82444b0be0c2fa82f2eb1baebdaa51eb01056f2fd591a0be577e12736b622664dfbbe754b3c1856179f465ff2c5cd5d7d98fd41cbdb970c2bb6b50df4 SHA512 fd56999d6a024659928298b461efe50e21e6e98c533d4e292021a4aacab59f033d89706ccd805f45d9f560f13220d60fa8ae59fb13683c034af3fff288a98e09
+DIST lzma-sys-0.1.16.crate 632423 BLAKE2B ce0df380c47e64bff3e95b60ee3772e0d1cef19b530461657c3ab8ac0153f4ede615013c8bcb2b4b9e1f1d37bd142bc940ab5e62625bb750562e5c75bc7b8cc0 SHA512 b9c3ed5d383f96f886471e89d8f194c70b022359e5e5504c3926aedaee76ff755e301b2f0aed95e8717ff1d9f2ff4baeb84a91d7fa41f1e0e0d069a74879e757
+DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST md-5-0.8.0.crate 13122 BLAKE2B cb74805b5b939e4261deb85de94b57ca0b64da03214221437f099dab2c49b1b4c2b1f2a6a8cfe7ea3047d4df41ca9117ff885516de06de298ff4ca416fcc5137 SHA512 f0baae0ede1dddb9be047f8d776fda2819980ece24e86da9d7bc4828308e53c4fa82597d416912ca115e75019518839a8edc076ba1e43686b0023aa559838a28
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
+DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
+DIST miniz_oxide-0.3.7.crate 44996 BLAKE2B 0e89ec4131e7abdadaa9feb6019b31853976a34434216e0f89ddab519559d0e1feaf2228fbc09906e51fb0242a18abe1a67a5362e080c19fc7cd00c2f95f08ae SHA512 d4eff239f8d6e947b94619e80fe03ed32aabd1a6393f63145d70ed7f08c51c45c7261d8157bf61c78d1637ea1f71ef15f9813ec733efd8afe6aa14810888718e
+DIST mio-0.6.22.crate 102782 BLAKE2B 8a088fb24797f4b16b6da28fee56a1c8bf1346959905c3501e3d78d16d169125c03495d9e21dc9da4fb6735a48af38b2883544d1c9ea2486d48542fde6ad47eb SHA512 b500b0271779942512c1d02756ee4caf4e00488f6929a06a7be8a46cc44318edaeb80abfaf6367d7201978a3529a6b5424679e07b719ee8194f0dc37aaf56ca5
+DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
+DIST native-tls-0.2.4.crate 32170 BLAKE2B ff0e24edcf4b1014e95990dcff7a5f2139bd3623b6b9809cf8fb95fe11720b8fbd0e563bfdfead36935e4d162b7c0829f51934d8ec191ad34bfe1d2ad2ede4a5 SHA512 810cda42159f302d315f05dde222e3ee20cfa30958d48bc547837f7d6df87a1b51d1239de90cc2901f48581be978c11f8e758fd69213a8a8fa85c71266302632
+DIST net2-0.2.34.crate 20620 BLAKE2B aee9aac0deb14a13c5f90793f1e439c94362403cb329e24607c1970c117bc379049da1b173d1bf827f0e3db38740a2d2e696981daf88c1b2302d81564be5433a SHA512 136ba95ad540545165fc2e34fdb5aab7da8f6b20e7682302ad5796b86cbf3d80b5364679c82caa19151b277f9d18de053968fda779ffff8ac88024940772709b
+DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
+DIST num-bigint-dig-0.6.0.crate 124115 BLAKE2B c83ba63579d39ef3716c43d16c3e21e15d9f968c653d447a8d7f3754965dbbb1749634469e78850d96a357a4746357581d1f4a82814648a5ae760b32e5337d33 SHA512 11b029c52945dbd460a8736b07affb425a27524fa1f507c39aa035a6fe298863d0b4f09bb8c390f77cd0bd73a65b9e6f010f9882e72c753c457788049d585ccc
+DIST num-derive-0.3.0.crate 12870 BLAKE2B c6dd72d95836655d839dc8133d7d7d0a26d31eb36c2904f0ce812f6841fd414e1f30105ec62834f15b43ee25c12806e12fab9ad345519a468546d1ef6e4ab521 SHA512 107ccb966fde3cd9983cce4a0b6499b4efe878b81be94addeb350d7c7ac2e001553f1d77cd03ba54d3a2ad85eaff46d6dbd8a0cd5efc3ad7569df6c7942cd734
+DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
+DIST num-iter-0.1.41.crate 10198 BLAKE2B 6e444eeb858a6f2c7e35a67c6d6fc80726bcc447c884400b9deefe0e4fd473c699616321a02b3af3e06bbee39f0213bc712d4bbe511523e16e6782b842884a3b SHA512 886f734845daac2e69be50efa612e891b2d22303995fcc2410d1e0b5c034bd207bfd0c27e81089836a2aeb25ac0954e3bb284b105e1449df04335f4d2a4d077b
+DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
+DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST object-0.20.0.crate 168755 BLAKE2B b1e4acf49909d42708146d74950e9c5c8970bc62f639633825b5a9f15b3c7a8e80333182031d548edb4a654ef79f336e3fe5a582195a225cbe750bfead06204f SHA512 9d766227e9f04ca436d12a527bd1ce4babf3f930a4815c5176b1c42c5c2dccf0c9fe31a8130db2e58bd9fbe54dd9cb4427d684c698078329b95948b8c6ab18c6
+DIST once_cell-1.4.0.crate 24625 BLAKE2B 6cfb6ffa2326fb53c4381d4b6a462928f96ad4133c653335c34265a1475c4f50067fcd2a6d9bb0660aab4406401edf02776ceff8d2b43c9d6b443998d2e3cdb7 SHA512 8debf21169653719820c4892ebceda67fedcc3c86e958aec42ade0d38247e12265a0152846f9284c37faa183e452ddf666b117e7ec5c066893cd33ec407dfaa6
+DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
+DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
+DIST openssl-0.10.30.crate 191808 BLAKE2B a6c76278f0d5fa3cb27eacab96d6430dcfb04deeb37cb8c6ecdc9b446f1bc8c44a69dcd83f50a8c50c56a49e8950303e807f05e90de3040a616f9c47a2f0caaa SHA512 058e9a483a9d0936e77626698bea5049608a9cc4e59a406b39c0b678f78c9207c5604286473dab334fe1d10d850fabcd786c6b54888a7affadb594f9459f5dc9
+DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-src-111.10.0+1.1.1g.crate 5104720 BLAKE2B 7c21440d60d8b45e80ce26a9eeffc9e6062d9d2691799e00a958266002d325fafe2e342cb162d108c56e6919930c3a08d6a67ce6f3528bb32e630619ce5847c3 SHA512 28da8cff87df92a6077e34f84ffdfd2d29b7d15637ea48e8d9afff2cb8d23d5ab970d095e11fd488a9f833a5946a86b2d1216cba0d0a5c9aad08166fc2e59638
+DIST openssl-sys-0.9.58.crate 47014 BLAKE2B a66f90a5cd9fc82ff22ad7481ca9e4a92c78852d25ee4151c09d5a4d23823942c28bed5d96d5130eeae005573d7120e7e5187a071ae81ff10572cebcc7db8b3f SHA512 098993619ea8effaa03ab61a0eaebc938d23cb8e5284b2dd45499972ae4c79abc36cbeeb51f34861a36816de9d02e2cece673f32fd042880669e99cfff181481
+DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST pgp-0.5.2.crate 654951 BLAKE2B f06a19fcfe8f831bc4ef623847bf6cc0c53ff9134bd881d9476206a22a8b19c7ad25b03fbce0377405ff34c84a856cfbc2001b7930be59f6444124b36163ddc1 SHA512 2094be221340a4e69b3d142dc27893ef809c17a02a1dfe65369b00a938c3cfb8fe689d2682bdaeb6cc8187752ce9f9f05a08b9b04eae93fec7c88c53ce5a25bc
+DIST pin-project-0.4.22.crate 53598 BLAKE2B f755c4f9cc6979585cfa99a9f331e91eb4f7ae062a2d9c9ca78d2deebdd3048ac4f147bbecdf9e7d12ac8e2df58e377e9b014a779bc646db3cd68750acabe64f SHA512 c6c129168b4894b8883e687d882cabe991a8a0ce5df50f207b1346f94aa7d5c295c743ece61e10f0ec356e515b38c3d886cd5a3b845c0a324097403e0e07be52
+DIST pin-project-internal-0.4.22.crate 29649 BLAKE2B 5fe089083d07e39ba72f3aad2ae0118341ff6ee7da12743b0659f9c7ba54d8bdf937eba6e4cedfa4097638740690b10ee6e5a374d3e22a24b4da0f7999a1faa6 SHA512 1da295bd962141b9fead1a0bca528ffbd5e62300bd1a9ba85a96390b8ee0f8d0b2a74adea11e58c0424f41a8936457e1b751769632a640ae4fb6b5f49df9962d
+DIST pin-project-lite-0.1.7.crate 23017 BLAKE2B 74fb5314d01232c24564095d8d34009189a0edb26d36a42a9f3abc35bcb669a96f6d45e078c7fd438f600e6c756acbc52e260ba509572ea5cfb59d8e9f63a15b SHA512 8987148688b3cf9b6d9928cd6bebe8e547412b87b11c23fa00236b8c5fc74dfbf200f03d219f0ed317ac0488cd2323fb09e576dbc17f1ade4e5e700bf077eddc
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST ppv-lite86-0.2.8.crate 20848 BLAKE2B ca85104fc1d6b300aab69c7b9367ba04f77ccde38bb7aad80cf1f615490696b27d61dcf242574abebe54b288414fdec2b63c756e47f188386a0f5523482ad9f5 SHA512 224db067f771eb48e4b0ddc2b7a1baf7389a47675ba93da50e3e4d6c88cef09e0f4529f399350b1b3feac7a88469406aa9b967377177a8c89605c49e1179771b
+DIST proc-macro2-1.0.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef
+DIST pulldown-cmark-0.7.1.crate 101344 BLAKE2B 798e4a2710643ef6fd86e4157a3de5d21b655a6f1d1dd5dbf0e62d17d864ba53015a74a7833647e63ba7bc8923c081aae5b4a40c79367a1eeb916a640e4d70b2 SHA512 c3b5bb456b9ac0fb1406f0815ed665abbacb25e449aa1bccfd1e5fc1b813cb0548dc84cc252b7746bffe791b6acbccab5ac6ecbba8e88bdda1241b0337d21614
+DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
+DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+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 redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
+DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
+DIST reqwest-0.10.6.crate 118989 BLAKE2B 8382f132efa584b6581966b0cd11bc07aa04b5470b7677a8085f9709c45b91cfa049034775cb14de5cf4b57be81a70f760b8397d005c95ad993254857402147b SHA512 1128b5f3a2a2014ea236054c10d933d380ab44b58011b57193cb84eeaac756b08ae2678ae805bf2a116127e3c8cd6ebd071456aac9fa4964f50a4ad176c2f7b7
+DIST retry-1.0.0.crate 7591 BLAKE2B 09e1aa404283a379e2da599ac8de2e53cedfe40dbaff3f6f822444c402973fb155066831f2ceae6b96b35588f1a3e20bb9aec6b9615303dff0fbc08a650fe871 SHA512 40a53c56f893905145eb0dd8c0667d8682990b85ecd971820de5f3b7c8eacd898059551591cfd6bfc4fdcc101173cc44222a37bd709be749b6419aa40d41f4ac
+DIST ripemd160-0.8.0.crate 10158 BLAKE2B 6ddf34f858dcff0111d5fe6ab5c18d899aa58803a1692187c26dace11265a0ccfc3d10b1cbe9001fc994eb7a145793c0171451818f39162e6c00f7e99c396165 SHA512 7ebfdbe4ab9ba8be8f27711acc6a73bfa04e81157ebc908ee093bf65aa42c0aaafb21fb5a0d8868cc4dcdb44a149aa256ecfc86790af82b7c5ff5ae82c7025a9
+DIST rs_tracing-1.0.1.crate 4859 BLAKE2B b79dc0c0dacb963be9b96d534d1e051b7c9f63aecd85412ff530d3c6fe997241a3a2430431f7ba224f6dd56fad18d02959c466943af499887f2356a919937b81 SHA512 eeae1266a9fae1918ed38678a0e3d83dbb42779d0e5a82b3dd9b2329ba2fc18535783fd1c7c7f053f569d368f8444eb6a7d9127cfd7972d535ab3314535488e6
+DIST rsa-0.2.0.crate 22074 BLAKE2B 766106aeeb8e6ccae46285ce692c09cc7103aca7f18c6cc9ee38d18345df69ef47f18625ba2ed017326c6c687eb9193656fc0aef9bcb243840c3ffe23d9be7dc SHA512 1065d84fa9cf56c89da7ca5b453c6b15c5cba81a5c00aca6fbad20ba2afa40e21d5a16664269a6e075aed627d9c701fd4e7209b020f63cc9189ee1904e3d0ed9
+DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST rustup-1.22.1.tar.gz 649454 BLAKE2B 86d9721a14794d6138c3cd8ab743592ecb35922633342fd52d904b2186bd35688d3fd9dd38e7c3a05d5342364c2a072a660672aead1af6d9f0f3ed21c7f7595c SHA512 14a978a3cf699956722d8443070b9f8a043f1252cc1a7ed300b14637a0e6d654f34088d4403790c676500cbab327e30fdb7f81be0b9bde29e552143f26912ac7
+DIST rustup-1.22.1_home_crate.tar.gz 10281 BLAKE2B 283ea853ff98658507194902b501cc0c6438bc2dde1007f579fbaf92917b906e5b9ccb322dc4d34fc01e08809d24194db10ea9c5177c0593ffc94bbfc934353d SHA512 39343c2c05adbbcd6a4a581abdddfc2801d9b052894b1edf3df304526045252b9b16b93c9db4fa248f308b762084cc7b97c3163c47d0ae4776b96be155836985
+DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
+DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
+DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6132c8e81ca8f37140f58d21e8a30dab56de35cc395b1878083f9e7b187af7e580bc61f8f38975b2e1193abb57 SHA512 9e1a517994f06dcdafa05f3ebe67958ed5bc751e6180cff6c891f48fbc143f3279aa841e6109be2c403b492162bdd90b23cf74aeb2154a34748c5d495789fd73
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST security-framework-0.4.4.crate 54841 BLAKE2B 75cc13b6053b491564b9e5329cf56c2da8800e61980a7030d51b09cabe2275a33844a4eb8b030dc96292c54211a37c2e638ec7c2dc4b1f650d57b4eb782b7413 SHA512 d17788d1300ce6d6a552f78b278f50056800aeeaadf7039576ce75e975aa371c2c9b86de2aa2c96e8b208d9240d246e0230f8788372f0e0f800d55a7ae8b7955
+DIST security-framework-sys-0.4.3.crate 10508 BLAKE2B fc49b876d89f479c8654059163566d4b7db870dcc21d7e1061ed92fb6e9e1e8751b292b726020f73cd931797436f7fac02ec26ae7306fc826e8c4063cacbc5f8 SHA512 a849f53a0d222299a83b38c55dec7d1282027c7dcd962c8e638afb9aa2f96bc961e93ca2bd34bce424f408d239e09b7baaacde8c2ab53e78860dc31f6bd76746
+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.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
+DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
+DIST serde_json-1.0.55.crate 114335 BLAKE2B 89118d6ad9c62b5177651a65391cef22258b3fbbfa85c8dbe38f99e7388a3a9a44f20db800ff2b62f0484bc1766d2cb7c9dc1088894aa18c2e50be5d45b98f77 SHA512 db81c9ddaae20ff5f712d8a2cbb58a95bfd139d9358797443c9ee10fb8af18f1396faf09f7335c249118feb32f52192734d61efcb0b40204ea58825056eea9c9
+DIST serde_urlencoded-0.6.1.crate 12540 BLAKE2B a8d697cbe24c0b1dab0c0a42a8e2277e197821427647147eb9ce1217dc41635004f6374f1a54b00e5a7b6ee54ffcb4a2c855f8ac3177645e7a8cc1bd9fe0415b SHA512 e48b87717549d1b99f5759aa12b5c76507b26a6176a69f0a3c7297145b50b539344b43a827345096783256ac8053bf700505091c6d9d0e430bf01a990803d444
+DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
+DIST sha2-0.8.2.crate 19851 BLAKE2B 9403b9b975b2a0d7ada7681f40659fe4b548e8da0c266f384e70ead2d7fe0d34e6bfd48204d43d4d97d29aec7352b565aef8bb251b3cb1ce37d92d034e0688e9 SHA512 a9c2c9ccc846fd73d12fe9120ad1fb224bc35475c7332379a9cc67a7889677ddb1c577489d3a1aeae24e98b397b321823010c20ab3aca172839b2ea1fdc89da8
+DIST sha3-0.8.2.crate 521118 BLAKE2B 662136b765939af2d358e7d226a02b3cdda50c3c69eb42d77fb7d9fa0a906e2639ee0d024fb9b9c8062dea57d9db012733ccb5513aff914c698d9a25ea0ea6e2 SHA512 0719e0dce29367f821ffcde75e4af69788dacc9421fcdd08c604f92c12c0dcded8ca75eedc9407cf09cf2d8d91ebd25a21a4ff2e2862484169753791fe654dc6
+DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
+DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
+DIST socket2-0.3.12.crate 29253 BLAKE2B 0b5c48c90b45ddc6e98e2a9437f239e681acd1431684ad47a9386d437d3aa2fccbb7190ed601a6f3dae65715f1056a211004a071b0f6e71be8761165e18e2660 SHA512 b39014c4c48d0aead812d9310651f459654314163e9f7d059801ee6e56ee116eacb912738b1dd58b5b979997c7334811161257e9b7a024299a2422808445d6ad
+DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
+DIST stream-cipher-0.3.2.crate 8079 BLAKE2B aa122f6a63467ec0cdb0033eb90fbc99c3d2ae8d4335399708e2bfb179b1900c399a636c053e9c7a182b046b8f303ffe4fc77ab71b1d5220045219c6f5a4fc4a SHA512 e9e891403667cd739677f1966aedde06740adf20af51dad93dc4df1ab7eda2f522084ff0a16c15dc25202d9d31250b99e374548d1dd188eb4e43240d777b994b
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
+DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
+DIST subtle-2.2.3.crate 10660 BLAKE2B dc21d61246c2fcf45cc3a47a065906b0b40c833a357125483e4cf3dea5307d0126605f65827f20bdeb5986b85784dcdd5db6100514c328650c314d7b6ebd1f6b SHA512 00aaaa95401cf10a198d2169a245289bc015b2c494ab945adaf7d3b42495583931b96fbf85a034bc40f325d21734bd5914aa5065aa289a7d319d7daecd5bae5c
+DIST syn-1.0.33.crate 204845 BLAKE2B acde40a1eb59a78ef17afd46fbc5dd3710db4a1fab1d2ca6159bfb1ab3e3ee4182818284ed6a78f6babb539312dfd46eb43dc62842063db953cedc65cd307ba6 SHA512 82408aea39c376825b977d54ea339661cf54664358637e5caaf8efaa7d08e03385b160b3317060c27662a621ab5752bd761cbc416165d1c2cccf28985d73db51
+DIST synstructure-0.12.4.crate 18105 BLAKE2B 8e7efdfa8681da8473903aa22e8cc55abcede012b29a91d65076042c89a21048b44b774ca5c3f788222dd32fa634ac20f58ce241eff610498cac19f659280d29 SHA512 ab3024644719c4afc9c06a4d3c499fd4934c104409d38197a46d62c9ce30414f88b3e7bcdd7f245cfd207489fb54ba41e5cfc1db94b0dd12fb01e9c00c861c47
+DIST sys-info-0.6.1.crate 14216 BLAKE2B 3ec8023c8ab62540f85df37bf2b689231dfc187079e643425375d2e2e89c187770f77b451ced1c427354357685fd3bfbc9c1fe64da262de735f1207dc92f17df SHA512 225ae4b703bdf252abc92119acb6d555bdb5985e53e973a044f8d14e38881a9e6f1ff42019d3eaa74ad92d4ba0a8f8a5bb7ef25fb07e823df005317db8453af5
+DIST tar-0.4.29.crate 44638 BLAKE2B 2769171e5e83c181685b4ccf55a0e7a14b322e63f6ad4e6cb5197c31f70c3a8b5e9a9049aefcb675ec572c8c3864340efb4dd6192020450e40458265e39556af SHA512 9d750161fefb077edf0c27e5eaf5cb7a6b65ddf8a0ad509e497799cf82f3315fdabe233baa73df26141fdcb52fffa6ed5d194775ee7671d80d3556acfbbd9218
+DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST thiserror-1.0.20.crate 15950 BLAKE2B 747ff4ccdaddbbcc80225164b203cacc8669796e3c1515db9011f053486ce8d77a4560ae58756641fde7465ae6c818ddbb5b60641d1e5ae288ddcc549eef1848 SHA512 7f8e201f8d173112c7009fffa79e6d2bda5614cfb0439b81a9a990b777261de792d7e7750d75f7638bd58e6d72d183cffbada902595f425f037d6df04c0528a9
+DIST thiserror-impl-1.0.20.crate 13197 BLAKE2B f7da61d0dea4864bc3fbccad178b67f85223ab9f9529c118b07229d55a2568f23888041f2cd813efe51dacf8e01de62397092f56c43c640ba97a32dae2b7cd6d SHA512 3ca4dbdeff76c12c5a716d811891ce14bb16013749a45b8d8fae9cdc599e304065665dab051713d7e8e5bd2d2485ff9fa0904ca3cb5bf9e19f2cf66b42f10209
+DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
+DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
+DIST tinyvec-0.3.3.crate 17860 BLAKE2B d3665da9e5e2369bbd68c84827ce13cd1c0afa07b8cf689b04a62e24e5bafe41e8f32b136e048ce85aad324c22ca68fb43995a5445092d1f331379366f71cb03 SHA512 41200e022e66624b45e186a5ef6e7cc05dc3e2fd28d332deb689699b17bb85ecd0d960809e4ea2a08ac1ebeb5f2fcf364f4f9626d297f23169476c8be9dc1557
+DIST tokio-0.2.21.crate 391113 BLAKE2B 685b6786f329e32369d3e5636f7bc9da6a8b164b7287e96e048255cfdf21c25f55f4800eb0e6f6e3823d5654a38eb17d4b12d817fb490dd9664534cfaab924c0 SHA512 6756cf5490ea3d0993fe8a9d0ae70c2629cb2c77214fb39f635ee799496699662391745de7f3c49b0befd53fb238c274764ca23d7f3a1f278ed7d1eda34ae4bf
+DIST tokio-tls-0.3.1.crate 22517 BLAKE2B 05be1ca4abb345fc859677bb1b4e49064324ef7858c5bff7301b4a5110e4a6339857f5d85037bbd66b433a3c2439eb3c15edc63648fe04df2da9bfe1c93b8e08 SHA512 46ac00d839415a8dc9d9709967414e3812606a23c2c1e0e9dc9aa6aff70b24afb44e4c5a231d0d857ea8d06d07c254c97a459713122006cf1afbc6d4f7b7b6dd
+DIST tokio-util-0.3.1.crate 27233 BLAKE2B 96e43dd3f6f6209a6436e6ef3a40739f44507312b02a83f0316c7500dd6a59b5a71af005a98818d9b1db0e33aed4a9330e4cf955855925c8a428132762985db2 SHA512 301a5d9a8a9537653e17d3360dc27d41c95aa28bcda3e0815923dca0ac735071b01b9fc8c1d53e826e0cd1e6e5f98cc233f1e9dea906ba06c6b5192608ae7ae8
+DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
+DIST tower-service-0.3.0.crate 5321 BLAKE2B 267a8276baf4dd10c168f6db5b206ab9433be45532bd7fc5389952b3492e104fbe5301857f20044d7ba0c1af9572178d51a6f3dd723a6034a25e0c3dfd48e9a8 SHA512 9b46928c2ac13c738e56a1c4e9fdb512f17aa8f4e95669ae4fb9a9f9a4b094114d7869b923186779f87b45b2915ecf778f95dba415b6d4b2e6c20c34efdc6a6b
+DIST try-lock-0.2.2.crate 3638 BLAKE2B fdd33b9760b12db5c90dd9c34980e62d061e1a691eab760ed80dafdcd1ae82055b4ccac7313babb43dc9f2f38d3cac3bbf3f586b26f407fbd035c5c3dfca168d SHA512 aeb54abe3cc02d5dfd0d13010558454e5caab2568bd923a035dfef5ed5d3394b4bab9f7ab21dbaf82f1c20ccd95955bcf6ac2bdc976a824d9508d6f2a27ef330
+DIST try_from-0.3.2.crate 4264 BLAKE2B 13a4f1698e711981c183478b4bd4138cc90e8451000e56c965691e7d0be96e3cd7ae78aca891ae4a0d6726ef9a1d3beb26e4a4c18042b409a232a467ac36c11a SHA512 a619b8fefaf8c25037f1e2e7f8e64506144c8a7080ad930138fc3c4a2541dc7fc83ffd9c9a8c762ddd57028072cfd8dcb9db0c590e3ac30a4863f8d4fbb63739
+DIST twofish-0.2.0.crate 10280 BLAKE2B c035224c8ea88e487dc987667739372a5acae6d9617e12b1fb97a809021a198dbc4066a211c23dea432eaed6d16de674d1e39ff0be96bd0727151961d390f7a9 SHA512 c89059ae23064130c03470997e27de5c129c8fac2cba476a96eee6c22314aab2a9f6c2bf1339709168a4e643c749b2a551a39dd024e8be90ae214b6d5737bd91
+DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
+DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
+DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
+DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
+DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
+DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
+DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+DIST wasm-bindgen-0.2.63.crate 154967 BLAKE2B dd18681df3428776d2e9f137f9bc76b5a322b4417daf9ed6eb56f2437c46fdd4b7039b2be0496d38394ec4fc9ee3c20e4f5785b49154fd039526a69869d17708 SHA512 cb9e652c6c60608ab283b74726781291d72dd215c69c73556a3e09df225131d1f56c6264f65d64af6ca696de2ed9fa87cc53fa7a60dd5c0f938d7f10ffd44b64
+DIST wasm-bindgen-backend-0.2.63.crate 23257 BLAKE2B 5d72962bab99da8040df4cc709fcff668c06b52b1048335508d011feae90db17977ac7ba7c42c5766c590df03c27817673f762f3aab4b49c50f97c2a844321ef SHA512 0f409e7772a3d9e4408f0c1b82f4ea09319f58365e05003d8070705e773f675fb6b536e883204e548916b6558add6c764bf090234d9cffebea4091fd6b6ab120
+DIST wasm-bindgen-futures-0.4.13.crate 13682 BLAKE2B 6bccd133d90600eb3542303ed5a25fd757f1c481ef1680d62ce5d61d23ae24aca43d03facd059602f2b4e0ea6ae71b096dad902c12c3f208be2fabba7f698c67 SHA512 0ca264b86b33812931264875762ed54a0cf53347255258e31032a2727923251f3e922bb5ad22bc51b785e0cf8c4dd7d920297f7e13b6ec1015e950ab6bafabff
+DIST wasm-bindgen-macro-0.2.63.crate 11598 BLAKE2B 7444d9e3998974ce1973991fe98875b7ed99df35c8680a6cf15c4c02fd6a88319e48002b7f50adf70c33ceaeff2bf7cc4c8c91f31625195130d9c2e1b5df9cec SHA512 49f6363b00f7d951315853a6cb0003725e1ee250579c115c6f533153f8719f4ce1be2c630b229a2a3e2953b61c4f5abf76596714acf112e33d1e0c2ec48e9400
+DIST wasm-bindgen-macro-support-0.2.63.crate 17497 BLAKE2B e8fb8ac1e66ad1de5deec16f46d2212b25bbd9b49b0ac2945d30621c5997619cadd1e7f16debc3a84a07a27b83453315a62335010687421f7b58f5c82d88dcfe SHA512 a2bdf1d4aa4232466a492e42bbdd86621378749495732ee366e5d2c05c4450aba5d0b34370aeca0d8dbc40c2024d9b19b912998199ab11d261a8b545f4a04bcd
+DIST wasm-bindgen-shared-0.2.63.crate 6738 BLAKE2B 13d3cde27d33a28ffa17497089f5af5faa22f2a18557c2aa25ab39d0e0385660788b8fc47dce9ac7c419eaf213aae96099c2332f077a6b31c38f5d519579a841 SHA512 095653acafded328e6a7c0d71e6c989a2effcc497c3826c26dcfec45b4f5ec6c2907e06d30dd32ef780b60c01ddaea8f001477142ffb3aacd6a9c59c6f2f5fcc
+DIST web-sys-0.3.40.crate 628597 BLAKE2B 1c1fe74bdc6938241ab4280817c2d7bcdb185681add3f2a8d6edb4ec1d111b1f485203530dbb3f2f9c25ad8ab3609aa667551280ae7928ac73c154f5ca81ead4 SHA512 162e55a340fec36490267503f8278584b6bf9c10d920dfe3e96bc86048c07f9a5e02ff2be796ebfeb5996935da4ba2466e9acddd92c8de1ae70c1b00c47bbebf
+DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+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.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779cb365ad2fc97686a6c13de6a91d6204856ea35a18b86a7f32e8d4ac1ea2d2c096d7dd3e42f78400752cd3e2 SHA512 a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102
+DIST winreg-0.7.0.crate 21225 BLAKE2B 5841db683dc0aa8b92de8ec43100403b029c8d3e544adcaab030d998e5af4644ea176ac0bcd97141d137450a7bd761a5291405202c445a326da7d4f240686230 SHA512 a0b7a2d239e30cea89a863b879831bc32b5f2988ef3f0586ddadda48827cafc82d3602d2f8df3c47dc1e80537149a1ca1dc1506f9fbf960d9ba081dff1bac731
+DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
+DIST x25519-dalek-0.6.0.crate 83928 BLAKE2B cf8a12b61d65451243a03c82686c19a0eceae9cfcc41c2fda4ddd29aec9ae1481a23514f88914ba32ad77ac961d9b80a210bb20ab12828e1008ee1911b32819d SHA512 dca6f29455bfabbc433caf9b16963a2c0e9ef8d719f759af8e09cd53d1f7e5d51489439d6b0067b10f0d60b3ae9d5f88497905bd2a130ae5cad41f777bc15bee
+DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
+DIST xz2-0.1.6.crate 24512 BLAKE2B 47f260f4ce920bf8eff1446981672c9d877b4e5908fe20053ed15419e3cebd540fcedecf71ace32b25bfc5d6731092a565a2a8ac303ed21ae47460c1b3414833 SHA512 c0880b2bbf890e962b27efda6c513d1626332ff400dd08a9126a6e1d1375e0d0e3bf243b10df78e2397b611d0365b6526d96974c4ff332bb81edba71b6ebc811
+DIST zeroize-1.1.0.crate 10316 BLAKE2B d5907adacd54a8fee639faa230ce98d8f9f2e1a68d22c824f475f0ca84d621e6d5c21e0aac676c5979b8529de556d45e5cf8c434ad3d8f99e9e1b2f9872919c8 SHA512 19ebb9515b7c8bc384c180e4ec8b6f77dc84fbc49a3690af972918b2ca73695b935d4673ff17ec8ae95a1824e5b261838e656e7939f10e3b14b3b984180aecbd
+DIST zeroize_derive-1.0.0.crate 4247 BLAKE2B 2e96c44ca630eccab5e49f4426bbecfcf83318ecfefdfce2ecf877dbde94a93c4fc44ca60c4cf2950e5108ccc1b4474e40be29edeace558c74dab8b12f9f84c5 SHA512 495979256548c6dc0e39d7f08d752772f6358214a2704328ec839a1872a59a62244b8bc700cf20830091ad4f02298dc8f571f2f17253f95c1ae99b38fb0b9445
+EBUILD rustup-1.22.1-r1.ebuild 5991 BLAKE2B fd99965860e6622882012cfeb3bd7d6e94c267fe36908d6bf2abb2d128c005e88574866d22d76f60b7631388b92583bf222d0258c01411b82a8a71dfe87a3b07 SHA512 cafe289e51d87d053c7b333c0864e2aea5cde08f6cae287da0ba360eca8f887321c0f92f8e90727444fe4a5b6ae39ad7ba89b439169e5af6d1ebb626c91ae317
+MISC metadata.xml 356 BLAKE2B e17235a7b0ea9156af7ba204f1693bffd96a42926df5241e158e67616a60101d5a554d882e3aec14eb41a53b411a762cb50ceae076e44bab6e0e361eee83c569 SHA512 dc4ec000b7f6d769dabb37210fd9515917feba7224cbd1db27013b0e0f27824cdf03c7310d0f64dd3a099bdc33fc65c29648e860011c98fc6c8e9b374a17e337
diff --git a/dev-util/rustup/files/symlink_rustup.sh b/dev-util/rustup/files/symlink_rustup.sh
new file mode 100644
index 000000000000..87365028843a
--- /dev/null
+++ b/dev-util/rustup/files/symlink_rustup.sh
@@ -0,0 +1,121 @@
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+
+set -euo pipefail
+IFS=$'\n\t'
+
+SYMLINK_RUSTUP_VERSION="0.0.2"
+
+: "${CARGO_HOME:=${HOME}/.cargo}"
+: "${RUSTUP_HOME:=${HOME}/.rustup}"
+
+__err_exists="already exists, remove and re-run the script"
+
+# dies with optional message
+die() {
+	[[ ${QUIET-no} ]] && echo -e "${NOCOLOR=\e[1;31m*\e[0m }ERROR: ${*}" >&2
+	exit 1
+} # die()
+
+
+# outputs gentoo-style green * prefixed message, a good one ofc
+good() {
+	[[ ${QUIET-no} ]] && echo -e "${NOCOLOR=\e[1;32m*\e[0m }${*}"
+	return 0
+} # good()
+
+
+# do I need to explain this?
+usage() {
+	echo "Usage: ${0} [<options>]"
+} # usage()
+
+# and this
+help() {
+	usage
+	echo
+	echo -n "Symlink system installation of rustup to"
+	echo " ${CARGO_HOME}"
+	echo
+	echo "Options:"
+	echo "	-a, --apply	Apply changes (required)"
+	echo "	-C, --nocolor	Disable colored output"
+	echo "	-d, --debug	Debug mode (sets -x shell option)"
+	echo "	-V, --version	Print version number"
+	echo "	-q, --quiet	Quiet mode"
+} # help()
+
+
+symlink_rustup() {
+	local binpath gentoo_rust tool tools=(
+		cargo{,-clippy,-fmt,-miri}
+		clippy-driver
+		rls
+		rust{c,doc,fmt,-gdb,-lldb,up}
+	)
+
+	binpath="@GENTOO_PORTAGE_EPREFIX@/usr/bin/rustup-init"
+	gentoo_rust="$(eselect --brief rust show 2>/dev/null)"
+
+	mkdir -p "${CARGO_HOME}/bin" || die
+
+	for tool in "${tools[@]}"; do
+		local symlink_path="${CARGO_HOME}/bin/${tool}"
+		if [[ -e "${symlink_path}" ]]; then
+			die "${symlink_path} ${__err_exists}"
+		else
+			ln -s ${QUIET--v} "${binpath}" "${symlink_path}" || die
+		fi
+	done
+
+	good "Setting gentoo ${gentoo_rust// /} as default toolchain"
+	[[ ${QUIET+set} != set ]] && "${CARGO_HOME}/bin/rustup" -V
+	"${CARGO_HOME}/bin/rustup" ${QUIET--v} toolchain link gentoo "/usr"
+	"${CARGO_HOME}/bin/rustup" ${QUIET--v} default gentoo
+	[[ ${QUIET+set} != set ]] && "${CARGO_HOME}/bin/rustup" show
+
+	good "Prepend ${CARGO_HOME}/bin to your PATH to use rustup"
+	good "rustup selfupdate is disabled, it will be updated by portage"
+} # symlink_rustup()
+
+
+main(){
+	local me
+	me="$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]} - 1]}")"
+	while [[ ${#} -gt 0 ]]; do
+		case ${1} in
+			-a|--apply)
+				APPLY=true
+				;;
+			-h|--help)
+				help
+				exit 0
+				;;
+			-V|--version)
+				echo "${me} ${SYMLINK_RUSTUP_VERSION:-unknown}"
+				exit 0
+				;;
+			-d|--debug)
+				set -x
+				;;
+			-C|--nocolor)
+				NOCOLOR=
+				;;
+			-q|--quiet)
+				QUIET=
+				;;
+			-*)
+				usage >&2
+				exit 1
+				;;
+		esac
+		shift
+	done
+	if [[ ${APPLY:-false} == true ]]; then
+		symlink_rustup
+	else
+		help
+	fi
+} # main()
+
+
+main "${@}"
diff --git a/dev-util/rustup/metadata.xml b/dev-util/rustup/metadata.xml
new file mode 100644
index 000000000000..0bd6e14ec70a
--- /dev/null
+++ b/dev-util/rustup/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>rust@gentoo.org</email>
+		<name>Rust Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/rustup/rustup-1.22.1-r1.ebuild b/dev-util/rustup/rustup-1.22.1-r1.ebuild
new file mode 100644
index 000000000000..fa40b7f00826
--- /dev/null
+++ b/dev-util/rustup/rustup-1.22.1-r1.ebuild
@@ -0,0 +1,309 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+addr2line-0.12.2
+adler32-1.1.0
+aes-0.3.2
+aes-soft-0.3.3
+aesni-0.6.0
+aho-corasick-0.7.13
+ansi_term-0.11.0
+async-compression-0.3.5
+atty-0.2.14
+autocfg-0.1.7
+autocfg-1.0.0
+backtrace-0.3.49
+base64-0.11.0
+base64-0.12.3
+bitfield-0.13.2
+bitflags-1.2.1
+block-buffer-0.7.3
+block-cipher-trait-0.6.2
+block-modes-0.3.3
+block-padding-0.1.5
+blowfish-0.4.0
+buf_redux-0.8.4
+bumpalo-3.4.0
+byte-tools-0.3.1
+byteorder-1.3.4
+bytes-0.5.5
+cast5-0.6.0
+cc-1.0.55
+cfb-mode-0.3.2
+cfg-if-0.1.10
+chrono-0.4.11
+circular-0.3.0
+clap-2.33.1
+clear_on_drop-0.2.4
+core-foundation-0.7.1
+core-foundation-sys-0.7.1
+crc24-0.1.6
+crc32fast-1.2.0
+curl-0.4.30
+curl-sys-0.4.32+curl-7.70.0
+curve25519-dalek-2.1.0
+darling-0.10.2
+darling_core-0.10.2
+darling_macro-0.10.2
+derive_builder-0.9.0
+derive_builder_core-0.9.0
+des-0.3.0
+digest-0.8.1
+dtoa-0.4.6
+ed25519-dalek-1.0.0-pre.3
+effective-limits-0.5.1
+encoding_rs-0.8.23
+env_proxy-0.4.1
+error-chain-0.12.2
+failure-0.1.8
+failure_derive-0.1.8
+fake-simd-0.1.2
+filetime-0.2.10
+flate2-1.0.14
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-channel-0.3.5
+futures-core-0.3.5
+futures-io-0.3.5
+futures-sink-0.3.5
+futures-task-0.3.5
+futures-util-0.3.5
+generator-0.6.21
+generic-array-0.12.3
+getrandom-0.1.14
+gimli-0.21.0
+git-testament-0.1.9
+git-testament-derive-0.1.10
+h2-0.2.5
+hermit-abi-0.1.14
+hex-0.4.2
+http-0.2.1
+http-body-0.3.1
+httparse-1.3.4
+hyper-0.13.6
+hyper-tls-0.4.1
+ident_case-1.0.1
+idna-0.2.0
+indexmap-1.4.0
+iovec-0.1.4
+itoa-0.4.6
+js-sys-0.3.40
+keccak-0.1.0
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.71
+libm-0.2.1
+libz-sys-1.0.25
+log-0.4.8
+loom-0.3.4
+lzma-sys-0.1.16
+matches-0.1.8
+md-5-0.8.0
+memchr-2.3.3
+mime-0.3.16
+mime_guess-2.0.3
+miniz_oxide-0.3.7
+mio-0.6.22
+miow-0.2.1
+native-tls-0.2.4
+net2-0.2.34
+nom-4.2.3
+num-bigint-dig-0.6.0
+num-derive-0.3.0
+num-integer-0.1.43
+num-iter-0.1.41
+num-traits-0.2.12
+num_cpus-1.13.0
+object-0.20.0
+once_cell-1.4.0
+opaque-debug-0.2.3
+opener-0.4.1
+openssl-0.10.30
+openssl-probe-0.1.2
+openssl-sys-0.9.58
+openssl-src-111.10.0+1.1.1g
+percent-encoding-2.1.0
+pgp-0.5.2
+pin-project-0.4.22
+pin-project-internal-0.4.22
+pin-project-lite-0.1.7
+pin-utils-0.1.0
+pkg-config-0.3.17
+ppv-lite86-0.2.8
+proc-macro2-1.0.18
+pulldown-cmark-0.7.1
+quote-1.0.7
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+regex-1.3.9
+regex-syntax-0.6.18
+remove_dir_all-0.5.3
+reqwest-0.10.6
+retry-1.0.0
+ripemd160-0.8.0
+rs_tracing-1.0.1
+rsa-0.2.0
+rustc-demangle-0.1.16
+rustc_version-0.2.3
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+schannel-0.1.19
+scoped-tls-0.1.2
+scopeguard-1.1.0
+security-framework-0.4.4
+security-framework-sys-0.4.3
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.114
+serde_derive-1.0.114
+serde_json-1.0.55
+serde_urlencoded-0.6.1
+sha-1-0.8.2
+sha2-0.8.2
+sha3-0.8.2
+slab-0.4.2
+smallvec-1.4.0
+socket2-0.3.12
+spin-0.5.2
+stream-cipher-0.3.2
+strsim-0.10.0
+strsim-0.8.0
+strsim-0.9.3
+subtle-2.2.3
+syn-1.0.33
+synstructure-0.12.4
+sys-info-0.6.1
+tar-0.4.29
+tempfile-3.1.0
+term-0.5.1
+textwrap-0.11.0
+thiserror-1.0.20
+thiserror-impl-1.0.20
+thread_local-1.0.1
+threadpool-1.8.1
+time-0.1.43
+tinyvec-0.3.3
+tokio-0.2.21
+tokio-tls-0.3.1
+tokio-util-0.3.1
+toml-0.5.6
+tower-service-0.3.0
+try-lock-0.2.2
+try_from-0.3.2
+twofish-0.2.0
+typenum-1.12.0
+unicase-2.6.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.13
+unicode-width-0.1.7
+unicode-xid-0.2.1
+url-2.1.1
+vcpkg-0.2.10
+vec_map-0.8.2
+version_check-0.1.5
+version_check-0.9.2
+wait-timeout-0.2.0
+walkdir-2.3.1
+want-0.3.0
+wasi-0.9.0+wasi-snapshot-preview1
+wasm-bindgen-0.2.63
+wasm-bindgen-backend-0.2.63
+wasm-bindgen-futures-0.4.13
+wasm-bindgen-macro-0.2.63
+wasm-bindgen-macro-support-0.2.63
+wasm-bindgen-shared-0.2.63
+web-sys-0.3.40
+winapi-0.2.8
+winapi-0.3.9
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+winreg-0.6.2
+winreg-0.7.0
+ws2_32-sys-0.2.1
+x25519-dalek-0.6.0
+xattr-0.2.2
+xz2-0.1.6
+zeroize-1.1.0
+zeroize_derive-1.0.0
+"
+
+inherit bash-completion-r1 cargo prefix
+
+HOME_CRATE_COMMIT="a243ee2fbee6022c57d56f5aa79aefe194eabe53"
+
+DESCRIPTION="Rust toolchain installer"
+HOMEPAGE="https://rust-lang.github.io/rustup/"
+SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/rbtcollins/home/archive/${HOME_CRATE_COMMIT}.tar.gz -> ${P}_home_crate.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE=""
+
+# requires old libressl-2.5, so openssl only for now.
+DEPEND="
+	app-arch/xz-utils
+	net-misc/curl:=[http2,ssl]
+	dev-libs/openssl:0=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/rust"
+
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+# uses network
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# use portage-downloaded git checkout tarball
+	sed -i "/^home =/s:.*:home = { path = \"../home-${HOME_CRATE_COMMIT}\" }:" Cargo.toml || die
+}
+
+src_compile() {
+	export OPENSSL_NO_VENDOR=true
+	cargo_src_compile --features no-self-update
+}
+
+src_install() {
+	cargo_src_install --features no-self-update
+	einstalldocs
+	exeinto /usr/share/rustup
+	newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
+
+	ln -s "${ED}/usr/bin/rustup-init" rustup || die
+	./rustup completions bash rustup > "${T}/rustup" || die
+	./rustup completions zsh rustup > "${T}/_rustup" || die
+
+	dobashcomp "${T}/rustup"
+
+	insinto /usr/share/zsh/site-functions
+	doins "${T}/_rustup"
+}
+
+src_test() {
+	cargo_src_test --features no-self-update
+}
+
+pkg_postinst() {
+		einfo "No rustup toolchains installed by default"
+		einfo "system rust toolchain can be added to rustup by running"
+		einfo "helper script installed to ${EPREFIX}/usr/share/rustup/symlink_rustup"
+		einfo "it will create proper symlinks in user home directory"
+		einfo "and rustup updates will be managed by portage"
+		einfo "please delete current rustup installation (if any) before running the script"
+}
diff --git a/dev-util/sccache/Manifest b/dev-util/sccache/Manifest
index 753f4f46f453..dc5041465cbb 100644
--- a/dev-util/sccache/Manifest
+++ b/dev-util/sccache/Manifest
@@ -500,7 +500,7 @@ DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779c
 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.12.ebuild 6438 BLAKE2B c5081551f48d557ebaff7ba1db9cf2b5bb6970161b87b54eb3cbbd343349f39ec26594e261180df68114f2a7ab14988f8497fea9e9fb8185b0ff4175d25c2da8 SHA512 71364454300c7a85e13aa93fa2caa1e15265d29cc637880261f951630db4811cd69fd68be232cc6330cee7ff00aef73a1f24e2701cb860e3b6d3dc9bd9f9218d
-EBUILD sccache-0.2.13.ebuild 7108 BLAKE2B 8cc7e7fac1917d97d8c8db44f87e6cbdf0f29fa014885ab40085aba4157fc97ab0b2f6abcbbf331dc3eeaf89f2b595e28f79afb1a247ac0bcddea4b514071da7 SHA512 d592614e125fa5a3602b4201f2380d9f9b40662c14fdfd0075e4f6fc5cf40ae7abff514882359aa4a1b2d02c3acd962e5c4a53f50e9d8aac9c4848ff62eed21b
-EBUILD sccache-9999.ebuild 2186 BLAKE2B 7f8dee2c48c0254db9ba4634434203e8b84bf135585fed7292ac5de0b8557cd2b9096ad61233bd383957a79f3264ce6bbdb7e59889f7cd17cde5e3697b62ec78 SHA512 1ddfb028afa3ccbb379eaf048e25250d0e1466769e89a8212a522e9aeae0138b0c7580fcfef50f7b65dbe98b5ef35bfc7b70e5eaadb6fda49a5097060b6cc08c
+EBUILD sccache-0.2.12.ebuild 6442 BLAKE2B ce7dea17b9bbb706cf26ae6bdf16d05998d111232eb5d31077c8f6c7d59ae8929edcb162f3be7e8f4e9d7d127d220bdb5c2a305a73a4193811ed5dcd016a8447 SHA512 e4573dab53862a45c4cee9c37757cf004467981d6794af70b5f97a1d8a1f36b9801c34b286dd883eab2be27ecc4840b142d79e1248fbac7b911cc3c9589bbaa2
+EBUILD sccache-0.2.13.ebuild 7112 BLAKE2B 6dcb6d6271897f2af86c84463f30ace17cd6827a727c7977a2298978ee6f820d855fcc513c77bc03a01f9fdd04ce65f937f2835094fde1564e346e59bd5e06e7 SHA512 1caee3d5d9db643314c3da85ce91e0d6f9353551808cc816990c3146ac78d92089314339c3674e0f602b0b59e69ec0032eb246db8e432924ef1908e828eb59c5
+EBUILD sccache-9999.ebuild 2190 BLAKE2B e326d3fce1481d57e29fd9dc80474dbda74d75e299ce1c7e38f4bf2e273d60036aef842ceea2a9b80a8339dd46741ff2394cabe98b5dbcddc4aded4eda33cd93 SHA512 3d33d1b6b91d9f071179d423816c03b7f1d3b5bdf644a9e07e63aed32ddcaf6097326f8d23a391a59484812d97c0763db06c741e73c88f8c2d6618192d1180ea
 MISC metadata.xml 1054 BLAKE2B 13d8f1062d23ea96ec26e52b27c8a3b4a47b3e3f48e06b2b4ae39bb068604556ecb76f3319fc2578babc10cd235ed0ab5a28722b9cbb0a776b8a35d60dead4ea SHA512 2f8a4161a99a060d4651f195eb459173f0e02bf3dd72371611b94408c8cb2f8e7537004a0b9d90cae461cc0ba8e1531a80823db6734cb8241ad57737fd50b5a5
diff --git a/dev-util/sccache/sccache-0.2.12.ebuild b/dev-util/sccache/sccache-0.2.12.ebuild
index d207e0de0d89..188882f12843 100644
--- a/dev-util/sccache/sccache-0.2.12.ebuild
+++ b/dev-util/sccache/sccache-0.2.12.ebuild
@@ -292,7 +292,7 @@ xattr-0.2.2
 zip-0.4.2
 "
 
-inherit cargo eutils
+inherit cargo optfeature
 
 DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
 HOMEPAGE="https://github.com/mozilla/sccache/"
diff --git a/dev-util/sccache/sccache-0.2.13.ebuild b/dev-util/sccache/sccache-0.2.13.ebuild
index b5642de7cfc4..4d2c3f7b8319 100644
--- a/dev-util/sccache/sccache-0.2.13.ebuild
+++ b/dev-util/sccache/sccache-0.2.13.ebuild
@@ -330,7 +330,7 @@ xattr-0.2.2
 zip-0.4.2
 "
 
-inherit cargo eutils
+inherit cargo optfeature
 
 DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
 HOMEPAGE="https://github.com/mozilla/sccache/"
diff --git a/dev-util/sccache/sccache-9999.ebuild b/dev-util/sccache/sccache-9999.ebuild
index df4af3cbb8ad..ea404f54b9cf 100644
--- a/dev-util/sccache/sccache-9999.ebuild
+++ b/dev-util/sccache/sccache-9999.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 CRATES="
 "
 
-inherit cargo eutils
+inherit cargo optfeature
 
 DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
 HOMEPAGE="https://github.com/mozilla/sccache/"
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 659c2c88f67f..de16c6f19f9e 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -21,5 +21,5 @@ DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc
 EBUILD scons-3.1.1.ebuild 2629 BLAKE2B 9b6dd42a2a625ae6110b2ead2754e0c5d1d69128c32058913d102d545c820ef9e2ca25e2cdedc69a01a777633c32fd7aa3ec598e4d8760ec349ecb1ce9b1bae7 SHA512 309b84180a14cf7233f4879832489da56dad5236f30f9c402037b9dd2737b3983fda32c233e966ce755a75c3db6392f44a385dedeee8d21c3880f9cfb364cd57
 EBUILD scons-3.1.2.ebuild 2753 BLAKE2B 5f7115fbf7d3947bd90d1d147688110e13965bbcdcfd869eb7ac7222d942bd3fefc21f90d77bc0c9bfca58afc4ff593267635d8abed69cb0ad3fcc33ee62bd36 SHA512 2e479ac016b7dbb7f7a80652121f228621e9f85780cb0a3895b0a9b610fbcd376b7482897a993abe03ebddd176a66a83dbc2d5ad4e46a7b71f83e1c9cff39165
 EBUILD scons-4.0.0.ebuild 2623 BLAKE2B 664c157b4c0f9dc13fffd17caba6db18f3e6f0440a2a584fca5695e2d2788034ae3630f3c534ae605ec001e79751ad072425e973035cef52195198e05aa8c25f SHA512 b836e5e27e1a9cfe8fa8e42d69ea9f2154ddeabca65668bf47befaff72ae46ebd0925fae55f8ae8b73a72b4397ee45b7e3677e6834caa7ed0de49f58f5b0eefa
-EBUILD scons-4.0.1.ebuild 2623 BLAKE2B 664c157b4c0f9dc13fffd17caba6db18f3e6f0440a2a584fca5695e2d2788034ae3630f3c534ae605ec001e79751ad072425e973035cef52195198e05aa8c25f SHA512 b836e5e27e1a9cfe8fa8e42d69ea9f2154ddeabca65668bf47befaff72ae46ebd0925fae55f8ae8b73a72b4397ee45b7e3677e6834caa7ed0de49f58f5b0eefa
+EBUILD scons-4.0.1.ebuild 2622 BLAKE2B e452a9c8b103ed5e93e948cc833bd41b4e782cc664c9e90139ce2813ca97fa2ebf31be8a7cdbba17ab42ba0d471a07dfef8e8f648578f79a566cbfc0a3e7fe8f SHA512 3d7eca7dc0c1598d667d6d036611da36aeaa0950e4691c82379f1d7ac9c299c8a7eec82dd7e0844c2ea4404f1efa60fec6d53dcde3c6ee9441a0c0866e422333
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
index 3325adc75936..191cd21327a9 100644
--- a/dev-util/scons/scons-4.0.1.ebuild
+++ b/dev-util/scons/scons-4.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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 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/sel/Manifest b/dev-util/sel/Manifest
index e9403d936bc8..73ccef0a176b 100644
--- a/dev-util/sel/Manifest
+++ b/dev-util/sel/Manifest
@@ -1,3 +1,3 @@
 DIST sel-0.08.4.tar.gz 22188 BLAKE2B ff965c1e6296482d14e09109932165524f666486d37239edc2c30f268080750de2b20e40fe5dfc65eeb1c52009db139e2b7a47c9f8011b70eb5ae561466c19a3 SHA512 5550f1b78fef10c2ac7c132f752db4e0f7a3318419bf5751a4f812c1da04b07b3fcac341076d32f6ea436a0216ad6746e9cf29c4bcef630b76e307ded6237e52
 EBUILD sel-0.08.4-r2.ebuild 710 BLAKE2B 93c5957c4dc0363428ced0ca7273b6c72301d4105bd83e7706ef96f17684a432625d37ed53481f49a205f3deaf375318fe2a8a9be8a9898d5baf28222744832d SHA512 f3c91bb2448ab6aca8b5734be01bef910a278f320dca6a3fd6457951dbd6463889347d7e7178629376aee6ed9d8d857fb6e628617e02909014659f28d0cc00ee
-MISC metadata.xml 278 BLAKE2B 6a95d389f2204d31fba86bfb283058e708907d15c8a58c0ea599e83b34297f8bcd3f9a44f98d5927a64f4866d09ac3b80e268713905ce27b0e6bfd707d1e470b SHA512 27d648be83bdf79c6728bb4936d00499b71be48225b9fc544f2a4f6d54bc60670f167a4b7a51ef28740b36a9faecf396c0df1fcfff08bfc89b88dc902109eda1
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/sel/metadata.xml b/dev-util/sel/metadata.xml
index 2adeed764081..6f49eba8f496 100644
--- a/dev-util/sel/metadata.xml
+++ b/dev-util/sel/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
-<longdescription>
-sel is a file selection utility for use on the shell and in shell scripts
-</longdescription>
 </pkgmetadata>
-
diff --git a/dev-util/smem/Manifest b/dev-util/smem/Manifest
index cc669ff4bb65..b744e59b6264 100644
--- a/dev-util/smem/Manifest
+++ b/dev-util/smem/Manifest
@@ -1,3 +1,3 @@
 DIST smem-1.5.tar.bz2 15443 BLAKE2B 31fc73b4e74c08a39957983fb02347ad18fae7a50aee8d8a259e15436911967c56e9ce14a4c89ccc3072d49d802c2b3268792992587170b795b7a08b1678d208 SHA512 bf21536294f1b84e3cc40cbed3077f30f5a1c911fd983cf6f7d7bd3f1bc6e3c4cc9ba509daa8da8f6a12ec2df63b25772a070d80cd45ee289a0725565c89a344
-EBUILD smem-1.5-r1.ebuild 836 BLAKE2B f012c39529642ba1d4cb92e835ca7bbd40031eae1d5797371482b14c3df00bb85a2135a72c7e9a861e806749e0041a6e35508d5c47c7f2e175d945c87a91010b SHA512 99c238141b55e18c5a2d47d4b5acc0e0f3713817d1f5eda6e59291fd152e16c875a26cadbbe314ff5322b2438de1e3a266b76a7138d8b74216decea596040f4b
+EBUILD smem-1.5-r1.ebuild 840 BLAKE2B 58fadce20176b72d41fd3df79ef8ee856cfd31aa2d812f67dfbec5be50fefbfe58d87e188aa266af0689185c641d73b613233d0399712cf66d083665ec005a73 SHA512 93f0e00400dbfe383e708c8d17411422aaaf7980756d723b8850434d0a0328b58fad58e7a582653510e64508af0264aa6010b921e9344bca980c39e9cf3d2393
 MISC metadata.xml 887 BLAKE2B 97eada233bb3bbc6976a34ed5e2ee6b80e0c17e36d7617b2bb109194183878fde46e59a2c38bf84216673850dc21814edf27ba24f189bd03c0240a9c3eed60f1 SHA512 6bb126678342abd8ea5b5c6b4091ffba18d28494db92715d8f2b7dbd363df48d6265579c52340d1b9514b0422b4fcebb0b2f4a9efdfea5e040bf047a1576e478
diff --git a/dev-util/smem/smem-1.5-r1.ebuild b/dev-util/smem/smem-1.5-r1.ebuild
index a910bb665c9d..69e6644eee3d 100644
--- a/dev-util/smem/smem-1.5-r1.ebuild
+++ b/dev-util/smem/smem-1.5-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 EGIT_COMMIT="2ab5040d5633"
 PYTHON_COMPAT=( python3_{6..9} )
 
-inherit eutils python-single-r1 toolchain-funcs
+inherit optfeature 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/"
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 14d0a9407a58..7b9364234acd 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,6 +1,8 @@
 AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c605681b2dbfc4c52730c9f20f8290f11a2be9c37db78e533a996c22140faafc2691c732b49b9de28a59644bd5e39a2b7d4209eb44486cdeee1338de8 SHA512 db4786a10e4380f4575d52cf861a82d0aa9f69cec7d47d574f453d159396e993527ba4e469fab75fabc36b977ee4b61abb9e3787ee2af45af8f5865b3b06e10c
 DIST spirv-llvm-translator-10.0.0.tar.gz 535828 BLAKE2B 0bce2f663b2f70a2db2b1ef0665d627716d63baa6cb47ced532ac2e30e8b0424934d273135581655445ea87f5c84c9df876da0490d7a302a6d00c86b78e05c22 SHA512 d6400bb3e4df780358b5d6d0af889e7654b7dfd472c8d41b77ff98e7ff1bd017c289ecacb59a3dd7bfddb1a5108e21028aa770bf645e06178610bb322de905be
+DIST spirv-llvm-translator-10.0.0_p20200909.tar.gz 599696 BLAKE2B 9407d0b3ea9f812a06d08b8fec6cecd73fcab5ebd8aaf10c38c7693207f161b4f1eb822e60b42521e3879cd34b95da7d37cec71fb891f8df13dc60783e655c49 SHA512 fe3e4a00d1ae3fd2324379bb92244399b18a4a31b1a2ec6b9bc60eec471a8ce2da7fbe2ea5a0d247590dd7ffb6e620072197a36631f384357e808fc9b96192f5
 DIST spirv-llvm-translator-9.0.1.1.tar.gz 498803 BLAKE2B dbc1a3a51671102e13ac265c5de744ec7ddbb74ff1a58971e18bfd7cbc7a0497cbb86d099681ac153d8e104577c93b66eec597b6c646d422eb701ea7c96a57c9 SHA512 a84494c49cc16148301cc468fdc20b9ef41a4532477b69468e32551d2132a9be68346369d5f4c07cbefd7f0f63b3e7ddf11e5c40088f74d8e3379a95c3cff251
 EBUILD spirv-llvm-translator-10.0.0.ebuild 1267 BLAKE2B b12f6b0095a57a290680f695296f85fa3cff3823dae03f527b3da718777c0b4f2a0cf465de5fa1671e191b83a837f949bea27f2664fa9d841efd2613f1108d6d SHA512 5b2c9122bba0244adc28d5cf1c93a93e8d810dec57702d3b71b22944f698dd13757a9b68bb4b30a2f483b94566877eacb205c150ed70139b7ba4756b98c849be
+EBUILD spirv-llvm-translator-10.0.0_p20200909.ebuild 1555 BLAKE2B 12befee30e2c709c9e709195bb37d9149542ea0abcea4b2fe94a6174c5262a991ca80bc74cd32437b410b0afb43adb7a7e69cd5bb623c2599863c282c03821d0 SHA512 f5a0144d7ecdbd13e263e972774ddf0b08de7ebe4e8cbd450a6c58d1f535b725556f323018433838d4df15620fbc458461f2edab76c605344be5380605e91f2b
 EBUILD spirv-llvm-translator-9.0.1.1.ebuild 1291 BLAKE2B 22fd214fa80e3331da17994058a0861b5f0a3f3d12b558cba329e6e8d3cd34020bd2d5f489ea89e2916e73aca2a45446cb3c36aba203b5fa3425984a486b140f SHA512 9a7e64db4abbae7d694c17935707fa5a1a79ecd0c454e12f35dfab369bc0d5158118c010629dd4b2fc8ea418c2ed8d0342bcbb0903328b394e6d8354b6c4f30c
 MISC metadata.xml 442 BLAKE2B c63b20489865e563e064525b8df310eca993f15ff03cd533458729e5d6611b678e2f797d6efbe177e1bdeaed84e9bcf63921cb67318e948d579b57cc7f1cd28c SHA512 b036abe761b1aeb68ce5668eb3d501d2e5530be3456e85f51bee15c0aa8387a8be89c212308d7997a5f60bb0301bcdd22a7cb44a27324c05533aed94215b4721
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0_p20200909.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0_p20200909.ebuild
new file mode 100644
index 000000000000..ab9d37786360
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-10.0.0_p20200909.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic llvm
+
+EGIT_COMMIT="4f1a3270f2431aa98f1bff30d1a32c9d8f4729bf"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${EGIT_COMMIT}"
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="10"
+KEYWORDS="~amd64"
+IUSE="test tools"
+
+# I have yet to see a non-release spirv-llvm-translator ebuild pass ANY tests.
+# This is probably something silly like the test suite expecting different
+# directory names but I really can't be bothered to debug VCS snapshots.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="sys-devel/clang:10=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+BDEPEND="test? ( dev-python/lit )"
+
+REQUIRED_USE="test? ( tools )"
+
+LLVM_MAX_SLOT=10
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
+)
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
+		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# Some tests fail on amd64 when ABI==x86
+	if multilib_is_native_abi; then
+		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
+	fi
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index c87c1417dde1..e0398a4bb6ac 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -7,6 +7,6 @@ DIST strace-5.8.tar.xz 1813640 BLAKE2B 315edf404fa57890dcff512f9fd76818e8e7d5ad0
 EBUILD strace-5.3.ebuild 2323 BLAKE2B 02812e696ba9c1f24bb8ea9b7cb21ce1ec6afc9bd5dedb2d70c3bc9b88c4523745333070be4d2a0c9297533a636964efd02b1d1ae33ed025251d18074081d114 SHA512 8c2b4b7e6a9119d226117f72209ec360365615670092370faa22fa605f0afd583749f008146eb59afafefaaab9f634b512c0893e0d10b896e7bd6221e51a7f58
 EBUILD strace-5.4.ebuild 2524 BLAKE2B 3a21233c29527856cbe1723407ddac3525b57efe6fa3bf379b6ba4d902d5dfe607049a5a9264f91f947ab2678cd36cebc4629eb49812658bb895583840fa5fdd SHA512 fae99e9ba572c1c6445ba03ec257759165d5c3be57d6de5269f1e886e6c9fb50361995956671772bfae26ec4d54785e9f40ac7dad25a5d4b2c33f8c3e2eb94b4
 EBUILD strace-5.7.ebuild 2355 BLAKE2B 7a3c90be9f839968e4b7355c80cfec5d9aacfe738af9bd8e8e128a64f7f54816850173e497d28e14087ba49e3c9c80e7b0dc2bc6f9f39aeee279f601bb5e0757 SHA512 e5ddb7a75e527523c8d9e39571fb1ba68dc38aec09536bc43cf1225bbd3cd521a32c517baa5c0c16b6874407fcf31dd8e505dfd4cb61223025df6d2b5fa1e46d
-EBUILD strace-5.8.ebuild 2350 BLAKE2B 095ada57669c2f6d1414f98a4a47cac114944cd64a0017694c45ff265105ba3e6bf748bda55e917426857fd8b8a8f38a8bf9b9275424af718a7514c1bc20756a SHA512 ff906a4626dd54452be909c2072150c231cfcfe3a267381135ded73078b0c724d8d694ef3601109b88987356cf5069332e7527f98f074c13354e74d543de3e9d
+EBUILD strace-5.8.ebuild 2347 BLAKE2B 564760aa40eed8d766be3f9f02cf89f5785abb7e627dbb09a9eb20ca623a0e17aff59992ee82e9e564df0c4c684e7552c800d4bc04aff72777827c31cafe92d0 SHA512 c7a595d3eb1c6e320d65e68b9b52c1f6f816237d0b881f5c91c88068877bb62e46fe3fd51db18e93f8c1761e098bb2da6da52e44ebbef202c7bfb0d279138fcd
 EBUILD strace-9999.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-5.8.ebuild b/dev-util/strace/strace-5.8.ebuild
index 2c980459b03d..00c488f0efbf 100644
--- a/dev-util/strace/strace-5.8.ebuild
+++ b/dev-util/strace/strace-5.8.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 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index d222beb72676..ef21f5fa70e2 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,8 +1,9 @@
 AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45e0e4ff4049d6b8d6cf44375f88c752a0130e4229a5ccf83a414db8f91504f4ef828d3a7d3d94a5eee78a9e90f SHA512 a9f068dafc2fb4c96696d8cfe1501fc3610f4ab0aaea9a20ffc5f57cda09561f9712896616c548661bbbc5c10dfe275d218c7b232645a5240507c80bec1850cd
+AUX systemtap-4.0-AR.patch 193 BLAKE2B 270a00dcba6cc982fb60075e00bbc3f7d6e23b77f8b595f4f84eae25519452d53a355571f0ce0515c187591796e245b9e683458842c0e9eac06e205b0f3cb3f5 SHA512 b59a56cf64ade81df11b629f9f1eeba8d8aedb5e3984bd0c8b8217ca76cbbb5aaba2120b8ee3ab83c300cbdc674e5c6e7999537371cd76794a2ace65a7a8b19e
 DIST systemtap-2.4.tar.gz 2664988 BLAKE2B 194ad2489482eb926188fde700f43a35301214cf062ebd4d101776f09a23cbaf502f592ce0eecb297d1ffe9bf0ecf103c29b55a8a1afa84b56b9b5a0a4dd0cfd SHA512 40c30942eb50948f11f06f9f37c76d96f5ebc8eb6d164c9af5d54845b3f43f38594ddebf5f0d42ac4704b0a2563cd23edf818c196ee1330db00011a85ae11b0c
 DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb18b6a9da030adca94405880fb52ff6ddbb62b01ae7acafa03e39a1ef5f0a7c3659300518412d8eee0c57d01b433 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 EBUILD systemtap-2.4-r1.ebuild 1981 BLAKE2B b1453aba34d1b350506996289c0a73d40c44693a63b3c712a8c171b2f0c6e275c2299e0bc1e8f6b3b201a2591ee3bcbdf383c186f20a2fb430b86be483eee57c SHA512 2bd1b737d6290477bcf342b106a0a7d0e7f30faecbdf0bbecca5ada7791408de14e3125c86e858ead803b8d400034921b96a85471568ab8891453a715ac08b89
 EBUILD systemtap-3.1-r1.ebuild 2159 BLAKE2B cd9b29ffa2a66dd891621c86ab59acc5e91b716772db9ce08ac03177301b932f85e41036151a62eec86987e1eaf27fbba860a9cafd93b3d558c3ae8371b21fd0 SHA512 aed426fc39006ab3758fa657b9e8613b07a0bd92f6cef4cdf393cc4f2c66fd553e55da45450b4ff3d00dabdf592008763fc6bd94373e966371b3e26c66cf7fb6
-EBUILD systemtap-4.0-r1.ebuild 2684 BLAKE2B d343218cdea02079d4af276455c4e445fa74895b3d848ab0913d7ca077fdd21c6951129cb093957cfffadb2a28feb721aedc39fd17f862594d54dda8b35b20d5 SHA512 865ce4d905779903566aa382e00e07a792a2c0e3c5c943e9035a89f0e7d1d5f105cf45a820653d34107ed68ec773012e2eea2c5eaaf07516b69a7310095972f3
+EBUILD systemtap-4.0-r1.ebuild 2718 BLAKE2B 91d339b14668b8d8bbd2e3d8cb3b414735f1b3cb677160cbf2e14ac3da25b13ea77c4fdd1d873efdfb9b47be462b5caa7b9494ae9c61f869e37e38a42ac4d8e8 SHA512 534c02ebbf088e0f8dc7b5ed094c12905d2421e495d85fcc920675c89fbf4d2012b33882a0a223e14cc5c76b6ca29540fd44d3aa592b27ab0b3173bffad1d1b5
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/files/systemtap-4.0-AR.patch b/dev-util/systemtap/files/systemtap-4.0-AR.patch
new file mode 100644
index 000000000000..fa5334e6fcf0
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-4.0-AR.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/720710
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,6 +22,7 @@ AC_PROG_LN_S
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_CPP
++AM_PROG_AR
+ AM_PROG_CC_C_O
+ AC_PROG_RANLIB
+ AC_OBJEXT
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index 03103d13f0fb..b04e23d320d6 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -48,6 +48,7 @@ DOCS="AUTHORS HACKING NEWS README"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-ia64.patch
+	"${FILESDIR}"/${PN}-4.0-AR.patch
 )
 
 pkg_setup() {
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index c522438020c5..69b43ca45f6d 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -7,6 +7,6 @@ DIST valgrind-3.16.1.tar.bz2 16262776 BLAKE2B 1c333c26827f7a8356869e8758da9dd6a7
 EBUILD valgrind-3.14.0.ebuild 3682 BLAKE2B b5c775610622d2aa48db013dfe9cfc6d8db508b825df2cc3f7759de9d0467161cb7d5eb8c18aee8532ebf04a9aebfa3663b88661bc4d3d747916997a71d1904f SHA512 8fddf0b86912858fcd60ba23e301934dbd256efbbd8f08ba9972167cd04ab512f5f759acd3dd2a7c12e45428bb25ebb3674bd60b84cc6ab1dac38f492f9a8952
 EBUILD valgrind-3.15.0.ebuild 3760 BLAKE2B 1f405ff5df90f34b165b7d35ce319d742c6b5877255426516efa3f042ac9e0defaa5f1e12f150e25c46063c0de507fea017823153f35fc82a13f13d520c6802a SHA512 6b00bfd3d64ffa99d9a4757c1f7a3e534754e454424f95ed2f9390d248a1221d4391c9405807c8801621ca1c8cb7d5c83a765875a553c59e96ab638695fe1974
 EBUILD valgrind-3.16.0.ebuild 3766 BLAKE2B 820536cd71c55c9fa35f77b014d7a5c5936fc845773b1523ef79c9c6e47d632e1633e2f60cd378b33610c396d57ca71241517de1817aad86402836376b954320 SHA512 454562b3e6725accb06c4d06450eb2e30cc5e4819932ad227d5b6f8b58b0b9b9d8f9966ac1c2294e8f7dc05a0f75bc29eb31c7084c27c3259d47306246481e26
-EBUILD valgrind-3.16.1.ebuild 3766 BLAKE2B 820536cd71c55c9fa35f77b014d7a5c5936fc845773b1523ef79c9c6e47d632e1633e2f60cd378b33610c396d57ca71241517de1817aad86402836376b954320 SHA512 454562b3e6725accb06c4d06450eb2e30cc5e4819932ad227d5b6f8b58b0b9b9d8f9966ac1c2294e8f7dc05a0f75bc29eb31c7084c27c3259d47306246481e26
+EBUILD valgrind-3.16.1.ebuild 3763 BLAKE2B a4bb3c950abb3182774ef903e1f1db2da8f509d596ac1efb2862e9f533eb665149397993d723a19a64d5f063dd8a29d2b15840954acb617eb35c7a83c4dffa96 SHA512 0c860af27187c55662cb493e63d84fab5af59355b7443499b9f8613beffa2ff9a8c5e1f92b94edc6b714a67c61edd988d5079a44d8645f0c41feffafd911e5ee
 EBUILD valgrind-9999.ebuild 3753 BLAKE2B 546a516d9a909f44e1c8dc20ace9025826335e2910e3652e1c7592804765fd4d679f6422276399c7629e2b711236181958dfe435198b8ebd8327b6f637cd67fd SHA512 64831f5594eee66cb5ed5a1afbc44708cf0f334e05b22e46c4675f35528628f5bb6f89981de420bcae568b18dee4767150a6465f75f1451cdd128bf297dd04bd
 MISC metadata.xml 1027 BLAKE2B df13361ec401ce5e0bfa11e51378c432405bd296a874d8c71c26c9cbdf0171689e4b3134b5e05672dfc22bbcd6e2b6c74b96c47367725c209990d3e1fcc65e7b SHA512 da5bcaf596f2adaa552cc3b7296891b40be0bafec8a12695076ce8fbe660b8aabe70508eb02ab3fb66b0d9dd0c0c8615f430c1ee0ce3f3579732ea2406c8a778
diff --git a/dev-util/valgrind/valgrind-3.16.1.ebuild b/dev-util/valgrind/valgrind-3.16.1.ebuild
index 33873a0e69c3..47ebd7d04072 100644
--- a/dev-util/valgrind/valgrind-3.16.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.16.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="-* ~amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DEPEND="mpi? ( virtual/mpi )"
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index b43aed57a5fd..2b639b9a20dc 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -2,4 +2,4 @@ AUX visualvm-r1.conf 786 BLAKE2B 863af1d373f3e8633a630c6a1cdbc8ada09b1a9b5f35704
 AUX visualvm-r1.sh 424 BLAKE2B ad18e375535b92e5bc5720c7b4f9f9526ee136d29d51103038a68e8c260245222af1e912b8320ca98dbaeb1a8736f041fea89ae87b15d1db9cb916eb1552c8e6 SHA512 8e579f126142f52e14f235a23c3834933b59a9df95ba76b6b9a82175cfc5e12d759bc0d7234ae3cea7684bdfe12f2efb9785afbe6844394f458cff05ae8342f7
 DIST visualvm-1.4.1.tar.gz 56752632 BLAKE2B cd171a48a0a9af440c27f2968ce27c5f89af3769046258629ba384ebbfc1c2ecb9847678af9d69bea5847fe1098e9039f35d350fb6f5d112e9236a6510c52bc7 SHA512 de8cf37e619e15c3a30c5116d49becddc09b54062aa22709e412892cf78e3048777116a8388dc6f63609d11bfb6fe37176fe48f5e3263a4dbce8439df676ef15
 EBUILD visualvm-1.4.1.ebuild 1667 BLAKE2B 92813bb7a920d1f2a83af817d9fdd821be79661331c29b6c4a7f8f945c190a9dfd4a89a8cae04ae347be3fbb68bf6a8f9b02a80310780f7fea29f3522dec0fbf SHA512 b38ac4aae3d549e8f7c749436f885cc538c5844b81af6ba2adbed503ffc5ec297ffc1dec3a4f5e3c96ac7f53dd8f508e25c18e3a11f7a3b9108b05ce0d51d542
-MISC metadata.xml 452 BLAKE2B a1a04fcf6da524fc4bc9d68c415c429dbf43813e594797eaf24f6590e47dd6466d9ec5bae1909011976ab9a47cedb07bbbff29f254f60371aa50ed88a3d9a50a SHA512 cfb0070326f1fc73f96016a138bdba35b6799333a625c38c84fb486134e1446f71bcfe2f170cdbe9ff86befe66905ba79caebd68f811547ec638e69821a5a739
+MISC metadata.xml 316 BLAKE2B ad191b52b75273728dec1af289e8df2ee7d538cde7dd30b2c8facd2623a6984de090356891a9e9f992d99da4bff9ae48be15bc7257987e8b6419fe8beaa979d9 SHA512 46972dae3e0d778f11af43101b50944f9edd850d1e7eecca9f5bf08c4db438dd53415348f61b85f37f788435410867e61bb516960d4ceb6edb8e88fde71cb243
diff --git a/dev-util/visualvm/metadata.xml b/dev-util/visualvm/metadata.xml
index 619755c9c84e..afbc7d3b4970 100644
--- a/dev-util/visualvm/metadata.xml
+++ b/dev-util/visualvm/metadata.xml
@@ -5,7 +5,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<longdescription>VisualVM is a visual tool integrating commandline JDK tools and lightweight profiling capabilities.</longdescription>
 	<upstream>
 		<remote-id type="github">oracle/visualvm</remote-id>
 	</upstream>
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /dev-util
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)