gentoo resync : 23.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
commit: 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree: 230f3135ceaace633cf93e9838b185c4a6664c2e /dev-util
parent: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)
161 files changed, 1625 insertions, 4037 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 206c33e81ae3..6a1cbfaaba8f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index fc7095dc9cfc..7352d1d40576 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,3 +1,3 @@
 DIST anjuta-3.34.0.tar.xz 6420472 BLAKE2B a5e10ea3bb60499e54def8d1b78603b0c809167ad03a3e11f9dbd031514f1a7cb566d9c7694be23fe3165e617fbfc3d1e6ce36f7dc8c0672044f26390aed6d5a SHA512 9d5a4c23751893ff7e21cd55c1f112f27b53fe2ea5ac645c63e2da627efce202b88696e3e5d860ad75a5c13c88a9082775d74f4482208161b5e63d56c4004d57
-EBUILD anjuta-3.34.0.ebuild 4573 BLAKE2B d21ba5dc9fdfdd77228058f47309319a476ce5331c4ad74d93168f335933ec66dd5cb89b97593d452f2d2042d74e24e20e5827a76cf662edb8a1ab4a1bc5a854 SHA512 2d080a74611e8eb26f9c759a4484f81785e3ec3f10aefd56b555e18c3ab8106a04074e4d179bfff00e06545df278c1ca37ccce80cb809efcef021709b2cc7a93
+EBUILD anjuta-3.34.0.ebuild 4527 BLAKE2B 7cfaf43f52163c2374f40d57062695b42d22583c492641cfc05db5e3d455ae4ef93a15d09440c09b17d2c8f38940a1b13dc64c0defb48c1fbc345525319d95f3 SHA512 2cda924e4aaf3fe1c090126bc423030de0f45b8bedb54cc080a775b399a5e315a17283fc5e0958ff52456396bf22a4df8829a113f9a2923ad91c625355287641
 MISC metadata.xml 484 BLAKE2B c5b7715c5b6fb11c942e2505cc727cd72866cb497aecd009df54a969c158af224fe83653c014bf4e81b8ccc04328dd5b03669d3aea4b8f7d652428e2472fd477 SHA512 3a2982297046c18fcb92d9f7ffe04a29b59890938188f00cf0386208aa42d2603393f169679b18469e591a24da5a956d4c7d981eab58a3ea7597058b8911d5ac
diff --git a/dev-util/anjuta/anjuta-3.34.0.ebuild b/dev-util/anjuta/anjuta-3.34.0.ebuild
index 97bb17cc3827..4e3d1619f0dc 100644
--- a/dev-util/anjuta/anjuta-3.34.0.ebuild
+++ b/dev-util/anjuta/anjuta-3.34.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 ) # python loader crashes on load with py3 in 3.34.0
+PYTHON_COMPAT=( python3_{7..9} )
 # libanjuta-language-vala.so links to a specific slot of libvala; we want to
 # avoid automagic behavior.
 VALA_MIN_API_VERSION="0.46" # 3.34.0 upstream release supports up to 0.44, but 0.46 vala LTS support was added without any other adjustments post-release; 0.48 will need patches
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index c8fdfbf1a8fd..c1036573590a 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -5,5 +5,6 @@ DIST aruba-1.0.3.tar.gz 133790 BLAKE2B 4008cfec1bc1d63113b1d8961e3bd6219f3884875
 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-r1.ebuild 1955 BLAKE2B cf5d1d8ae0dafe1ef47c1c8f44f1ee0094a58f58308f5aaacb6c12b695ac97b6e8323507c120842feeab0ca0ab60d798fbaa7042da82269bda0dbae53fee9245 SHA512 e7b6275d8625e65a1c565185e2baf7d7a7bb3f5183c894ea9e8a137499ec05520abb1a33c1905901a9d1dfde4cd14b6e1153153a2d242f4fa168ffabb793f414
 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-r1.ebuild b/dev-util/aruba/aruba-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..0e20ab19c5b0
--- /dev/null
+++ b/dev-util/aruba/aruba-1.0.3-r1.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 ~ppc ~ppc64 ~s390 ~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/pry 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/bam/Manifest b/dev-util/bam/Manifest
deleted file mode 100644
index 845e0a429d55..000000000000
--- a/dev-util/bam/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 0.4.0/Makefile 508 BLAKE2B e3da9902bfb7252513b106df127b299ac80a595a9134be88622d1fdefec3d2ee9ebbd037bbfe19a045d1698cced6bc8c0eb919bae8a4ef59486f0a5bd9df3fb8 SHA512 9738df23d15a19aec675d9988163c3e64e028b51e77a555509273496358061af7e851a244561cbaa8dfa3bb2e5b8be54b1b5b6517da19800d13203fe2204b577
-AUX 0.4.0/bam-0.4.0-test.py.patch 266 BLAKE2B 48ea5564bf8c59f708f26f72a98fcd1f9f365c465ab4f79ed58f88d837bcdce3e7ceb24ab2e9b314bb6880d1302e48fa8ceeb818fe06bf9a32e2ba278a7a9d39 SHA512 5e6e3106f05ce2a3fa8cd6a51d9125700f3c962a7f5eeabbaf7cc2c64b98ebbb508f109c9587efc8ec58f377b4a78407e81d3deaac68e0bf220e92c1b78705bb
-DIST bam-0.4.0.tar.bz2 164033 BLAKE2B 75c3ccc2c0a22e793ebaf116257ad735db097870b84dd3cb7e9c12068e97b38ae2317c148f04b3d9b45e39a415e595d519d003c6c58af1230ab066538f93e2de SHA512 10ba53b05ac1604a9e9a01f4c008a8cbdc4e4e9df2fc039c8ca59251461e4c5f95770b5b72945d07693db7abe7cd312bc38725686b4d509d5dc21a585fffc810
-DIST bam-0.5.1.tar.gz 258693 BLAKE2B 145016bc9da49942c53d27d191f55d6118343dec725477b494a221fb40050ab165a301c743071bbda294720c481830c223b688d6f214ce8764fc6ad2daea9b68 SHA512 e6f1b3daad6073c58b0e3cbf836bb0a6b66f0c36532d6e6eca9949239ab8b584cc88f892cce6f74974e370a8a688f33a95dde86dd65cc1790e49e5f8aeab0fef
-EBUILD bam-0.4.0-r1.ebuild 974 BLAKE2B 900b4f398acd817aefd98a3ccc771b700a1071fed88124e608382291067c23fc0642a476ce93a170cf67960e6509926b3ec71da8b2eb30dc376a634b61e23b0a SHA512 3d2612e49e962d2ee3c0bbf7126173999d971401a9fca6fa20ad9cbc7a96ae46430ec69ae692ea10d8498e7a0af169ab92e07ce499eafb71a7cfd3da980a1182
-EBUILD bam-0.5.1.ebuild 1006 BLAKE2B 73c0139ff520f8cf0d832ac8e7f2f5554a2f72b5687a52209ffa247a721b6c741d8d6be07c8c1821a51e9e612293f0b82aaa424a9228d31c187f9d91714fbf09 SHA512 6cf51e23bb591ff91a6cb36a2efbe928061ee6c8ac56367f753852daa50807c39604940046d532bec7fe5799874befd16a51bef7c959430e314a98aa6b0df248
-MISC metadata.xml 250 BLAKE2B bd1ea3247aed63356bdac68d882e6cff2c996f3052a4590dd0a404dd0838bdc6b512db7ecef1563aa9d508f995d13d02bdfab7119cc3822b1c75bcd1425283cb SHA512 abe615c77678bf004cbb59192db454cbd48846b5715037375f15dcc44b331da47f462bb625251ef8cb2e06c809dfc8abd69bb997c827ceedbaef6b54128c0834
diff --git a/dev-util/bam/bam-0.4.0-r1.ebuild b/dev-util/bam/bam-0.4.0-r1.ebuild
deleted file mode 100644
index 78b8924a8951..000000000000
--- a/dev-util/bam/bam-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Fast and flexible Lua-based build system"
-HOMEPAGE="https://matricks.github.com/bam/"
-SRC_URI="https://github.com/downloads/matricks/${PN}/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/lua:="
-DEPEND="${RDEPEND}
-	doc? ( ${PYTHON_DEPS} )
-	test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	if use doc || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cp "${FILESDIR}"/${PV}/Makefile "${S}"/Makefile || die "cp failed"
-	epatch "${FILESDIR}"/${PV}/${P}-test.py.patch
-	tc-export CC
-}
-
-src_compile() {
-	emake ${PN}
-	if use doc; then
-		"${PYTHON}" scripts/gendocs.py || die "doc generation failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-	if use doc; then
-		dohtml docs/${PN}{.html,_logo.png}
-	fi
-}
diff --git a/dev-util/bam/bam-0.5.1.ebuild b/dev-util/bam/bam-0.5.1.ebuild
deleted file mode 100644
index 28b19976824f..000000000000
--- a/dev-util/bam/bam-0.5.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs
-
-DESCRIPTION="Fast and flexible Lua-based build system"
-HOMEPAGE="https://matricks.github.com/bam/"
-SRC_URI="https://github.com/matricks/bam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-lang/lua-5.3:="
-DEPEND="${RDEPEND}"
-BDEPEND="doc? (
-		${PYTHON_DEPS}
-		media-gfx/graphviz
-	)
-	test? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	if use doc || use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	# There is no such file licence.txt
-	sed -e '/license\.txt/d' -i scripts/gendocs.py || die
-	tc-export CC
-}
-
-src_compile() {
-	emake ${PN}
-	if use doc; then
-		"${EPYTHON}" scripts/gendocs.py || die "doc generation failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-	if use doc; then
-		dodoc docs/${PN}{.html,_logo.png}
-	fi
-}
diff --git a/dev-util/bam/files/0.4.0/Makefile b/dev-util/bam/files/0.4.0/Makefile
deleted file mode 100644
index d64f43abcd11..000000000000
--- a/dev-util/bam/files/0.4.0/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-LIBS		+= -lm -lpthread -llua -ldl
-TARGETS	= txt2c internal_base bam
-BAM_OBJ	= $(patsubst %.c,%.o,$(wildcard src/*.c))
-TXT2C_LUA	= $(wildcard src/*.lua)
-
-all: $(TARGETS)
-
-txt2c: src/tools/txt2c
-
-internal_base: src/internal_base.h
-
-src/internal_base.h:
-	src/tools/txt2c $(TXT2C_LUA) > src/internal_base.h
-
-bam: txt2c internal_base $(BAM_OBJ)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BAM_OBJ) $(LIBS)
-
-test: $(TARGETS)
-	python scripts/test.py
-
-clean:
-	rm -f $(BAM_OBJ) $(TARGETS) src/internal_base.h src/tools/txt2c
diff --git a/dev-util/bam/files/0.4.0/bam-0.4.0-test.py.patch b/dev-util/bam/files/0.4.0/bam-0.4.0-test.py.patch
deleted file mode 100644
index 5ea2acd3e440..000000000000
--- a/dev-util/bam/files/0.4.0/bam-0.4.0-test.py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/test.py.old	2010-03-22 19:23:23.000000000 +0100
-+++ scripts/test.py	2010-03-22 19:23:43.000000000 +0100
-@@ -178,6 +178,8 @@
- 	print "FAILED TESTS:"
- 	for t in failed_tests:
- 		print "\t"+t
-+	sys.exit(1)
- else:
- 	print "ALL TESTS PASSED!"
-+	sys.exit(0)
- 
diff --git a/dev-util/bam/metadata.xml b/dev-util/bam/metadata.xml
deleted file mode 100644
index 3d17928aa2c6..000000000000
--- a/dev-util/bam/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">downloads/matricks</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index d69a20a33d87..32a30795c5ea 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -5,7 +5,9 @@ AUX bpftrace-0.10.0-no-bpf_detach_kfunc.patch 379 BLAKE2B cb796b682fa5b4a89d4f7e
 AUX bpftrace-0.11.0-install-libs.patch 6063 BLAKE2B c05146ef6d6ffd7fb5e1f97a9ea3dbdbab1b875bcf1707b07ff8c2b93e0e8cd36093330edc32b1d25796a5b72370b114301c1c0db78bc59c48740158e31a8e95 SHA512 e022425af1d19e1ff586f23d7de384b912bf8b67e501b86d31e3450e118ea3266cb81413caa06b3e674a31df2585ad447234e3897c716f055c7423a5f7333a66
 DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B 623369bb2a2ad8d5eec364afa98bdae3fbe5e66182d8f1187fe86a8bd70ee357a554eb063fdbe5476eab23912adf2cf027092cac3e6989d8f716e91aa5d01212 SHA512 da400efe78cea505a32deead594b047ec4394d3eefe86e7b6853fe2dc715c5847a3abcbd26c1fac39d0a534f1e57d6c0bc3625e0c3f1054b0d84b7b1d6eb69b9
 DIST bpftrace-0.11.0.tar.gz 867444 BLAKE2B a99255befadea0b4cb54299a8318c0a7a667ac2258b612750705b4d351ac59f4411f2567bc0100929291e3c9756d276671e41af9d398b118b3d486dace2953d7 SHA512 32bf0c23a7b0e1a57d0e0b8fc845a9e184e201ac3f6018a3d3cee8c97096093b333578cb898ede02fb3ab8d55ba9bcd2bb67ac70b81a49461c0f6e5c03c2a6f5
+DIST bpftrace-0.11.1.tar.gz 867481 BLAKE2B d77e69e21a1cdd65c610b57a8e16d02ff2da69bbb6fd207ff312d2ee3dd4ccbaded205e4b9f16a7ff24177fbc227304ffbb447cd974f44c7828d54f38ad573d5 SHA512 361cedc6ce8a950188717db5ffd005b9709371010810cf6bc870ca945c1db9bdc7ab99b55b694345d580d03145b3eb6ca169f2f1f9909f3e9fc34250df9999f3
 EBUILD bpftrace-0.10.0-r1.ebuild 1676 BLAKE2B 57af40bbdefcc28fc775f7aadeb2d7213b974b130aa51591076354f1f351ecace66d9c1355c99adab7f5cdcf2e711767d1f045f6e076eef2476055d7a0309bd2 SHA512 42b1eefa65583294af9baf692dcd9d8da5577b4e59cdb202b5d0df25e7746acafeac9888ee2c7eac8bff8974edaf4407c9d07e62e47662a02743fc0de0fbc9e5
 EBUILD bpftrace-0.11.0-r1.ebuild 1538 BLAKE2B 7bc25c0281e1e50bf22933c32cb16802a521ea9633e003ca1c6487542ea8ac6f101e932a9c1e163c9f42936c1ef7115f143212aa9275ef0d57187117f2474602 SHA512 0be111921a92d1e6b7c17aa59842a9d06ab6478fd6b86aab7c232b19978541ee3e9b3d5adbefaf57f26272c0276c9ed5dcac53beeb34cdc07cdd7440a4d258d8
+EBUILD bpftrace-0.11.1.ebuild 1538 BLAKE2B 7bc25c0281e1e50bf22933c32cb16802a521ea9633e003ca1c6487542ea8ac6f101e932a9c1e163c9f42936c1ef7115f143212aa9275ef0d57187117f2474602 SHA512 0be111921a92d1e6b7c17aa59842a9d06ab6478fd6b86aab7c232b19978541ee3e9b3d5adbefaf57f26272c0276c9ed5dcac53beeb34cdc07cdd7440a4d258d8
 EBUILD bpftrace-9999.ebuild 1538 BLAKE2B 7bc25c0281e1e50bf22933c32cb16802a521ea9633e003ca1c6487542ea8ac6f101e932a9c1e163c9f42936c1ef7115f143212aa9275ef0d57187117f2474602 SHA512 0be111921a92d1e6b7c17aa59842a9d06ab6478fd6b86aab7c232b19978541ee3e9b3d5adbefaf57f26272c0276c9ed5dcac53beeb34cdc07cdd7440a4d258d8
 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.11.1.ebuild b/dev-util/bpftrace/bpftrace-0.11.1.ebuild
new file mode 100644
index 000000000000..6eeeb6c28d67
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.11.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+
+if [[ ${PV} =~ 9{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
+	BDEPEND=""
+else
+	MY_PV="${PV//_/}"
+	SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="
+	dev-util/systemtap
+	sys-devel/clang:=
+	dev-libs/libbpf:=
+	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+	sys-devel/clang:=
+	>=dev-util/bcc-0.13.0:=
+	virtual/libelf
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="
+	>=dev-util/cmake-3.8
+	sys-devel/flex
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.11.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=11 llvm_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs
+	mycmakeargs=(
+		"-DSTATIC_LINKING:BOOL=OFF"
+		"-DBUILD_TESTING:BOOL=OFF"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index c3a35510ff1c..7f42e7495854 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,5 +1,3 @@
-DIST buildbot-badges-2.8.0.tar.gz 3935 BLAKE2B d5cf4dff1ebcb752b3b82377912d0a6e811d7def94dcf9e6f339a810d67b7eafcc699f4abdf32618aa71f231165e31be57be1834c9d0a8bf40012e66c7f19245 SHA512 2653393de1fa3c6e98d744144190e7f7999cc1955f67467c70609ae6531f5b5f05adc4bc84cce9092deda374103266e24397080998c3d62635bf44dcb8650609
 DIST buildbot-badges-2.8.2.tar.gz 3982 BLAKE2B d2320979c3c8530089ddad3c9c57e9f77576da8979b5834ab7f4e6766c5d210c822e7ab582103e897591db0efc63139dc7cb9f9d834bf81ae199dd25929c6b49 SHA512 e2f6ca0178428db90812633c9af47e8f5c40220f506e62745a150a5572a95f99d3a4115621c29b8188b4b5d48aa3b0bac1862b6c5793cd87a4971798a5aae28a
-EBUILD buildbot-badges-2.8.0.ebuild 934 BLAKE2B d0dcd4eeb7fae46b19a851c03585212352793045f54fa289a48fb085318dcfdfaa75984e8d04e32b1b783b7823f1010db7d00a5af35231ac1b098ecda2dd9e23 SHA512 c4302329a9cbbb3d2be9a353bf8c477ae3b39d7a575bf1fe6d955751e20ddb4e5d1ed82de394c552ddb6015a7066b33db0747bcd4dbcae54a9963994e5f93467
 EBUILD buildbot-badges-2.8.2.ebuild 934 BLAKE2B d0dcd4eeb7fae46b19a851c03585212352793045f54fa289a48fb085318dcfdfaa75984e8d04e32b1b783b7823f1010db7d00a5af35231ac1b098ecda2dd9e23 SHA512 c4302329a9cbbb3d2be9a353bf8c477ae3b39d7a575bf1fe6d955751e20ddb4e5d1ed82de394c552ddb6015a7066b33db0747bcd4dbcae54a9963994e5f93467
 MISC metadata.xml 761 BLAKE2B 5e3b300c2266a8f89672880260926a73744b83141b265f5a6e5ab11f9e2256165762d4371255d58a97c704479f281e160cb42e74269f35d4d623b2937fe8ff05 SHA512 72b794413f121ae9246da5fdf07b730c72949d84cac8fb881dabe31ef283d283afd83b62bcd71de7a6f92f247d07fb5d134f9945273032e2f21469bf9a030f73
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.8.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.8.0.ebuild
deleted file mode 100644
index c59f1ad4227a..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-2.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 1f0803cba861..5da730e89d96 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,7 +1,3 @@
-DIST buildbot-console-view-2.7.0.tar.gz 17939 BLAKE2B 1ea1848f0276bb7ef4adaf63dbe290ad5769689b15898682deed61e9797eb4945047dd26d492b118b75314621bf2777b77e992f1a3129e413c01c17b27b680c1 SHA512 22875fc4c3440892147db7c6ef1eba165a29f4ccd3583827394d0195c72dc8ec3d31940587e4da1f0133def074c72f87bc23bb210189a0e0d028c0be52368107
-DIST buildbot-console-view-2.8.0.tar.gz 18022 BLAKE2B 455ca2a1caed7d55a26d4b176cddf1a571f411dab191eda890698aa1d5150539c620ae90b2d1c5ab70cd47589466ca4534e2da1d1e73ab388761319f81434b39 SHA512 9344021b774f5cecf39384cff869ec0c9778630ec0015d654218ad03d83a18849e1b144dae74f7c85296efac6bbc767f387a1aa4b5271f3996c7e1b177f3b735
 DIST buildbot-console-view-2.8.2.tar.gz 17575 BLAKE2B e036429dd40fdfdadd65a10d4f6fc025b00d9a61153aecd4f31e0c6c133ba1e546b1c810254ec1fb83913cd4434db223c3cd782481ef5785ec48162a2f111682 SHA512 dbec358933865aa79ad86754ef454d89fa369fc64f3df54eb079c0f1ebadb027131d4bd7ac14dd29a16d34aa416e21f90cbecc873944a7ab8ef7da637e20c999
-EBUILD buildbot-console-view-2.7.0.ebuild 970 BLAKE2B 82003d6ab74edb27984e6a909be96c232d59c32807989ed535c51b50ccc3b46ec9c2c3a3f0ab423d88028035a1a47680a673ec27af5e167cde4b0ac4fed6a12c SHA512 c11fdbd0be9e12e6eb11f24d9bd79d93c6a7f6745e8d29b854c06e864753bf633a850aa0b7e09b196f64a7ae4895d67ef0242173d261a87271e55c24f64f7cf5
-EBUILD buildbot-console-view-2.8.0.ebuild 756 BLAKE2B 4efd6cf5e862092bc00e10f8951ba7cd54c9c5619908cb164f20e8b70f8eed9f4dff0a95d1368fc3c8fe7b383bafd1ea5454608939d7d31c1ad6503091795706 SHA512 bc65b167fc41c9869292a7665f14ce5045eb79d7c48115fde3fbce653c45e8e23ed6afe85eabb96e0ae5c7bef4c4729f02c7610001645c31fcbf7dab34520884
 EBUILD buildbot-console-view-2.8.2.ebuild 756 BLAKE2B 4efd6cf5e862092bc00e10f8951ba7cd54c9c5619908cb164f20e8b70f8eed9f4dff0a95d1368fc3c8fe7b383bafd1ea5454608939d7d31c1ad6503091795706 SHA512 bc65b167fc41c9869292a7665f14ce5045eb79d7c48115fde3fbce653c45e8e23ed6afe85eabb96e0ae5c7bef4c4729f02c7610001645c31fcbf7dab34520884
 MISC metadata.xml 660 BLAKE2B dd64f91ba93d64ffa1d1aec035eddab0863d2332664ae9292d54ddb394c3d406ca4f5c55cc4da7e0163563623d27602dbc51656e100e587797653b4fdd01f5b2 SHA512 975022375960d255342c24364513b4352e6eb6ec34ef8f16f8a7c08a978969202660516957eea8f61e4afe13622dec826ad8a5f69673d0cabffb9f52e91e0992
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.7.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.7.0.ebuild
deleted file mode 100644
index df99fe29f95a..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-2.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.8.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.8.0.ebuild
deleted file mode 100644
index 461db8d8fd20..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-2.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 04b94304c77a..bc281d9867aa 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,7 +1,3 @@
-DIST buildbot-grid-view-2.7.0.tar.gz 13342 BLAKE2B f37d7466d346c2db4083bdf0226f405fd48dec73306a91a24d77e38ef4f254bfd3a7b64604a5518f4fce5cd83c00ac4788626e06167cc6fc72f1dd4f31ab16b7 SHA512 a2ffa0ada87a2672b8839516bcf571ab8d884c953459b567fd87c8dbe1c65bdccc862d2bcfd4148f91959b1a942afabdacf98f37f2a0374393b57fe8c09aee04
-DIST buildbot-grid-view-2.8.0.tar.gz 13399 BLAKE2B bfecb49fb3f6b0a9b6147625f6214f2b4c3dd76ebb2698af3e49526d0a6a1241ddf519fa8d612c37e5f12f8c11f673db2a2aa4558bd503834ea3f167d880f631 SHA512 2466130b2227de378a005c0cd6086de3d58c96339bd4f662b3da78ee275cc24dad82388b5f7798a20bb921d76e01a69802dca14feff6213677a89a279e93245f
 DIST buildbot-grid-view-2.8.2.tar.gz 13373 BLAKE2B 0a7a73011655e9a57574575943a3560c395ca4358c0f2169def8413a60f8381644512a227b54f016b23e6dcd18641d1ea7a3295f6c0a983c6f3caa9ab1dda60d SHA512 9b136d96f5a38f0d28f6c37db6269e039eca0cff5bbc7d75d43346566ba2e9f7924e453098f4777792429a7a9bbbb5e02c34a9b81e131d40dc3e339f4dd377f1
-EBUILD buildbot-grid-view-2.7.0.ebuild 971 BLAKE2B 4718358889543a5c5080e754545927975ed1ca5b507671e79669c24b42b369f19b2ec9517765886ff5e6acb3644a8adaead1466fbf8e9d02c2bf8f4522555b3d SHA512 393978409823602087a1ea8cc8fbea175eaf17ab21d6958d4ecfc5b41312390bf376899ae92eec450dc04f946bd52a4718fa1a7cd399fe9913e36b3cf56095df
-EBUILD buildbot-grid-view-2.8.0.ebuild 757 BLAKE2B 19309fc37c0f499a196327984a3154e26e289d94dfa3ef194eb8e8901a895411f85a069850995209fed20b55971d5fef2001b409d7e6f58ee58cc3b507ec81ce SHA512 6c34f80ba22ab5c3d33d3b99a9fe4292ae0313a8ebb99bf660c73a228de78c3dde3288c68005f52f5b497c69c04c27f160db8c6550b49609dd9a6b2a8b9d0da9
 EBUILD buildbot-grid-view-2.8.2.ebuild 757 BLAKE2B 19309fc37c0f499a196327984a3154e26e289d94dfa3ef194eb8e8901a895411f85a069850995209fed20b55971d5fef2001b409d7e6f58ee58cc3b507ec81ce SHA512 6c34f80ba22ab5c3d33d3b99a9fe4292ae0313a8ebb99bf660c73a228de78c3dde3288c68005f52f5b497c69c04c27f160db8c6550b49609dd9a6b2a8b9d0da9
 MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.7.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.7.0.ebuild
deleted file mode 100644
index 20e61ded8bd7..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-2.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.0.ebuild
deleted file mode 100644
index d598731012b9..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 0b497330671c..821b254c9730 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,7 +1,3 @@
-DIST buildbot-pkg-2.7.0.tar.gz 4754 BLAKE2B 568c59e9ba60fb2a221794ea7cba44d0a1fb1f4e41368dfcc9199208733fdacb8052a90b64368e8cf5bd906c02ff2d4fddd65dfe4ea117566f176924d4dec621 SHA512 9a6b67dbee28ed352671c2da3b14a416761f49bee2e77cf7f55936cbd4556e5509a420c13c7d4d88756e01de8e1268e08b43fa48ac0cf6a00dbff8566042a33b
-DIST buildbot-pkg-2.8.0.tar.gz 4768 BLAKE2B c07e7a46681319ebf2d5bdc1a2228218d9b48378cb877277b1e9c88285f4ac4246eea4cea8018d652b8beba01587ccd9c5e25464645f283ba7e8400c7a8efbe4 SHA512 962b1b8c56d15ad3b40148d2802630b34f808d7699747e8c97c9a5f48c7b4cdf6762c4994da4fb1a495ae9fa9fa1e1ee2d5076b4eaeb593f9c2090d2329c03cc
 DIST buildbot-pkg-2.8.2.tar.gz 4736 BLAKE2B afbd5213b51240845f8becfcc727dc3280aa1510dd62305a5e029099da4f8e7cbbf749365baba568a2205354205e97dbdbff78a1740e464164e0c2bbc3148194 SHA512 611b5600df181adfbbe203947c36ad64a99c10c6c63c0f4e65ffd2ae4551f2d879559007b59302434cd1a2ae915a2a7125afb90f6c896110ebf514212434a2a7
-EBUILD buildbot-pkg-2.7.0.ebuild 870 BLAKE2B 4e53bd1ed3e5d0700da2d572dd291212076bc0f647ad1713a04e30816e137790ad918b615670230da705edeae4c99e442096690ca29a11e99776438d401561cb SHA512 f7dcf812c9fd1c2ed17999c7309852c25dd6d85d8a5f9122196d2a346feb6c5e1a196cbec4a9f5cda3efe2b6f0ddc18fd425eb50dea3f74ac67eb7249fcf2de1
-EBUILD buildbot-pkg-2.8.0.ebuild 697 BLAKE2B 180e58c11212eb4959cf774e6b573374d8ef435d10b08e3968479a0d78deac119ed09603fc3f3cc7d097792ba8c4504841d8efc8d54d83df6490c4cf45d1d193 SHA512 ba6850ef6aa66485dc2c1f32b599f17662c93e84e7213ee929946a2d0db4bced437bcf7333860da0089969234743367158c4628ae72e88ad04f0d0e383d6efa7
 EBUILD buildbot-pkg-2.8.2.ebuild 697 BLAKE2B 180e58c11212eb4959cf774e6b573374d8ef435d10b08e3968479a0d78deac119ed09603fc3f3cc7d097792ba8c4504841d8efc8d54d83df6490c4cf45d1d193 SHA512 ba6850ef6aa66485dc2c1f32b599f17662c93e84e7213ee929946a2d0db4bced437bcf7333860da0089969234743367158c4628ae72e88ad04f0d0e383d6efa7
 MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.7.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.7.0.ebuild
deleted file mode 100644
index b037354c93c1..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-2.7.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.8.0.ebuild
deleted file mode 100644
index 24f94f8cc0d5..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-2.8.0.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"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index ad9af55c9402..98b63aef0fce 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,7 +1,3 @@
-DIST buildbot-waterfall-view-2.7.0.tar.gz 191009 BLAKE2B 1730bc7caef0aa405ea0adf0585ec50f94b162286daa14755b6070af22d417a9a1b756ade226ac9950d7c0f9eed96c22817ba71cce5b6bb9a344c4dbed989c09 SHA512 7327766532062dc5dd09b210914af9d0e1ecffa6a0d94917cfff93274627f5896552fe191003f1895208702f83670f202b4fc735d0d9161c9efa3419dc46b12b
-DIST buildbot-waterfall-view-2.8.0.tar.gz 190508 BLAKE2B 3f406648c44d4717872056a5e4c048bcf50b9c2865427052a920c530ab3da1dfb622513fc12676d60a0553408310a233b591591b447ebe990bae539209fbffe6 SHA512 93b455fcfdb28e32267b77c6a379e59de063bcbd244225cab589b16e688d31184505de0645330ae8d3033014df124f3fb5803d3f0f2b6c941c49727716c820c0
 DIST buildbot-waterfall-view-2.8.2.tar.gz 190551 BLAKE2B 9db81d1cf17357a57c34eb8f3b1e4412635c4804708d3d99646a68293af52594952884f96f7d528c6a87302c3563a8d4f4411ed410da2fe1043b4439d4113d73 SHA512 e252874745a623c1ec8fefcfb10c742a783ec677f172d20ef8165687ec5981f4df09092096f7922381e886f4ea7ba4c795997ad8ff8fd58fd6aa40d8bc057b00
-EBUILD buildbot-waterfall-view-2.7.0.ebuild 950 BLAKE2B 421a2f6c248e518597353a533280a75a21f64d5272b76cfcb9c5d4ff4af2e604397b6fe52febc5871f972fd972842d490d38a3664ef395a072ba6d5396bb6e83 SHA512 5c78349930dd79ea931e126014a8f12f2c5eb013be1926e5bfdb1ce01aa994c1a64cef98d6254852d9921b65b9a253be3aacc480e4a512b1ff04a31edae72828
-EBUILD buildbot-waterfall-view-2.8.0.ebuild 737 BLAKE2B 2605c7faef8d318b3102ce2db0d28697146778a1015cdd6ec2f733e454b60c4d4af6b57d91efc3250344e62a459b77fcbb24f3e700e4b49c3fc914ed91aed7c3 SHA512 86800c7957c85078d5437df0b2d14bd46a02a1c89f5e6a7b1051bf0cc4a1b30ddcb575a818b6d95b3b6c97fe37c9f7e1d401e85be48ee6820cb45266ef5a7ab1
 EBUILD buildbot-waterfall-view-2.8.2.ebuild 737 BLAKE2B 2605c7faef8d318b3102ce2db0d28697146778a1015cdd6ec2f733e454b60c4d4af6b57d91efc3250344e62a459b77fcbb24f3e700e4b49c3fc914ed91aed7c3 SHA512 86800c7957c85078d5437df0b2d14bd46a02a1c89f5e6a7b1051bf0cc4a1b30ddcb575a818b6d95b3b6c97fe37c9f7e1d401e85be48ee6820cb45266ef5a7ab1
 MISC metadata.xml 680 BLAKE2B 47bfc9bb17933438a0c3ec478c1dad7da7f398cde2133ab96c472d0665e563f4d5c8d09ba04bcdccf820603cf3dcc18086b1e217aa86f7ae4d8067178922020b SHA512 266fd7fb76a1373c9342b438487d73a319209f320097981041bae9cf3892dc9d091fd253532457328a3f6f52ec37b0a0e6cd1119c6800de42bf19d7fc6054133
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.7.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.7.0.ebuild
deleted file mode 100644
index 193d88c66e7a..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.0.ebuild
deleted file mode 100644
index 8e4b9cc0d871..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-	KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index e5dfb63989a3..1ca9c4bdec2c 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,11 +1,7 @@
 AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7d8b6cb23cfeee84bcff31b99a6bf2e81bbc467db340a774a43be6a2f7fc3c03068df09dd6164fc9e8050d SHA512 4a1b6d78b51067b5d3efb8de18d91995efb820bf9486c6ad6acd5bf726e39c3a7746cc9fb90b5a07eda8a40b09988490972b11707026d951184660a21fddccc1
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
-DIST buildbot-worker-2.7.0.tar.gz 101075 BLAKE2B 2ee82434f565bef111685712b9b4dd7b0c522de59eefe3eda672827e4bcffae8288c5b9842221b52aa7d5907eeadd4bc5c635382b8c6c4e82977b3c139afdd4b SHA512 bdfce0a7b222fdddbf7830f90c1775e2bded7080e5053b114b7c136b3e114f6c8b26ee4ad802fce66514524e29e863a2f1a4366758c59ebbc6eeadb4b0a271db
-DIST buildbot-worker-2.8.0.tar.gz 102605 BLAKE2B 4cd6d8755803d7649acaf1b45e6632a7a9bddd8a58590a8caa73f686584fedf62d98911a9e148e5a6f34c99b8551cd80c2acbd03fc4f892300cad89a4f68e0b8 SHA512 62f3a72ed7d7ca724b667528e55673c20382ed95abc898dc43e43c5e09bc1d8116eeb2791145097a9b9f7ab2d38a90d974dfbbf5697d8c045a630632ece8512e
 DIST buildbot-worker-2.8.2.tar.gz 101707 BLAKE2B 451dff979c6934bf6dd4e1579abbe18e9cf43551c906bd516c788a6a5f6170650a5468927bec0a8d4ab242e5886247406b2e098e1908a8d9b5777744982c7be6 SHA512 0628825ac023a66cd249dc6b42ff2f3ad3b5c0cb97561fd332ce4775abaa5368a8b7b636115259ab4aa842c811178c9b641ef4453b06167315eb81117ffef815
-EBUILD buildbot-worker-2.7.0.ebuild 4824 BLAKE2B 89494ddf6d8a70d022bea3ee54ea7366cdceb698daa31225ce47b68ae07b3f0546b2607f7c53e7123cf0272c210d94fccd351010a0fb018510dd25fc9006baf5 SHA512 3ba8a04299340a2e372e2455f0e80edd81067281131f9f1673f803ff740ab7cb423ce3c24929bdcc6bbf03e87e99bedcad3f1127cb9bcfd046047dd82e83700e
-EBUILD buildbot-worker-2.8.0.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
 EBUILD buildbot-worker-2.8.2.ebuild 4614 BLAKE2B c42112272244fb8a1da208eaa6e3583d98b4465bfa39c2240012eeb4243fd6a5edf59321a54bc72f0918d353a43c0d89062fdeb523b7a5bc9078c6ef86475d80 SHA512 b655a8a68739e287f2f2e4a19ad22f3567801982342d491d0c75e949d0d7671869b0b624d8cf2c1d2f4003eb3a97938d893654c780939de6256f7706556b5bee
 EBUILD buildbot-worker-9999.ebuild 4619 BLAKE2B a88900d63e3fb4e3b51e31b4736cacd7bc8f60a3aa7f27f6bd6200e9fa788147ad4073d5aea22ec55cc1a54148f87dda3de5f0953cac31f3152fba10d8399012 SHA512 79bdf14db42b15492932d100ee01c3bf043f7ad01dc72d35d68152d95601359aaee73b8661ada31d490218f5081465b7dac5c649aa2a704373e9bbe18426fa3f
 MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
deleted file mode 100644
index be5258cd9984..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-2.7.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-[[ ${PV} == *9999 ]] && S=${S}/worker
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.8.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.0.ebuild
deleted file mode 100644
index 3bd934a50342..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-2.8.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index b0948e8f6e9f..5c2abd7f7201 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,7 +1,3 @@
-DIST buildbot-wsgi-dashboards-2.7.0.tar.gz 5573 BLAKE2B e50576da2a86c3f63435c6ca721c0756e1bbe004e82a750d4f0a03799cde4b6c8db7a5199842ce46a835614ccfb588b4eca20035988f54c7d1b6dc9c43f31823 SHA512 018a103fd53f6c3fdca418a46d8576c6b1fd35c05b1cd2ef2dc2c8d30540fbf1528501369246c49d64cfc2d795bcb528fb672f0536a0239f64b87616c50c18c9
-DIST buildbot-wsgi-dashboards-2.8.0.tar.gz 5576 BLAKE2B cad5d728ab7811b6e5f0750dd4e74ad25ac92c72a8e5f58beed0c19ba38de1599f5f5977c087acfbf2a138e41aa927ded54fd7ff9f1719de46560e814bb3320a SHA512 98217a351b0d441ab346d385b8b72333d100c33f40812f2c248a893a31e9ca157cc9e19048ed5a6e49283bdd9dd15ddbf5f16fd9e47ec5a63fedc959a93f1a33
 DIST buildbot-wsgi-dashboards-2.8.2.tar.gz 5566 BLAKE2B 487b816862366acae9e55c39cb440a21c8e5c438299c43e2d6fad049ff946ece5ab647390955fbbad403ad1d7c0a2707a7612129442dc398cc7210d831aa49ef SHA512 2b75a61331aa457b3f168e1955b8905f95d11008ab6bee611ac92488f988cb0cf73fbf92321e594ac0a6e5ae03b82dfa05daab5a0647ae636a96922c0f4e8eff
-EBUILD buildbot-wsgi-dashboards-2.7.0.ebuild 997 BLAKE2B aea4b3352b6a2800846f11d2b2aae38d45cb7900bac975e2eff8dbee47b840fc235da2f6985c1d5396ce7a0a8a99726a09d26b9d357e26e844f410bb8eab4701 SHA512 1e12927a4530ceb2528f84c094e12a2761a5b94df7c3002d2b58cb1a358e4261dbd8480f1c5480866567da8a4b142c54cee26b493404570ab0a44ea697336cdb
-EBUILD buildbot-wsgi-dashboards-2.8.0.ebuild 783 BLAKE2B e86d4cd37741844a6a73194d8dbf87940cc4002db9d29f1d533d9be8f085e051d625369ae2ca4139c70e23e7feceff253c34a3cb659b18138546ac9fba5d6f59 SHA512 2341b355fb3868fc0f488c9a8b378e67b0e9ffcfa973628f235686467623f50c57d1e554f3781ea476a77dcf580bc3399e53d110cd39bd9a364ed83fc1c39884
 EBUILD buildbot-wsgi-dashboards-2.8.2.ebuild 783 BLAKE2B e86d4cd37741844a6a73194d8dbf87940cc4002db9d29f1d533d9be8f085e051d625369ae2ca4139c70e23e7feceff253c34a3cb659b18138546ac9fba5d6f59 SHA512 2341b355fb3868fc0f488c9a8b378e67b0e9ffcfa973628f235686467623f50c57d1e554f3781ea476a77dcf580bc3399e53d110cd39bd9a364ed83fc1c39884
 MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.7.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.7.0.ebuild
deleted file mode 100644
index 631f56af346d..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.0.ebuild
deleted file mode 100644
index f124a0ef5c54..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 2aa5d10b9bcc..0f2708e7f07f 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,7 +1,3 @@
-DIST buildbot-www-2.7.0.tar.gz 3173804 BLAKE2B ac51e6b8c6860dfd98647cacd5a300099bee19b64bb796e8643fab149c96604bb63a565a25eea51dbdc458128cd4c431efbf46069f2ee0adf5f835992d860e5f SHA512 530c2e3926dbec743b9dbc3ed38ba32c421ee265dc5ff48618748a547b0e8da4d7064e6afa379a8187ec189f8031c1e24b99576d276bc5eab4ad1c6a5bc27a84
-DIST buildbot-www-2.8.0.tar.gz 3174211 BLAKE2B 32463f0456ba3fbc5eefd067bcffc4021e1b1dbe95d3a68b1a52c1657317c883a49c6b5baa0696f1bc90c7a519406eb6a4b0797e9c48f28d021cbd4480d80ff9 SHA512 916fe250f14bcc2cfdfe6d54d426c523b6a093e13ec60be65b93e3dcad2bf919d091b9b4ecd797e0d616c8bb6cd02974ee9d66931031d8e614740bb9f816fb16
 DIST buildbot-www-2.8.2.tar.gz 3172352 BLAKE2B 8ead9e9eb046bf773bd70d312ae612dced839b263b02d300f600d066fcf21ef98a7884fef36c494bdc8eb26129d5bf7897c319256f0fe6ef8e1515dc8507a26e SHA512 22d0ccb3e5b3badeb5a59db18dd7b0b925fe84936c1be1773437e899122df95bc9b0a4205a0c87182cf6be4ca4275ab20cb86a4da6098c9d9c73927cb9b3c784
-EBUILD buildbot-www-2.7.0.ebuild 898 BLAKE2B 208e8a8b89a9373a60e34502f08b81b6cd3a3bf93b5fa96b23eeb31b54ffe2a7b68cc22a57400d05688af492658d3141718b4e71a4bc355cf75998d13a22c5f5 SHA512 003cfc4e9a053e4ad986adceba39272293f67a8852658988a0987cf919206e672de274e8aad439b40163cf64480df5bd47e1bfaadb2b849901907a9d38350c54
-EBUILD buildbot-www-2.8.0.ebuild 684 BLAKE2B 039407715092e067fdbce4aa6ec39c384e359947513c1013b2ad85bc50150d2cbbc56936fe1296f15a3187a1df48349c821adbe77ca61d233dfd64b281f363b0 SHA512 22bd07189fb594572729155b7cb57e4d3cd95a81d7b29526835f2434dd7845491c2b9e68c403d0a53b597b31152492ace54a5e71330f3104772a44a2db440fa0
 EBUILD buildbot-www-2.8.2.ebuild 684 BLAKE2B 039407715092e067fdbce4aa6ec39c384e359947513c1013b2ad85bc50150d2cbbc56936fe1296f15a3187a1df48349c821adbe77ca61d233dfd64b281f363b0 SHA512 22bd07189fb594572729155b7cb57e4d3cd95a81d7b29526835f2434dd7845491c2b9e68c403d0a53b597b31152492ace54a5e71330f3104772a44a2db440fa0
 MISC metadata.xml 666 BLAKE2B 2fc8d01c607e9f1fc0de5d151e0256fd7adbc1572d2497126012b0792967dbafe2522b269232a72c5208a5c0a6b9eddb9094afdde5d99d4b27995ad506c08f03 SHA512 1d00795d602f0df5e1dac771d38dc068e80edd098add25231bafb11d0f8d2ce783e884e41c3b0eba1a52fc2dac26a62f4c1c29603e20d6cb0af7c6977f437907
diff --git a/dev-util/buildbot-www/buildbot-www-2.7.0.ebuild b/dev-util/buildbot-www/buildbot-www-2.7.0.ebuild
deleted file mode 100644
index 162aae2c188c..000000000000
--- a/dev-util/buildbot-www/buildbot-www-2.7.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-#[[ ${PV} == *9999 ]] && S=${S}/www/base
diff --git a/dev-util/buildbot-www/buildbot-www-2.8.0.ebuild b/dev-util/buildbot-www/buildbot-www-2.8.0.ebuild
deleted file mode 100644
index c5f7aebcb28c..000000000000
--- a/dev-util/buildbot-www/buildbot-www-2.8.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-DEPEND="
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 114ed5cb84a7..3a4da2068b49 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,18 +1,11 @@
-AUX Add-gentoo-to-the-VERSION_ID-check-exclusion.patch 1137 BLAKE2B 0ced9724aafd4511542248846364011fc022b06016a329225c3203e4e932db0932d60ece526b095b60a30acfce0e700d8bfedaccf8d30c75b3c38a9e85b51814 SHA512 6e774541b8b2b229eb29171f78a46cd93f6c01056d410e0423ca757f5e5b956a4e29bb4a7b0c38d281e3afe126423e65bde8e367657fb663cb01ebc8c6f2c622
-AUX buildbot-2.8.0.fakedb.patch 358 BLAKE2B ad4066e76acd5ab17c487c7d56f388fb6d0d4fc147656fb7c3df36519e93a11d1f7f97cfb3c7e16c299d92a83fe71b24bb45d8ffaab106ca8d2b711d8f7802fe SHA512 1a3389cf5de1a43294a5eefe967246fd52d796627b92b2d6ab28de4b3394786945743cf76fbda1699e8291ed639fe2f7616db13b16fb369554798793cb5ecd81
 AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
 AUX buildmaster.initd 1654 BLAKE2B baec16ceb91386629cc9ea0b22118dd3dd76ec6f50a1ced00ca246fd8b0e5df96d9ccb75620d4e8a96560f99a3a2ceaf8e113172a9ed4de238dc21c955470bec SHA512 a036559f61bd7d8f5834e9e9cc6bfaa7e8b70a694c6344482449c29c8168a34ecc180c908e7aab6b722e1487c51a53928693c0dcfbfd016622781bcfdb7d5d7b
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
 AUX pypugjs-2.8.0.patch 3633 BLAKE2B de243262e4631e7ce3b3208d4f3acc7c7857375c4e938809d18ed65c1dcd2aa8abbdf0339fe278a329bc734220a21cf85f772b81e0284d42cf3c66599902a0e1 SHA512 c847026d0658d61ac617b7471a09fc0ae4f70fdf82bd1c79d460c0dfc9beb060081073b260aed2cdb5f2092746146dbe12787589f311bce6857a2769ccfa1e13
-AUX pypugjs.patch 3631 BLAKE2B 168c865da59c947a00f4025108ff9fdedba55a9ce3a588e7fbe3f77d10dc88434baf8690edc4e5318d87c7823a551f2d796fd47b42cb0facb8cddfa29f6354bb SHA512 1ea242249f44ed1ea958e2771ce14f7cbeac6bbaec4e7bf803a38e2e386d604efbfe1158bbb0151d29a8891f55142ca0a0191063051f2ec56c3c3f053ccb2d8e
-DIST buildbot-2.7.0.tar.gz 3175050 BLAKE2B 0a41eccaa4ca8df6396455049e8c09a1b2fe6cde3072da7fd3715f2769015944e8880f41dbe6750dd7b26bd863fb82f8e8d8c6540f9e1bf3ea4378f11adc973d SHA512 9946fe0b1591d51e5136d9458526918e872174afee79b5f1c333823ef1d2ddae66f017e9b57e26a2451da7ca7672720f32544c606ce5652d0825fae563779669
 DIST buildbot-2.8.0-fakedb.tar.xz 16204 BLAKE2B 741676e2c9117b1ab174ce49747bdfcd07766ad3e471e308398dff476f167fd231b7772c2f02002cbafb27e2ef535242d84d5aa84f4bc8942d4d216b2d5bf1f6 SHA512 c2b00d8621b3a1e521f6c17e902ae331b606dda3d319187895f26629dbdaf50caefc5d49fb150fb780e682ae431515c7ded4950d62448e8a73b8efba821c0fa1
-DIST buildbot-2.8.0.tar.gz 3162882 BLAKE2B 19789f1fe9f572c978a1843a98cd01d752a614d89eb29f2de9db750808d1f96d7893b39d703f37cc0e81e022267c08603c86d59a5902d65194e236f7170d6b30 SHA512 18af8fe1bda6f7014f514bfd112ccf9837194c0e42cbdabaaa6c6202660670964421feff3e92e9dca4cf960f69a4bde9b3666287b54ef7e912284a0471dcc2b6
 DIST buildbot-2.8.2.tar.gz 3181035 BLAKE2B 40a3e424cc03c982549f25993a4abd2fe04bdc089ad22288af4d25724972f9f3541ef32549d2761c808845df44a972b00cf631adfc564bf4852c4b6b6ab14404 SHA512 7d7f15becc7fc1803ae4e9f1906d547c89dfe1efaa51e8fda0674a3d9b060bafbaae4cb671ec844750313247edb73f17c9014c545bce58070df0ca322a0fd9a2
-EBUILD buildbot-2.7.0.ebuild 6974 BLAKE2B 0a847a75805dd0342a55f46640c4f01f9982eefa2cc1aeb00b15c85a5bad0a958761bcc9f508f03545be943e51e2896493c590c69f50e64691480b1916413ff2 SHA512 1e63016e5593a2135c92b2072181fb714d16bc383d88d9fc9513c30ab5a60af6b2bf6d94b2f5c25bfeba31b119ff4e45ab7f5291d950fa373a03e4c1caf6f315
-EBUILD buildbot-2.8.0.ebuild 7458 BLAKE2B 5c5c805eb70bb4eccd7f7283951a6e0c39d0bec01b79866ff8bebcee043ce086faae455feffc722a82373390092edb3a79a0cbc522111fb2b160aec0fdce13f7 SHA512 36ce0b760b6b7705fb8ea1149c1580529bfce1ae1d9ea07ece8b8aa642439f3726ddf79f35e9494b531b533bf0fe98e82d018409f658ba696efb54ea73e91754
 EBUILD buildbot-2.8.2-r1.ebuild 7150 BLAKE2B ce82918388f2e96e42448bfab5e1ce342ba5399d6cef53d0143132413bc4740622c8902431d4f603ea2b8c6c6c73be682e15ac07b4da12892654f779fc417602 SHA512 ecbd1a1a60a7492e0390006360e790aff3df2b454131da427876595748b6f0d0afd4caab5aef993aed1e38b54271e04626c340830c35cdf7b450a70be019cf37
 EBUILD buildbot-9999.ebuild 7065 BLAKE2B 582634c656ab3f3b211c0894c3be6b7e96804fd4ce88fc0a3d640c5f40a4a01ee436cab144541ae3f0208b4ac8122ad5b0aff8605fc40b29b20e759e1bfa8aec SHA512 5f3182f5aed253d0605234d53879ef99fd23938033c50a86d5a3a96424a595720f4bbd91dcc2059954b0917f1c18624de345cbd6bc484df1f0b7178a67710a52
 MISC metadata.xml 1359 BLAKE2B 33a6b0f21ad4255f28bc527fb18a384889eb34b2ddc5df5cfa03cc4b1960712b91c787706b95913154300b8e82a5879703dd90d0bf4d796cd6b8bb2a7c4b71cd SHA512 ded6f9cd25bef2df1431b71d5ffc9f0aa3efe9d2f7433cee7800fc27e1f6f76ad64cda9bbc4d3eb3fe0f44dbd7414c75b029f78307925dab5ed06df3d52d86e7
diff --git a/dev-util/buildbot/buildbot-2.7.0.ebuild b/dev-util/buildbot/buildbot-2.7.0.ebuild
deleted file mode 100644
index 01fd9b609492..000000000000
--- a/dev-util/buildbot/buildbot-2.7.0.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-fi
-
-IUSE="crypt docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		<dev-python/idna-2.9[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-		crypt? (
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-			>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-			<dev-python/idna-2.9[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		)
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-if [[ ${PV} != *9999 ]]; then
-	PATCHES=(
-		"${FILESDIR}/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch"
-		"${FILESDIR}/pypugjs.patch"
-	)
-fi
-
-distutils_enable_tests setup.py
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-2.8.0.ebuild b/dev-util/buildbot/buildbot-2.8.0.ebuild
deleted file mode 100644
index 1de7b0513a29..000000000000
--- a/dev-util/buildbot/buildbot-2.8.0.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-
-IUSE="crypt doc docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		<dev-python/idna-2.9[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-		crypt? (
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-			>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-			<dev-python/idna-2.9[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		)
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-		"${FILESDIR}/pypugjs-2.8.0.patch"
-		"${FILESDIR}/buildbot-2.8.0.fakedb.patch"
-)
-
-distutils_enable_tests setup.py
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		HTML_DOCS=( docs/_build/html/ )
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch b/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch
deleted file mode 100644
index 16fc0a133e10..000000000000
--- a/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f8d6fe39570a698d80d821a440219f5cd79d8314 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 5 Mar 2019 11:21:14 -0800
-Subject: [PATCH] test_buildbot_net_usage.py: Add "gentoo" to the VERSION_ID check exclusion
-
-Make the exclusions test into a list (slight speed improvement, easier to extend) and add "gentoo".
-
-Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
----
- buildbot/test/unit/test_buildbot_net_usage_data.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/buildbot/test/unit/test_buildbot_net_usage_data.py b/buildbot/test/unit/test_buildbot_net_usage_data.py
-index c347956..e422c55 100644
---- a/buildbot/test/unit/test_buildbot_net_usage_data.py
-+++ b/buildbot/test/unit/test_buildbot_net_usage_data.py
-@@ -150,5 +150,5 @@ class Tests(unittest.TestCase):
-         self.assertEqual(len(distro), 2)
-         self.assertNotIn("unknown", distro[0])
-         # Rolling distributions like Arch Linux (arch) does not have VERSION_ID
--        if distro[0] != "arch":
-+        if distro[0] not in ["arch", "gentoo"]:
-             self.assertNotIn("unknown", distro[1])
---
-libgit2 0.99.0
-
diff --git a/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch b/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch
deleted file mode 100644
index 2ce217b0d2e4..000000000000
--- a/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py	2020-06-01 15:14:03.169026527 -0700
-+++ b/setup.py	2020-06-01 15:17:38.619177059 -0700
-@@ -194,6 +194,7 @@
-         "buildbot.test",
-         "buildbot.test.util",
-         "buildbot.test.fake",
-+        "buildbot.test.fakedb",
-         "buildbot.test.fuzz",
-         "buildbot.test.integration",
-         "buildbot.test.integration.interop",
diff --git a/dev-util/buildbot/files/pypugjs.patch b/dev-util/buildbot/files/pypugjs.patch
deleted file mode 100644
index 3ac99502b5d5..000000000000
--- a/dev-util/buildbot/files/pypugjs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 26fefa8f8fa7b347e1c86723194de3a4094dc012 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sat, 25 Apr 2020 11:53:06 -0700
-Subject: [PATCH] Initial pyjade port to pypugjs
-
----
- common/code_spelling_ignore_words.txt        |  1 +
- master/buildbot/test/unit/test_www_config.py |  8 ++++----
- master/buildbot/www/config.py                | 10 +++++-----
- master/docs/manual/configuration/www.rst     | 10 ++++++----
- master/docs/spelling_wordlist.txt            |  2 +-
- master/setup.py                              |  4 ++--
- requirements-ci.txt                          |  2 +-
- 7 files changed, 20 insertions(+), 17 deletions(-)
-
-diff --git a/buildbot/test/unit/test_www_config.py b/buildbot/test/unit/test_www_config.py
-index 23a108e..a8c24ec 100644
---- a/buildbot/test/unit/test_www_config.py
-+++ b/buildbot/test/unit/test_www_config.py
-@@ -107,10 +107,10 @@ class IndexResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
-     def test_parseCustomTemplateDir(self):
-         exp = {'views/builds.html': '<div>\n</div>'}
-         try:
--            # we make the test work if pyjade is present or note
--            # It is better than just skip if pyjade is not there
--            import pyjade  # pylint: disable=import-outside-toplevel
--            [pyjade]
-+            # we make the test work if pypugjs is present or note
-+            # It is better than just skip if pypugjs is not there
-+            import pypugjs  # pylint: disable=import-outside-toplevel
-+            [pypugjs]
-             exp.update({'plugin/views/plugin.html':
-                         '<div class="myclass"><pre>this is customized</pre></div>'})
-         except ImportError:
-diff --git a/buildbot/www/config.py b/buildbot/www/config.py
-index a021299..50bae4d 100644
---- config.py	2020-02-27 13:34:10.000000000 -0800
-+++ config2.py	2020-05-11 17:26:44.587026761 -0700
-@@ -61,12 +61,12 @@
-         res = {}
-         allowed_ext = [".html"]
-         try:
--            import pyjade   # pylint: disable=import-outside-toplevel
-+            import pypugjs   # pylint: disable=import-outside-toplevel
-             allowed_ext.append(".jade")
-         except ImportError:  # pragma: no cover
--            log.msg("pyjade not installed. Ignoring .jade files from %s" %
-+            log.msg("pypugjs not installed. Ignoring .jade files from %s" %
-                     (template_dir,))
--            pyjade = None
-+            pypugjs = None
-         for root, dirs, files in os.walk(template_dir):
-             if root == template_dir:
-                 template_name = posixpath.join("views", "%s.html")
-@@ -86,9 +86,9 @@
-                 elif ext == ".jade":
-                     with open(fn) as f:
-                         jade = f.read()
--                        parser = pyjade.parser.Parser(jade)
-+                        parser = pypugjs.parser.Parser(jade)
-                         block = parser.parse()
--                        compiler = pyjade.ext.html.Compiler(
-+                        compiler = pypugjs.ext.html.Compiler(
-                             block, pretty=False)
-                         html = compiler.compile()
-                 res[template_name % (basename,)] = html
-diff --git a/setup.py b/master/setup.py
-index 8fca506..1f32a74 100755
---- a/setup.py
-+++ b/setup.py
-@@ -490,8 +490,8 @@ test_deps = [
-     # http client libraries
-     'treq',
-     'txrequests',
--    # pyjade required for custom templates tests
--    'pyjade',
-+    # pypugjs required for custom templates tests
-+    'pypugjs',
-     # boto3 and moto required for running EC2 tests
-     'boto3',
-     'moto',
---
-libgit2 0.99.0
-
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 15dd13862396..5aab5242a72b 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,7 +1,5 @@
-DIST byacc-20191125.tgz 871913 BLAKE2B b779fd05a98bc794544d84568720979ede374c7c821f3883e2568dd97bb2ded2dbc85471f5dadb7aa2953d9cc9665f4f1f18b77717aa63eae0786f70683fd9b7 SHA512 ef35ec6a294b07c71958dbd7106cc9b4a99d0eb45336d71c2763b3861a2cf97ed1de7f8c242a5eeb2841578711ed4a0bd874b7d6ac5e63db7f1d418847767c7f
 DIST byacc-20200330.tgz 872217 BLAKE2B 870ac1eeb439c96875e343223925414115b500d5b22ccdae9d7b30830ff6805d18d5bc43ec6f7ae1237ec500cfa1693aefad6e9607cfcc74188b541abfd16595 SHA512 df8cc1aa550d633ab547a13a4f091d8c940a9a67b52dc5ecacad5b005fd54c3ceb1269593068c1a7949049e85b6e6eea20cffbbf4b408e049fde75c0ffe51f07
 DIST byacc-20200910.tgz 871242 BLAKE2B de0f63b9edfb9451e23d7693daaea59f2661305a6727cd8e986c2557e513ca5dda8f0008d05b5c8f35a153a309bc4b02ecd6f45219bb553f928c9da11b616130 SHA512 491bbde2d5b0fdf2ad57bec5080112ad7c12ce3830b5e14f2289092aad1addae6edd4698368a9c8d69219a95ae5fa47eb32a95a2625841915297972591bebea3
-EBUILD byacc-20191125.ebuild 615 BLAKE2B ab2446c14262888052f7d370a0c2c104eaa7430ef9b95a4c19087e3bf074b995261e5a9428c78e865a6e203cafeae1b747a60ecc4bb946418c4febd617f244de SHA512 4427ce8d462725709c15b6ee87fd47918ba76a71cffd2a74d531eafa5a57b90150820f67e400d17c5953a0872451a8e069a283705f7ee88ae3771cf90e4e8dcb
-EBUILD byacc-20200330.ebuild 619 BLAKE2B 8df1ca9b6ac91893cd91a0a60613d6369505872210a1ae049e1967f90c150c3a2cdf9ca86965fd6e340a68d839b89709805cec611b21009183800c848f66ff6f SHA512 e35a49806801d08901fe443159256d8266776a0a13f4b9efe5bed1b0745aded2c65fd1d8b80632687d6ea7e9930e528899affcc7a559bef31e2f2bef48f57d2e
+EBUILD byacc-20200330.ebuild 615 BLAKE2B ab2446c14262888052f7d370a0c2c104eaa7430ef9b95a4c19087e3bf074b995261e5a9428c78e865a6e203cafeae1b747a60ecc4bb946418c4febd617f244de SHA512 4427ce8d462725709c15b6ee87fd47918ba76a71cffd2a74d531eafa5a57b90150820f67e400d17c5953a0872451a8e069a283705f7ee88ae3771cf90e4e8dcb
 EBUILD byacc-20200910.ebuild 624 BLAKE2B 8828020e31c2c22c33929d4c89d5d87fd8597b78835f12868e92cec5617e7c4ea56490a801f76494c6800e69da806f8ca19dc3f5f09bedc3924aa9abf15d7ec0 SHA512 ef316d3081e414c934fccc62c4d47da6950426484a16b7a283f2a59eaae38ab0e1e67dc5ca13a3f1bfea8844b3f70af9b7b188ae4fa8df21942ede1f6425fafc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20191125.ebuild b/dev-util/byacc/byacc-20191125.ebuild
deleted file mode 100644
index 5a73d932b404..000000000000
--- a/dev-util/byacc/byacc-20191125.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="the best variant of the Yacc parser generator"
-HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
-
-src_configure() {
-	econf --program-prefix=b
-}
diff --git a/dev-util/byacc/byacc-20200330.ebuild b/dev-util/byacc/byacc-20200330.ebuild
index 7fd51f86ae7b..5a73d932b404 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/catalyst/Manifest b/dev-util/catalyst/Manifest
index 458f1ea34992..67584c56d068 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,8 @@
 DIST catalyst-3.0.12.tar.bz2 621114 BLAKE2B 52306fb90f2ea3856ea26e436b4c520cc8ec65e22542ecd2ed20a54306655ea0eb3b607749fa42e6871256644e46e903b18d3159979ad40b95fc8ea1c05a1fbb SHA512 8bb50375ff8549ef790e2999ba71607281a6f631c7adec976f7e31302e8d16eaab41795d97474285e1506068117570fe350d77e4881169ae8051371bb8d54fda
+DIST catalyst-3.0.13.tar.bz2 621326 BLAKE2B f87a94b696d897fad8cab5e033a68a944dd5f73cbb110c3051432f9ae8baf8d341e456e1c9935345ac9102e99301c912abe706225023b3bdf28372095410cb26 SHA512 87f66b56056000ebee061003ae08d6e4e6b64aadbe89d71f6d50fe86e838e04d3f534dd3bc2f561fe42762de4108bf4d5536fab485fa260c251f90b45e97e8a9
 DIST catalyst-3.0.9.tar.bz2 873866 BLAKE2B 293a4d52c57e73269f1f82fed8ea72934a0f939b3b9d4fb9943f4971fd4155edecc6cf0170b917eba16f0125aac9861041b7e10f85f6110a35659a2f85fd3665 SHA512 c8c25ad1c76b0040bd84b491909d364306746c660afbbb8c6a074911779aabe89b60a12cc3ac5b9cd3398bdf8986b50d24d9979c3d12d2fa9de66ebf62ded309
 EBUILD catalyst-3.0.12.ebuild 1912 BLAKE2B f136ef07278a13065b7df59cd1917d5b4075cb4dc4ea17d28ea8c402d25c4061feb334c59f99741ec9edf0370bfe4debd4fc6e57dc0287c2c19e65b0b4c2aea5 SHA512 298b705f37e8edd9bfd45e690793ee0c6b608ada57ca2d1510e61fe7882abe4f8ae380c6fdcff1b4c3fa9b687fa87b97722471145afbfbb8374dcca94e96c408
+EBUILD catalyst-3.0.13.ebuild 1921 BLAKE2B 4722d977737cd728eba8b6170c1a7a52a51b907db54dd2555332e2ebb0e0979d484a5292ad35f67110080570bfc09bf256e14c8c60ba1ab08bbd8bc838e51d55 SHA512 1c3a43f3df8d90fbf3572ef655a34b74563d2ead70b62b4cdf61be25deb58713037a813c622ee041d4071282901d6ee65b29e2fb1c6dcc15d43bc5d089c9d4d4
 EBUILD catalyst-3.0.9.ebuild 1912 BLAKE2B f136ef07278a13065b7df59cd1917d5b4075cb4dc4ea17d28ea8c402d25c4061feb334c59f99741ec9edf0370bfe4debd4fc6e57dc0287c2c19e65b0b4c2aea5 SHA512 298b705f37e8edd9bfd45e690793ee0c6b608ada57ca2d1510e61fe7882abe4f8ae380c6fdcff1b4c3fa9b687fa87b97722471145afbfbb8374dcca94e96c408
 EBUILD catalyst-9999.ebuild 2197 BLAKE2B 4744840b79871f9a804cb70d550d99f7e98d6c37b8c6117457d1aefd99f00948e5be6bcd50e3f12b304d766acc8399db9061b5fe726a4e048f6ef2f5385f68a7 SHA512 9591efe950983a2c876f725af2cde13447206ea178bf1a62e8aa3365feaff7ae73aabc7e5c702c821b0ec3419d1951ac7b1ca0fcbb9d623ba5f0c561388ad1c7
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-3.0.13.ebuild b/dev-util/catalyst/catalyst-3.0.13.ebuild
new file mode 100644
index 000000000000..644bdda69629
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.13.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	iso? ( virtual/cdrtools )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 5c58dd3770d7..4daf497c38d2 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,8 +1,6 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-3.7.10-objdump.patch 392 BLAKE2B 6c15a165aff5b2633b0c3571f8f89a3480d5608b006f9f3c0a80117d5c94039fc3e631d0f54c870df1904ac5c855d11007fb73178be8df7001be4f414d103ede SHA512 94f291d44a64ed9aff04da39467751aaf84262fd987c63e53213cbdedbaf30c36ff0aa0902e73418846153e8cdf5a912b021adf7c122bea9698cb296faa9ebf6
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
-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 1531 BLAKE2B 38058178daa852cbbc37d5a34c088fffe552c7d35c9861125cb4a7d1e7ee298a685bde2407fa7ec719cb484b0e1fa377cb9eef93330d2f5dfcb2a003b774755b SHA512 513d185664b3a4e1feb46ddc6141f0bd391c0cc4d78c204cc47db67a6e044a9d61fe5b3926fa335e3f50ac40f594d0b93c7ad9c4e2be7a45626fd02082b89540
+EBUILD ccache-3.7.11.ebuild 1530 BLAKE2B 093cb80d04da0eff8e43fc8410ae9754e469a7bb13b6345e58b54e78403c51c5958d74ee427fe48a4b9af7106c6b06078bc883bd98f89d1272e68029dacffb6a SHA512 807892e4ce506421b26715df51fbfb92eb6101d25589f4c91dd7d7c83b20babd95371ce6d2fa9fe3258f3cadff2be8f96f24dbe9b1e674fafcbf5dd55d798fb7
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.7.10.ebuild b/dev-util/ccache/ccache-3.7.10.ebuild
deleted file mode 100644
index ef3ee0cf4101..000000000000
--- a/dev-util/ccache/ccache-3.7.10.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-
-DEPEND="app-arch/xz-utils
-	sys-libs/zlib"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+="
-	test? ( dev-libs/elfutils )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${P}-objdump.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-
-	# mainly used in tests
-	tc-export OBJDUMP
-}
-
-src_configure() {
-	econf --without-bundled-zlib
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_test() {
-	emake check V=1
-}
-
-src_install() {
-	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-	default
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ ${ROOT:-/} == / ]]; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/ccache/ccache-3.7.11.ebuild b/dev-util/ccache/ccache-3.7.11.ebuild
index 383e4b0afac5..04f64dcc7b6a 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 439fe3b94f5b..2e0b4c02f0fd 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,9 +1,10 @@
+AUX cgdb-0.7.1-respect-AR.patch 807 BLAKE2B 6689327f2a41f52d772b1d1f2714bac4f4cd40e994b51c6b12a8c9c5d40ed6616cb03128753e60bb773a6c6b46d26fb6d9d80c67c0ac8432e5f17e34b70105d8 SHA512 db51c83bec17cf05e9b8dfc7d92b253999e545c2c1a002db2f63edc0a08d0c831fa6b4b5177e972844755f4df455ec268e5b3554115f5fdeafa071d1df0dd4bc
 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
 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
+EBUILD cgdb-0.6.8.ebuild 1030 BLAKE2B b9b63fab052fc0548adc68b7416180f02d71c868764c0828efaa47e16a2da1a0d0ae1f0a589dc597ab2f56b83c22f6d48bcd87da6573875f7e9c2ecdfc18b1dc SHA512 00d475449fe55161876abae492c79c1458f7bf3aedcd01a6476f007280179b3d2ef840efda5d2f15b66740624a51c20e3511f566656906ea32445a76a00374c2
+EBUILD cgdb-0.7.0-r2.ebuild 1557 BLAKE2B 3b8f53e8c96f607d701bdaace3842e3d5fd63ac32384f1902a574af942f2fe2022cfdc9881ceeb952be8a3b3f624779489bbef38ca2b609fecb08ee33dedc9dd SHA512 a0605eb5eafd3e8f7d48670f5397781a6d9b9a193726fc417fe9499209949ebb08c2cea93e10ab5e65658a7dc08ea74d95efb97824912c5394cd94d9796f06c9
+EBUILD cgdb-0.7.1.ebuild 1546 BLAKE2B 5acf8793b8f5354f908cbc409b163e09c6ce26be1674588df71ea887b0fbc115ebd6a097e85a5e1acf215ea8b07e59f38e25c5df6a33166da9cf385aab5f9b56 SHA512 21765d784f1ed6310de035fd1cbb145877df982a0a1e29381ca3edbdabba551dbefc82757bba63940bde2a9f807bf9ed6685d6ae6fee9f32a7f83b4047659477
+EBUILD cgdb-9999.ebuild 1486 BLAKE2B 462a9e9fef68d24af10cf84bf7aff8585d87cd9d854aef53d0aa70dc5a7d166799006cd34a9d1f61b1ace6044576cc0230b3842aadea4037524b16524a693c20 SHA512 0813893bf020b8a77607712df53bdeb694f84b3b2254da0282131384dea8458f0c62f01355601d78ecb0ddc4a7c5e3fc22804f9fa1c3ff6397015d9dbe34400b
 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 c38d3ca1e868..357b17b658a2 100644
--- a/dev-util/cgdb/cgdb-0.6.8.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.8.ebuild
@@ -12,7 +12,8 @@ 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
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
 HOMEPAGE="https://cgdb.github.io/"
@@ -34,9 +35,15 @@ RDEPEND="
 
 DOCS=( AUTHORS ChangeLog INSTALL NEWS README.md TODO )
 
+PATCHES=(
+	# Bug: #724256
+	"${FILESDIR}/${PN}-0.7.1-respect-AR.patch"
+)
+
 src_prepare() {
 	default
-	./autogen.sh || die
+	cp configure.{init,ac} || die "cp failed"
+	AT_M4DIR="config" eautoreconf
 }
 
 multilib_src_configure() {
diff --git a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
index b2a19f371e8f..8ff75bb5efdf 100644
--- a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
@@ -10,9 +10,10 @@ if [[ ${PV} = *9999* ]]; then
 		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"
+	KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 fi
-inherit multilib-minimal
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
 HOMEPAGE="https://cgdb.github.io/"
@@ -40,11 +41,14 @@ DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 PATCHES=(
 	# Bugs: #730138, #678006, #630512, #682386
 	"${FILESDIR}/${PN}-test.patch"
+	# Bug: #724256
+	"${FILESDIR}/${PN}-0.7.1-respect-AR.patch"
 )
 
 src_prepare() {
 	default
-	./autogen.sh || die
+	cp configure.{init,ac} || die "cp failed"
+	AT_M4DIR="config" eautoreconf
 }
 
 multilib_src_test() {
diff --git a/dev-util/cgdb/cgdb-0.7.1.ebuild b/dev-util/cgdb/cgdb-0.7.1.ebuild
index 9b0c032ba93d..79f79a249163 100644
--- a/dev-util/cgdb/cgdb-0.7.1.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.1.ebuild
@@ -12,7 +12,8 @@ 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
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
 HOMEPAGE="https://cgdb.github.io/"
@@ -40,11 +41,14 @@ DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 PATCHES=(
 	# Bugs: #730138, #678006, #630512
 	"${FILESDIR}/${PN}-test.patch"
+	# Bug: #724256
+	"${FILESDIR}/${P}-respect-AR.patch"
 )
 
 src_prepare() {
 	default
-	./autogen.sh || die
+	cp configure.{init,ac} || die "cp failed"
+	AT_M4DIR="config" eautoreconf
 }
 
 multilib_src_test() {
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index 403e3567898b..191687d3b093 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.ebuild
@@ -12,7 +12,8 @@ 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
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
 HOMEPAGE="https://cgdb.github.io/"
@@ -37,9 +38,15 @@ RDEPEND="
 
 DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 
+PATCHES=(
+	# Bug: #724256
+	"${FILESDIR}/${PN}-0.7.1-respect-AR.patch"
+)
+
 src_prepare() {
 	default
-	./autogen.sh || die
+	cp configure.{init,ac} || die "cp failed"
+	AT_M4DIR="config" eautoreconf
 }
 
 multilib_src_test() {
diff --git a/dev-util/cgdb/files/cgdb-0.7.1-respect-AR.patch b/dev-util/cgdb/files/cgdb-0.7.1-respect-AR.patch
new file mode 100644
index 000000000000..e9837855ee3d
--- /dev/null
+++ b/dev-util/cgdb/files/cgdb-0.7.1-respect-AR.patch
@@ -0,0 +1,32 @@
+From: Jakov Smolic <jakov.smolic@sartura.hr>
+Date: Sun, 6 Sep 2020 11:33:02 +0200
+Subject: [PATCH] configure.init: respect AR
+Bug: https://bugs.gentoo.org/724256
+Patch taken from https://github.com/cgdb/cgdb/pull/142
+
+Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
+---
+ configure.init | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/configure.init b/configure.init
+index 920b2a3..d2f696d 100644
+--- a/configure.init
++++ b/configure.init
+@@ -13,6 +13,13 @@ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AM_PROG_LEX
+ AC_PROG_YACC
++m4_ifndef([AC_PROG_AR],[dnl
++  AN_MAKEVAR([AR], [AC_PROG_AR])
++  AN_PROGRAM([ar], [AC_PROG_AR])
++  AC_DEFUN([AC_PROG_AR],
++  [AC_CHECK_TOOL(AR, ar, :)])
++])
++AC_PROG_AR
+ 
+ dnl determine if we are running in linux, cygwin, solaris, or freebsd
+ AC_CANONICAL_HOST
+-- 
+2.26.2
+
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 5d6e1d0a92ba..347becea859e 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -20,11 +20,9 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 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.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
-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.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
+EBUILD cmake-3.17.4-r1.ebuild 6144 BLAKE2B 9796b95f1405488d6543a69fc0867cf6ae2f63041da17ec0f30f830974815848ed11f429650691aa557058b8f462923826c94f149e0001289cbb107461d2fbc9 SHA512 80a1214aa3fe6690def0983a37f70a81ea96762ed0e8abf608c15a188003f79d12e42effb0da89a9e51f68b4134620c5a9201649babd40dfbd5a04c904e40144
+EBUILD cmake-3.18.2.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild b/dev-util/cmake/cmake-3.17.4-r1.ebuild
index 3af2be355a2b..7575025aa80b 100644
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.17.4-r1.ebuild
@@ -22,8 +22,8 @@ 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:=
@@ -71,7 +71,7 @@ PATCHES=(
 )
 
 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"
@@ -104,22 +104,24 @@ 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.CommandLineTar: whatever...
 	#    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
+	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
+	#    TestUpload: 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)" \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
 		|| die "Tests failed"
 
 	popd > /dev/null
diff --git a/dev-util/cmake/cmake-3.18.1.ebuild b/dev-util/cmake/cmake-3.18.1.ebuild
deleted file mode 100644
index c09e035ef01f..000000000000
--- a/dev-util/cmake/cmake-3.18.1.ebuild
+++ /dev/null
@@ -1,218 +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 ~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:=
-	>=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
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch #691544
-
-	# 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
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${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 -b \>=${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}
-}
-
-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.18.2.ebuild b/dev-util/cmake/cmake-3.18.2.ebuild
index ab16a6de18f6..7334e72c320d 100644
--- a/dev-util/cmake/cmake-3.18.2.ebuild
+++ b/dev-util/cmake/cmake-3.18.2.ebuild
@@ -108,17 +108,19 @@ cmake_src_test() {
 	#    CMakeOnly.AllFindModules: pthread issues
 	#    CTest.updatecvs: fails to commit as root
 	#    Fortran: requires fortran
+	#    RunCMake.CommandLineTar: whatever...
 	#    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
+	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
 	#    TestUpload: 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)" \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
 		|| die "Tests failed"
 
 	popd > /dev/null
diff --git a/dev-util/comparator/Manifest b/dev-util/comparator/Manifest
index e516af07051a..341c59b646b5 100644
--- a/dev-util/comparator/Manifest
+++ b/dev-util/comparator/Manifest
@@ -1,6 +1,4 @@
 AUX comparator-2.12-gcc10.patch 793 BLAKE2B 0bab88fa6aeaf046ee4dc569aeb0d3344a2a9def5e2a67f1139fd59621dac0cb7f89468b04fd776b4a81f883c55fe5d311890409a0de22363ada166c3c20475a SHA512 c4e4c03f0dd8759e2fbd9421465b75254f4a02a56846347c4f1062c411c124f62e803854af389a527a8323f57daef563f7948eac5fbe25ff3e0529c7384a1287
-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 958 BLAKE2B b028284f0f21d9dcf25acb133885eace8f7e730bd1b75644bc436ae7c10388104e3866740553b6f86bc9a83eb0c2a319675c9c88ae729e71277c8b015c5eca59 SHA512 19da391ed6b6867620190253209947daa19e91e491bf9ac6e57276cfc13387021e875f2715b4a5b6bff4dfc846e61198affdcdaecdf7ba97e70edadcf677cae1
 MISC metadata.xml 331 BLAKE2B fd076ee192291de68e11340e0f62ea70193b7ddf71484d602a836bc103b097253054f085ad49161f70e1dc197080fa902f93e498c07ef6e406dc7b9034070f91 SHA512 32c3410d936b566ab3f5c6ff890ba8ca7c66e3d61491ac74b0abafa5cd5f5d338e2064737f0421e8e31237f8bd424d84ab8dd668fe8db381c186604eba649e97
diff --git a/dev-util/comparator/comparator-2.10.ebuild b/dev-util/comparator/comparator-2.10.ebuild
deleted file mode 100644
index d331167b3ead..000000000000
--- a/dev-util/comparator/comparator-2.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="ESR's utility for making fast comparisons among large source trees"
-HOMEPAGE="http://www.catb.org/~esr/comparator/"
-SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="=app-text/docbook-xml-dtd-4.1.2*
-	app-text/xmlto"
-
-src_prepare() {
-	sed \
-		-e '/python setup.py install/d' \
-		-i Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-	emake comparator.html scf-standard.html
-	distutils-r1_src_compile
-}
-
-src_install() {
-	emake ROOT="${D}" install
-	distutils-r1_src_install
-	docinto html
-	dodoc *.html
-}
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index fe66312b878d..ac543638e669 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -1,5 +1,7 @@
 DIST cucumber-cucumber-expressions-10.2.0.gem 22528 BLAKE2B beff2fb2229154f8bec7942be4679b876243f65621747482669041aafed099e27ca78f2696d67a39b0b05b3139a6eb1b0bc8da4a045724892a9e0656ee98dcc8 SHA512 9996bc084d10a56f7efe70220b4a0496fb540e4f288c1819be458d6e9e58443749dfb5e1ba6c6bfd36a95a8de51067cf27285ad175ebc9e0404233fdd4bfdba2
 DIST cucumber-cucumber-expressions-10.2.1.gem 23040 BLAKE2B 590f54eff3054a9d0e7e80732912b41fd314041578c0f4758a6fb0e175b7177f849dfdcd2eb32be5ab9ca4fbb282121c5ef0e2b18a0e66f287ade71acaff9cd3 SHA512 6f3ce32b70150d029febfa97d5bea5acbe7a59e588fa1f0b9961c6c64ca667a53514e2eaa6bf1160de916cc094f82aa341b03273f05fc54019bdb4e0940a3d02
+DIST cucumber-cucumber-expressions-10.3.0.gem 23552 BLAKE2B 6aab081690081e991a1c1dfdaac93e114165dc1b2a39a1825e6424304765c96836cec9dcb8635e9f97ef0c07a6b58cfe7fc587c651dc73bab0670f4230828640 SHA512 d560c62f625f6b284a94974cef5227a3623fead9c8c4f45ea9fed2300b37c405ba69161d6c6f5e159b2a36be5eeb05b122789cafcafec0dc84efbb366bd0166f
 EBUILD cucumber-cucumber-expressions-10.2.0.ebuild 482 BLAKE2B 38b52c2ab5403e58f9b53d7922ec0e4b5013436490ff84bf424709f497f98fa8b916b194fb3ac0a070cca1e17ad2d6d10f4623b4d000e863e1849268bf190ccf SHA512 8d1885a702f9536a3f0c25977f7d34ca22285e849f5a2d34ae1704fab8b8c8b430065386ebc6778bb3b82c73574cfaad49198ea3d746f708b3426f67b7e5f3f6
 EBUILD cucumber-cucumber-expressions-10.2.1.ebuild 475 BLAKE2B 200a330f113a55b51d98ad04636633b38a369ad76fdd2b20d11fc609b904f40a3bb6ffc107877ec670843aebc9e5f065574916a6d5374754e480a9cff84097df SHA512 fbcc950bcb316eecfffbcdd4addc9a64a7c3c280bab6eb56bae67e5a6ba0973ccef92beeba9653c7310de441488776ef70fbd87852e4dba88c5ca663ec3f6ae1
+EBUILD cucumber-cucumber-expressions-10.3.0.ebuild 475 BLAKE2B 200a330f113a55b51d98ad04636633b38a369ad76fdd2b20d11fc609b904f40a3bb6ffc107877ec670843aebc9e5f065574916a6d5374754e480a9cff84097df SHA512 fbcc950bcb316eecfffbcdd4addc9a64a7c3c280bab6eb56bae67e5a6ba0973ccef92beeba9653c7310de441488776ef70fbd87852e4dba88c5ca663ec3f6ae1
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.3.0.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.3.0.ebuild
new file mode 100644
index 000000000000..10db2f04fa4f
--- /dev/null
+++ b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.3.0.ebuild
@@ -0,0 +1,17 @@
+# 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="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a simpler alternative to Regular Expressions"
+HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index 41abec5fea66..829b0bf6709c 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -1,3 +1,3 @@
-DIST cucumber-messages-7.0.0.gem 10752 BLAKE2B b76698440d91a045e95b9a4166ba98b46f0032a7330ebda98a2e1556ebb8f1232ff1124a691e7d82dccf8d9bf34f557ea078bd7bae5dc0d6a540d3abb15c81ae SHA512 3945a28fcbb3502f669aad228bce094112d7e5b5e459ebf71df8e32bc29216d2295d64cbf8c17ca4a2a8abe5fac45bde634300ffb9371d3e9c3a64f22fcc68d8
-EBUILD cucumber-messages-7.0.0.ebuild 490 BLAKE2B 55c926659a1d5a0273e50a625b2fddd1ffdff83b7ddcec30c7bcd1a42c0696b1eaf7b9daaea05168ecd8cbfb8b4882cf6f7d8b45ebd28a20f5453207e1311ab5 SHA512 4042594f1c95e6d48e1b60577e0d20a50cccb7cacd86fb3a21aa4a9e6f976f2a058650421003b192aa6813765d1c3619da7ef68257c1f7533501c5fd936e127c
+DIST cucumber-messages-13.1.0.gem 10752 BLAKE2B 53ee61ab3ebb9f746701d583abbc78b31f929dabe848b88288888df891c0c8a9c2fe1ca416de5cf84cd47bdcb5b7d821a1ddf77ac2e5684b5315fdcdd104dc6b SHA512 cbb7ef75f8ef33dcb6230b62408f4c53ddc490029d271de54c753205aac761b4f47fec72d1d579be9c804c1dd512f3a9359f84b2a633d9bec211bba81b39a9e1
+EBUILD cucumber-messages-13.1.0.ebuild 498 BLAKE2B ea638bd90fb55c53d93616b7e5f5d6bcf447d0d47771006e58ba906d3af66319b11c746305f822a7c13c78d2deae663b9c284e48d60ecef65a6b159bd19a1085 SHA512 b125defb262a718a774d9a166836858cdefa9275b7facb079e6e0f62814a2c5f6c49ffc81e52293cb2d65b2692a2a7d285124a63c5152d6d9626ba0a166eb71f
 MISC metadata.xml 313 BLAKE2B 8043a2240cf0e24b0307a6f068bd8bcccc65471d59ac643f3c654227695ec7a2392a6c1ed9ce4c0ca7cdd926a26be275b248626509c79aeaad48930e00f00c62 SHA512 949342e57dd6165f4402bd068865400a7affcc6e7f73adac6f8e121caf1ef9564bc95b61fa9bd7f80d9ca8597e5b5e0f3200a210d496577d4ec2fa881fbc23bb
diff --git a/dev-util/cucumber-messages/cucumber-messages-7.0.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-13.1.0.ebuild
index 34d22ed0a0ed..3a73f5abb188 100644
--- a/dev-util/cucumber-messages/cucumber-messages-7.0.0.ebuild
+++ b/dev-util/cucumber-messages/cucumber-messages-13.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -16,4 +16,4 @@ LICENSE="MIT"
 KEYWORDS="~amd64"
 SLOT="$(ver_cut 1)"
 
-ruby_add_rdepend "<dev-ruby/google-protobuf-3.9"
+ruby_add_rdepend ">=dev-util/protobuf-cucumber-3.10.8:3"
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index 4541cae1e71a..a991c551de56 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,5 +1,3 @@
-DIST cvise-1.1.0.tar.gz 228867 BLAKE2B 08becb5ad00ef08a1f511c0bdb0cb649af1406dd035fe61f737ec6dfb5151215ae363272fc3676ce76e17234a88866ee1dd0664d82326f3ddb2ced2f1982aacf SHA512 66c09cb7e088fc36b0c36928e2eda19e7bef4fad4573fcedc06f2070136e74d7878f8056f406c2ade22fc465a75bf13dca9f4a1a319cd183187a2d66a441e661
 DIST cvise-1.6.0.tar.gz 243050 BLAKE2B 64c305426dbeaf2e3f3a92a902209b35fcc76b5f5a6d2e48fcc8e24d1325badc0839e70afa1381c6d1412c22a7e9dd41ca03d6ca714fa5082958378cc8863000 SHA512 9d4ee043c34748b600b49ac4f00463b853faff2809f8b581e9b07433a8f3bef4436d0e5d5a9dbff1b2d7c3a8ab1d6d4823e78787eb3e911a683808703b2e24b6
-EBUILD cvise-1.1.0.ebuild 1018 BLAKE2B 169493f2e01288a2adfc9d6071504da944fde4f68c1d137bd6df395424989a1569cf9073ed0673d75eca4656fda311587295c0eeb354dd69c318b991cd1010df SHA512 284ffd54f82b9776d450040ad1af394b348e1b52ec0392faa10fe23b64ee59e8992a0474924e9c5d6962ad2d241ae00903418c38f44f29909600a8b9572385da
 EBUILD cvise-1.6.0.ebuild 1164 BLAKE2B d481af85ea81eb7a558782c6b873e65a34065e1c88e1fa4128cb8877802b38f47b554206f1734f7563db89d9346bfbd143b0e4bfa7b6a51e025b0fc50a72a7a8 SHA512 d621473db6720f2d7b280da9b108b0ee51e20f75671bdf6b87a70970213d3d8a420eadfdb6dcc2915313c03dbcff6de06b02295707aa2aa26e0051b7c7db5abe
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/cvise/cvise-1.1.0.ebuild b/dev-util/cvise/cvise-1.1.0.ebuild
deleted file mode 100644
index dd6cb68eb87c..000000000000
--- a/dev-util/cvise/cvise-1.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake llvm python-single-r1
-
-DESCRIPTION="Super-parallel Python port of the C-Reduce"
-HOMEPAGE="https://github.com/marxin/cvise/"
-SRC_URI="
-	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=10
-DEPEND="sys-devel/clang:${LLVM_MAX_SLOT}"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pebble[${PYTHON_USEDEP}]
-	')
-	dev-util/unifdef
-	sys-devel/flex"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pebble[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	pytest -vv || die
-}
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 50eaf0930252..c409005be6b0 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,10 +1,4 @@
-DIST debootstrap_1.0.115.tar.gz 75691 BLAKE2B ef2ddd8b76d7eafdf5be50e3cbb99725066562bc4a717ab42b436dcab3e5e3a2148c9e6eeaf7b6135e4bde836ee01101e7158ebc0472c08329ae0152d0845b8b SHA512 635e4feb1fb2bc247968127dc86bf0956243c8058f99e66ede177da84f0258cfc2de51873f347c099217b07e679527aeac08e7263d31b4112fb0708edb3deeb9
-DIST debootstrap_1.0.116.tar.gz 75723 BLAKE2B 3a48e0a51dcd6066af26d036df17e36bb901d7099dfa9521ca86cc1d2d70b8326ad068dd86130de1a2b686a44391d8fd0bcfb78f24cd558777b487f8bdbde699 SHA512 59ba44ecfa7c6bc3d81a814fe66a87223fa4bde24bd986f75875fe9077355a5f4268d822347f99402d4146e81b270a06f21111fb977729f4326bb5b8e017583c
-DIST debootstrap_1.0.117.tar.gz 76196 BLAKE2B 19bd9ff287da5cc050890eb22d874c8c5407196604b29de75d2cfebc8757df899f3a952c89eb0e4bb75d7d2e0a693e70a0130cc50542c700e9db3fd0b02e321d SHA512 e7cb734d2a3280f68c9b7707a20a0387c6308aea51d425d63343212301c2dae5dd2851c21b15b62bd6e8f4e855437b58e1a06373378f3e0bf659ba6c767f770a
 DIST debootstrap_1.0.123.tar.gz 78175 BLAKE2B e507ee76817eef20cfea4e37eaf893f8e64acaa791806ebd55bec97b8e60eb3c59b68bfe5e6023dc6e73706bde2468db46b84f0176ec46d086c3ea9423a206c7 SHA512 3b23f61528d4993750ba22b8765c10cfb9695793177017d9e4faf546da076be6660c5d6e0d1bf30bafe14f6d70f886190d3ec42a0057b895f40e860475eea794
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.115.ebuild 1168 BLAKE2B 9a61918f4a713360d63fa16b54abfb0bf6570b7551763a05652c190d1f1fb1256d154b16d99f82c6a6067adecea19e9ad6560fdba9caccd1a7d1076b6178bc8d SHA512 532a18dd5662d3f40b26941e8211090de602c655ea557d998431092aeec77f3e41c65919a265a1c367a5f269da5cf9ab354d86824c00a11b3175a804acdcbaf2
-EBUILD debootstrap-1.0.116.ebuild 1175 BLAKE2B cccd238e7c0069376c7e3265113d1f18a0e307c8812e0e74da55b38dadeb3bdd57aaaa5c8203856053b1333198d8ed803fbeefc45e923ccd1556b23d1bf44721 SHA512 59a8f2bc22d53358247c82784f8461c7908ce65bd74ba119f7e840aa599fb9c5cc7ca0d4772a5bff8b47b14d866431c7e2d05b94743007691f4ccc02d7dd5225
-EBUILD debootstrap-1.0.117.ebuild 1175 BLAKE2B cccd238e7c0069376c7e3265113d1f18a0e307c8812e0e74da55b38dadeb3bdd57aaaa5c8203856053b1333198d8ed803fbeefc45e923ccd1556b23d1bf44721 SHA512 59a8f2bc22d53358247c82784f8461c7908ce65bd74ba119f7e840aa599fb9c5cc7ca0d4772a5bff8b47b14d866431c7e2d05b94743007691f4ccc02d7dd5225
-EBUILD debootstrap-1.0.123.ebuild 1201 BLAKE2B 878a39bc4220fc8c46fde54cd64f6459749f064b164fb0ed2b08b3e79b70bcf77fea79e9d8604a43c23515cbeb7353eb6d1d78ceae23fea4931ac54aa24d39c2 SHA512 8b659771742077fa67d4d9e66ccdaea2ca93a3ea6934ad37f83c4b74815d13469e38c275f865b3b195e8d09c87c9f8d28e3b6205a3569f653f232afd88760c11
+EBUILD debootstrap-1.0.123.ebuild 1194 BLAKE2B 06c3a88040d43367bc9aafc397b229b66631c37271be119296e3f28ce6f6df74ce4b1107bda675984600ccd500dbdbcc67b1530c5ae053fa67dd4b50dd1945a8 SHA512 ab3d4519277c356d21072a269e1a687a61c841ce920f25f6a6d0605d88500f5764b0b7195f8adf5ac1e34ec382ba175edba25781faa6b1e8ec24a9fe77ea7088
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.115.ebuild b/dev-util/debootstrap/debootstrap-1.0.115.ebuild
deleted file mode 100644
index e1c4c43a56b3..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.115.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.116.ebuild b/dev-util/debootstrap/debootstrap-1.0.116.ebuild
deleted file mode 100644
index 43a821d68891..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.116.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.117.ebuild b/dev-util/debootstrap/debootstrap-1.0.117.ebuild
deleted file mode 100644
index 43a821d68891..000000000000
--- a/dev-util/debootstrap/debootstrap-1.0.117.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils
-
-DESCRIPTION="Debian/Ubuntu bootstrap scripts"
-HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
-	mirror://gentoo/devices.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-arch/dpkg
-	net-misc/wget
-	sys-devel/binutils
-"
-DOCS=( TODO debian/changelog )
-
-src_unpack() {
-	unpack ${PN}_${PV}.tar.gz
-	cp "${DISTDIR}"/devices.tar.gz "${S}"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	default
-	doman debootstrap.8
-}
-
-pkg_postinst() {
-	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
-		elog "To check Release files against a keyring (--keyring=K), please"
-		elog "install app-crypt/gnupg"
-	fi
-
-	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
-		elog "To check Release files from Debian or Ubuntu, please install"
-		elog " app-crypt/debian-archive-keyring or"
-		elog " app-crypt/ubuntu-keyring as required"
-	fi
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.123.ebuild b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
index 5149fd9864e5..20b3e32fc58f 100644
--- a/dev-util/debootstrap/debootstrap-1.0.123.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index f4394af9b38f..7887a0a13ce9 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,11 +1,3 @@
-DIST flawfinder-1.31.tar.gz 174148 BLAKE2B f545a9d4dc8c0a9d7ae34fb5b26e06eb7c40a916155fdd738e4d56b6fccee4af1941935b6847d5f6c8f968ba45e95a8e9b44e5723b11a9c47fce725d1c27dcf1 SHA512 880919a05dbf0e29055f052b88c8bbfd403105504749bc65fb17675e6ebe0d84f9cd367e7a6efc68dc0d9209e0938185da4718b70f484007c507fe96b83e0355
-DIST flawfinder-2.0.10.tar.gz 252772 BLAKE2B 9647bb4258f6a7fcfa84aa119b2b714dbf6239c0869a7a0c3b6cb50264c5872d18bd6d8bd48fef5030cdc72f38b945e71d6bccb2c861e922212566326263a2ee SHA512 4bf24f4b84fc17d1cecda7686259efdd4d36afc267a315be147545518ba965929f3a58d13f534aec4c1816e55cfb854ec647d09e170bb5f5eccfb4dc3469acd0
 DIST flawfinder-2.0.11.tar.gz 256777 BLAKE2B e2aa109a0cc435da7a8ba5f40b5dc6474e27ec340785c0070fce4a648fb5a186f6f0f5ab4e53c8e06c91fb1cb15179ecdb605a7f7477968e4d5595fc46cbd7c8 SHA512 4236da49914fa6317eb2fae1b3fd7ba08aa96a34bc5245bfd15b6532049193cbd0367bb3620e32252ce71cdd1128bec4b20c0e88b02c55d0ede1bb5bb091ddeb
-DIST flawfinder-2.0.7.tar.gz 249177 BLAKE2B 35dc5796ca7ecf456bf623247c7fb3944e05864bb714900a386f3e39eed81695409b44b9684365e4b172feb938a7c781c831856a8a94826c48b1027698b0967a SHA512 ecfe98c58e253b1d90b833747d69c41597ab7b4c82286e5f45dff45de90056216c25d2c9626540aebfc1e475882a04c3cfa3c0cb3ee242f498f5cdfe188d761f
-DIST flawfinder-2.0.8.tar.gz 251546 BLAKE2B 4817d3f529c27f0e969754fab08d1323b5fd778e4914882bdd4a61a96301ded287e2899016e609f658d9fee5dc76c1013e535a32120831cd166bb3f24c443e8f SHA512 9346c60808087ddf28f433067691c662beb0c36375903fdd0b4dbe3e53fe92b3893e38b13ecb0fe134586cf680fc554d33c92ff910dbd1cd4c3cbeab946038f4
-EBUILD flawfinder-1.31.ebuild 724 BLAKE2B 4441a55be26ce38da31944675d0203dac0028b27acbf99dadc1e733114d8e6a80500aa0c90a592f89b188831faa1ffc1160a7f11e96a7b940f9af01f518e164b SHA512 d4730fd182db2bcd39ff3b44c0036fa4dfd00d26b98ff5732c03d89980de5ced3a9a955d926dcf40f1afb829839f5aab0f635d4a60464d15fb603bc7190eba39
-EBUILD flawfinder-2.0.10.ebuild 792 BLAKE2B c922817eed9d047f9fc26e3e85bd9c4d920c16799b5610e242352b5837c64ea522b8dbda7f4747beb3d555b57e30e9374d55f83b2ca7de7a106f207f202a1e16 SHA512 806fecac292a50f0978b17761f2ed006dbcbc4d4579b34e1c2bd9c525a8cdc8a77b220a1c6700770d4612b6fd8568dd3f8ba7df614baa20fa17dcca7bc1427cf
 EBUILD flawfinder-2.0.11.ebuild 784 BLAKE2B 9ed1d3fa43c50a760c79ce800ab2d48e0148eb20bc5b00d3404c22c58c02fdf032de953ef2777d5f82a203646f793a6d1ea254314f6690f0fe9d3ad7f20c82fc SHA512 6849ef5a067cafec819f9c28e1d51c7934a9683432dec14ff99c14dc82aaadacea4b1aab9ffdd3b5d5c1cd5285246347217da6d787c163bc4d561d22241463e0
-EBUILD flawfinder-2.0.7.ebuild 792 BLAKE2B c922817eed9d047f9fc26e3e85bd9c4d920c16799b5610e242352b5837c64ea522b8dbda7f4747beb3d555b57e30e9374d55f83b2ca7de7a106f207f202a1e16 SHA512 806fecac292a50f0978b17761f2ed006dbcbc4d4579b34e1c2bd9c525a8cdc8a77b220a1c6700770d4612b6fd8568dd3f8ba7df614baa20fa17dcca7bc1427cf
-EBUILD flawfinder-2.0.8.ebuild 792 BLAKE2B c922817eed9d047f9fc26e3e85bd9c4d920c16799b5610e242352b5837c64ea522b8dbda7f4747beb3d555b57e30e9374d55f83b2ca7de7a106f207f202a1e16 SHA512 806fecac292a50f0978b17761f2ed006dbcbc4d4579b34e1c2bd9c525a8cdc8a77b220a1c6700770d4612b6fd8568dd3f8ba7df614baa20fa17dcca7bc1427cf
 MISC metadata.xml 622 BLAKE2B b86d650364e1cd87b7fadc99bfc02e6acb360147c849846bfc94b3e827042aca129c745240ef8e04e3270ec6468dd5654ef9dbc55eeeb59d0251a73ab9d5f888 SHA512 5eda245e47619da4309fe11fd709daf8aedfefe97624ffcdd898bb4915c29e8dbf07b25543071ea9fe15af604a96f030ba816e26580c7166fd9689a1062e8e2b
diff --git a/dev-util/flawfinder/flawfinder-1.31.ebuild b/dev-util/flawfinder/flawfinder-1.31.ebuild
deleted file mode 100644
index 6ef0a76bccb4..000000000000
--- a/dev-util/flawfinder/flawfinder-1.31.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-DESCRIPTION="Examines C/C++ source code for security flaws"
-HOMEPAGE="https://www.dwheeler.com/flawfinder/"
-SRC_URI="https://www.dwheeler.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc announcement ChangeLog README announcement
-	dodoc flawfinder.pdf
-	python_fix_shebang "${ED}"usr/bin/flawfinder
-}
diff --git a/dev-util/flawfinder/flawfinder-2.0.10.ebuild b/dev-util/flawfinder/flawfinder-2.0.10.ebuild
deleted file mode 100644
index 927a0b2c1081..000000000000
--- a/dev-util/flawfinder/flawfinder-2.0.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Examines C/C++ source code for security flaws"
-HOMEPAGE="https://www.dwheeler.com/flawfinder/"
-SRC_URI="https://www.dwheeler.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "s/${PN}.1.gz/${PN}.1/g" setup.py || die 'sed failed.'
-	default
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	local DOCS=( announcement ChangeLog README.md ${PN}.pdf )
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/flawfinder/flawfinder-2.0.7.ebuild b/dev-util/flawfinder/flawfinder-2.0.7.ebuild
deleted file mode 100644
index 927a0b2c1081..000000000000
--- a/dev-util/flawfinder/flawfinder-2.0.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Examines C/C++ source code for security flaws"
-HOMEPAGE="https://www.dwheeler.com/flawfinder/"
-SRC_URI="https://www.dwheeler.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "s/${PN}.1.gz/${PN}.1/g" setup.py || die 'sed failed.'
-	default
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	local DOCS=( announcement ChangeLog README.md ${PN}.pdf )
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/flawfinder/flawfinder-2.0.8.ebuild b/dev-util/flawfinder/flawfinder-2.0.8.ebuild
deleted file mode 100644
index 927a0b2c1081..000000000000
--- a/dev-util/flawfinder/flawfinder-2.0.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Examines C/C++ source code for security flaws"
-HOMEPAGE="https://www.dwheeler.com/flawfinder/"
-SRC_URI="https://www.dwheeler.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "s/${PN}.1.gz/${PN}.1/g" setup.py || die 'sed failed.'
-	default
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	local DOCS=( announcement ChangeLog README.md ${PN}.pdf )
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index 94faf9dd96ab..4665e6027b10 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -3,8 +3,11 @@ DIST github-cli-0.10.1.tar.gz 257623 BLAKE2B 5b2dfb95ef4f4880524cfcae178e1c30dda
 DIST github-cli-0.11.0.tar.gz 267416 BLAKE2B 4200693f4e63eec6c7123240f0eee871e82fc58e2714896ce85a09b791450d275a77681ad4f91f044c8f5041b3d3d35e1e4131ade1260d1b46e275468e172ace SHA512 9b4bac9750c38170817f4f818723f1b2a48caed0e49a706f6de3a151c9c84cd492b92c65bf1c9251d672831bf81fbf76c64ad2611fbd70b745fc091754db8eb1
 DIST github-cli-0.8.0.tar.gz 225839 BLAKE2B c460405973e73374d393f19a6315a9b4af4de2ec3634b37a1669b8683e0cf5c1e5872dae4d130e9fca15dc88881e9abc4888d706b1050883361f378c8da5916d SHA512 5fca1f148a2973eafffa25df052ad09a8407dbcd2e41b9c5152011b990f02c27e1dc75b41d5c2b985bb18c6f1070839e8d526032230a910f9f776147a3a31c19
 DIST github-cli-0.9.0.tar.gz 236398 BLAKE2B 8a1004b8fcf54179e2538d71471b4952fbe9ec2b67d97bea130afcceeb0b6dfd93ce9a9a477f54c1f689a0c5707cae5550445719a7badd81c66748543909d4fa SHA512 75d09cdcff4f31d6cad0e9570af3aafcffdfd8bdb925596780abde24c0ba20a212cfc9426aaa29e7409c7fbb7061bb8c88c15aef11fc9d9490265fa51aae5cd8
+DIST github-cli-1.0.0.tar.gz 337523 BLAKE2B 8b7e2c507da77224d03f0c349eb0cb9538f3293a3684994cec1a8fc3f6f9f261d71f8febf54936afdfe734b0595ae052a2c6c83db803331b4991c453b50284d2 SHA512 c4b9c041ff8e63551ea6d94ec65017f8d264bc5b5c5b70b0525fcaea672c34f5e6aa57d096decef35891fb8d51a732c15835b0354e712b9dda353b7c869988c4
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.0.7.mod 731 BLAKE2B 1ca410dae120a2ec12efbe7c1d8e0fdd2a38ed1ed76ab770e37aa6ba449da6b5ef6e32a51e6ee263a982f1a593e2ee239fe0a774063d4295261f9ff63e09fc1c SHA512 72213e0d0609572f5e749a4f295a8b3ffd13bfe38f786fa3174e53ec318a623e9122c69718944034aa70b05ddad1771cbfa62d2fdc49df2152c5c9679a681ff9
 DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.0.7.zip 90292 BLAKE2B aa2accf4630d73289f2ef94ad870fc8599f25b7eff43d56b08c0b72464848181845db5b9c4b6bde5c91ad0969f2baa02d1d2f2aaca27287952895ab547b60ab3 SHA512 aba8a60445568ecb8f68b5d85604845e2a77a216f747b15b8012be59f5609a4e71d367aec4c6a222c9ec93d1b8063a190d9d529075be19ef633ef7f26b138216
+DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.1.1.mod 719 BLAKE2B d95afef5c101e842eb6754ce837753f0d953c76546b5cfa0a25b672e42db57b78e7fcf9fbc48dab261301c448a811818f53aabb251edf6cb209adf196a5cc0a8 SHA512 11355981fa0cc2c28a274175a123c7a3ac5dab596ea08faa429da137611bcfacfa15b38110943b520a99565776039f2c48c5474eade25aa64b8eb5a3fdb3f098
+DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.1.1.zip 151157 BLAKE2B 9580dddcd115d6a103153197f520eec62845acd051b3ab0771826cc4e5c34fe81173fca5878f92bff5513633b630fdb8efbab3b25a8e6d2fdbeac167307774b4 SHA512 37e1f668ff036df4352f8d612975d050bb8e70be2b02b3fbcb44301c26d48951aad6ca7857fae36e418edd68bcab4d3a56b2ff195dc396e890993b1d73454303
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.mod 47 BLAKE2B dfd201f05c706aa363cbabd93007bc8ce093490f650cb59d3bb29c8a2977490fd11ea1027ddee290bea8a33abd78ef87336bef390490bdc8dce7ef6b8e73ce70 SHA512 283a7606aaa0d7463b9744a13a6c2064ca5d815077622a5d36e43be704c17403d80e6a5e106f544baaacf922b14d106843d99c1af174808960cc27a3fc26db91
@@ -16,9 +19,12 @@ DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.
 DIST github.com%2Falecthomas%2Fassert%2F@v%2Fv0.0.0-20170929043011-405dbfeb8e38.zip 73310 BLAKE2B b0aaa346be477c14bd504f98219659c8a82ba08afdd94f1a5ffbb44cfcb6cc9b014c1ee35aec6071d4733134931e6d2a569940e9f1f06a5e69b00f56d82579e9 SHA512 adf9a3b8bda92edd028f497ca10648900a7aac4dae9372469b511afc74e79f8b990e448f375ab2a8df651a491bab5413196c06db531adc10358865f74de6f26b
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200304075647-34d9c7143bf5.mod 674 BLAKE2B 41eb6ab1dedaf85f4eae33fd39f9bcaab0aad42ade09b145bb36f0f1e254c8e0b55584f4bfedd0c813ba7bdd0c26ba2ea09b8af9e8c7b622710550918d9c02fe SHA512 b8d1d453815756d8d12d6a5009921a7967dee726884bef700ddfe5318b16a29f834734857f223c6d6a5d8d676c65d1c8ccdfbdbda849969c0c572c63adb59fa3
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200304075647-34d9c7143bf5.zip 786894 BLAKE2B dc1bc0aa2f01b05838b07dd0a951d6b7ec12fa995369137d512118da8d29ceee92b0a5da466adb0acbb079a49ae9aee21b73d2f0201054cf96bf15d8322bc668 SHA512 6487bbb54c3dd4690b8d43543f344b47369bc09b46e0ebc9f74d4fe276a196dc8f5bb63a92c1e253cea6fd1d8dfc9b90d851040ac2d7a9f773057bc433c2f497
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.mod 687 BLAKE2B b987855d98e0e6181e8f28c12976081b5e0699cffc79b0721c811eaf6962e6edc5a01135519f787eac6d38e742517aa4d6e061ac4e5ba986e5c5e0cbd2a19177 SHA512 bf5c7b4933d685d90882099aa8c5bc33f8ec58e5a35138180b58771185306b6119cfaab319a43ade929b4560be9746f9155c8d55d1755df12b177613982c7617
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.3.zip 780356 BLAKE2B f1e5a30ad9e46d9f59c5fa3ef7732bc5071f5012ff3205d23b67a52b0c90eda2b8ecf370de54d3cab98d0f4695122f478cd70bee8751d68c3bbfd627418a0583 SHA512 74f74db02dd92d45ae77cbc64ffce73b87066cdeebc23a4f5cd509660accb72d72be398fd0571871e651191e62eef30da7e104ba4a4e88db323a0609cfaa48e2
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod 36 BLAKE2B 60ece6720c6735e5b01efc335fef7d7f1186087068e573d5fa073b811053ea60b761350f9c371dada8cdeb5b285911c4ff87495b800f9c19ffeb69739f4b143b SHA512 971e35af5346054a0930f5543dc936c5f32ca801433d3ca26461ae7c1583b4f814376e8880f4d5329c46c36a3bde5ee4290b825bf19fd70c6bf2fbbab03f8ff1
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip 4919 BLAKE2B a939fbc897831f04ef6995f3d6220d56b8b3a8e3ae4486b605b9601aeb5bf764249cdd619248ba55b650e15e208a720fe1571df99a850a0b742755ab36f86c0f SHA512 7947f0ed3b2b42b8454af3cfb0fb27ec38af8234936d7cfe29017d1168b80873dbb6ac1345719fc5c405df9c814bd732a4ecf6f985da880f4ad83cf2f25b7834
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
+DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod 219 BLAKE2B 188d73a4d4cf4bcb52cea7b32d8d8898086532d50e8ed0e92825e2b34ae1e035111dbc27b995b9a12d70e6be509d99bc693a0af8e3734641dc23cd1da39cf984 SHA512 165cb7ab17309c66d509af018c8a521bd90f9a58fec8fa9437e5b32aa2105ef1be19a1a0a1b13a51300e308c5e63c6cb74897ad938bd6f8b3bfb2d372347d02f
 DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod 34 BLAKE2B 6b3b01c8066b701d0ea30efa5b144fe9bfe8e9f196ce4f0dce058e0947890e4f2d458bdade3816c3df1e35a972bbeef478c91e02579f81116603d0dc20855315 SHA512 5896c9174737c300a726f70b7d6300b892e790e41598b5f82ec82aca020f93159f9ea94afb6a4db605aca196d527a7a42df9b1babb73b8d182fe6749e95975d0
 DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip 5773 BLAKE2B c1026dc04da3122194368b90c597d7a3b7a90279d5ca27e6f3b397f0054c4f51dbb61205804fb0257c07ce078ec3b328fdc638e752411b379474cd51d2337488 SHA512 0c048e8778641577f394433483fdd4f916c9ff16ddd4d7b1b37c4b999b5107353e6867c2b2430b183027807e53f160ebb2419ad85f1d1b2e0bc0b190efe47352
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
@@ -33,6 +39,8 @@ DIST github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.zip 222552 BLAKE2B fb3c694
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
 DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200320173916-301d3bcf3058.mod 315 BLAKE2B 8df0e2009d27da74972a7e67c996f4968738c3dc87fc68ad7fd0d74a0fd661e2a6de497efe742ef3f5cc8739011f49f58dad708cd9e89e829489fd61d1e686e4 SHA512 0b385c4ffe887f5023645af413daa5df47a9ec840cbc9d886088050885732cf1246a88c930b8005290f5005cd017c7fbf9e4a85c0a7304d8058353e7ee61f1a9
 DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200320173916-301d3bcf3058.zip 553185 BLAKE2B f8157149a821cd527c9b9a4980e7d18038f4be550b20c3fef3b7f45818812773cebc35ab2955fcfeebfaf469a160c780a20a52323907848db0764e1c633b13b6 SHA512 aed0a7f014eac4cb07dac7e4fd446523e5787903d7bfe3dbf187055cd7ed81bb398652a7219af6cbee158599fa6739d4b615d41007d26d00b01b078813f2aff8
+DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.mod 284 BLAKE2B c24bea0833ca93fe4e43e639f601cf7c2123aa21320193a59abed6a8dbc18530e1d2a9e90eb8a27d6b836978d5f79066b2b6ee328f3cd24508bae3f03a47d021 SHA512 55e98df741d1b7d2376e26b8c23f322e5425fa346d98f571d4f5c22cbfd63b6ca88c8caeb2f538b355a4cb8eab39984d1cd0029ab7570184ba80eb2958e8382c
+DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.zip 553508 BLAKE2B 0e613623ae7238b16c77b0245577bbc65ee903fcd36f2a970f0e62955e2aea4b7ee36fc3b20bf892f95ed02417ad1a7288b09776bb4f8cdbde800dc364883d6c SHA512 31dd378d0006e449b88ac2ecef5e47198c10f86204e4ee0e1128c211ab31da3d4c62dddb594b5c34cf446e9aa7228c9ead3cc83895e5157d8067d728fdfbfb12
 DIST github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod 182 BLAKE2B cfaa0b1b2ef310b9950e6e41ffa374e1e4c19ddb07519f493c5c2e7ffab9d7e8a1da63646d8e56b603075a93a3dcb9fa6b5acac9f183dbabe78e00bb28d3f660 SHA512 f9514e587a38fdf0bf2d29c6d908b242645341b4b5e1616bc2257ebd2eb1afa45ffc41132077957112c3d23d833c102dd7291efb8cfe32f326db40e99d20b6c2
 DIST github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip 25883 BLAKE2B 40e18b6c3af8a28922261454d82fca14c83f2153d3d84f2729f15a19b6cd8e61cdf6d31908d259ef3eca51527ee0cdc162ed114d48c24c9a03d82912e436507d SHA512 eacfdd76948c11b063d041db27fb51b28e2c3dc434113a668678905106907adf10cc8004117ccc8d312ebeb33c81201d1bd90392b4a96707dadc2f2d4b0b5bab
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
@@ -75,6 +83,8 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 74164 BLAKE2B 6a3c04c2986b35dcc32f14553534758c3270c294a5e2595487f884e32e76cac2ebbc34cf7e42232eb7d85e71fee7660b513de4e365981e625515b086c341d15c SHA512 7be2dd2b362f56ad7fb7be35b62a841ca051d4fe31ffe1ca784e393b0cfe44674a050cf1129a15094872bc16c8ed9bc62afe0e7017bcaf1a4eb9b2e39423f790
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.zip 107826 BLAKE2B 29a78a894dafce98587969d844470c650fd2dd5284b0801a7a63a052279ee60f9c95c65398b3d5448b7ea5dfa67f971c3c8cbd5261ebef63b437b0a945fe8d38 SHA512 bdce84633bb5e735b6500b4d3da15894ab2adb34af81bdd053b2b19ffd5286b9fd3f66c73d13c930d72521627486bd80f10f8d3945cb50bb161981aac6e4ce7e
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62
 DIST github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod 32 BLAKE2B b4a6a587860fd47f9340df6d0af6ec2cae0f503dc71c715ba513bf266e707f02df445c0a0006cf9839a647ea613703bb9fdcf6b002de99a5383dd33ed960173b SHA512 c1830b7804ca1b5a7c6d258f0dbc92c733b70551b1fa44ea0144f0b263e3f7283047c19770971565386d197fff2e8685cd67c2870f85e0dc1f9143016f9bc572
 DIST github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip 23165 BLAKE2B 828e907723a961b6ea098162a30917e9f710ac38218529d2182056b551b7da98578d9e4d52b1259f9b4f2c03d1a1d27490bc037e96eb55a325eac8a7360a7718 SHA512 ead3c46b7409ed22f125b75333fcf558dcfde165e20a837e89228e5674da65a92df59380c4018d6784a3509d4e99a54cdf7ab7c5d6ca09bfe2cbbc5347ae456f
 DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod 40 BLAKE2B ddfa83250a6d66e0f112a249993164e9dc1880abef25e9d8921c58bba907eccc0fca5f34cf3333523d81b22e615e6bda8e1080a7bbb8d21e33fafc168de0cf8f SHA512 33a53fe7874517289a9eb9d87b62060ab4827159300acb6f933018b30fc56e3356ec3d33ee64e452137cc6c892a0c6eddeb7e6bd383be8972407c6e7568f94fa
@@ -86,11 +96,15 @@ DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip 15917 BLAKE2B 66bf9607834472667be4da679727ff2b004e95dc52e4c69d1470586244387b3cb2afb792b8f7d858c4edb3f73151771eed8d7509c7da91ad31655a945ac4d326 SHA512 b1267266cdb9895cfc0707dcfbb3dbcc8e3a53adb297811ee70d20f6a77d080f5cb0c4b8438e68d933a7ebf701c0c3e3f9a1b881916fbdf5b4832d5ae790ebe8
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip 16706 BLAKE2B 3077f81adf72f995a24e9e8e0fd90e0457d5c210cba7b820dfed7a2cddb06eef4ad4747ff0da2e663419ba891df9fa7ff374e1bc73f2326faddcde17bd3e6bae SHA512 c44bca4c63fc38ebd97c2abb7b5bfa2af635548723697d9533590242b936f1b55b119d0f4a327f1b02c546d571cd0d085f727c00057634d8c2316d1c7249fecd
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
 DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.4.mod 44 BLAKE2B 94ad329f624923cf978da8c5a6ee75345463bbca80f0165433c6e2221795f0fc9d5751ba2f00a815dc4ae9320c3a2994c8ba70e5775eefdd315dba02561d6d70 SHA512 40bca3f1c4e260519e554e71f0578c9e8c6e0ee064d65446f869fe24ae73c84beb01b91db4e48cc324cde72b43ea695721b490606dfa2aff17f1037b51de7fda
 DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.4.zip 50127 BLAKE2B a1be6b96e421a711f6bbb67520724fd3723a0f218bb530e77f5f34916d8d8f526a56614ab5b0336b6f3707cdbb47ab96e7b1c4a32917f3d2e76b74daaec636b7 SHA512 e094a536e0a8de13a21272073bfbffce16e27f2971c5426a34199859828f014c8c2e60c105d2765ddaa46fd1340f6550c052160dcb16b97383c2f0269395a094
 DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.5.mod 44 BLAKE2B 94ad329f624923cf978da8c5a6ee75345463bbca80f0165433c6e2221795f0fc9d5751ba2f00a815dc4ae9320c3a2994c8ba70e5775eefdd315dba02561d6d70 SHA512 40bca3f1c4e260519e554e71f0578c9e8c6e0ee064d65446f869fe24ae73c84beb01b91db4e48cc324cde72b43ea695721b490606dfa2aff17f1037b51de7fda
 DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.5.zip 53497 BLAKE2B 805e5717032f2fcbb5821f2315fb8745b11d9603be4debaf9271872de45428a5b1ddf97049765c71e1dc080f53291ba2c06426f41cb5081c99c65e76e83cbdde SHA512 3be5ef1b956bffda1a8e1b7eb2536cb0384d8c66baa21d16cb6ed75eb3019651721631d00277804355133ff6cf72d7b913b617532f41bd09736745f342fe5786
+DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.mod 44 BLAKE2B 94ad329f624923cf978da8c5a6ee75345463bbca80f0165433c6e2221795f0fc9d5751ba2f00a815dc4ae9320c3a2994c8ba70e5775eefdd315dba02561d6d70 SHA512 40bca3f1c4e260519e554e71f0578c9e8c6e0ee064d65446f869fe24ae73c84beb01b91db4e48cc324cde72b43ea695721b490606dfa2aff17f1037b51de7fda
+DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.6.zip 54484 BLAKE2B af7a19565d04fd3948b7e993058eaf38ff83e18fc8a648ac59875aa2b4185195f3f2c80eb30cbc17da74f85672fbec5eec151849f06c74baf9599adf3362d9fb SHA512 bfcf27f8b1703d50af88ffd871398b5c56d2bf8f2441d6c97ee416d64eabe7badc9df11d588aafa7d98bb5eaa3163e335eae4c03bc186ac38bbf8aa0bccfaf26
 DIST github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.mod 32 BLAKE2B 4d59f879c5dcc4dad7245ab234981ff0906c2c3ab979d0e264fba1741785e5bc33a20d7177c58a8cfbfcd2d0f7b83ff141634bdc1e277b70fd68d23e83e9c5e5 SHA512 acf5ab31222c39f98b7bdbdeeaea6ac7daa0acd3440de82fe67537da6c735968bc442901aa3617fbb02602d5d90f255fc92501c1239a62e6f57c683990588cbc
 DIST github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip 22492 BLAKE2B e82ef3edaee9b1060bbb2933f101a6298978cf568e79626b2d327d970da112d433ba4d5fd267b2ba1040c85de93a83d8649acb584f35766720506f2b2a950aae SHA512 5e6879cca425ea5b46f6acdaa71c63ca9da3f4d056ba50b8c037552595ff18151d0b399955c5037281a868c8c126753d95a36ed00ac2106dbe8d4e1fba915daf
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
@@ -118,6 +132,8 @@ DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d6
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip 12177 BLAKE2B 8089c6123a976fc954dc76f74aadea87031bef339aa263aa38e80d3f3ee0fe87c58d9986b2961e29b746618617e2cb6b2cfbacb5c413acf963a2464d36dd0bc0 SHA512 54509ddbb3aecd1980215f73a53739d2f3c757daf67c78e54c508474678cb5df929a3b8e17f8d2b66438c1e78989a2268db2b32d6a0a6d5236abb6936a09ac04
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip 13682 BLAKE2B d7065d3799d84593a9f7f7d93b8c286b7673505bb292208ba0475573667831ecf1aca5236f4703f1bd4d43e41b7cb688a9abe7502181edc9a76305e2a5842ebf SHA512 60a5dfa6c733fa6f71f2b0fb16ee153b2905f940b5eb7e95ff0d04bd3537961467426a1f6064d079fb164190d6a8b3c4bdeece2bf643057f34f7f96e9842f54f
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
@@ -131,6 +147,8 @@ DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323e
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
 DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.mod 29 BLAKE2B ced49475e4e8b7199364d477553bbdf91390d5969a6840e688e9d24d70afcf28ede7ef8fc09c89f23a32bfd65bc0bf9f9b58261b693e5162189e37be03bfba2f SHA512 93e7d64e25fc66cfcf514bf546e618198e32d2c35fadaec01684e9488489b484ee402efd301435eb2f725f086ea851ff0445fcdd26775848db3494795a09183b
 DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20170206155736-9520e82c474b.zip 7444 BLAKE2B aa8d4a83365fb9de2c184015be855c1bb9a82772fc154390a13cf95bf5a755beb3544111e90e02121e5251729bbf0fe072de7b6f8f8ca6eccb2585430e88a839 SHA512 fcd99a4e9294362485d8f1f66283416c53b3079bbfdf3e9d1849fc1a9ebb61970563a9fe479f84fc9037f1fa7b820291026cf4072a3c81df2555876d02d99eb7
+DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod 29 BLAKE2B ced49475e4e8b7199364d477553bbdf91390d5969a6840e688e9d24d70afcf28ede7ef8fc09c89f23a32bfd65bc0bf9f9b58261b693e5162189e37be03bfba2f SHA512 93e7d64e25fc66cfcf514bf546e618198e32d2c35fadaec01684e9488489b484ee402efd301435eb2f725f086ea851ff0445fcdd26775848db3494795a09183b
+DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.zip 7713 BLAKE2B 00c6ba491b5508ba3e1e6954be790e00da0c7ccecbd3d95abd1f791d2de4b40297b2f4bb9f9dce68dafcaae451f9674c358fdfafa82b94e441bc559dfb894437 SHA512 7d5646b8fbf81e808791fede4a64c2b5d9ff8353253fb6a0914c992ffd205ac6023e55c43fea317fcbdfa1260a74adce4ee240cd27f94988c8596eb5e9e092a4
 DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod 111 BLAKE2B cd42dc1330b96fae45e713c29f29646a37b6ad3470419a4bcb43c20c06a5b4fc1f3e198b5b2f99ea6da0d3eb241a2e5becd89fdcde6f015a773cc0170686dc40 SHA512 3f63e75a3eaf94a9dd340bf3fd5f615ea713ab08725e9d90435ef4a7df218f1793069a73c0295a667edc008cabe6ed8cb9e3db71035f0a3b801e73e89fb38697
 DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip 155023 BLAKE2B a7deb9eb724afb25ca7e806b916ff452a8077833ad962901e4d48ee6d7c907e4e2f05b6d7216905e412be864e9f7634c7ec648ce98b8da1e2e448a5087c0681b SHA512 49e76ccc9a2932cb6e7c32f98ebcbd851554d5e5c70d8302563178a39713b81e735aaf6c1cd20cdeb66b655734da11fa0994bda94fa1032845da96bdb899f958
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
@@ -140,6 +158,8 @@ DIST github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod 87 BLAKE2B cb79e46ab6a5bd617
 DIST github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip 21720 BLAKE2B 4d088d303d11be2734aad265a65981ac006f824d1564cc9a1517f1ad85192c042d1d00da87647d012522f477372f4816b9b15af5ab187d8a3d5a9ddeeefbd7ec SHA512 65c5012688d4e6d6730a2a50d770aab99e6664948ff2375b76b44283c7b0ebd3f35d1c2a460830e936743a1a9267b9fd1f9986ada7c8b01c459199dcc54b2d4d
 DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.4.0.mod 195 BLAKE2B 199a83e2d16de25f166542ce1be5be51a5bf4bc80c4dd5d5f2c28851591ff97922d09a8da44f685ab0287f7e01ffbf7a6dcb260ef3eb804b606db72effafc31d SHA512 247fa27c3b947eb1808a687fc67732cab9ccf48ec075375096f93b64490243f04f76da7cf4338a3200ff379cb97448f29abaf981190da5e44d82a87d9eaad96a
 DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.4.0.zip 408235 BLAKE2B 597bcf10b4edb3914744517a09fb0e33c521968f5df27cd3faa53da57ec3b5c7749e4040da26cde39baf3b6a0ea51a0180ec21962a01b10a4808802993d5fb01 SHA512 cb5f2fc5b32eb4f0608c0b6466a1b5a19c99bc309ab1f83627ad7d576c872c5d2d5d9b52c774825e77e6d863d9d395f853fd4f705aa3608d097d09583a07a764
+DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod 233 BLAKE2B 57f3b11b63eef192fad7cc8ba14b9be56ea9865b650d85d1db2e5a5a67088e03bb7948b61033d616df25454d795f33b9e6c65ad5c791a80f2db135728072774d SHA512 fc2d84b74177bfa1208cee1965ed421f6527bff59c2b0b3a10d31b41f1ce629e2537eea56f42e4e6f438607578dacace1ecd1cc4e81fa90d8530d048ae1e9a9e
+DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.zip 411922 BLAKE2B 7e7334afdf133c56cad4c63d9ce3add449c688750065c3e1da5f2bb28c75f7ce8afe58642213dc4cc19bf8e64ec25b7f1baedb5a4caa28da066e9a4035f8968e SHA512 d3c0cbbe1681820cec2c117223a838c5346bb48216262152de5faca819300cfbda8def7db03d3e6c07ce0223df5177164d39f593ec43ffd52aac872f0e39e520
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
 DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod 96 BLAKE2B f192300c52fbe1d75a3a9c89e3d808d25f13944940475b8f2654b3e3a1205721f6a9aa553ab6293f7ea4c9e8be3d695bf7fd5fb55c35e3179cef924fd1334273 SHA512 29bf0aa6ae9cc8d66b0e1bf852534dda3a3e0e16c918be357cc8f6fec14f2d2537a94cafa1ca9cd06b64363a8f0f0d3c00dabcb5137699aced8d16af767f6ce8
@@ -149,6 +169,7 @@ DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
@@ -160,6 +181,8 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e2
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
+DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip 45664 BLAKE2B 300a1f32c514f6857be8cffe884b9fc29091a709746c83567f82413b0e64d7f42ff3aa6bc34846745489f98e10045736e3571797e715fad87cec937df28d0fc9 SHA512 f9a98001ee97894e319b82f4c190f93ce7a60e109b991691f3a90cd51818596b1baefcc1c24793aa3c8c9d4505f809fbc689037b1a929e21e17fcf134134118b
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
@@ -171,6 +194,8 @@ DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200414012201-bbc966b061dd
 DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200414012201-bbc966b061dd.zip 45974 BLAKE2B d00a240342b45f910424c2824a863fb850a7765d0cb5ff7e9bcd978a8349cf269797c4370c40f04f57b98738344b26a631f427527f69bb8b097485858dbb9423 SHA512 6ffbfc7a957698eb531f5b8a8110da5103c8498f7b7d02c843ff827e54557fb77227f0126aa6c2ac772746ab1aeedf3bea1b86a2cf03a328ba38cc0480f879ed
 DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200627185320-e003124d66e4.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
 DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200627185320-e003124d66e4.zip 46033 BLAKE2B 59549b4f19c4fd761b4135263a814c1bc61f881e2d45bf906f2aec010eaf890e93fd02c9521f760d9f1ca7d6fe324b964fdb73326e160f79e867f6a236a06913 SHA512 c8d68af95fd6ced0708a9704fcad645a9b964b1e567c961108e57fcdc3f3866a753b70d912f87477eb2651da01d0502818c2af33e94d27529db9539bec6a5187
+DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200802174311-f27d2ca7f6d5.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
+DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200802174311-f27d2ca7f6d5.zip 46371 BLAKE2B 2f5c65a91c534f7ab58e2593dd0b17bb7f8758a8fedce35cd77eb7ab97faff1d15b0bdf4fa6b1dc0247aa8fa07f3820d9cccc8f26f88583b326533e2c24fc076 SHA512 d889227fa22c06934e9a5169abcf25620d4aa97e9ff35520b427a1ead2c306697020d904d8b31a22c0166d9a5b4e5c4ade7e0e7a07905d4c1123207799858d6c
 DIST github.com%2Fshurcoo!l%2Fgraphql%2F@v%2Fv0.0.0-20181231061246-d48a9a75455f.mod 35 BLAKE2B 5203f9130c17196d735630eeea5f692c85ad9cb9c1f2884507fd31715329724313b852c5182ea175cd9ba8ba61d0b26259f42d83f46bf6bbd24c3e0a0864b141 SHA512 9a08a375efbecd30f4d479810be1dc4bba52e1f7254ff4a527a390628e2396b6b1838d305a7f417b932f82c53a4f45df7938c0d30aceb3d478790233bb0028d7
 DIST github.com%2Fshurcoo!l%2Fgraphql%2F@v%2Fv0.0.0-20181231061246-d48a9a75455f.zip 24322 BLAKE2B c3cdee6186b0847db90eeeb6e21ce38d0f14227db33d9ac4787ac22325e942a5b9882da4a47d0786e11c4f0967a4776f2434cbfbd44e18dcce95eb5be0da0f85 SHA512 b4a8986187ca882557f6780663433eaadf51ea0395924590773396ed89b0aeff2d2b31a6a63419e16cc4231cfd7f07817d6e51254238f42893ba47ebbb405ea7
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
@@ -201,12 +226,16 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.24.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.24.zip 260015 BLAKE2B a7f83264cdc1f7cbae1e7e62301557b3ae2f268b0c5d134cb363eb62382960e81dac038d3b570c6fc33815bd29f64f91805f314d0c0222138775401562059336 SHA512 fcccb3f27cb8d64c5eb644cfc65c8623ef2c8030eb7f2c4a29bd930e3962df54e26f554f026ed99e96b276e8aca58a9682e367e5ac25567e49eb1392de70d5b1
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.zip 263448 BLAKE2B 91fc28eb885a3030886862073f55978d2d1d7bd1186d3173f107809d09b0093bb2d4af45e812a4756fb8406bf00eeb6ac0c512fd19390154e91302d75232a6cd SHA512 e67fa8a6dbd35966bd06f6e2fcd346e09417dc3d8f7f093163f2dfeba4523ae567a0cf8dbb491e0a85d1911ba0583b61fbbbeec4b5e3a01847621cd31649b507
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
@@ -221,6 +250,8 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip 1871909 BLAKE2B fa2d419a5bdff43385f70e3c6e61f8c1b3528b6c4e21c3105f66dc358515b6336673188ff68b27a792be9ae69d77cd26c82b7e30605b974e4435634f961c7583 SHA512 de179d887c4ed6ebba0a1cdcfa67b8312b8b2dcd9bd04589d581c872f6fa7a8606ad1376dc6933dec41938781218a91f31fa27331d80cbda30542b8cd14c5af1
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip 1876176 BLAKE2B 84ea067e58783d36780037272d669162fce90fac23d5bb6090898e14ed6753ebd4bafc001b3e3ec792a29a2a802d57763a365a3f89f1acfc37f18e320aee42e6 SHA512 1a94d4b9e787a0f322cf9ee223c3b01d8dbd34b59381330808d2682ae05de0cdad62c31e085c554033e852bc5fe49d789993a668a2d75bd7eb8b2389ac774e65
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -255,10 +286,14 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip 1471634 BLAKE2B cd90cd97113e500e5d20b6bb1c9921be7132157089936ca68d862efc531e2e3a8ede741d6c682c8f38122dc33cb65c84a8962eb1eb9cf25277502740639091d6 SHA512 c3fce15b61446dc0805383e55eefcbace75fe1e8149561692624f47ad69d20eb81e6415dc0000beec435a6caf0937b9bbbef67504016a5f77faaf72a46125085
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -285,12 +320,16 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.zip 101288 BLAKE2B e67aaf35537a57e2fd73a0ebf74e6a15924c43ad58ad5cdb7acb67b82031ea86b79eec9a11548c08a08664f6812bc9066fcffa918496591c1f0ddd15a05a4a29 SHA512 e89999a0ccf811c36b476a131197084fd1ad30f2c801cbcf3e9184adac69587ddbc9df2650e8be47bf1a1e1b89422a62484076c3d124470f8013e72a379b0740
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200506231410-2ff61e1afc86.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200506231410-2ff61e1afc86.zip 101681 BLAKE2B 0021071f9f09d21a14b9a6ebcd6167081656046b0ee1a7dddf9602863a01a5d35c260d3a458ce22e8993c58ed7409556109a4e32561ca85ac2a335720b8c1680 SHA512 4e57cd4228ab4745b75f1681faa9da20db355a01d11a1f50fc90423145d41105203572e1c12545861d003ee3b1e0e4a6047f45b487f437e42d07b91e32b6574a
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 EBUILD github-cli-0.10.1.ebuild 14811 BLAKE2B 9271544dc3dddb30c8261aa8a959a2bd7bec1c6bf613814f2bae0338f7d1f819eea8d53f99655ec134d28db74d75fbd0d2aca9d7ea1e3647e89bc2944d93c09d SHA512 56db74f5460b742ffac3a6a0800c2fa4f3ffd439772c174051906eadf1d8d7dc4145aecd3d45fdab13219d8bf26952b2a65081bd2affdb4cb9db2ffd5de7cb77
 EBUILD github-cli-0.11.0.ebuild 14955 BLAKE2B b6fb74ce2981d0fb5632f816659d451decf84dd9a4bffd34d8e6c70abee466e9cad21a61656b740ad106572b7175da1c6884950a00f4ee23b9f147281e2418dc SHA512 c8ca77588f33fefaf00ba941f443ff93bade89a2ec0ad8fe4f076e6b6fcf4903f901cb44866f2a465ea900df03750b84df2d3678d25ca5b8232e796056d7bb01
 EBUILD github-cli-0.8.0.ebuild 13976 BLAKE2B 4f07e3c272f93aaaec21d91e87d6e9dcc5a4727f98e3d37f1aeab73082b653debe44274d54a9bc9a71065f260c1eaa32aa0e0be76846237b4f06255d730287da SHA512 daf47d0f292f8f8bcfc1137cba8cf67df3677daa99f08d7bf2d4c2db080e581c7a7c5cc398ad223a0126e72a31407eaa135deeca3c5b71651af7ae51dbbc4d76
 EBUILD github-cli-0.9.0-r1.ebuild 14428 BLAKE2B f50d76ca95adf375bef2be3a8e514b1839c1dc1778ae29cf9b851dacfa127ea71bd8a639c65d63e326a21436acb0ec23bbdf6e7ab3f4efc1154bd4e24ee5241c SHA512 e2fbaca1d718798501aabc8362b1f62c7eab0b4d48314d2650b5fa203927618237ea51b583c38b70ed5afae5ce7ed090e89a98dcd4ffa3e6b468d201c7e24798
+EBUILD github-cli-1.0.0.ebuild 15257 BLAKE2B bf13252169a4a9acf8e896d1cab65726802b0668ff30fdf6efe2f3a95288e8d220411919b4e3c2dc39f5078f7b5241d2b6f03deaa7045c7222632d5850d0dee2 SHA512 4625ed04e5cee5574c4159824b60ada8a306131c3b0f7d9656304f01f4f0a1adc46ccbade49080b97ad95e54938a829f79f9f523aca0022a5c049e415705098d
 EBUILD github-cli-9999.ebuild 14428 BLAKE2B f50d76ca95adf375bef2be3a8e514b1839c1dc1778ae29cf9b851dacfa127ea71bd8a639c65d63e326a21436acb0ec23bbdf6e7ab3f4efc1154bd4e24ee5241c SHA512 e2fbaca1d718798501aabc8362b1f62c7eab0b4d48314d2650b5fa203927618237ea51b583c38b70ed5afae5ce7ed090e89a98dcd4ffa3e6b468d201c7e24798
 MISC metadata.xml 332 BLAKE2B 54306af02dde121faa49501abda73a96982f0e2aa0c34b1bc3698594d558b52aa4f98cf2c966a5d3cc2df698cade7461d99de437a92edc41958d0057c8cfd339 SHA512 f3aec1ccc8b69282598c560f63162fae9fadb47e784725e0d05631d2b4686bfd001f6b0a899dab39c977a9da5788b5c38f796723653f80be2b65525ea5e7f930
diff --git a/dev-util/github-cli/github-cli-1.0.0.ebuild b/dev-util/github-cli/github-cli-1.0.0.ebuild
new file mode 100644
index 000000000000..29df95f86bca
--- /dev/null
+++ b/dev-util/github-cli/github-cli-1.0.0.ebuild
@@ -0,0 +1,330 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="GitHub CLI"
+HOMEPAGE="https://github.com/cli/cli"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cli/cli.git"
+else
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"github.com/AlecAivazis/survey/v2 v2.1.1"
+	"github.com/AlecAivazis/survey/v2 v2.1.1/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/MakeNowJust/heredoc v1.0.0"
+	"github.com/MakeNowJust/heredoc v1.0.0/go.mod"
+	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
+	"github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+	"github.com/alecthomas/chroma v0.7.3"
+	"github.com/alecthomas/chroma v0.7.3/go.mod"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+	"github.com/alecthomas/kong v0.2.4/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/briandowns/spinner v1.11.1"
+	"github.com/briandowns/spinner v1.11.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684"
+	"github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684/go.mod"
+	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e"
+	"github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dlclark/regexp2 v1.2.0"
+	"github.com/dlclark/regexp2 v1.2.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.5.2"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
+	"github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/graph-gophers/graphql-go v0.0.0-20200622220639-c1d9693c95a6/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.1"
+	"github.com/hashicorp/go-version v1.2.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/henvic/httpretty v0.0.6"
+	"github.com/henvic/httpretty v0.0.6/go.mod"
+	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
+	"github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.4"
+	"github.com/kr/pty v1.1.4/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.3"
+	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mattn/go-colorable v0.1.2"
+	"github.com/mattn/go-colorable v0.1.2/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-colorable v0.1.7"
+	"github.com/mattn/go-colorable v0.1.7/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.7"
+	"github.com/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+	"github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d"
+	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.2"
+	"github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/muesli/reflow v0.1.0"
+	"github.com/muesli/reflow v0.1.0/go.mod"
+	"github.com/muesli/termenv v0.6.0"
+	"github.com/muesli/termenv v0.6.0/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.4"
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rivo/uniseg v0.1.0"
+	"github.com/rivo/uniseg v0.1.0/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/githubv4 v0.0.0-20200802174311-f27d2ca7f6d5"
+	"github.com/shurcooL/githubv4 v0.0.0-20200802174311-f27d2ca7f6d5/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v1.0.0"
+	"github.com/spf13/cobra v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/testify v1.2.1/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yuin/goldmark v1.2.0"
+	"github.com/yuin/goldmark v1.2.0/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5"
+	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4"
+	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/appengine v1.1.0"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	)
+go-module_set_globals
+	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+			${EGO_SUM_SRC_URI}"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/cli-${PV}"
+fi
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
+SLOT="0"
+
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		go-module_live_vendor
+	else
+		go-module_src_unpack
+	fi
+}
+
+src_compile() {
+	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
+	# Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
+	unset LDFLAGS
+	# Once we set up cross compiling, this line will need to be adjusted
+	# to compile for the target.
+	# Everything else in this function happens on the host.
+	emake
+
+	einfo "Building man pages"
+	emake manpages
+
+	einfo "Building completions"
+	go run ./cmd/gh completion -s bash > gh.bash-completion || die
+	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
+}
+
+src_install() {
+	dobin bin/gh
+	dodoc README.md
+
+	doman share/man/man?/gh*.?
+
+	newbashcomp gh.bash-completion gh
+	insinto /usr/share/zsh/site-functions
+	newins gh.zsh-completion _gh
+}
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index fe824f963844..f28ad6881b46 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -2,6 +2,6 @@ DIST gtk-update-icon-cache-3.24.16.tar.bz2 91713 BLAKE2B 883c1437ecbff8cdec545fb
 DIST gtk-update-icon-cache-3.24.20.tar.bz2 91769 BLAKE2B 4fb1d4e06117924377e2e3f28f733ffd4f929414e6e36855a4486d6aa2a63f3a37cf5710c8dffdb6c32470c24861070a3160b8373dfa10a3831d098446f5701f SHA512 2ba23145e3cd46d3cd7129c68355c6918a271688935b828be110049e6a912879d25f88a8105c8dd1484de8b0c89d220bb6e8f4282aaf083602ad88e2cef9a54e
 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.20.ebuild 895 BLAKE2B eab694de369f6703304e6d838a1a73e0ddeb996253b65a8a14368e52919ae75c2ee040f261152b19040d71c23108ac027b7a6f6f0cbacc8cdd5325c2b5a66750 SHA512 3e228071261e416f164201cef33c5e68d8e8936ffb89985ab93614d2d325cf419dd2ab2f331225180258575581407b54c0caa47d263b45f631787db78898085f
 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.20.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
index 2e418357d6dc..f83602ea880d 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.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/gyp/Manifest b/dev-util/gyp/Manifest
index d9d89b990d6c..ee97450eddd0 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
-DIST gyp-20170904022846.tar.xz 447608 BLAKE2B 41f0e28d04039358a9e4ec9628fe1d936d19748061ea882a4e47f2cb23549db3866c5281e102b8f95d6ed37cfe999e7342129a81333671ee42534fc53d2a0d0e SHA512 9336be1103048fe5f51f90fcb2a153bba7638e71e4b579c47b725db81ae4257a56a8f7dacddc936e627862ee6149a453f1c7f5bede633cbd3076e0fa2fce07a7
-EBUILD gyp-20170904022846-r1.ebuild 788 BLAKE2B 2fb14abe495c217952de94a24ba9a1d7e634dddd91139f3f20df2d97b5f78acd6fab936fe6839b92a02703889e8799aa32430713069ff86b3e092772ba887d51 SHA512 68912342b6876b7d5d3c8588fb15c19316353090da62b04aef730c06a9a706436bb8ed0d12134b2a63af709c2e5dfcdecc973fbb8760eac1e6cfb5a487a470ab
-EBUILD gyp-99999999999999.ebuild 839 BLAKE2B 23211f1919910dad238ec6c1bda075cf5fa738a8b1b4e0bc1ce5b9139f81d516d3a59dfa705f97815700c600416fffc21b6692c3a75507a7e9b9652b3a949bf0 SHA512 b80be2b5679e6c06c09264b711636593a19a709828bd0c4e4343d8784b56708c4165ffa51ea2e94b8e5d5f4518ee9a7161f00fb57f4bb4d4683ba84b80c21ae0
+DIST gyp-20200512145953.tar.xz 443884 BLAKE2B 74ff269e3e8aa51e6b34f795892f6e8922d098a81b4d855619520d3d366e79b611931cddf4ee2ec60a7e040af11ac8eba7582ad10e24de627df5a4aa4eba6474 SHA512 35bf2af22f2e632b3d6e546e5017df8effd0c7ad80beed9b95ed1e2f294d70215889bc6a0147506461254e951d70189dc48824af10a6620e996945d2cf5586ee
+EBUILD gyp-20200512145953.ebuild 1289 BLAKE2B 1c4f2b4adc041fccaace6c4341aa6fdd7b98733a871d65398514bf6032525d9809089be4b522fe469a856c4a390b45a096f3352764f7e677752b8f1a9ab1efc7 SHA512 135cc599f3a6a5bd15ba7303260b5cbdda8a5ae1520d8ad136fb1443b71df63ffa4ea5e3fcbefdcf4157a2a299328ea2adb25197501173a70a2d3ef5faf6f951
+EBUILD gyp-99999999999999.ebuild 1266 BLAKE2B f4020ae01454a7141fa18ce8a8c66aed1143462992bc54e553e33a5189a1e4f7f687c3c134b62abac3d3c90abc470c493d92e040da5f87841d2108a2ef996fa9 SHA512 a7ad2fb23ac45acd63a8a42926f46c1a4fab63f7e03b6c3cbdfcf72b1b683fc0104fc31af89c7d433bf85d6b5f9366d29d67116071a798de42ff2db8b1219a63
 MISC metadata.xml 415 BLAKE2B bee460235492c13da7eb83441f00a502d900c169b48c91802a8891f9856c5f87aa225e61d8efd90ac2aade3ec52a93db293e3927b73c9b9b2708f723370d8585 SHA512 378e53a81fa2177409ae4557c336ddfb62b8657bf2d756ae651011d5dc5e94604d52aece3cdda38fbd0f123d5a1f83b721ccee3ecc5870cc562670fd748631c9
diff --git a/dev-util/gyp/gyp-20170904022846-r1.ebuild b/dev-util/gyp/gyp-20200512145953.ebuild
index 4c94b7b218e3..9ee7379992fa 100644
--- a/dev-util/gyp/gyp-20170904022846-r1.ebuild
+++ b/dev-util/gyp/gyp-20200512145953.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python2_7)
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 DISTUTILS_SINGLE_IMPL="1"
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -26,8 +27,23 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
-src_test() {
-	# More errors when DeprecationWarnings enabled.
+BDEPEND=""
+DEPEND=""
+RDEPEND=""
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s/'  Linux %s' % ' '\.join(platform.linux_distribution())/'  Linux'/" -i gyptest.py || die
+	sed -e "s/the_dict_key is 'variables'/the_dict_key == 'variables'/" -i pylib/gyp/input.py || die
+	sed \
+		-e "s/os\.environ\['PRESERVE'\] is not ''/os.environ['PRESERVE'] != ''/" \
+		-e "s/conditions is ()/conditions == ()/" \
+		-i test/lib/TestCmd.py || die
+}
+
+python_test() {
+	# More errors with DeprecationWarnings enabled.
 	local -x PYTHONWARNINGS=""
 
 	"${PYTHON}" gyptest.py --all --verbose
diff --git a/dev-util/gyp/gyp-99999999999999.ebuild b/dev-util/gyp/gyp-99999999999999.ebuild
index da57f66635d9..bf36a597b2c0 100644
--- a/dev-util/gyp/gyp-99999999999999.ebuild
+++ b/dev-util/gyp/gyp-99999999999999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 DISTUTILS_SINGLE_IMPL="1"
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
@@ -31,8 +31,19 @@ BDEPEND=""
 DEPEND=""
 RDEPEND=""
 
-src_test() {
-	# More errors when DeprecationWarnings enabled.
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s/'  Linux %s' % ' '\.join(platform.linux_distribution())/'  Linux'/" -i gyptest.py || die
+	sed -e "s/the_dict_key is 'variables'/the_dict_key == 'variables'/" -i pylib/gyp/input.py || die
+	sed \
+		-e "s/os\.environ\['PRESERVE'\] is not ''/os.environ['PRESERVE'] != ''/" \
+		-e "s/conditions is ()/conditions == ()/" \
+		-i test/lib/TestCmd.py || die
+}
+
+python_test() {
+	# More errors with DeprecationWarnings enabled.
 	local -x PYTHONWARNINGS=""
 
 	"${PYTHON}" gyptest.py --all --verbose
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 332e0585a9b1..75e83775e43b 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,5 +1,7 @@
 DIST howdoi-1.2.1.tar.gz 13112 BLAKE2B 33492547fab53085aebff295202e8ad88d41850503155b944f38382137d6ec8fbcd4f6050583b16c01c3701683ccf18c6929c525b5d8f34bf6f2ed9410668f36 SHA512 83af30118087105392ddb95b05d9e7442f5ee5df981faa9143770dedb8927c164a4f30f37ccd219a826340f0f8cd81fc5eb9a3b12e5d3956786294699b6e2f9b
 DIST howdoi-2.0.5.tar.gz 23910 BLAKE2B aace040311845cd8c958d5186ea804a9b0d746694563e2acebd2dbc5630ccbeff66c8a1848245b0f4c127ca611218a0b56e4051d6991e8cd796017a8b5022c46 SHA512 5ad8a99758774c28b26afe5a5ee0f1d2fd6f8ea1afcae5f29b3a02ab3c25758b8cd8aaeccd3afd10a3d02495c6616966cad5da03327c94979e89fc3c601bd367
+DIST howdoi-2.0.6.tar.gz 25113 BLAKE2B 0b83b28d1d0a75a20e49fea0bdd0b3eebae10fee17b2ca195289b8ed014befa7bf17a3c8221dd90d0a2de166f9fab9be24619aa24c886120f2f1d2ee4afe0d84 SHA512 3153ec28f5c3c1c78b786a50da3a328586dc05f5a6fe0bcb33621baf13ae8cda55e15c3538c772dba309cd5a24f631c36c09924ff535cfc8494743b631e01fb5
 EBUILD howdoi-1.2.1.ebuild 613 BLAKE2B eb1915c84777fe6f247c2abef28ae2130648c377ed539bb80b984f19b7eba421fe9cd3e097c2fc390810d0a6cebf7f68286a6f104ed6c354d963e49595f14808 SHA512 cf39a6512968c9bf70684e59421471ce8cc7b5958a94588b4a2462761a216eb4133b9087ff9d48bd2cbd4983e55834996022d76115dded1a5c8377581add7dbe
 EBUILD howdoi-2.0.5.ebuild 655 BLAKE2B 9db2a97feddd4f5460a4bdd4a62861f1aef99caf76602d34de731b586f44e62080e3eeae7b77f57b715e01c5dd2f8a027733cedb48a08dc8f33108bc10af3949 SHA512 56a487f4271914cf55c3267ab705e2ea620b6e10ff550bb87f7f4800eabdc64560ff1f26323b72cf06b2db430c0b897de07d2b047c6ca237d4c09a1323765478
+EBUILD howdoi-2.0.6.ebuild 655 BLAKE2B 9db2a97feddd4f5460a4bdd4a62861f1aef99caf76602d34de731b586f44e62080e3eeae7b77f57b715e01c5dd2f8a027733cedb48a08dc8f33108bc10af3949 SHA512 56a487f4271914cf55c3267ab705e2ea620b6e10ff550bb87f7f4800eabdc64560ff1f26323b72cf06b2db430c0b897de07d2b047c6ca237d4c09a1323765478
 MISC metadata.xml 343 BLAKE2B 34cc8c4f7372fc0492d8b328ccae1b94946bc5593d20a181d6e32d3fc8e79471f517eea7509cf32172ef55092d898ed65350167d465b22bf127f62fbab6dc1c5 SHA512 f83f432490f25508a138dfbce3a67a120937fa12fee712cbdda9302d238805f3bd18034cc52d473d28b990221bb73748c9305f31cdc9912aed91a79f86386efa
diff --git a/dev-util/howdoi/howdoi-2.0.6.ebuild b/dev-util/howdoi/howdoi-2.0.6.ebuild
new file mode 100644
index 000000000000..c7dca4f4594c
--- /dev/null
+++ b/dev-util/howdoi/howdoi-2.0.6.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/idea-community/Manifest b/dev-util/idea-community/Manifest
index 09e9495021c7..237311f4e7d9 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,6 +1,8 @@
 DIST ideaIC-2.1.202.6948.69.tar.gz 529563846 BLAKE2B df3771c8ca85a276a1ed9db5e9483f922a98f25ab82061cc54dee791f84d44dcd7d813180d587a3a9f3cd91d10b83881a3d42da11ecee3be77dccbe2ee7e98c5 SHA512 bc32e01297785bfcf2a57f97e697b7ec8f894f49c5f27959ed3fd5bab6ade0cff8f0091847809f7ee5f7b7299c2bda3e4bdb83cadc68a7a3056242dd83c1c4b9
+DIST ideaIC-2.2.202.7319.50.tar.gz 529375561 BLAKE2B 08a77a1326b81e9d6299779bf48fb0b9be389572143bd92591bcdf6ede79ecf86b725dde634e1b8bd412dc0b886bde29169bb236fbc902ba509b468e79073e90 SHA512 f68fe18a824fd47b3b21f0a3dcd172652858aafa9f81d1db908b3adc82f925677d2ce48d0a06ad58354c06b30e01c36fff910b4eb7d5ec89c408a6a1ff017e8e
 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
 EBUILD idea-community-2020.2.1.202.6948.69.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
+EBUILD idea-community-2020.2.2.202.7319.50.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
 MISC metadata.xml 758 BLAKE2B ab45d0a8508bed2b64d02ca83d0aaffab9dfceb13a6a188accbb18f0648593ef1a9cfa03f375292b9858c05b17f003f4c6c2261b9d962ddaf679eebe7cea2eda SHA512 15ad0429ec342e939f3406e83b736ec9a273cb4ba33998a83584cee7af4ad0433a5a4758c8d01feb24efef51e4a4d9761db18d0bfc054bf9a0980ac8806eb459
diff --git a/dev-util/idea-community/idea-community-2020.2.2.202.7319.50.ebuild b/dev-util/idea-community/idea-community-2020.2.2.202.7319.50.ebuild
new file mode 100644
index 000000000000..97ec35a8801d
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2020.2.2.202.7319.50.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
+# available separately
+JRE11_BASE="11_0_2"
+JRE11_VER="164"
+JRE_BASE="8u202"
+JRE_VER="1483.37"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS="~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
+		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
+		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
+	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
+#either (or neither) bundled
+#Defaulting to jbr8 to match upstream
+IUSE="+jbr8 -jbr11"
+REQUIRED_USE="jbr8? ( !jbr11 )"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	=dev-util/lldb-9*"
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+# jbr11 binary doesn't unpack nicely into a single folder
+src_unpack() {
+	default_src_unpack
+	if use jbr11 ; then
+		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+	fi
+}
+
+src_prepare() {
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	if use jbr8; then
+		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
+	else
+		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+	fi
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+	if use jbr8 || use jbr11 ; then
+	if use jbr8; then
+		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
+	else
+		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	fi
+		if [[ -d ${JRE_DIR} ]]; then
+			for jrebin in $JRE_BINARIES; do
+				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+			done
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 71a4b9d1054b..2a621c9b9340 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,5 +1,7 @@
 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 1759 BLAKE2B 183287bc5e3d3f93406946fed4f96b76ca57c7aec205f03ef45257a17e2099235293e549e6a8d467dc0d15773b494093092121c6b7f8c76dc402cbe5f3766b27 SHA512 a7b1fed4d705a363debebee0e8ca847b4db5b4a17d423ddb6e78cf8f82be3ce06bd2c497545b4b7193605df35c234441585de2e84276d08f0f01bee5cec03acf
+DIST intel-graphics-compiler-1.0.4944.tar.gz 6632351 BLAKE2B a3d72730b8c10fd3810fdb8206d9d92da325a094627b678bb9f8d0941e29c1697994a2d98a1b49780fae62dc421e623dea4c3a7e3061347de5f5b644cfb5e105 SHA512 34fafd5387f3b86bef17511015ff1e8daef75ebdff5d1d14ff2000b58968bb502a9ec1aee988858a2992414f6cdb222e7de19c2d877f7fc8cd84a79417e9a85e
+EBUILD intel-graphics-compiler-1.0.4111.ebuild 1949 BLAKE2B c479aa3914b8d8e03a00d76c21b5ba6bf4e3ce9ef572cbf478eb77c9dce877b6df7b78e6b4aadccebdb811b5dee7b1bf88ae87becb6a010880fd84629f10f272 SHA512 87b2d259c3ec9e1746efc29b242a9908818751b50fc2309bda3c88bdf178d488b88e0feb35209fb6fe424465fe66a3d33254d911751d7a2ac98a6d70965505e7
+EBUILD intel-graphics-compiler-1.0.4944.ebuild 2492 BLAKE2B 2a41f64fb5ab688815cbfb29c4454eabd645cfa4ae0e852ff6fe41511726dd380843a561ebe4b594971093c51f5ceab8b132d9ac766d980bd6b4a254979f996c SHA512 feaaad5029246bff1faff06c3ba9d7c4afb15be0c31656ebfcb1a9dee7127271599144d5fb118625b034f8bb86970aed83f2acc0822eff01f2791ea74c671785
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
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 b5113c4912d6..4b31c121d43e 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
@@ -18,9 +18,7 @@ IUSE="debug"
 
 LLVM_MAX_SLOT=10
 
-# Bug #738934
-#COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
-COMMON="<sys-devel/llvm-10.0.1:=[${MULTILIB_USEDEP}]
+COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
 	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
 DEPEND="${COMMON}"
 RDEPEND="${COMMON}"
@@ -32,6 +30,14 @@ PATCHES=(
 
 S="${WORKDIR}"/${PN}-igc-${PV}
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if tc-is-clang && [[ $(clang-major-version) -ge 10 ]] ; then
+			die "Building IGC with clang-10 and newer is presently not supported (see Bug #738934). Please use clang-9 or gcc instead."
+		fi
+	fi
+}
+
 multilib_src_configure() {
 	# Select the same slot as the best opencl-clang
 	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild
new file mode 100644
index 000000000000..7651df693d6b
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4944.ebuild
@@ -0,0 +1,72 @@
+# 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
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+LLVM_MAX_SLOT=10
+
+# Yes, the last dependency does effectively force the use of llvm-10
+# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
+# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
+# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
+COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+	>=dev-libs/opencl-clang-10.0.0.2:=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+	"${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
+)
+#	"${FILESDIR}"/${PN}-1.0.4427-noVC_TranslateBuild_retval.patch
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+find_best_llvm_slot() {
+	local candidate_slot
+
+	# Select the same slot as the best opencl-clang
+	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
+	einfo "Selecting ${ocl_clang_ver}"
+	candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
+
+	# Sanity check - opencl-clang brings the right LLVM slot as its
+	# dependency so if this is missing, something is very wrong.
+	has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
+
+	echo ${candidate_slot}
+}
+
+multilib_src_configure() {
+	local llvm_slot=$(find_best_llvm_slot)
+	einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
+	local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
+
+	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
+	# IGC uses this definition causes problems for some users (see Bug #718824).
+	use debug || append-cppflags -DNDEBUG
+
+	# VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
+	local mycmakeargs=(
+		-DCCLANG_SONAME_VERSION=${llvm_slot}
+		-DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
+		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+		-DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
+		-DIGC_BUILD__VC_ENABLED=no
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/intel-ocl-sdk/Manifest b/dev-util/intel-ocl-sdk/Manifest
index b0c15225addc..c935119a8514 100644
--- a/dev-util/intel-ocl-sdk/Manifest
+++ b/dev-util/intel-ocl-sdk/Manifest
@@ -1,3 +1,3 @@
 DIST intel_sdk_for_ocl_applications_2014_ubuntu_4.4.0.117_x64.tgz 105808431 BLAKE2B 58b9bdf1979c070757beff7abaa2b16d43993e7dd4aeda05843facd556f25f3c695a6b2de4745890ce6b7b1a5cee1113b62ffae4059aad49a462d28d6d3461c3 SHA512 c0f65bf4d9b894f11076995744d32aef983e01b40472028e411c7be6b9117ef8b260b9abe46d6e936333aca525f98f81aaca2ab3e093ccefb09f525a3646d7e9
-EBUILD intel-ocl-sdk-4.4.0.117-r2.ebuild 2131 BLAKE2B 1d4c5b22e3cad945b429433b11ebad627ddf9e893f2d75ffa07b985b3fe757511e77e2c2aa5ba26f2f4738a9c97886d847d2e1e31a73abf6bad63aab5266bda7 SHA512 8d1bc5ca60546f2936225c4e746780eed603c1f663f0e13d926d9e76821c125cb7cabd794bf0f87705571026e2340ccf259ceb10a002c6eb7a209c242c0628bb
-MISC metadata.xml 611 BLAKE2B ca21cce054fd665fcaf1f98df3e2562dc900b8afffd803af818e5d36541f330a4cba8b4bd1a3023a7c31c85ce9fdb3d063259d0e9979508aaf2a55a0d95d4eca SHA512 b1b403d2c7ab37dbe26dfb25ede8c7f9df69a641759b8db6b76fee9d9f28203a6b552f4a99df02a5aa74f0eaf25def03f65960fc9f8b24c5202f3f10d1c46a90
+EBUILD intel-ocl-sdk-4.4.0.117-r3.ebuild 2205 BLAKE2B 6ef11c628d12c43a113b0dca19663f0a547a9ea8df17d6b5a1df32965e79b9b5946376d6e2f98f805c8d3cf6517eddf7e50143d45677f83442d4b7296fd920f5 SHA512 c9c4306492900b33ab8f346e67382a8e1a7117c3824e8f7be492d57f1e21b396dc3057ac0b3f9474fb816ed70c527d7c8cb262cfa7ff4294205e6a31d9a7b536
+MISC metadata.xml 518 BLAKE2B ef50d331271bba1eb551a84a021cf1512c05740e6f0db90d328cc6dd38f26ac3e08fcfd532147308b75fe52c5bba3971ae87754049171c596851bd3de53fe596 SHA512 d58fb4e44bbb80531cfd138b47b839bef8e90c9401f6fd6459bc39ba03aa0ed517b354aefbd5ebb1b425a53752438f8067502af8397ca9b552d03fc9f659bd3f
diff --git a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild
index 9eaedd6076e3..371f3e61ec93 100644
--- a/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r2.ebuild
+++ b/dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit rpm multilib
+inherit rpm
 
 DESCRIPTION="Intel's implementation of the OpenCL standard"
 HOMEPAGE="https://software.intel.com/en-us/articles/opencl-sdk/"
@@ -11,21 +11,30 @@ SRC_URI="https://registrationcenter.intel.com/irc_nas/4181/intel_sdk_for_ocl_app
 
 LICENSE="Intel-SDP"
 SLOT="0"
-IUSE="android +system-tbb system-clang +system-boost"
+IUSE="android +system-tbb +system-boost"
 KEYWORDS="-* amd64"
 RESTRICT="bindist mirror"
 
 RDEPEND=">=virtual/opencl-3
 	sys-process/numactl
 	system-tbb? ( >=dev-cpp/tbb-4.2.20131118 )
-	system-clang? ( =sys-devel/clang-3.4* )
 	system-boost? ( >=dev-libs/boost-1.52.0:= )
 "
 DEPEND=""
+PDEPEND="
+	dev-libs/glib
+	media-libs/fontconfig
+	media-libs/freetype
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	sys-libs/zlib
+"
 
 S=${WORKDIR}/intel_sdk_for_ocl_applications_2014_ubuntu_${PV}_x64/
 INTEL_CL=opt/intel/opencl-1.2-${PV}
-INTEL_VENDOR_DIR=usr/$(get_libdir)/OpenCL/vendors/intel/
 
 QA_PREBUILT="${INTEL_OCL}/*"
 
@@ -49,12 +58,10 @@ src_prepare() {
 	if use system-boost; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libboost*.so*
 	fi
-	if use system-clang; then
-		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libclang*
-	fi
 	if use system-tbb; then
 		rm -f "${WORKDIR}/${INTEL_CL}"/lib64/libtbb*
 	fi
+	default
 }
 
 src_install() {
@@ -71,8 +78,9 @@ src_install() {
 	# TODO put this somewhere
 	# doins ${INTEL_CL}/eclipse-plug-in/OpenCL_SDK_0.1.0.jar
 
+	INTEL_VENDOR_DIR=usr/lib/OpenCL/vendors/intel/
 	dodir "${INTEL_VENDOR_DIR}"
-	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so"     "${INTEL_VENDOR_DIR}/libOpenCL.so"
-	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1"   "${INTEL_VENDOR_DIR}/libOpenCL.so.1"
-	dosym "/opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1.2" "${INTEL_VENDOR_DIR}/libOpenCL.so.1.2"
+	dosym "../../../../../opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so"     "${INTEL_VENDOR_DIR}/libOpenCL.so"
+	dosym "../../../../../opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1"   "${INTEL_VENDOR_DIR}/libOpenCL.so.1"
+	dosym "../../../../../opt/intel/opencl-1.2-${PV}/lib64/libOpenCL.so.1.2" "${INTEL_VENDOR_DIR}/libOpenCL.so.1.2"
 }
diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
index 61f0f5718487..dd498d74bb3b 100644
--- a/dev-util/intel-ocl-sdk/metadata.xml
+++ b/dev-util/intel-ocl-sdk/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="android">Install android related files</flag>
 		<flag name="system-boost">Use system boost (dev-libs/boost) instead of bundled one</flag>
-		<flag name="system-clang">Use system clang (sys-devel/clang) instead of bundled one</flag>
 		<flag name="system-tbb">Use system Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 3255b9e3a18c..ba5a81abc904 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,12 +2,14 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267
 DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3
+DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.0.ebuild 2477 BLAKE2B 21be1f15644d0c00a5c9fb21d0874b2784116b16a36190947b1df9d4a962a9cefae2e386c741b91b3e60709e1cb8fa8d8327f38c310198641a0c91aaecda9d0b SHA512 61bff2bfcdb91f14c8a4f70b59136df0b39fbdc86aa43e090f116e11e8e03ff0af15d3ca0b0ae7dfd516207e3457b670f08c1cf4198ecd979c5e1c2b4f7fb117
-EBUILD lldb-10.0.1.ebuild 2318 BLAKE2B 7a51d8537d244c152098e46d4b617b42257260f96eba07bffc58b36c15caa3f73295eeb2f7791bc0cc75fdf39dcf3ea62095ce7a5925326afc9d0b077c23ded3 SHA512 ecbef89dccf5f747ab3e48c76deb223e3fd00ced89f2b8abbbd413cd963d60932aa18134a967f7c7ddd6e38d33b44de182edd93b37297ee9297a5d78779394c6
-EBUILD lldb-11.0.0.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-10.0.1.ebuild 2336 BLAKE2B aadc50c6e94522732e3760d608f4904dff90036a6c0eec0e30ae32b40bcdef8e54d00f21aae73b2aa5097a59fcf16cac5c57d4b82dc727d771ba0965749a5788 SHA512 8e0503d60572f67878527a3879c53935cad6ae1d5533ce45f3c33253e3d9535b203ce2720f7ab8b3535708da4c1723e1379c9a9833648714756ff02067aee822
+EBUILD lldb-11.0.0.9999.ebuild 2316 BLAKE2B 556a0c1160097a9fd6853dbe9fc992cb8f76d3fe0a0e05728d70732b9e4815617d9f821b9e4f1332d14015ff6a8d2d4b34f70c9866cd7f31c6e6dd17cda96485 SHA512 44b9aa5f5895ef8002f7caec77dd3947e9833f5fbd56c567d83464b7a611f5aa9c002649115d037c7502cb915d8199c4603f38221fce8a1acc96fb52fca4a3a9
 EBUILD lldb-11.0.0_rc1.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
 EBUILD lldb-11.0.0_rc2.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
-EBUILD lldb-12.0.0.9999.ebuild 2295 BLAKE2B a3e876ca7ae4f0c1278848003cd69ac2b72ba643fede6abfd3ca1ef93243e12ace24a4fbf46315b7e39362f9404ea57aeeaea1d521ea3ca1d453a13f14711d03 SHA512 9e907448f9a3ac8e92fefcb09444214c9b5a27b5217b8fee74f5ffe90abd82530b9ff53fd19b6f2398d336e7c6573387b520bba0d28a00bb664df9f4795007a5
+EBUILD lldb-11.0.0_rc3.ebuild 2316 BLAKE2B 556a0c1160097a9fd6853dbe9fc992cb8f76d3fe0a0e05728d70732b9e4815617d9f821b9e4f1332d14015ff6a8d2d4b34f70c9866cd7f31c6e6dd17cda96485 SHA512 44b9aa5f5895ef8002f7caec77dd3947e9833f5fbd56c567d83464b7a611f5aa9c002649115d037c7502cb915d8199c4603f38221fce8a1acc96fb52fca4a3a9
+EBUILD lldb-12.0.0.9999.ebuild 2316 BLAKE2B 556a0c1160097a9fd6853dbe9fc992cb8f76d3fe0a0e05728d70732b9e4815617d9f821b9e4f1332d14015ff6a8d2d4b34f70c9866cd7f31c6e6dd17cda96485 SHA512 44b9aa5f5895ef8002f7caec77dd3947e9833f5fbd56c567d83464b7a611f5aa9c002649115d037c7502cb915d8199c4603f38221fce8a1acc96fb52fca4a3a9
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.1.ebuild b/dev-util/lldb/lldb-10.0.1.ebuild
index 5b1f9a525b5e..8f08cb60395e 100644
--- a/dev-util/lldb/lldb-10.0.1.ebuild
+++ b/dev-util/lldb/lldb-10.0.1.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="libedit lzma ncurses +python test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
@@ -85,7 +85,8 @@ src_configure() {
 src_test() {
 	local -x LIT_PRESERVES_TMP=1
 	cmake_build check-lldb-lit
-	use python && cmake_build check-lldb
+	# failures + hangs
+	#use python && cmake_build check-lldb
 }
 
 src_install() {
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index 2dfe01834ca3..a5b3aee8c3df 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -85,7 +85,8 @@ src_configure() {
 src_test() {
 	local -x LIT_PRESERVES_TMP=1
 	cmake_build check-lldb-lit
-	use python && cmake_build check-lldb
+	# failures + hangs
+	#use python && cmake_build check-lldb
 }
 
 src_install() {
diff --git a/dev-util/lldb/lldb-11.0.0_rc3.ebuild b/dev-util/lldb/lldb-11.0.0_rc3.ebuild
new file mode 100644
index 000000000000..a5b3aee8c3df
--- /dev/null
+++ b/dev-util/lldb/lldb-11.0.0_rc3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_MULTI_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+		")
+		sys-devel/lld )
+	${PYTHON_DEPS}"
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_COMPILER="$(type -P clang)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/lldb/lldb-12.0.0.9999.ebuild b/dev-util/lldb/lldb-12.0.0.9999.ebuild
index 2dfe01834ca3..a5b3aee8c3df 100644
--- a/dev-util/lldb/lldb-12.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.0.9999.ebuild
@@ -85,7 +85,8 @@ src_configure() {
 src_test() {
 	local -x LIT_PRESERVES_TMP=1
 	cmake_build check-lldb-lit
-	use python && cmake_build check-lldb
+	# failures + hangs
+	#use python && cmake_build check-lldb
 }
 
 src_install() {
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 1f8fe63b11a6..dc7b7f320490 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,12 +1,8 @@
 AUX 0.54.2-multilib-clang.patch 8033 BLAKE2B 724d87eef8d560eb733b9873d28afaa6dd49c23867440d182d427a9a569bcd6852c5007675fde77724f6e05d1a4beb371fb0b474e8aeec2dbae0a7e8ca3a78b8 SHA512 1251222bc107abc1b5b0acfa6c52b4bfcdd47baf2651b291f162b39d384b61383627a7ab4d925ad2df1f36307e79e4806c6e05eb889e98a58688657e40ada29a
 AUX 0.54.2-prefix-dont-strip-rpath.patch 1118 BLAKE2B c28bbb0293c2d15a493bd09c902cd6bb3f48c6d279063f326796919f9d06d0dc99e5a7e975742ad8fe4da3dc5bc9b07329d0ae7cb3186431c12aa93709aaa665 SHA512 bb41c4d06c04af4249c9c5ba5724c982a5edb1fe16118120ed53e52ed82cde0bd0ea43454799c986dd008b48a3bbdb7dac820260d9835b020323babc6ec617ed
-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 2406 BLAKE2B b69982946ae8b15e8ec94c47628eed80d023d9a2bc39f902081c9038f05470a5507bdbd59d5c8506d7d5bc728cb5104eea96c64d6f7ce20ae12522d0e7232a15 SHA512 8512e31a567adbf1f3168a76d24d469a3e9b01f3a8dc986388020ba9f37ae77b690517587182972e5deac514fd75fd80f93f874efda97e54e183a31889fb29ac
-EBUILD meson-0.55.1.ebuild 2286 BLAKE2B 278d16f6f840de9f634f4c8b74b71fb67916b2f89513454c038969a277437bb2db84653345facd71bceefbc70c05a85c526a905646bd9fb88019108e8c5ffbc4 SHA512 fb6207e6e33c2630d29b13fcd044ea2c86843c0802867c0e8c7313e8c2f6c5b8e1464b8409374ff75b0011fa14dc61c325c451efa468399da9d2b6691b8fb58b
+EBUILD meson-0.54.3.ebuild 2405 BLAKE2B 3aa48813a3a17a008558606a36b8bb96bc8476e5d6de900b112e3511508f894692e600670383ce3920c6690df1e785cce39ded1589c034a092b564f9bfac03e8 SHA512 41aff80d144a6b19efb255bc1c2a05039256e4423b0bfb0f6f1f098bed677fdd554cd3498e6cf2d01d35f81f2a302ce1424b7b8d0860aed21aa984ea52c9296d
 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.2.ebuild b/dev-util/meson/meson-0.54.2.ebuild
deleted file mode 100644
index eee417491e84..000000000000
--- a/dev-util/meson/meson-0.54.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-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 ~x64-macos ~x64-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
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/0.54.2-multilib-clang.patch
-)
-
-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
-
-	use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch
-
-	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/meson/meson-0.54.3.ebuild b/dev-util/meson/meson-0.54.3.ebuild
index 26328b22c3d9..e91ba990d3a4 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.1.ebuild b/dev-util/meson/meson-0.55.1.ebuild
deleted file mode 100644
index 38ccf9179e21..000000000000
--- a/dev-util/meson/meson-0.55.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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/molecule-core/Manifest b/dev-util/molecule-core/Manifest
deleted file mode 100644
index f45f5bd2b10b..000000000000
--- a/dev-util/molecule-core/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST molecule-core-1.0.2.tar.bz2 30616 BLAKE2B 00aff5ffa61eac63dbd9bf93027f24e5953a1cb1daa8855e9904f75b8afc68677306ccda40cb5a1db765b086a8cce608ffa5a24efd69de7cab86c43ae3aec07b SHA512 1f501960e4029cb993680c7356aa8fc0ac7afa249d106b4ce97afb39f58cd666640bcf9fd8cee64482077ad23f91da743d6ce54e82863faab20d68a1814d92cb
-EBUILD molecule-core-1.0.2-r1.ebuild 588 BLAKE2B fbb11c547883fab0e5b66436b9344f68b00dd82fa0bdbd69053e4bdd7a0e3e85b141ad1dc06ac145f4974ed3513820b30bb172a2b812ed0a2ab280b6274d625c SHA512 b5e910632e4949a9bb5865761267cd2968d5fb4de786e9fda2b2df6bfd424fe2f52017e83313377e3e5e72edd24b8ce4dfba398fafd185b87e8e85239bdfaa1e
-MISC metadata.xml 1197 BLAKE2B 2ab6fff633d6e31b8c8721f39138026dafd6ac7a5fa9e559e93f39b12e59a4f449704a8a2f4c3dd2f2d1aeb1572e0af22afb54ecd0da9b1165c0af5ebeb43f08 SHA512 740155e85fbd48b3e747a88cd6a1b612f1f6802e9a62c7a3f454fa4908150e0c37ed3c10505b4192acba929d45714bad4856aa3945c33ed5fd48e59435553362
diff --git a/dev-util/molecule-core/metadata.xml b/dev-util/molecule-core/metadata.xml
deleted file mode 100644
index d531ba147a5e..000000000000
--- a/dev-util/molecule-core/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
-	<longdescription lang="en">
-		Molecule is a build tool that can build, rebuild or extend Sabayon Linux or
-		Gentoo Linux OS releases OpenVZ templates and stage4 tarballs.
-		It doesn't contain any specific package manager bit and can work with
-		your favourite one. The philosophy of Molecule is simple: ease of use and
-		modularity.
-		Just like Catalyst, Molecule uses its own .spec file format and learning
-		how to write one is just about reading examples provided at
-		http://git.sabayon.org/molecules.git/.
-		You can tweak your ISO image or create one off your chroot (stage4) in no
-		time. Molecule uses a plugin-based system to implement support for new
-		execution patterns (like ISO to ISO, ISO to Tar, Chroot to ISO, etc).
-		Molecule is born inside Sabayon and is used in its release cycle for both
-		daily(live) and versioned ISO images.
-		Molecule developers are looking for help for writing user docs and HOWTOs.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
deleted file mode 100644
index c524412e7975..000000000000
--- a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-r1
-
-DESCRIPTION="Sabayon distro-agnostic images build tool"
-HOMEPAGE="https://www.sabayon.org"
-SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-util/intltool
-	sys-devel/gettext"
-RDEPEND="
-	sys-process/lsof
-	${PYTHON_DEPS}"
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
-		PREFIX="/usr" SYSCONFDIR="/etc" install
-}
diff --git a/dev-util/molecule-plugins/Manifest b/dev-util/molecule-plugins/Manifest
deleted file mode 100644
index 6dde50ed858b..000000000000
--- a/dev-util/molecule-plugins/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST molecule-plugins-1.0.3.tar.bz2 17662 BLAKE2B 6bbbd484ec7fc8441bfccc8c716475e9bf831804a79a0add1dedd428f2dadbbd1a3025966db25619c34364f2a0b6873946c121f1df6fd3a2dc041a3a7341565a SHA512 e00bb7ed9a19452f0363e3453b56a86c22b2f96b843798ad20c6c61a87acf72a389158bb7c8b1b09cbcdfbcbb4b081996c47b6327d790b72c98a13270ce4cb6c
-EBUILD molecule-plugins-1.0.3.ebuild 643 BLAKE2B 5355e2e32816444421092998bc55c57a741c1c7322e923c0d03ffc9688a174ff14800ceb7edb96629a89526a9462183c3bdfc08672f92551448518196a3aedfc SHA512 1fba908f98ea65de1eda99615e729e9da9a7e9994a1e1244d4a35d13efc2a1b81353a8445e1e8dbaccb6a79a5e7c57142e4122a7fc913f05afd825f8fcb74724
-MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
deleted file mode 100644
index 6227d3cb8fba..000000000000
--- a/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-r1
-
-DESCRIPTION="A set of base plugins for Molecule"
-HOMEPAGE="https://www.sabayon.org"
-SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	>=dev-util/molecule-core-1.0.1"
-RDEPEND="${DEPEND}
-	net-misc/rsync
-	sys-fs/squashfs-tools
-	sys-process/lsof
-	virtual/cdrtools
-	${PYTHON_DEPS}"
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="/usr/lib" \
-		PREFIX="/usr" SYSCONFDIR="/etc" install
-}
diff --git a/dev-util/molecule/Manifest b/dev-util/molecule/Manifest
deleted file mode 100644
index 9d005a507453..000000000000
--- a/dev-util/molecule/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD molecule-2.ebuild 410 BLAKE2B 92beb523963a2b0de5294e9c8fff1b7bbb5d6b526511c83fe54e6560ce767a85a089f19c946be86b286ec40f97b982ade5231c5788ba8a3bb1d01b972a96c16c SHA512 463dbc7047516789646336c04396bc1a8779bf84300919857336c3f88669e7a6afb6b69233b1a7c00f6dc7faa8a8ba29fb9beb66707e551b6b6163f598d40d28
-MISC metadata.xml 346 BLAKE2B 830af22619d9811dc4fe57284341e78745cadff972125d644a02453a2b4dda0ca787d7826a1f7b029b1b66f1242b49a561b1d9bca83b491ab4b1440904657761 SHA512 375fa961d0458d6e8ee556a76fcd9396b9b415880af196592b27aaffd02f5c68f8a8a8b2fe4a8346b2fb18aa94b2c0c2e806ff221f9f3a80fa8cc0700a8c4a5b
diff --git a/dev-util/molecule/metadata.xml b/dev-util/molecule/metadata.xml
deleted file mode 100644
index e14a66af6247..000000000000
--- a/dev-util/molecule/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
-	<use>
-		<flag name="plugins">Add plugins provided by dev-util/molecule-plugins</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-util/molecule/molecule-2.ebuild b/dev-util/molecule/molecule-2.ebuild
deleted file mode 100644
index 65f34e44ba35..000000000000
--- a/dev-util/molecule/molecule-2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Meta package for dev-util/molecule-core and dev-util/molecule-plugins"
-HOMEPAGE="https://www.sabayon.org"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins"
-
-DEPEND=""
-RDEPEND=">=dev-util/molecule-core-1.0.2
-	plugins? ( >=dev-util/molecule-plugins-1.0.2 )"
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index c6f0400a1411..8e5f43b36a4b 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 2688 BLAKE2B de89a2e5709267a583808672c0129878ab4e34291f481f6e1e847e6e7aee997319c1fb19756ad165c0cf4fd3632e07c564fa05642e044edf2ef4c962eae36dec SHA512 54e7ed51457c7dc0da4f484aa129991d0b4d599b402838ddbe026392a5c1d0dea6d8087a7c2ab306881269fd4ac19cfbaf96caee0d9fcb0a195b5b7af404faf6
+EBUILD ninja-1.10.0.ebuild 2687 BLAKE2B e025b310f8ba38be99d226155b365e3a62d5230fbccbe24f045a396b313ee3e8cff7785a9cc3a1e2c55586a4953863d37c7a64fcb0a9a26a1924a335c4b8ca7c SHA512 d25cbb60faa8cf707c4850ae431cb9f46c024ddb32683b226c906294b2dc40f3cd5df5faacc2a6ee968a98cd1df6bdd6ee958e8e3c536b90bafaa96d311115db
 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 e44e4f5c6299..dcfb7965b6c4 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/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 0325ed210f52..5c192a2cb7b8 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -4,6 +4,7 @@ DIST cuda_10.1.105_418.39_linux.run 2423314285 BLAKE2B 924872eaaa4e8ecd6b81765c9
 DIST cuda_10.1.168_418.67_linux.run 2526901749 BLAKE2B ed2207400730600c63895cc894e02a14dce59c6293f198ea2a94f6dd0fab25a005d4754f91376c267cb95f3fdc66ee08e4353ec17b69d28881c59190b9eb4746 SHA512 85635012ec7081e200fb46f973852939f9709e802f495c288d5f31ff1fbd283a578fdaca0afa8955e6e0c7ca6c4862428da5168e0938b48390952d8633350910
 DIST cuda_10.1.243_418.87.00_linux.run 2572375299 BLAKE2B df9cb4faeeeeecc536e72697c6c73d544219f1b23cacb7fed646b0908fc7e573e85920861d56f76776ba637d84964cd1c789a0fe0d6541a4e0adf618b6c74d3c SHA512 f92b19d0242969a65a6e6db43bc293e442abc07a9e168c9e995692e1a401679504598c782e511be3879e1650b90f71a50bbc63c9ee45654c26b5007cdf33c4fe
 DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
+DIST cuda_11.0.3_450.51.06_linux.run 3112522594 BLAKE2B f458aeebee3f7145f46c5607d1743d350ed96e9b8fd824fd94d2c998bcd8ccf3ef924cf37e95ce002ba92f464edd5004164497e820084953613ec2deb6edb144 SHA512 e7014c868c0bf40c000b1fd14d156265773a399782937cc85a2b09cd62abddcacdc20b412e1cc91c3877d01563cf054b1e021f047b32cfff4ab516e7167382dd
 DIST cuda_6.5.14_linux_32.run 76788277 BLAKE2B 75e79dce6cac5155bde8a3cafa945047c489b10272f8a3b94bf55d499df4b9c8b82506a81a20f9fd816bd4fd0514e515a6435399db1cb62b027c76490bd4dfae SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc
 DIST cuda_6.5.14_linux_64.run 972320904 BLAKE2B 4a4361fb7a90989ec4b4aa433189e7b358e5a2272fb9b9c59429e0014ac14e3b8de1b247ee98dc30c3f3ee4cc009eca4fdd86027bd3b9527a683353d60bdf5c6 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e
 DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
@@ -19,6 +20,7 @@ EBUILD nvidia-cuda-toolkit-10.1.105-r3.ebuild 3925 BLAKE2B 6a5bef41d998a705c8abc
 EBUILD nvidia-cuda-toolkit-10.1.168-r2.ebuild 3925 BLAKE2B e43bab5926ca7649293281a6a964b93ee639da955519e616fe82b0d607c52874fa153f622496259d3848146ea08b4d447002714b10382ea417be26effe255746 SHA512 379e6ab18e78e5f66fdc9976556e3edc9b8937de57a7e582567e6237cfd5e412637ce0127e84504bb2b750f40062112488bd8a29faf0b8940a8f04d6e68ea1ee
 EBUILD nvidia-cuda-toolkit-10.1.243-r3.ebuild 4238 BLAKE2B 07fdf4e6eb0ac919a73b0f9d72e7859446f6c9a4f2500430537e79d8cb6f512659c2a56624bec7d7913723f9e6000ecf83746da30e745a43f7631a17648aecbb SHA512 3a5e9a96999c0f23b05f2b3c7452b0f662985e7e3a0ae94cf0619ffd12c96387d540fc2fa58ba2e69933f6fc046387668b06003a1e9d6efec127254ec3043d34
 EBUILD nvidia-cuda-toolkit-10.2.89-r2.ebuild 3992 BLAKE2B 858d1b4db64e393f061a36c3e8f22dfa83bb2e4d083ca5d987eb80b1e74ed2fb51923ecc49a4e32f52291d6ef84e1d82ab257bb345d11225e92be1368b5f4f9d SHA512 047735e7b92f12a7152b950c88d8c6b09da7772a31f4b133c8af5c8295f55d81b312b796b481dd7f6ae6767d3f2632a280533c6bcd5a22ec705dfcbd3933a94b
+EBUILD nvidia-cuda-toolkit-11.0.3.ebuild 6555 BLAKE2B 4637b8fd2819d8f16fbbaf74e3c2aee7738c2fcede4db13c8fb90df55290362db1ba43f9605fb1cbca32053dcad5ccb9e1a28c8408b9a4e07a65bebbac9b8049 SHA512 1d65ed5613c789341a05dc2549954ac4a23e16f23e05d8ed992033edd93361f1d001f8bc955102da37078f425fd790e279cab250ee94e32aa6c549132219c062
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3902 BLAKE2B fb559c6ca55638853cede289104f9528bc939f10c20b9c67d168caf6cc3962c06e56f25961a17acfef4c143a95648efbc7d37f2362ef4af3f40d9d289ef88dcf SHA512 c810885c9fd7747d61078fedcefe4180da8aaa4ee7fa8822908f7d8dc649fd488781ea570f9f078c6a91ac7949cef3f112e8fe8a6bca3bb0d662abbe0ba755e9
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3928 BLAKE2B a3cc31983db891d496f5172bce661a5f1fd77a10afe0fb4ea1e243121530fc5560257c5846cc240da52986c7e6157feaace7047d0c675d0653144f5a42263a21 SHA512 9705c2ee7e76b5a66b20e08ca84c4ff998405a0816bbdd2e3d56eed21115ca154219d079943966525c71460baafdaf2858e2c7c6e08c44eff45db1be4d8c1f0f
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3439 BLAKE2B d1f61624448cdcd69db1a592d6fa4a78004fa8021b591efaa64dcd46263a2803f4983782b87ec9a3a89834e4ed99ab26f7dd706dee2a631887b1ac96b2080d4d SHA512 0c191cb31f5349a7a09c88c1d06e52ce025421a61a2c2bfc925a058b33f855585ccf20d538943c8e7f4d77fd1bb926d16fed76efa467e0a4380ba4b7f93f2c7f
@@ -27,4 +29,4 @@ EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3435 BLAKE2B f404d22f374dad343031ed38a7
 EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3442 BLAKE2B da89d56a1c4e12b9048f3251464a21aa10b287c294f16e9e03d5182f4f7684efb05ab3c6f7fb0e1b7b326899405ce79f407468f00f04a5b12cfb6a4fcc4ceaca SHA512 469619f9ba3dac697353d0761b47e169833571bc20e3b7f59c124df3bc0237a9d1e8eaca74ffafa0fe615bbc0950cd829b358b10bf6939cd0236f7f37d22f6ff
 EBUILD nvidia-cuda-toolkit-9.1.85.ebuild 3418 BLAKE2B 27debd5814eb6814fbffdc2241015663643c5028d6144426bb530705f974383153c3a5a0480e8c3a837fb157811a44dfd3800c58a9e30ba919c91623b32d21a7 SHA512 4972987db01a4826a86386313caa11d27a6f3e7a5c0e87096a7a299a7a83314a10170e9d8f22c3d5dcda29c7ef000824226def568a968ebe668d437193d4f952
 EBUILD nvidia-cuda-toolkit-9.2.88.ebuild 3420 BLAKE2B c0b4f78b1a1947b8414ab2dd163365b189edf15b49465c24f104b424bc11b9b92bd36c633226f5b1a4c01b84721247e58b4501952f96f60531ed42b1eebff3f8 SHA512 c9e5bf620e9d29495d623c70a574e5f1847eef4464820229a77c6ceb25b150be5c8d0c2612193b2ba5fd1642d60d8d0a619f679825355cd7bd42cbaea03f1620
-MISC metadata.xml 456 BLAKE2B 9c2baf84429d6969aad82a907a25acb5080bcfb3a5eb996f235ad05ed6ef5345df1c268bee9398c105f5926184f6179f46f98b396397266eef82ee9f6e7db470 SHA512 7745eb56d4a3a9a7d01e3143e807f2018d288c00bcc6c3bd0624c989d4e15ac5521dc087553cd643ff04392c1ac9964578fe03d05947eb2ed4cae21bceb9c67c
+MISC metadata.xml 725 BLAKE2B c1a42a486876a7d4c8c08f3ee49786941c4425be0dc9e0ae1c0e8de672b4512c365cab425e5a4c99cedd34dc559c63f9111f203e9afff0f9717d8cca368d8722 SHA512 de7189cd9928b3becc20a50bedb6ef9c0056815784d24f2f38662faf60d6d1550e2573c6896bedc51d4e365b669d10d460529de18d5c000140760eec8854c2c1
diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml
index 4b8ba09a6653..27507c5dec4a 100644
--- a/dev-util/nvidia-cuda-toolkit/metadata.xml
+++ b/dev-util/nvidia-cuda-toolkit/metadata.xml
@@ -6,8 +6,11 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<use>
-		<flag name="profiler">Installs the NVIDIA CUDA visual profiler</flag>
-		<flag name="debugger">Installs the CUDA debugger</flag>
-		<flag name="eclipse">Install plugins for eclipse</flag>
+		<flag name="debugger">Install the CUDA debugger</flag>
+		<flag name="eclipse">Install Eclipse plugins</flag>
+		<flag name="nsight">Install profiling and optimizing tools (nsight-compute, nsight-systems)</flag>
+		<flag name="profiler">Install the NVIDIA CUDA profiler (nvprof) and the related libraries</flag>
+		<flag name="sanitizer">Install compute-sanitiazer tool</flag>
+		<flag name="vis-profiler">Install the NVIDIA CUDA visual profiler (nvvp)</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild
new file mode 100644
index 000000000000..019039d5007a
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.0.3.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+DRIVER_PV="450.51.06"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-10[cxx]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
+	debugger? (
+		dev-libs/openssl-compat:1.0.0
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	vis-profiler? (
+		dev-libs/openssl-compat:1.0.0
+		>=virtual/jre-1.6
+	)"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	# ATTENTION: change requires revbump
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4 9.2 9.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	# Install docs and man pages
+	pushd builds/cuda_documentation >/dev/null || die
+
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	popd >/dev/null || die
+
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx}
+		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			local f
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	exeinto ${cudadir}/nvvm/bin
+	doexe builds/cuda_nvcc/nvvm/bin/cicc
+	eend
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/Sanitizer
+		# special handling for the executable
+		exeinto ${cudadir}/Sanitizer
+		doexe builds/cuda_sanitizer_api/Sanitizer/compute-sanitizer
+		eend
+	fi
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		exeinto ${cudadir}/libnvvp
+		doexe builds/cuda_nvvp/libnvvp/nvvp
+		eend
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		exeinto ${cudadir}/${ncu_dir}
+		doexe builds/${ncu_dir}/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+
+		exeinto ${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64
+		doexe builds/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{ncu-ui,ncu-ui.bin,CrashReporter}
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+		eend
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+		exeinto ${cudadir}/${nsys_dir}/target-linux-x64
+		doexe builds/${nsys_dir}/target-linux-x64/nsys
+
+		exeinto ${cudadir}/${nsys_dir}/host-linux-x64
+		doexe builds/${nsys_dir}/host-linux-x64/{nsight-sys,nsight-sys.bin,nsys-ui,CrashReporter,ImportNvtxt,QdstrmImporter,ResolveSymbols}
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+		eend
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle openssl
+		# TODO: unbundle mesa
+		# TODO: unbundle libz
+		# TODO: unbundle libstdc++
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+		# TODO: unbundle libpfm ?
+	fi
+
+	# Add include and lib symlinks
+	dosym "targets/x86_64-linux/include" ${ecudadir}/include
+	dosym "targets/x86_64-linux/lib" ${ecudadir}/lib64
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin$(usex vis-profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+	# TODO: Find a better way to add +x permission to installed executables
+	# TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 9135135b85e6..6a8ac76a0ea5 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,7 +1,9 @@
 DIST packer-1.4.0.tar.gz 9794922 BLAKE2B 2e1d817e0a3f549255ecd8693d6d99b2e45df2e8fb0acc128f03bd1448f28afa865a0849ccf58e9a562ef50b901ea86efd29fe29747c126aa98c05456638719f SHA512 d2dbeb99d1fe44a427d2997eeb4ff6ae66bdf2d7f8f08e2105f8614487a6565b8bc263cf8aab8413520783a4dde18d150aae6c69db171fe1cfab3ee1bd0a0743
 DIST packer-1.4.5.tar.gz 13705057 BLAKE2B d23527e8bb0104e3f0206f5a82eb93fbe15a9542409bcce13cefd49fa83a47c0262f48e74ff951990211de9f85fc32efd41bbd4ed286b3462aed86df68afebc8 SHA512 b2a3ae27612c78fcfcb2ac655437faf2cff6e587fd10033b39ddaca8b92b634b93ecd0ae7e3ee43253ee716a2c0f7da532b3ae0ce33c59d1d3896f9187d9a657
 DIST packer-1.5.6.tar.gz 16037500 BLAKE2B 9409aad981b3494a442fc6854481853494b12b74532ed3ac8d210d4e275a8f4f18bfb6dcfd7c36c4e97b3d5ba0263155fc8f08592b0123705c5d341d9183e6eb SHA512 993f54a1bf98abd5bc450bafaf202fbbfbad009b661d49783ff82cba9891b8556340801680c0fdc33b90396a3101a2ed93a11798ad51c10d7bd5f81fef4f5a31
+DIST packer-1.6.1.tar.gz 17334870 BLAKE2B c6db96de6a96c337ca2b2e7f273be21b4410e272817622af849346f38fab7212119aec1fcfd71b0c67bb00e8aad879485fd21cd42d7054eab4a37251fccc3ae7 SHA512 3b4b21eac425fec44a47a5799dcb5387099de06b777906a4b7c5bf169c71d8b82ab4296a21c8b60daefa4546d5a814b8d9f23e4d2afcf0eb91c3338d8f327ce7
 EBUILD packer-1.4.0.ebuild 792 BLAKE2B 98101308b1243d57463057ac8be281bab376eb32c5b78156f3d00645335a5de62b71e3422fc14b4c8d4b33994563773e47970a9c671e4341c28e77e731680a0c SHA512 0529bbe8e372bcc7e89ceb7b2f3b3d6a14122d1b1c0276dde64f230430049c3c41f1d443df65ce1413713abf138d7f0eeec81b91909ef92aa675dc5facc59135
 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
+EBUILD packer-1.6.1.ebuild 674 BLAKE2B e434094f73b06347d1cba9e315290b26a2f6f32bfea078bcf4a657ff8769f413bf3724cf4fe12e439e5e162644d870cfdd282601b297bd195748a9a69b5fc579 SHA512 7088a701f7a71c9080a1d236d56091118d135b8f833fe998cf571ec95d931d65701aa86370b2cfb5d0e0bd0df56591598ab7fb893330e0577dd1af98d708ca8a
+MISC metadata.xml 1377 BLAKE2B a2c25ec31f167d12a441da18cfa141e1d19001e2fbb0cd4df5d8c613edd0ebbc95190541b6586380dba6f62f6f4c4715ec729b22d4f30ffbfe1a7fccb13f5a8b SHA512 0f949311fffa40abd1cf6722068b210e1d06270d25698dbf17554722fcdff847dfedd6e47650a5091d2afa1ecf960e50937a2058150051a4af98a485ac9435b2
diff --git a/dev-util/packer/metadata.xml b/dev-util/packer/metadata.xml
index c8bbb6c2126f..a2b26dedcc96 100644
--- a/dev-util/packer/metadata.xml
+++ b/dev-util/packer/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>xp.vit.blr@gmail.com</email>
+		<name>Viktar Patotski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Packer is an open source tool for creating identical machine images for
 		multiple platforms from a single source configuration. Packer is lightweight,
diff --git a/dev-util/packer/packer-1.6.1.ebuild b/dev-util/packer/packer-1.6.1.ebuild
new file mode 100644
index 000000000000..c1237d3214bd
--- /dev/null
+++ b/dev-util/packer/packer-1.6.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 icu imagemagick ISC JSON MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	go build \
+		-mod=vendor \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/packer
+
+	einstalldocs
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 9c60d53a9117..21b581209cda 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -2,16 +2,10 @@ AUX perf-5.1.15-fix-clang8.patch 659 BLAKE2B 5f68efedb5dfe092116db7cb1a0586dbefb
 AUX perf-5.4.20-binutil-libs-2.34.patch 1845 BLAKE2B 573a1d620ec5ee45b8baa09527062733f699e667be83f0fc17af469295778453b0ad0a6af892321423b1189a2d19b7b4c8e26533c1f23e48ed8b1baae7b2ed60 SHA512 d83549c67b97c0039764bea381a00bdda1b883352306dfa47ff326f9290d6cbcf3f830b29bc4a44cfccefdedb5e92974c8dfa28f6e6007ab289ee07546ddfa59
 AUX perf-5.4.6-fix-clang9.patch 558 BLAKE2B 001bde226595891626dc7b46ece6de240696bbfb7e5071e4f071653f90e3b98a032ed375b0ec4a3f88795c20b8066954e8934fc4c38f8814c0349c6037d60a1a SHA512 af1c82863b2e7e9d87199896765646622d8431fac7a80b7579fb88ca83df182493996b61033618632a9b11ca6c87e4400cf14506ade9b00d327ed2cf644e1945
 AUX perf-5.4.7-propagate-cflags.patch 1502 BLAKE2B d35f94d10ecc2d384cae9084a7f843581553682bd1ec66e7dd33d0fe110e03c01761b9b2472aa637a71f5c694f4c4eb10691afefb08351e06ea607ca4a460248 SHA512 a5506e118f75439386b3c7699197b20017ef819669b06d89ed79886146e7a79d52d1397680cc94e10137bd6665d3dc2812cb1556498de2739f4d967582522a80
-DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
-DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
-DIST patch-4.20.3.xz 91732 BLAKE2B bf99271bcb35508df239343fd6c9d57c246f88320b586e44e2d97771d08b249a24db230214d4957015a5ed35261e201f0680101b99d0e92f0f1f69bc53e21458 SHA512 47178b8e3bfe4ba09cb82bb1ce8b0742e6749d4be3412fb57518918f7109e74eac1d3d8eb32a43e21b3837a14f37d5eefd8cab819defd10cc2db61fb0ceddeaf
 DIST patch-5.4.20.xz 776552 BLAKE2B bad2a95ed8521ac5c379fe91e16d60b2a38de19b9239755084621e5230677b232ec4cf9e2e8161c0022daff43fdbb37d5b5b5bfdc9e932ef3a860bcd17f640f8 SHA512 65fbcdbd41e35c17601ff15bbe33933be2ab7a694aa181a0b802cc11c1c653c9b688dbb382076cbad05983a0c07467955c035ae25f5175f7ce5bc24339303d77
-EBUILD perf-4.14.33-r1.ebuild 5059 BLAKE2B 3bae91131eb7c24b152dbeac414057d1e5ba08d174a51417aeecb4a049c9fec362b4b67e34c367198d2b9729ffedfc82556e3a13c92b5a9129571b44d31b894b SHA512 bcb9c57a583a930aa026988eac0f14c9b13283565189c7251118e4a2037f4094b2999093aec63ebcfc1c6e6325681edd26fe35480b90a90721f92c6405afca7f
-EBUILD perf-4.20.3.ebuild 6042 BLAKE2B e1498b914f8b135927f5e97211d5246dab4bfd5bafbcf9ba431c2f8d95cf1568a162d2704f6cf851951178287efdcc6d75391ede09ea101b18d88463a4586912 SHA512 3f45b1edfefd658eaa48b4e4ae02c09e39cd6f2f7235bbb8eb9d90d69028df6d53709dac1790f932c7a20e7e77fad8327867ccdec80f302c0d72958d3c1bb138
 EBUILD perf-5.4.20.ebuild 6651 BLAKE2B e1a091114d71ba1c01f838b8d5ff372e2adad012769b973a2e79d662f6c5f6ed6fd97b2f7be880bfc57fbb99c549c487a084bf2450a935dc34ef22725268047a SHA512 e14917b4e051d3734fa515f3dbf61a2fe2cfdbe5b3aed29b9ce3b05e70609a13276d5f8fd0522f0b4addca16abdd986fb70b16d2b51f1204d02df848b64e6138
 EBUILD perf-5.7-r1.ebuild 6481 BLAKE2B 049d8502779dcc2b3f80cff18ab9795855495ce13342ab0394f29c22d552f45652c7faf0b19e24953180d5851167c875b397540375e3db0f66141863851387ab SHA512 66b7922dd0b77f2ee974695bbc6c2330c06b523b1cbc0d0dac0bf16f32489cb4266152267b70ee6130ad252075fac7f3858e5dc222e06d6ab2a8f2a10344f52e
 EBUILD perf-5.8.ebuild 6481 BLAKE2B 049d8502779dcc2b3f80cff18ab9795855495ce13342ab0394f29c22d552f45652c7faf0b19e24953180d5851167c875b397540375e3db0f66141863851387ab SHA512 66b7922dd0b77f2ee974695bbc6c2330c06b523b1cbc0d0dac0bf16f32489cb4266152267b70ee6130ad252075fac7f3858e5dc222e06d6ab2a8f2a10344f52e
diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild b/dev-util/perf/perf-4.14.33-r1.ebuild
deleted file mode 100644
index 34c62791ba66..000000000000
--- a/dev-util/perf/perf-4.14.33-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
-	PATCH_VERSION=$(ver_cut 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
-	# stable-release series
-	LINUX_VER=$(ver_cut 1-2)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-	SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	demangle? ( sys-libs/binutils-libs:= )
-	gtk? ( x11-libs/gtk+:2 )
-	numa? ( sys-process/numactl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( dev-libs/newt )
-	unwind? ( sys-libs/libunwind )
-	dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.9
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local paths=(
-		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
-		include lib "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch || die
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		cd "${S_K}"
-		eapply "${WORKDIR}"/${P}.patch
-	fi
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
-		"${S}"/Makefile.perf || die
-	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's:-Werror::' \
-		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
-
-	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-
-	# LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
-	local arch=$(tc-arch-kernel)
-	emake V=1 \
-		CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
-		prefix="${EPREFIX}/usr" bindir_relative="bin" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		ARCH="${arch}" \
-		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_NEWT=$(puse slang) \
-		NO_LIBNUMA=$(puse numa) \
-		WERROR=0 \
-		LIBDIR="/usr/libexec/perf-core" \
-		"$@"
-}
-
-src_compile() {
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-
-	if use gtk; then
-		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
-			"${ED}"/usr/libexec/perf-core || die
-	fi
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-	if use doc ; then
-		HTML_DOCS="Documentation/*.html" einstalldocs
-		doman Documentation/*.1
-	fi
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/perf/perf-4.20.3.ebuild b/dev-util/perf/perf-4.20.3.ebuild
deleted file mode 100644
index a366266a3ad6..000000000000
--- a/dev-util/perf/perf-4.20.3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit bash-completion-r1 estack eutils toolchain-funcs python-single-r1 linux-info
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Userland tools for Linux Performance Counters"
-HOMEPAGE="https://perf.wiki.kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-if [[ ${PV} == *_rc* ]] ; then
-	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
-	PATCH_VERSION=$(ver_cut 1-3)
-	LINUX_PATCH=patch-${PV//_/-}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
-		https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
-elif [[ ${PV} == *.*.* ]] ; then
-	# stable-release series
-	LINUX_VER=$(ver_cut 1-2)
-	LINUX_PATCH=patch-${PV}.xz
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-else
-	LINUX_VER=${PV}
-	SRC_URI=""
-fi
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	crypt? ( dev-libs/openssl:0= )
-	clang? (
-		sys-devel/clang:*
-		sys-devel/llvm:*
-	)
-	demangle? ( sys-libs/binutils-libs:= )
-	gtk? ( x11-libs/gtk+:2 )
-	java? ( virtual/jre:* )
-	lzma? ( app-arch/xz-utils )
-	numa? ( sys-process/numactl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	slang? ( sys-libs/slang )
-	systemtap? ( dev-util/systemtap )
-	unwind? ( sys-libs/libunwind )
-	zlib? ( sys-libs/zlib )
-	dev-libs/elfutils"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.19
-	${LINUX_PATCH+dev-util/patchutils}
-	sys-devel/bison
-	sys-devel/flex
-	java? ( virtual/jdk )
-	doc? (
-		app-text/asciidoc
-		app-text/sgml-common
-		app-text/xmlto
-		sys-process/time
-	)"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	local paths=(
-		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
-		include lib "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j option (both
-	# GNU tar and libarchive's tar support that).
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		cd "${S_K}"
-		eapply "${WORKDIR}"/${P}.patch
-	fi
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
-		"${S}"/Makefile.perf || die
-	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's:-Werror::' \
-		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
-
-	# Avoid the call to make kernelversion
-	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
-
-	# The code likes to compile local assembly files which lack ELF markings.
-	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-}
-
-puse() { usex $1 "" no; }
-perf_make() {
-	# The arch parsing is a bit funky.  The perf tools package is integrated
-	# into the kernel, so it wants an ARCH that looks like the kernel arch,
-	# but it also wants to know about the split value -- i386/x86_64 vs just
-	# x86.  We can get that by telling the func to use an older linux version.
-	# It's kind of a hack, but not that bad ...
-
-	# LIBDIR sets a search path of perf-gtk.so. Bug 515954
-
-	local arch=$(tc-arch-kernel)
-	local java_dir
-	use java && java_dir="/etc/java-config-2/current-system-vm"
-	# FIXME: NO_CORESIGHT
-	# FIXME: NO_LIBBABELTRACE
-	emake V=1 VF=1 \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
-		prefix="${EPREFIX}/usr" bindir_relative="bin" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		ARCH="${arch}" \
-		JDIR="${java_dir}" \
-		LIBCLANGLLVM=$(usex clang 1 "") \
-		NO_AUXTRACE="" \
-		NO_BACKTRACE="" \
-		NO_CORESIGHT=1 \
-		NO_DEMANGLE=$(puse demangle) \
-		NO_GTK2=$(puse gtk) \
-		NO_JVMTI=$(puse java) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBBABELTRACE=1 \
-		NO_LIBBIONIC=1 \
-		NO_LIBBPF="" \
-		NO_LIBCRYPTO=$(puse crypt) \
-		NO_LIBDW_DWARF_UNWIND="" \
-		NO_LIBELF="" \
-		NO_LIBNUMA=$(puse numa) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_SDT=$(puse systemtap) \
-		NO_SLANG=$(puse slang) \
-		NO_LZMA=$(puse lzma) \
-		NO_ZLIB= \
-		WERROR=0 \
-		LIBDIR="/usr/libexec/perf-core" \
-		"$@"
-}
-
-src_compile() {
-	# test-clang.bin not build with g++
-	if use clang; then
-		pushd "${S_K}/tools/build/feature/" || die
-		make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
-		popd
-	fi
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-
-	rm -rv "${ED}"/usr/share/doc/perf-tip || die
-
-	if use gtk; then
-		mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
-			"${ED}"/usr/libexec/perf-core || die
-	fi
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-	if use doc ; then
-		HTML_DOCS="Documentation/*.html" einstalldocs
-		doman Documentation/*.1
-	fi
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Without the doc USE flag you won't get any documentation nor man pages."
-		elog "And without man pages, you won't get any --help output for perf and its"
-		elog "sub-tools."
-	fi
-}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 524f94c45fdb..299e8338ca0e 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 f6a2b5e3f48767803cac0a2bdc408d806d44ce89ea7213e86cfe8a664d02d6568373d8f2aa6f12fd10e2694de54581ac7c6e2977a3f7650781038e7a3c4938cd SHA512 a01fb30b90b0dff455ea53320fc2aec0d0610209107ce4adc8c71b85cbb551b89a939534967ca3c7bb0640879f821045030895b25ae2040d74371ef751313a01
-EBUILD pkgcheck-0.7.7.ebuild 1408 BLAKE2B 7cc007af37958c3d7d96bc2dc4479af747723f61c0a118e6935e7da42427a2bdbb92e19085fc1b377073c032d21683fb573da415a6dfd5ea894c023f2582e0fa SHA512 100691523a491b2a65bc7c4d4b160edc3feae89936d17e242df93ba65bd205850bae2a3b976978b050a20de6e82547aa18c6be232e733d9e17740b17c8fb2d1f
+EBUILD pkgcheck-0.7.7.ebuild 1404 BLAKE2B b7d748aaef717b15f79a329b3095be323480a80109c17e1199145365f3f09bc7b77c13d8093ced2d456340163668646b1b613a41ca16cb953dcc9df21afa13c9 SHA512 f101e48fbf9ac4434dacd6d1474550e6bba654567e53d2452b07f29060702f3468a3f4417d0b38c27ed0b23822ecd459091cee0201db4d8ee45a31a75bf42af4
 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.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
index 03d7a31bc1a8..931de679b4fb 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
@@ -10,7 +10,7 @@ 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/protobuf-cucumber/Manifest b/dev-util/protobuf-cucumber/Manifest
new file mode 100644
index 000000000000..fe3051ccd871
--- /dev/null
+++ b/dev-util/protobuf-cucumber/Manifest
@@ -0,0 +1,3 @@
+DIST protobuf-cucumber-3.10.8.gem 236544 BLAKE2B e81636fc06fbed54dc67def3d4d1c445a971d861e3dcd99aa406e137b858734d995100c76d33a6d00b6ec9584d8dbb8f1d05424e73d0f35a3d196cfb70ffc561 SHA512 904b3b6f0564a9db61c1b8e3aef10fe666dd602cf09c43c32241e908695b2f144be5e9ee094a21a07c43354ecaa3c9006ff62aa0e6f6ad2688b72bb9a40538a9
+EBUILD protobuf-cucumber-3.10.8.ebuild 916 BLAKE2B 1d0c1d97fc0c8c5b99754450a47d92db3f5bd3a4abaa113081287318e5d737386bdb5e64a5198940e04923cde926752ae2a2f51be451d48e51d4b4b1a6186575 SHA512 50c93a8045dd7b5d809edecc255f7ee03f7ef81229a3e35f1e8df084f85025586a3f68390d66f278e4533569023c7cf961db06c7beb6bf5b0f7cbad512d1b4fc
+MISC metadata.xml 304 BLAKE2B c9b85d55203c87d3e465d940748317de36c01c57ebedb89ca9ca7d671480bc1bbd8663e574b0571aabb65d18b18b9f2ece115a4edbce1918b536cd70d313517b SHA512 f39a76c9e9712656c87d5f3dfd937a3e246a0fa0ff50f5d6fb8e5f6de4e7e3d51b553c0e26e33cd6272c776480161e1103e6056222a1046caff368f249af2c16
diff --git a/dev-util/molecule-plugins/metadata.xml b/dev-util/protobuf-cucumber/metadata.xml
index d396d1b7e5a1..31246c7969b9 100644
--- a/dev-util/molecule-plugins/metadata.xml
+++ b/dev-util/protobuf-cucumber/metadata.xml
@@ -2,7 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
+		<email>graaff@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ruby-protobuf/protobuf</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8.ebuild b/dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8.ebuild
new file mode 100644
index 000000000000..1d4dbac95549
--- /dev/null
+++ b/dev-util/protobuf-cucumber/protobuf-cucumber-3.10.8.ebuild
@@ -0,0 +1,35 @@
+# 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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Google Protocol Buffers serialization and RPC implementation for Ruby"
+HOMEPAGE="https://github.com/ruby-protobuf/protobuf"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "
+	>=dev-ruby/activesupport-3.2:*
+	dev-ruby/middleware
+	dev-ruby/thor:*
+	dev-ruby/thread_safe
+"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile spec/spec_helper.rb || die
+
+	# Avoid unpackaged optional dependency
+	rm -f spec/lib/protobuf/rpc/connectors/{ping,zmq}_spec.rb spec/functional/zmq_server_spec.rb || die
+	rm -rf spec/lib/protobuf/rpc/servers/zmq || die
+	sed -i -e '/context .zmq/,/^      end/ s:^:#:' spec/lib/protobuf/cli_spec.rb || die
+}
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index 9179872906c0..929e50fc5d10 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
+DIST rocm-cmake-3.8.0.tar.gz 15823 BLAKE2B 321d31769cee254f9f9048104c7837fc6eb4a224d53e3e3ec18d5fa283f33cb116ece739a19f791cf62ac84f533933233461fd9e470b5c413363aa58fe23b57a SHA512 52e71033ef85b526edc00c1c11681c888ca7a50cf70a69f111ac2d7d32821340d8c812714a525711ff7ec54c8e7cbb79c4cb620a6e559699c509397ebf1b5886
+EBUILD rocm-cmake-3.8.0.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
+EBUILD rocm-cmake-9999.ebuild 731 BLAKE2B 463d3a82ab60695d46d43566435db7d3c8e09848a9d43b3c810a6c82628fa882deb81e94b134ec7b5661e4530dff9a9dd407043348bbcb100ad2d7318277a904 SHA512 6fdd1d769eaf846f8e582fa24316da54e6d4210a7b08094300930941d3bee8b671919a4589fb28d3ddb5df61f5ce6969b858de6a0c5fc9de7530e9351df9cd29
 MISC metadata.xml 371 BLAKE2B 41c8b543a5928a1a337a4858ecb042011010df6e199b8c61cdbc8cb0f79e924cbd7ee8e7c2acf324d17d91176e2ef94b171f61faca35aef5469ad33326dba27c SHA512 ede90d9d5bbf97823fe93004207fd61a79dcea2651d00b5f520cb395868a17e238278cdd13113d1b2945de5ac9db9a1471c37812467dea201bf78fb662db58ab
diff --git a/dev-util/rocm-cmake/rocm-cmake-3.7.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-3.8.0.ebuild
index a8e68baa5599..a8e68baa5599 100644
--- a/dev-util/rocm-cmake/rocm-cmake-3.7.0.ebuild
+++ b/dev-util/rocm-cmake/rocm-cmake-3.8.0.ebuild
diff --git a/dev-util/rocm-cmake/rocm-cmake-9999.ebuild b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
index 5922137e202d..a8e68baa5599 100644
--- a/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
+++ b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
@@ -9,9 +9,9 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/rocm-cmake-roc-${PV}"
+	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
 fi
 
 DESCRIPTION="Radeon Open Compute CMake Modules"
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 723fac75c5ec..9742c2cc651e 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -1,4 +1,6 @@
 DIST rocminfo-3.7.0.tar.gz 15104 BLAKE2B 728ce471e52dadca8b59aa3196c2f75933650e3002335014accd7f8eada19d4936a7404f908d50747a0e51faa8a65764200072cf598f9d0855a3052db8290160 SHA512 25a6a9216366e310ece9db50a21bc0eb7741760a7b46fa1818ee102557000348f430f9269e2ba9e872437dfafcb31ac563476e2bf83a10705fde8dd5fc854404
+DIST rocminfo-3.8.0.tar.gz 15103 BLAKE2B afa6a2cd3315b18f2711cf1de4701e672beac76d08548453f9377c865f2b108f4f50340f545a9040450c7acded3ac093d334908a7ceddba35c847136fe92aa77 SHA512 c75fa7a4116b9cfa75d6b7ff3920c85ad19fea09ab5f6a7abebde9cd184763905aea8684574f6b1919044806af8ab35a81d7f6010cbd0fb18b36699a182b5f39
 EBUILD rocminfo-3.7.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
-EBUILD rocminfo-9999.ebuild 794 BLAKE2B 8ba7a2ebd5a75e507089f0deeb49b1085175641bc0c53c0609d386f39a1d6f3d38a608703f59f798f2fc24ae453619d8154427e7bf4c02b5852b260b0d01c067 SHA512 32a8fdda420e1440df3a2b297d6030ac69c892e5be970d61647942be7f2be3c620c9fec5bfa179ec54c3af1eb1e19d51e2de82d2eeb5d2b62c57c945844ed2ac
+EBUILD rocminfo-3.8.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
+EBUILD rocminfo-9999.ebuild 606 BLAKE2B 74046413f39f646c076f8cbc9d0a5d1373c3be8e303bd50767d6019d3b1a58a06d05ef0dbdacdcd079aeb519c28fc163c38246608024b9fc4225c99051d3b6df SHA512 20dcaa312421446d3ee1882f85babfdfd51a51dd598eae824b36d7fc8969da717f05685d436c59b61d2d1744479672a4de544667379a7fb9163c5e9637fab70c
 MISC metadata.xml 369 BLAKE2B 6549050343e744050fde68092a20018b058f5d2411b4f7dcb5ade0e7ea56e7f8f9f6a00040882f1384f01ed2f5b74a1d453c276c8d35aaa12021225f0c7c6346 SHA512 4b7e636a59c30446dfb02d82d80804706dbc04b464f7d7ce37340be1076a9723cb5ec164972dc07a325b69fefb1dc3026055fb5b87588b6b6fbaf4e9dfbc2ef9
diff --git a/dev-util/rocminfo/rocminfo-3.8.0.ebuild b/dev-util/rocminfo/rocminfo-3.8.0.ebuild
new file mode 100644
index 000000000000..6de4e9b7cca0
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-3.8.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/rocminfo/rocminfo-9999.ebuild b/dev-util/rocminfo/rocminfo-9999.ebuild
index cac515f5ca2b..c993e808caf5 100644
--- a/dev-util/rocminfo/rocminfo-9999.ebuild
+++ b/dev-util/rocminfo/rocminfo-9999.ebuild
@@ -21,12 +21,3 @@ SLOT="0/$(ver_cut 1-2)"
 
 RDEPEND="dev-libs/rocr-runtime"
 DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DROCM_DIR="${ESYSROOT}/usr"
-		-DROCR_INC_DIR="${ESYSROOT}/usr/include"
-		-DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/rustup/Manifest b/dev-util/rustup/Manifest
index 7ca801770fc2..b94c019bf8fe 100644
--- a/dev-util/rustup/Manifest
+++ b/dev-util/rustup/Manifest
@@ -234,5 +234,6 @@ DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c
 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
+EBUILD rustup-1.22.1-r1.ebuild 5967 BLAKE2B 987dbc8c42def9bdbe8c727ef3eed809cdb381635a1ed0ffb95b4dd5ea0f534fb535c9659c64b0b025afd139450b16d65770c9e7bd9b1178f620d95b5843baf4 SHA512 87e27711d7f743e418ef29adbb138cbaeebd23f2b9e80e90ca37518f6f40e2ce8004184d8617d1aee250a77a22b7839cc4c4210e808096d939d5e96036c11003
+EBUILD rustup-9999.ebuild 1907 BLAKE2B 37a0bbf4e8a391aa2531a0579e4a2d17aaa9ae6251cfcba7d71441afed618b2304e4f27b750085db64219ab9aa80b643fafdde5bcf9d9faa2c220e2438c00abd SHA512 5e272b49b1efe36a4bbb941c5a7faae5b957a3ac16c7db0fc539f51d3e8b6a1ace2151ed7ab8a4a11d71a7463f1c4497c11d9c009fba621864780cb7ae7278b9
 MISC metadata.xml 356 BLAKE2B e17235a7b0ea9156af7ba204f1693bffd96a42926df5241e158e67616a60101d5a554d882e3aec14eb41a53b411a762cb50ceae076e44bab6e0e361eee83c569 SHA512 dc4ec000b7f6d769dabb37210fd9515917feba7224cbd1db27013b0e0f27824cdf03c7310d0f64dd3a099bdc33fc65c29648e860011c98fc6c8e9b374a17e337
diff --git a/dev-util/rustup/rustup-1.22.1-r1.ebuild b/dev-util/rustup/rustup-1.22.1-r1.ebuild
index fa40b7f00826..9f951ef8aa7d 100644
--- a/dev-util/rustup/rustup-1.22.1-r1.ebuild
+++ b/dev-util/rustup/rustup-1.22.1-r1.ebuild
@@ -251,7 +251,7 @@ SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 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"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 IUSE=""
 
 # requires old libressl-2.5, so openssl only for now.
@@ -274,13 +274,18 @@ src_prepare() {
 	sed -i "/^home =/s:.*:home = { path = \"../home-${HOME_CRATE_COMMIT}\" }:" Cargo.toml || die
 }
 
+src_configure() {
+	local myfeatures=( no-self-update )
+	cargo_src_configure
+}
+
 src_compile() {
 	export OPENSSL_NO_VENDOR=true
-	cargo_src_compile --features no-self-update
+	cargo_src_compile
 }
 
 src_install() {
-	cargo_src_install --features no-self-update
+	cargo_src_install
 	einstalldocs
 	exeinto /usr/share/rustup
 	newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup
@@ -295,10 +300,6 @@ src_install() {
 	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"
diff --git a/dev-util/rustup/rustup-9999.ebuild b/dev-util/rustup/rustup-9999.ebuild
new file mode 100644
index 000000000000..5db8a446ae65
--- /dev/null
+++ b/dev-util/rustup/rustup-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES=""
+
+inherit bash-completion-r1 cargo prefix
+
+DESCRIPTION="Rust toolchain installer"
+HOMEPAGE="https://rust-lang.github.io/rustup/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rust-lang/${PN}.git"
+else
+	SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		$(cargo_crate_uris ${CRATES})"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+fi
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB"
+SLOT="0"
+IUSE=""
+
+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_unpack() {
+	if [[ "${PV}" == *9999* ]]; then
+		git-r3_src_unpack
+		cargo_live_src_unpack
+	else
+		cargo_src_unpack
+	fi
+}
+
+src_configure() {
+	local myfeatures=( no-self-update )
+	cargo_src_configure
+}
+
+src_compile() {
+	export OPENSSL_NO_VENDOR=true
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install
+	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"
+}
+
+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 dc5041465cbb..35d68d220101 100644
--- a/dev-util/sccache/Manifest
+++ b/dev-util/sccache/Manifest
@@ -2,85 +2,56 @@ AUX scheduler.confd 438 BLAKE2B 3e047418c6953dc5e21f1caa4770f1c95d58f59dae58938d
 AUX scheduler.initd 525 BLAKE2B 8992cca3a4592585ecd465c6cdd7b7d5d3771bb10ca31d4d404919552b28dfe3862dd05fea453b5aab043d05de5d2f4b46011c4ee6992cdf658a41f32812c526 SHA512 05a973d61f952fd16f84698821624837f6d0f073c826b7ee4ba0f95c0d251ddb6ba84508deb413e96dfd4de28a637e4bd93a5791acd59a4ba75dc28155f21292
 AUX server.confd 420 BLAKE2B 0cdb51dbf3c7d06285d02dfaa39e92a480e0d9ba1ed27473ee6df876c5d60ff5a0ce0ce61c0e60790bda901fe955315665c44fafa207aa94ea7baed0b9ab19d5 SHA512 74be100f820aa89df203097f92c82370c02386980763a47248ffd3c6a3d8ada313ea2e9989e224eb0ffcbd728ba41cc76eebd233c9eedcc8784b8fef78aa8ae5
 AUX server.initd 564 BLAKE2B 785903c1c6d9d5414673bdaa23cf1dbcbc3c1d8df4f68452b542723580e2c450c91b3273d9d60ffc8f223f3286613fabe4063439dc6571ac99d1c9be4eab036e SHA512 dca646e92fafde352149f17b4dfd6c1e0489fa468b0782deaa5bcc4082ec6c92a96d109c46a515a0c6c9c22a1b1104ff10cd28a506b8bb4aa6fc3ad72a55de24
-DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
 DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
-DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
 DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST ar-0.6.1.crate 13383 BLAKE2B d52fe70cb51dc473a7f1947628db963fd52e0959b60bff684bb466509cf9f3f4867a47ce06fe6b82887f8175dfb2f5d36bf3b48c46f16c2ccb625a4a1c7de7b3 SHA512 38f1863cb1265ab4de71b2b9dd8e9de35cf0da9af5a6276704cdf10c596c92c43e0128c334f6f4a1a94d4b39ee04770f99dbd4a8697b2e47abffa8ff7e1577a5
 DIST ar-0.6.2.crate 13681 BLAKE2B 2f5ee35b94c9f8424161d229ce7658b78e30e5de12822f4af01c7633d068aeb0b78a87bac9909ab0661fe210ce5ce7882ef868c1aca62b9e85548aaf61f7ff30 SHA512 0ff23ebcf206ecc0d2ee4133d721e5eef378235e8c3b1dda967da77c3ac35decc7388b35e6134c9b7fb475298e198ea5533436f2221503e1ecaa77cd2980befe
-DIST arc-swap-0.3.6.crate 41603 BLAKE2B c340a43ce48a7e0b418dbfd9957e840c8e51f65fef4e08fbb2759e6ef8c29f36b4b74b75d0277c8b774311c6ae798497139a944e585ceb8734c3d7c4b6e0126a SHA512 6cdf0fd63c813c9c11ae5587b4a681412873f71531054e119b5771a29089e344d44d2a4cc8347cefa76b33cb7a313308ea069251f66fc63e85f38705191d46e1
 DIST arc-swap-0.4.4.crate 47969 BLAKE2B c307ae6cf4f3ff2b75557e9806bdc46869ee058b5c6289d051df1973d0278147016ada7e03efb851be9c62105882c74343cc2ee90bcbf9e641ed52498f913a16 SHA512 7e0045d24d82c5624b22563ddbcf150a35903d165bd3f2b71787922839cf52ad846da563b1c0d240db52c3b6405d145cbb675ead3d6cbabbf0204dd2afd474a9
-DIST arraydeque-0.4.3.crate 17884 BLAKE2B 7c104ffc8c3fce4664a21240ef3e921ed07205ad2bf204c0910ead05231ecc64e6ebd2ee832ebef2aea10382433309ea10153f1466e970f1949543ff24b2cf3a SHA512 3fde1697f1b64a9abdaa996b36c45c64e67d9f081807d95c0ca9c262382839f10a527909cc99558878e21a9e3a4463dff2fe2734f62dde67df55d508cc34e342
 DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
-DIST arrayvec-0.4.7.crate 22946 BLAKE2B 93d17ae9e706969e319980b4e00dd0a6c040c8d62cd41d1de34ab997e28798329e00d3dc3893da45ce5bc066fcf70dd5d8e98a79fbac8fc06d33a073a97b7b89 SHA512 195faecd7709eb908227cda7111e1b736ecf96120f9b615f1dc0a9a1cc61947e2ad4fedc7fc81d14405b51a4c8a216f81b8ed1d1d603a9fa451a38b4637e2bae
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST ascii-0.8.7.crate 23773 BLAKE2B 52a81c714d4478af4298bf96e376c48bff248de825d1bc1f69d58380ee5b5e09ed76db713dffd0f8697f74f694775deb754b91c7b11595e526da11b877299693 SHA512 255efb6df7a297db6ada9571749e62bf041f5e777ba69dd367273db76282f244244e0c9e4c002f59e8d542a4c1f75a6a26a618d5962fe051ffb16349285186bc
-DIST ascii-0.9.1.crate 25317 BLAKE2B 4cbb9afe82675c5d4419bce5dcb640f56ed168aff32b39bafd6f4539729159eb44130ea3802800357c8a618278f824f71a5b5c6b3d8724d04372fcbaa34828d1 SHA512 3e74dc12133e4530453daccdffd2fce2fc48d41b93509d3153f3d58803a7a00cde0543b96089d637539b97a5ad859270dfa4202d0b11658a51a6b6c88adb2f3b
 DIST ascii-0.9.3.crate 28283 BLAKE2B fce32863fd75ef1badd496db55387f1abfce5eac7a7a61ea07e1475f555fcfaeb2726ca80e69577c4cd05c366f8c46842f064fd9325955eacb8ad38d0cee990e SHA512 ee8ad37b0a3db9524db22a9abe0c348e30364f108039bf761aea8e3eed07c08849924a0a287fb17c019e14b654d2c6db3848112047a1fa8db58247c9e138dca8
 DIST assert_cmd-0.9.1.crate 17844 BLAKE2B fbdb8c2e0a185d9d4f275021295e0edb74ca46f41d278e9f2fecb1ac115499b6a26729b31e0538a8ea82136909b073ff3a8f8cbec9b795c6c035de949b649bc6 SHA512 761d43b5be35eba9ca5d49f6ec32e1e37f25dda18469b22f8d2e9efe78fd23ab298ff28bf1239399e4fc783659665969762a529e69db96ade3392a155b39cc61
-DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
 DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
-DIST backtrace-0.3.9.crate 31054 BLAKE2B 5d90d098d149198eabe4665b1eb2cf41c5f392ddc1c5cc499047dd72533d79b679943781445f7d86f269a15d3f8ca2775dfe89123935d32ccef4b8151547283e SHA512 edb485ad27d19e0cccea123cc6a9db5b3222831e48722d8fcec7349fd1c4b62b67ab1f488fea4973da82c8f17a86aeba4ea8f2fc1aa60f6528833cda39efa637
-DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
 DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
 DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
 DIST bincode-0.8.0.crate 71632 BLAKE2B 4aa94a42641a905069701955ce23717f75c1a5a91b743e44e574d1f0f9b4fa693fd9a8541dd618e2cb03aa88b52642269f2b8bfccd897bbaeda981e0f5c76bf3 SHA512 fa6bd7a7670d510cb1ed422a49bf30e77760b333899bec2b2af2c74f6cc6429b0ea1b630fdf24c490d121ae03183d3e034921a98d3f562a00e9cd9e234b38a99
-DIST bincode-1.0.1.crate 14071 BLAKE2B 99edd46decd97925e2af882411c9cc986311e936a0e8c05ffb29e49b44460cb6fe6cf17e75301743cdf02d5b30bba7ea1efaf70dd1d3b770061c7fb6db4dd459 SHA512 1294b89089b457ce2bc4d9471ae677d6d06e64eaa01948e9db4ab49fc23638ba79e7aa1d6ca3a0df5fb61bd90cadc811df724053a321ca99d16b8ce650abbd59
 DIST bincode-1.2.0.crate 15433 BLAKE2B a0940c61c37b09308ce58be6137cf05a351081e88ff32a14af351fdcb36998c2f4d260b80edbc03115c67534b35f422e25961fec3d2c1bf6963be0179ff8ac11 SHA512 9b599115ff33531eaad003e2c928e83211373101a5ad6cac0dcc09af0b97a0cb157abfc432c1a8c68f303e07732ebd6e0ab776c771250356da9f50187e92b1d9
 DIST bincode-1.2.1.crate 15489 BLAKE2B 98d8a7b3653dc75aed07a637707a8a0d7b574c9a7e9ab8aa39d6f235d003ee15dc4abdd76e3ba171b10aafc98dc16f9ef8413f4154c30848ca0c12d4972f527e SHA512 b86915db2079128d6abe52c8f3fa0ec21815faa988bf678a162c2caaeb0d2ecf2f5df496d5dab08f399578b4f0258f252e890d9ab9e8347c50e5d7a2ab374db7
-DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
-DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.9.crate 33575 BLAKE2B f5bd6efad39b7727bdf033bea9796eb0eb24ffdcccf9d9682c22942a5acfac6c566377f635e3030d2ec9cea05129632627c1906031a1c395744c787354e4948c SHA512 cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e
 DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
 DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
 DIST buf_redux-0.6.3.crate 16159 BLAKE2B 13ac3c513ce794e52b73ebfb5ab5deeba5bc9169988464d05276384a548cd7fb8b1c0f8016cca11a8ae1e771a15cee647943fc2ad3a563599b1475f3939aa201 SHA512 1c8adc5b87248b6e6aa1405ea3b081aab15cd7aa3ef24926dbcf76540f91d261468d19e5e83fe9b96b02fcc330dc500ca3df3a9eeaec9deaac1662d877e826d9
 DIST bufstream-0.1.4.crate 8741 BLAKE2B ee8913b2efc3b0b507d8abcfb86ada7924e4f30554907f9cd690b42616ddae7644dbf9f69d6d0ad599f6db1d4ce3ffecff1c8cdf5900fff110871f76a1417b0a SHA512 bc5029c826280e51231e2893474a964762fa6456a7fee043ba32ce262ea4f0240056e352267c5e66510e737217c8841061672336631b5eb763212a6e5df5ac9e
-DIST build_const-0.2.1.crate 4499 BLAKE2B da7f1040560862b76447426be8884bf0ac62d2f2faca0a572b8cf566fcbbaaf27dd1f260fb1333c3cf9410251433239616aaf0ca1a2be644fd4cbcc2b908eeb1 SHA512 4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658
 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
-DIST byteorder-1.2.7.crate 19640 BLAKE2B e5225871a7b55be755a28878f330f165092d576e4e4447816d4908998d4c6103eccd7f1d962c06709823331143ec8279c5cb1ebc9ed49f7bc30b20586568cdfa SHA512 166bf831dac44332fb05679add5ed8c54d692a582cdb8584486dee8295080a625d12eebe40de6f3b82ef98a1f4c65503da9c84d570b14d58dd5e31a3cc6b7391
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
-DIST bytes-0.4.11.crate 45988 BLAKE2B 617fa9bdd07bf22a6f0089e8acfc44cd1444af07174b7a02a00f21438405620cd2cafb9574d04811464316108a05c60e6066b8d87d6662a5791ecd17a7f8f8d5 SHA512 3a0354981488c354b2aaa664f320b18cfb09ed07a5f74a10f8fc120279d660dc7899306bd01b1b3405fc92eec5de3f6f8e9d6c1e5d4a2374da865d5a8a8405d3
 DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
 DIST c2-chacha-0.2.3.crate 13336 BLAKE2B 0b548907ce4c9ee502ec96307ca003d168e8bcf9007ec667661d158f33de36fc2e832cb3c36cadc2523f6ba8b9aeff4dcb16e7f95a9a34ae02e8bd5d00f65cf2 SHA512 302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538
 DIST case-0.1.0.crate 2629 BLAKE2B 065ab6572d90205f031f3a01f83ab3937d9c9556d649b05f31340c997b3fa63aab03702c03e7a70a78faf7271cc92b4d89b6f263a233ead2448c366cf655cfc0 SHA512 6c12254cd2274ddd28b2da55d78d3306e0f3b2f6a495d7aadf9c86f82366e766fef2283eab407a6273324c80305cc7d1cebad4dc1bd0a28319c69b0fc1cacca7
-DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
 DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST chrono-0.4.10.crate 136101 BLAKE2B 728e1a25601aae8047aae009a3943b985c4cff314aa193cfb57e5897f2a449a1dbfdfe7d270ee26180532efd671e5821f811cb8ff0ea353e874c5025b7361266 SHA512 dc5234407e5845a4934e7da7d5293e79804c6e73d3a7c9d3a78a4062b98fd112d31e3c31a2518fa6ad6b28b98472fc2ca6c6f95515bf3bf971e8c128ac763f47
-DIST chrono-0.4.6.crate 133108 BLAKE2B ac9573577f4ea6516007df2f9948f9df4e8170e53119ba7cf1e55592bc594bd1cbf05759ce2baf9b6397b68a72aa9e0518ab0b7a9c63bd043ee4a7a8b81e36b4 SHA512 c869cab6da906d50531476c892510042eeccb3daf790ef13b3014121c805b3f8e23c7a6ffccb3bb11d15a1615e997df4180e41f0140a2c327cc816b94f28976d
 DIST chunked_transfer-0.3.1.crate 7730 BLAKE2B 5bd1fff872af6efb54ccf5f4597ed816d87154340dee0e8295d40db7d9f28979d32ac3ab54f2e83327014900a26f91f34badbb81499401b4b0863a61020667ad SHA512 9f3ae572c75203a86602596434ad2b3fdc443ac9eb50330f57ae3050ad355897eb22feecff537e7c01c871b466cfbe57686906729f5ee0914bbf6bc71ab24638
-DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST combine-3.6.3.crate 101445 BLAKE2B 9874d0f456e752941ee6d57f85c3a87fc20590b437b0c3e33097aea170f40b515460a3f39acc48932595da5b88efe9af1b3185ea0f058fd672b7eeded2b3519b SHA512 69a7cf4a582bb4cf6e00012b4590630c2da7416a23cd9de40fe88f8b9a375bfb33ffee59e51207349d08141e09191a2b5b5a72d10a1c6a0d6aab9dda0a6a8e7f
 DIST combine-3.8.1.crate 103773 BLAKE2B c8ecccda28eb7253e14ef112707166f14892fec858941adb302a866eb0495878d091592c770307948fc040fe459a525af643db9798a601aaa331ca7959ebadd9 SHA512 12cf00c23fa6ce6a73d562214456799a9aa98eaf2defe9e4884dc729cdaca26efe2965ada3390892940644e6cae4644363a65ff5aca1bf1a1a684cfd4a8d7f60
 DIST conhash-0.4.0.crate 3548 BLAKE2B 4d1f8ee3689bbff8cc8a070f15733ca05f23f4ce30584965a2d8727473b67112fca2ee284c5662eddb9c8988a633bf1d173a3d15f0fa0c8681edccbd100d9476 SHA512 f5bdd628966881ca17f04b22d4cd73821575c74efaf19069028b814bde6d1ed1f931f88955c9bb7435f10c9223a1a72ebfe18d681939d9c488f92c313d6d6f4b
 DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
 DIST cookie-0.12.0.crate 25953 BLAKE2B 630dcb365132e952c81813a772f94266230fb1e83cac63d39713aefb0a4fc6449c144a7e9630ba8aa65194bbd732fb42b3fc150530f950ddeb6a2d6373a78197 SHA512 4a802118306d25f1e53444e143913ca2a14a9e5584b26c5aca67b5ce0ac5111c4469fc5d7ee6b5877f8ac59143739b749edac83ceedcef7b53ba1e15cd97a821
 DIST cookie_store-0.7.0.crate 25211 BLAKE2B 1c201c5baace2c595b2bd7c214140d1c97fab1c4143eb91adcdcaaba4cba8f1c97ebc8ecea626c77a1b482ca6c326f220920458c11f23e5a497b75f220c9bff3 SHA512 40584ddc3189ee798b5ba262934d0a48455376d9cab4d715e6c4dd476b75c62ec09fe0c2f1b748b266d20f2b84fd97e58cf1ec88cc6b245290a572fb29fbc4d4
-DIST core-foundation-0.2.3.crate 8323 BLAKE2B cf848a8345a2d2952b2646772bdf204b56e4406a4ee6b5820424b3d633e0eb3993fe0269aac0fedfebe84221a9693b7bc53f60e85a7e95a6da19178d24a660fa SHA512 e14659d440f2ade3d4db9b307d649a4dffe7dfd7dac5f0e7df5f391531fc94f66e10fb5a22c2ff0b95d44d1fb539d6b11c4088beff43632dd6edca270c5b1719
-DIST core-foundation-0.5.1.crate 22519 BLAKE2B bc411c7a7bd1dcb00b4f02d75cbdb9d8422c2802cd6a3aebb7ac5136b19756f7ad5e48553e15b6c5a7ff85fa3f4f3fa98e8644a0eb13b4525fe2edd3a5b3daf4 SHA512 209b06bf889ef75451b9d055505dcd19eeb8ed6b6f57f7b3288556ec9be90fbe716175679f7d0a650c1d55644b3c56eee9b1116f2c8b533b4b4580008c79cdb2
 DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
-DIST core-foundation-sys-0.2.3.crate 9128 BLAKE2B edb0757a904b40ae5b403af2d3d396b50ec70dd918ca9e03e90a9a40b71ec8de6c70cfbcc20107549ba5be7ae4de57f0cd2b6373256201b54dae1ef9398c4197 SHA512 bb650b13251288fae1f83998684aad7869d9a6aaea4cec8e1164e626d4cf4833337ccb9d3ad3a84a7ade711cc650fa03f1d945e2e10d6cbcb7b55d857cd46ad0
-DIST core-foundation-sys-0.5.1.crate 15974 BLAKE2B 5065520f9d7661523edd7018e77d43346f39bcdef407ffe7bafbdec019e39389118b90a11599d5afb4f78c8b454dbf4530a6c81c834fd9952557529f87cdcb0f SHA512 9cb023399eb660ca318c9d3461b9f177206792c3542564d990c08ba4788dc41da2f2c6070f0b55550b2ded0278c3f3d21a159212a20d18c12997658df3df5052
 DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
 DIST counted-array-0.1.2.crate 2959 BLAKE2B eef6d7175447df795e3cd7da7ff91649232eafc412a7e4f637fc3060c69a379b5a5250d800b75da6c53eab1c3cf6ed3519c2e6d1d8b79f2b55fbd7a52f019470 SHA512 91d088b07c9a21880b2ad813b7395d5135f9697f5beea22323155fe0276a7bce5a8b8364326750355b8ea45a10b9be16cefe1b29f4b2673688d1d97605db65e3
-DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
 DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
-DIST crossbeam-deque-0.6.2.crate 14037 BLAKE2B 28276d69b715b6ebd620256ac81a5dc0dbb148caa465a7efd3bd545bc7bae913f8eca4619aa289565941d5fb5a18b72b2b14b4113df03dd3d61ae7e7d3d68ccd SHA512 f010545e12dfecbb5004d91846a7e41d2142d2194b3671ae2ae383a74e6f2cbb80f3d086109a8fbd3c6c88ac187d7ba45c97cce3ac91e8102daaec59853ff930
 DIST crossbeam-deque-0.7.2.crate 19557 BLAKE2B d0be481c85d0a9e22b6b85ad109aecfa227ee2c7748774805d3f487f39540c5620dbef6c89a35459afdbab2df9ba28a48a741fc4f9dd79fb9325dd4523a7bf37 SHA512 1ac3112c3904751ff3540e14740b04b23f8e64b5dc1097deeffd4e7c39af76626bc4b7d1f402cd44f7ab4ab33b275048f5c2d48f941a6bc555b0d98a53d64551
-DIST crossbeam-epoch-0.6.1.crate 34089 BLAKE2B e99a20c26bbf6cd94978d0aebba43b5e49e76a97ffd4113cd050c262140e257a3d3640f85b0ef7b217064dfd2f53ba016fd14f33906b9f50567eeddbb9ba00b4 SHA512 f2be7ffda167935b4a30ff0264762477690bd7e7916ad26e6bdfe8a7a0a6fe0bea5e8662b2a6e7fa7dba26baf4c2c2944307cf19b5565a957af1f9f3b336e7ed
 DIST crossbeam-epoch-0.8.0.crate 38711 BLAKE2B 97fea09cab0da60998f640b7cd13cf4f3c07081f0ca569418c0565d8e87f2c6f1da036c3acb318dd12ec56ba2109f74600cd2ae6b4362afeed39b1076b02fca8 SHA512 e7eca59128d5ae6fefdbd34e912e10b08783436858636c0905d65f651a3af8cb6a2b6d872f4136e31d242d05019391d31ba1be424e8ed5c951f15dfd46162892
 DIST crossbeam-queue-0.1.2.crate 14104 BLAKE2B b084846e3adaefb33991770d53130b361f2dfa76ac9f4793618643afff09c4ebeae1545c33c59211d09427bf8d13d13d3ed0965211568884b0b2042e5542327d SHA512 f799ec04a78ee86051bc6a0b99dc95766c83d2ae8672015d1fa95e53aa0f93232f3816b7b2d38bfbcc577516f45af009a5aac04be21f521550347fe87ca0b444
 DIST crossbeam-utils-0.5.0.crate 12162 BLAKE2B 63366fee26c4012ba705ad415db867e0b9bcf81b0880ee3c5ec3c06d2ec8776e64585ddc04ad072d363ddff3acd1382069e591c25daa27141bbbf75412d96113 SHA512 eebb6bf81517c930fdb4c15a8eaf92693907fe58dbf1913a9c2f4315a6c0550eb772cb15c47e2ac4e3f4decdd47f69ea8e42910ea649bd2e2279ad4cbf9d02c4
-DIST crossbeam-utils-0.6.1.crate 13987 BLAKE2B 89a08fe3aee4b709fa87355bf18f8f80ae8f32975c152d319018fe762a233a2bc7037df6fde08d6b9e55ee6d68d56fa65ce66d9d4c0166d62f4a48196ee8aa22 SHA512 49e02da3d2bf9451048363faf59fe06a80b5b9590935971d39fd903c09d72bbcb7e8a70aff36dbc9467246c18a2608e32ec9d5460e085a98f2c359c728db732e
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST crossbeam-utils-0.7.0.crate 34202 BLAKE2B 7a080ce1cbb33f28788738ab9c0a68ad9f535075633de1bcf9267f52759c679bd4d013bfab8e316294dabedbdf8c3b4b902b082a9993600db7bf6c98126fd1db SHA512 260d4f2e209172128da1470be16fee4ada3f6675649c681c0e311ef7da273cd6f04671cd06483e906948f4c0b505c403622456e9fe68d77e0c8b56ff4bb35c3c
 DIST crypto-mac-0.7.0.crate 7636 BLAKE2B 30158db3eb9511373013558e5e430ab4412705843375d6a48f015a534199dc16beadfe6b94c601ea5df329b0aed9392bb20fc0c95d01b7b0f42408756a73c000 SHA512 7297396fc06aae578644d47c8ef1053895e0a29d1c007f303631166cf12711f106eb91c9c11d01497e7a85fb461b84a16d2e0f1020444ab16fb4b8f2dfee18b1
@@ -90,27 +61,19 @@ DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22ed
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
 DIST directories-1.0.2.crate 16020 BLAKE2B 76fe417487118cad8dc8a6a64b07f62d83550b00fa230f06902d9252dfe74134bcf722d33967d65131cd1e036bd1b4b117b8f56a3f96a073e24509ee0add5410 SHA512 6b1ed06a66e43115c5446ad19d6960ae6ed7956982b23727422ed49e285ba0b86ec9721a83a7949772faf7d1db28abb499f0983c53e70da529a54ef7fadb26f5
 DIST dirs-1.0.5.crate 12908 BLAKE2B 0a5c1428087adeca310d7db53850ca0ee4b27df34a7629f13ca0f3c69c019c0ca2339949022317ec55ca0be35aa721e0a9040d9c9d011e1516d99772ccf8f730 SHA512 12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416
-DIST dtoa-0.4.3.crate 14456 BLAKE2B e310c71454a3ebe77e9b3f479b45b8dc15b988823eeea4549198df1ef3dbce05888ca6f34701b27dc5e8c0748d99e03a14af96e4901be740bc98ba1342589ae6 SHA512 e400efb07317fd605e93fad6670bb4569f52abc66139042649a4112ad1eb2bbdf4b819ac5771fae133a60248da7a440e30109e68e919867d3fd29853618d7315
 DIST dtoa-0.4.4.crate 14818 BLAKE2B b7abe646e02193a30ba17e17aa8ef19c59c4d925d8988b5f40c73f1c07ef3b9c5e6572a953d99b10ec24b100aabdb5d9d9968ea9864ccb2bba52f0fa2379c23f SHA512 d2ca487cf950dbab9cfa20eb8b712e07276e40f2cb8b0c5c56f60719ae18d8a1c7fbed2bbea869255b0d5286b9890ad6fc6b3d7be2cc13af28c84c2882de8044
-DIST either-1.5.0.crate 10900 BLAKE2B 5db7e6758a91dbb7ea7c9f49b17d03e98463894e9fb95914e519542367f9f87986358b4ce0f34e261b31c204af532ed962b2ddee2e6fee9ab001e7f372371711 SHA512 9dc046f2c27bf12f57413443586171cb1d7574e5de76e02af892f9027bc66c2cab840180ad85af3833aee61d5fec033c77a15809492e8c2a78b541addbc81df0
 DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
-DIST encoding_rs-0.8.10.crate 1244099 BLAKE2B 855a2af8075d8ac81e24978b6d03017db408319e8fe485b372af06addfd9930df0841d99f986edc7c16bc9822bdac72bf7af56582a3ca441e66f4cf0266f213c SHA512 b6ad406bb549c0a0e7aeaf11961eb45f640ce0f83baadc54408827db04d69a70e490f8bff54dd01a0457a9fe717ae42b9d5c59d89f8246219fe640f77a4208bc
 DIST encoding_rs-0.8.20.crate 1403599 BLAKE2B 23b3ed8c65d0002abd7d2deaf6ac04ef9bce374adb6ad3f4ca993a0f487d57543188ad8b58756d5268bcb130f0a4d6c7e3199c9c9c0c952510cb0ca925cdfc4f SHA512 601e0a8ac8eb39def2336463b38de3052123f62653e22f5a48b8015912f946ab7e78610eca65e7663b2158c908e7f7f4f9f6b48f188c18319ef5594fb7e86e9d
 DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
 DIST error-chain-0.11.0.crate 27207 BLAKE2B e50c4e2d6a173e9866311bb81adbde4bddd64d529bfcc919ecade60926112b537cff491a4ba8e84586b3dc63e87e2b3c0695452c165ddf202d6901b2d6247f2c SHA512 a7c06be660a554b4c50deacaf6ef0699cf6e8cf234d9610324c70dac0cffeff1540dfbf10efd41427858551b095c998d670f1287c9459c35217bd78d8887c60b
 DIST error-chain-0.12.1.crate 27906 BLAKE2B 66c54c3448b8968a70395861469d7b80aa101210a3c96d2f28b0933fce6d77ec28f4ee18d7666402abc8162f567029fe93f7dc80b93644ef6e488ad4062832bf SHA512 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc
 DIST escargot-0.3.1.crate 12708 BLAKE2B b6beb0243d791576070ed0662e39944c28204aed3345d63be96d2e43851840e6bad084e5d38aad2e775169c25661aded27fa866048b4725e5c2d654e7db55411 SHA512 4d7b28c08aba0cb8d61c0df4ad1fec2c2e940495384160dc16dafaaa0f65a603d9acd4b53ce6c87fd55f255ff28aa78265c17254bea8489c7b6b9b27f9f7c92f
-DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
 DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
-DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
 DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
 DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
 DIST filetime-0.1.15.crate 11211 BLAKE2B ee1661d356f7b6d7cf20cc0dbc822e04ea7e558118b41c29f060f02df4987ed7bdf69be5dcf66106c1573ed586b03dc0b0196be7716227d97c7fc857f81fbac5 SHA512 81d6e80f3da3ce12295ce8d85bf174eac3ee3dcc7d57e5a65f2ae91ab4f3dcf294582788af24db9ce2f18cb0e43080fb1baac76929dacec32d5ba4d09928b962
-DIST filetime-0.2.4.crate 12044 BLAKE2B 563df5750ef95e392f8458c0a23f106eb310d8e8e7253fba6b2b8245afb103a37b505fa41b915691b8f93ac9d6277e2940ee219a4993232781269c9876c5eb24 SHA512 a27ea45b6de09c93a818f56436e49ed358cd7cdab2a39913de159144da239bef14677b5b521633c68bb9a4f38e71d7e2404b6bf628348b3573e509c9440d0863
 DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
 DIST flate2-1.0.13.crate 74039 BLAKE2B ee9411cccbf4e304dd3eebfe62676007eedc72cb6fdf673eba824883d2f4d2adcbe292eba3cf9315da4b509f29ffee7371ef6d8f503c3bedb8d9fdfd5f91d1e6 SHA512 4b3b9e9a9251f0158aa89e4ccd65aef07a48afabe2323a2edc402f36404b632fe47df418d597de1de66898808d88f765444198cfe16ca228ac20406dcd158089
-DIST flate2-1.0.5.crate 65990 BLAKE2B 81a21446ff62d000b4ced19cf54ca5e10de59a2df290999f77886c222f87df501e7496534f49fd21d8eb317a2f0d968336129d9b1f9c51d712ef3410a1bb1e1e SHA512 95bb4857a8a267c67e34e12c711b56794643ed39ae6320ebed1c75c225d80da4482a2ca800301d439dbf08a592dc93681dc230035bae14e9343e2cf61adcbed6
-DIST flate2-crc-0.1.1.crate 8985 BLAKE2B eacec2d0f07bd97d8de530ca9250ec10867d06eb3974527735ef5fd50e857e2ad3812f36ae8e15bd64e3232ac790aad15404359f773d06100f7a8b2ac5d999ac SHA512 dad46e30c81aa31f3efc92e6a1e5da77a124b1eacaa2c7a049e11c981bc3e0bd7cbd3ae8bb5af0762304813e9afb6dff14e0240d74d7dca32453c0518993abbe
 DIST float-cmp-0.4.0.crate 8774 BLAKE2B d8c4854b7147e938565d68e8f4890f0a0c25a886e78a2f61dc7fff595488e3a2655b2f942586546466a10087a0bc415b18acd41dd828c26427adb655c1fbedb8 SHA512 62aa5623affe11bc65f3153f8d0b923cce82ad6ce38dafb25ed30fd9d2d239fcd09baa10f0f4f9a58ea1a84b12688ce43e48c7e57c9751e940d32e9719c54a63
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
@@ -118,67 +81,41 @@ DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST futures-0.1.25.crate 158626 BLAKE2B 88b8f274a4cd5673760ec57e0d6a1d92eacc34346b5b81935a1ae8a5f7067c12438af81ce3cc30c57891047683fe9cc395f6dbb8f89e8c2568259448644cf188 SHA512 5bba3ed715e5ecb40450b3911d2f3d469bfd93935c94a526d70c2b6604de7953f8b1e4ed80a276e42870771f581d3c7f0b40dfb9cd076bd215a3dcffc78136b3
 DIST futures-0.1.29.crate 158346 BLAKE2B 943336cf753166f852f9dcbeb8e0b76d1d26cf6d688449a99f9f1885912cbc79327115514ad93d28bbdf1b8a91b2d22f8f62d7e5f5feb61f3024e9a749e11da5 SHA512 16b16ff65c75cc565c5364406f5d9c0d120a07a520f6ea2dc86aaf4644b9ad6fb32bc021b44fb7c74246cb7a700b3df3bfa813908541eec079bd7eb7beee0200
 DIST futures-cpupool-0.1.8.crate 10583 BLAKE2B 5832359dc451551a3cb77e48b73054ec1505e28e04b2307af5d8e17a3be9e0552941deaaa94d477082b924daade1a2aeb15a0e095629e29ce983b0788a15251a SHA512 49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6
-DIST gcc-0.3.55.crate 37262 BLAKE2B 3341dc7136c14fa822a67fdeb72f7ea50b1264823e695e189d69604b8b8cce898ee2d40d8a536d0f520f5e190576afde16afa5d9cbe0a2c4b8600cf50bbd1447 SHA512 b045b60cf65c1deae44e4f40d0f511dab05c82be5065390dfbdaf5b51ee2d0653c3a6d8d1e7606e4bb6d234adfd22a8c68bde724406f3edb4bb6366617d46a86
 DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
-DIST getopts-0.2.18.crate 18416 BLAKE2B e90b0cd8fb5dc33076e98833a03713c35b50cae6a5dfc542e4b28627221fb40082bfdefae61888d7856a3b684d4ec4c2dfa55c961abadbbbf035738926215741 SHA512 68236eda2645c92e09fe4f7408dc8fc07d7f143bcfc179d297b307ceea0420dd999586deb37fa4600e929228db5cf2c6f1217aecca500b4f5534ebd934b6dacc
 DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
 DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
-DIST h2-0.1.13.crate 140232 BLAKE2B bbf7477e6ae9dc307301895c296b67c6872f173c4e3f15554f435da9733e0d49224ff67a5bbf9b72a750d2eb1482b625c90f99fe77d3f9845957869d16609386 SHA512 10a9333a2f4b968b238bcc966a2a9ac775043d1803bcc0adb8856a658eb5880442b6f6aa36f21d279f228a5460ac71402bda0ea0cc8855acb5b7fc6889b017c2
 DIST h2-0.1.26.crate 153921 BLAKE2B 4a84716e37abeeebbf0771720c5af636576cff47158eca1c7bc76f21c0531b41a75bf3ad7b6bd88aca960e96e15679a7908720d316321e319021624834a97c4c SHA512 37686cbb102eeb15de3f76d0607cf64210b11f5272ed83dbbb145650fbf11916027be3acb487cbb3e02654469b9f78167a7f18551f39af142e659cb149363d49
 DIST hermit-abi-0.1.3.crate 6741 BLAKE2B 0a7edada6e7c834fdd20b804237d29558b9b413ab99b538de5647e485d36864749fba6b8f46b4a6de4c620cdaa2d711bcc6759b53f8d57438ec5c9b78da71ea8 SHA512 ca85d69192ddd2c1cf0f12d6abc7eaa70a71956df5b55aaf1d3780c6e40207c33bb188a92a5f4769478c4ce13bd93cfd6b4134a21e245781b4ab4e3cb3eabe87
 DIST hmac-0.7.1.crate 9765 BLAKE2B abf46bbac094d80d90d8a7c4ce8346a841957b33ff86997889b111a801d53dd68222885c2cff8c8eb430ea72c7f3b752010a59c72cb462d7c0469d90eb00619f SHA512 d1054cf7f24c892af4091464d8bd885a0914a24f31963e5cadc5f32d05742ac8ec558d754ab7f60c4b0997f4e437289a68aed79fc6e8ea45159f8775513a6d9d
-DIST http-0.1.14.crate 97027 BLAKE2B 02f83c006d6a9fd4176ad7d564688b81505d8c75cc1ccb7655ea33dadf72f1d13be81408f57626d96752fd53be5819ea197d846b730d3cd36107f2c9e9fcea58 SHA512 7cfc8fe2e3890a0cc430e5bdc8a88afacb185462381c63670acba59607bf89952f823a16c627010bc17e037881b14be5fe2f2ffddf85aeaf781a31f516bcfcf5
 DIST http-0.1.21.crate 103053 BLAKE2B 78b888c4aeb641399bdf5696b53b596041b3d7236fb9596b6d6676f98563fbe8cda4d3f6fd5837d852b4235c862c42303977be5f092adfc00df1fe3634e0e859 SHA512 edb1ef74c8f73c89dc7b0ebc83a6c5985ee6b1223001403d1b8c1b2c3ffa3556c80df7f28575620c8145a35dc3846b05a263dbeafb3c62547c0f17c3ac6c82ab
 DIST http-body-0.1.0.crate 4618 BLAKE2B 2320b5b52a64cfa32550ffeebd950fb56135a0dbb8e43122521a760cfd574083b19a5a41ead0809f5ae764d797eca7007397931b2e63a79dbd9b4a26055d81bd SHA512 b1c9fff799f6581160ef232ceff82a0c222a9f1ed3ec24760fb6b156d42739e06512086e4819323aee7e19b1d0b30ac8915f775f9c36d63b4f901546d331cc80
-DIST httparse-1.3.3.crate 23689 BLAKE2B 17aac3985a19a3cbcbf1072e134cfa15644367d15186ed924ff7f76205bca42ffa0fa96a46236d7387d599a0153e31d9727d40bf177736bf1ed116adda120225 SHA512 b7c3486fde1ec34c07b317df1ad03be6585c3a114a8abcc593dad4244ba372ff4faca9c25151c5c896609dce72523a9daceebd554efc396a937a0c80f87a2087
 DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
-DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
-DIST hyper-0.11.27.crate 155617 BLAKE2B 56b7a1b60b1b900dd7468cf623f48cb2af9d939660ceb62fa1167bedd50d8db563ce6cc7e27e65cd51935a46874eecdddb3f621562b9313538af4bcc3ba671e9 SHA512 912713166f601d086a7aa68507143c143ac69c31bca23948e0446eeab2c7eac09fc75c5f2e61aeeed312f2ed54b91b0f212d8e46e30ecccd3be1af60dfcbd59f
-DIST hyper-0.12.16.crate 111412 BLAKE2B a3161814bc0928227e305bc66b1b7fbb17b6d5ddadbe8590f4c12e7c10822cef5b6bac4ba819a66c69fa6fb31ef5df85b07d10d2571e7475e116b222c6990864 SHA512 6dfa6e96a2664f1fc505b593ad281858e43cdde8e08c6d5aee00b6268383e27d9b7fe6398c521957db5d027b8ac405a20622c52e6ccac3054fcef47ba99f4219
 DIST hyper-0.12.35.crate 127971 BLAKE2B bd2b1cf87d30fba32fe96312164b5a55d595bb6f6495df4c0b219f9756c1ae9180f9380191ca202f5cfc49002416ccf05d4799bba62c7038578c59860c36a4ec SHA512 40f3285b4de23ac8404b191a44a78399ed3186d9e6abf77d759615cc4678292411df798cbe4c2d5405677cd5c108468c015d6b42fd8d833484f8ca9c1128f68c
-DIST hyper-tls-0.1.4.crate 8137 BLAKE2B 92e9f0c3f852e80b69b977d313f4c6d74d9bd437ba1d1e5d1966acb5d768f8cfd73c9d1b9d2a2fceea22b36fb8296f14ddfbbcb00fd39264e8f639c3567275c3 SHA512 3cbcd0048e11d33aede6c27a816d9adb89abad9c29d09c62bf8a6b0235df3698a632786f53aee8ea4d539d553e0eb1862b54e3b547f753fd4808bdabeeb04a0e
-DIST hyper-tls-0.3.1.crate 8836 BLAKE2B c678f9ecb89f51d1beca7ebfcc258162dd6f87d444bf83f6c5b82a28070320bfe9d4b118571b3762ba3803d4fdfdfef70bdd780116154ae95542547ed08abc87 SHA512 3094057eadabd596ce7909c45aa24f6ed5a5dbbce4773fc20293ddf95c712234065253d38422a17e24c3fe674ff94d0bffb95e4034a97dfc46d4402b9add396c
 DIST hyper-tls-0.3.2.crate 8901 BLAKE2B 2b3810160156c584057101a25c8f7decec4fb4632631f4c048353d3d2f90a37cec7b20a85ceef61941f02c5264932c8d0255823c2d615825d2499951f5e25a0c SHA512 9179878b95e8e390b17d45bb02c24219066405f671fddc4e044ecac0a00646e9ae03e7cda31b0f6f7beddd8fbccfc873d28d52e6b46aab2d252a2472302a483c
 DIST hyperx-0.12.0.crate 80997 BLAKE2B 20441f370d04eae79f6fbe5988b9f63806ac4c9e7d93af998f7cc322c2c9963cf7f536139a552a251a8567070e311f05a926262a9aed1ff8a179ceddea6e44b1 SHA512 85ea65b3bbc7c86af5cb97948674b5aa41a3277699334f07a6d072c28f53771059d4ddc8833e83fe3a525bf41c2773f5957601dc445d75b8fe97f62ae7021234
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
-DIST indexmap-1.0.2.crate 38255 BLAKE2B 78d99087e4f282fe4e4789c131621bfe5d873be801cc105629aa8932a3e4c8a519180560b0bd83463d808eb3b75194b551e39166260a1b9056e822fac07fed94 SHA512 cfae9d222efcce9ab15c5a8368db2865fbdb6819b4fc317ca0aed55c32ea312b5c5ca13130d4aabf08af1803c34d465a1a1209dabbce37e7a1a911faf5cfcfe8
 DIST indexmap-1.3.0.crate 47086 BLAKE2B b05b127c459c3107123037e6044eed24fa58bba492b230ffb9df7b8bb84f6c86f2241e87afa7c43e133957845b1092d7450534ab74b507eb187b0e509045f18e SHA512 41c933a78a5cd5e62aac2c4c8aaf20bd3fb394b9fa41fb9c59a69afa9b4039dfab82b3d1fb1b0c67f28f0cc7657cea6310db126dd4d84e3473d2c231fecc2331
-DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST itertools-0.7.11.crate 78722 BLAKE2B c3a61cb938e9e761af9d9caf6ff862b121345c2721a1905ad94b133b8d93988023a083cb7de1a6f161fae1b40c00fa698304cad88430cb9fd1decf9bb93e14c0 SHA512 29951da2e976befacaeab91a1016a935e81cfc05d4eec04910de6710b14d0ca3a865ab6b5cbf4ec78a0ccbee1c025b6ef0c93f4e0b7be3f7dc3f4eaea408fc87
-DIST itertools-0.7.9.crate 78365 BLAKE2B 484565266bbaec5373654bb22f64d7071d6f4a0326f33b0bdde87b2d98019e6c19cde7023f5e87f3c5e0b892fdf6fd615c523ebb0b2be22e2a079da171236c6f SHA512 07543ec2c9bcda6c9a0f24d8be5e0add1ab8cf4182156a246822dbcb9fcdfa74aef194aa5b308cfd329efa04cbe87a6847e6aaecffcc0bc2e293d431342d3fa7
 DIST itoa-0.3.4.crate 9921 BLAKE2B b2cc97b6b50164bfab0ccf3afb53ec827ec3247a8111814f9e2e3181394515abda1f452168d11b518d771701f6ce9a2936a0ed69e9b82e1a842c51c1e74df536 SHA512 1cecca0c6c6d9602e692e16cb6dce850c0f7c7ac5ec1defe1f5b8a17ed325abe41eaba56c1d973dc63bc476b52d436a90b266f6eff99c618b6581cbffcaa278f
-DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
-DIST jobserver-0.1.11.crate 19687 BLAKE2B 1ab784f253bc3a0108c30f1ebb02106e6c7d86f1654973d65c84adccc52cf4cc1f48447e8d40bcc8b9ab5cbbc9dc0becf35f9e7c81c8c6340b1dc41121b4dd9a SHA512 daf8e7e994fcbf7df5265e78d3d95f2e1d3e26d2deaa43213d75e33d5a2bc1c7c7bf66aae42a0ecde7aa59514cf70d16bcdc6198fd84f244d197bb1d09f15fd3
 DIST jobserver-0.1.19.crate 20656 BLAKE2B e2cd785178522564d2130c21a351d16e8cea229f0858641f5b362a4b19c13994c749cb2efd3fb5d9791efff3e03052b3b54354d09100471786f932c5c6f56d8d SHA512 9beecd11eecc52f24d060c56267f78dc240c473b99dfe5c2752f19cf9724e8bf3b790c0c557d4dc3d0d9038058996abf416b1e0afd18126ef6fd9cb45a585efd
-DIST jsonwebtoken-5.0.1.crate 16414 BLAKE2B 4df3357a76a8ce5666a05ee2e9bcf836677b47a8ef49026bcc688ea316ec4e622b912cdb1a10911466d32bf15d6675f8c866c3317d1d4bf86c731cfa8d6e9dbb SHA512 a031fdbe2778f2447746eeabd29879ed8e1aa178a5df037e25735e984ac84f46d5143b3d05b8c5dd6af7c813340d9bfb0454c165b05bb9c2e7879648a32272be
 DIST jsonwebtoken-6.0.1.crate 17095 BLAKE2B eb6d69d7d22d27c55b55efb752010d78baa23a433f3d1f0863009f3d07d9cb83837829293221bfc89c660f9ce7b5cd3d0557f649158feb9b14bbb2e85f869d7d SHA512 8366d8f8f12b7b9644d389b59a12582ea91b09f7f556b801724fbf5e53c981e284ef2b1a7e16aa4e0fecc8571f4502dfc57419d279abc97fcac078dc71948e4c
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST language-tags-0.2.2.crate 12754 BLAKE2B ea59a130fa723b1537e451d5a51914391fc0d375d40df1d8b3ccda64819e918332e344585523d3ba61bb0394899fc1663cf7a452aafd4a7e694f8d70627f1bc1 SHA512 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6
-DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
-DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST lazycell-1.2.0.crate 11259 BLAKE2B 87eaa99fcdd691237c54c06f870a71e55ecabcd2d2de06551d2b718c138cdd9ea085b445f0d6a7b773b4a025b2fb9a7a04576cbd7f74be23af4916d8e8d2e7e3 SHA512 194e538f8e2be6748ca56463c9b6e83c7a4598bcc9d3f2680f8e35e391f61e36e0d9aba92bcf8e312f286a5d309f0d83be06e879a52e405bf2c89ec13d3a545d
-DIST libc-0.2.44.crate 347920 BLAKE2B 04fd82a1aab02a25a1201f6c463c0b30547e69dbca161f9b0ad87bfcc5b9b8427267fad3534c0a900c23fdb808b8477e20047dac396c8d000657266753786abf SHA512 fda87b206acb1a65be60784516c7d4f4aacb1ce53063e3c67a6a5335a02b3a7232867d11b0cdc574131d562fd98471df8bd0427cc5790c4add0556b2a090b284
 DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
-DIST libflate-0.1.18.crate 35142 BLAKE2B 59fbc83847c8cf2a0a5c68d242764a85ba440967b16205a225d9cd8b2e26859fac1989fea5d99520edc70f6177b0f66039d6b33cb59b775196fafbacd97f0fe9 SHA512 921c3650de299bfb52a5f4375cb16ea43bb0ef0722f9e9e4522fc2bd6c2b43f88dcc88033ace7ce29699245daf70c875cfbae3fe95d582b2570487eb894c0f22
-DIST libmount-0.1.11.crate 20894 BLAKE2B b33cb52058c8ff542242be01f0a092b2794cba35bbf761bbbc035330e192cd5d064aed6deb35ec6b8960b36c153cae81f70ebccefe1b105a1071af67b4f1dcbb SHA512 4a24807c0fc5785ec91aed7881dcd9684bbc85d68280b629af39ae62a02fe6f3c2ee29138e3810e1d4c6c8cfa9bbb783b1e9a6971040c006049f0a3d339a5a3c
 DIST libmount-0.1.15.crate 22892 BLAKE2B add6012440cb6b654d292c6ce38f7f1326c1338c1459514a8f7cb0a9478127c963805541c259d6c5d3e0c5f221c9458200a290f49155e5d77e7e365332f35a8b SHA512 0528969a3f4e0779e23154e5aa46f16fb4ee5e6d0db97564b697443d75fd66494e496bfa95cca4c1d4536b9554d05fbe3c8bf1fc44072b6a37a6c5152e7ae078
 DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST linked-hash-map-0.2.1.crate 13672 BLAKE2B 76ea32f13ba113656afb26f41155d0d4c41a1190e809a070608bfc116eefdf8d79f605e4e13d8bf0be5fe6ec8dd34c3d9e24146008626ad87837356eb1730e3d SHA512 3e18c9e1cfb90ac3c6b65a57d63eaf3b0510e70d3b046043dab0a48b57fd83f2b11c98d474d4779a17e7bf2fa3a95ed92919634b1101ee0190c5209e2ced4182
 DIST local-encoding-0.2.0.crate 10531 BLAKE2B bff98eabd71a70643198ce82ca0131228a6266d21c24fcec7fd4c0ac2f46aef71275891e85a9669a611f76ff9206d0a193b346a19e5c9e3b760c4710250a75f2 SHA512 d27146411d059d71a83a88726238ac6ccac775c806f8c6621ec91bef70042045ebe398da76d1b6ff14a690383b92a7893274710cf5a4da2a98096c2efb6bd9b2
-DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a23788821f2ba816b5e5b7a6b09d543c630a946b956811dd199144bf43568b52da5ebdd5e8b674e489f9efd2234d SHA512 e6049a8a840c11f00b6505dc9d01d1f759aa7bee47520f86e36caf6c52ca476236b09609b0a5cab0f4c247a40a4736f8fc04cf26fce0962cbbf2956ad4adbfde
 DIST lock_api-0.3.2.crate 18404 BLAKE2B bb7dfe778cc1fe3ca300bd2c35817cd217083a8de59a5fa7c615a29ca5d31293129b80ca68565f4172d296164b7bb327c6e0e0e7744171f98ed4a51711ad1706 SHA512 2cc7a8ba1679d345adac9dd68b4485c2e947e3a6248b935c0a41762a896920c40cd87d4e7bacf00f0b78ac44df89a411dc32eb6fd7f4235eecb080eca7763d74
 DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
-DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
-DIST lru-disk-cache-0.3.0.crate 10560 BLAKE2B b027b7b84a553e47cbe46520d0271025bbb9067e9f0f5a0539b01cded949f0b32e3dec390b84211a603efc92e729059801a6d675e01fb798f9be4e7c0592a268 SHA512 d8aac241e43140984500c443ae61f30ce33a1532b6200d63f122a3b2aed9aad8c9a790f6387644947df2accafcd060b5bc75a0fa9c19e14b1f99dd86d870e50d
 DIST lru-disk-cache-0.4.0.crate 10813 BLAKE2B fb88c3efa2d9f815ada63e7ffb31c6e818d9b5160d65afc896ee8dc20a2a37172d2126c5abc1506859814d64f091defd07fd9b17e665247c37b7bca01fa12d36 SHA512 314381bcc3f2c17f846e70e673bd0bced1c144dee14822798b36468ba88be13912f9c6c0f798d855375b6a51502a925bb6d1a564d482fc4569fd4685fc25f44d
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
@@ -186,21 +123,13 @@ DIST md-5-0.8.0.crate 13122 BLAKE2B cb74805b5b939e4261deb85de94b57ca0b64da032142
 DIST md5-0.3.8.crate 6177 BLAKE2B ccfe37b9ec1284e5b7a1532d521ac2a96f3a77488166a71b5e57ac5d848db6db9a3b43cda0a5f8d2ec35f353b0576f4c16f50a6fb5041844c668462f0afcd05a SHA512 3cff7965ac287077803a1cae6e808f8157ed182ab282c948fae6f936692b08ce904ecdf53d37b83989aaf57dceaf1e82984c749ca27a2ca83f8eed2945f36398
 DIST memcached-rs-0.3.0.crate 19015 BLAKE2B e50bfe0f85ad0706fc90aa46c1f36f6291377e5d4ce0da1e242a050420ac35e53cd5f5dbe21659ea69b0077bfc248ad2b9ae8bff05ae7bbf54d5760f31a0c8c0 SHA512 bdba069d806d7d032eec08c0328f9bf8a388746d1072e7a654b9c4ca2fce34f164ad1ffd1d91239eaf8e34c821b83bfe6a46ec5c81f7768874627a26183b24f5
 DIST memchr-1.0.2.crate 8639 BLAKE2B 3177eb1792892c0a74c5a7696ba6a4543fd5fabbea60d77e9b55e9d7eed365f3ed1b6dce44911246b52b8ad9a05e51679f42f9ffd4e6bbdbb5d01b5155eef280 SHA512 322b70bb881bcc2f9046f2daac5d939fd581370fee82b7e0500e27738d1d91e11c3f65fbf4576e0d987043cd08e5cd2b39a5ecf66d0ba7d95f48b6fee502bc24
-DIST memchr-2.1.1.crate 19591 BLAKE2B dc612eec81f7f802692859cbb63d61e9a92578bb42402062c628e044367df6b02028f0e63f0b577119cd8935e0dc8a78569a1d45c81584ac69678ba49d3b39ac SHA512 62f8ff395a695416b147c600de62aa7acd4dc47aa195fe78001dce7ad13afec45608a1e1f69999048806acf97f8ae61a449caa16115062b0070f2a965b2b12f8
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
-DIST memoffset-0.2.1.crate 4618 BLAKE2B f04c4e5e1747d5516dff26fb045d91f01a2eea6011974a342c1830ad2aa6b203d5c6cd4db464177797f799197656085f980c00e78d0257efe5d3377188a8b8ee SHA512 4901eca49eb20acc53d1120548925d691d5e0a0ee899f5c26f55f8b997549cea3b819b1f9b4f5495f4bc73fbcaa386cda50cefdc0036c097c4eeca8086568530
 DIST memoffset-0.5.3.crate 6107 BLAKE2B edafda6ce36dc8bad6bb1f2d824d6c6726b24effaaf8b6e1e612bb95c506d9f0aede29fbc7c5cd71b27b624ec4f4295b0f09842e6b66257093df8db076b7b974 SHA512 a647140f4218bae56c48119a21c96edefb214a10329bdb91f16382e2b85854dffae33c6c3d55bbad3dd7c82424f0a10e5d97a9010ccfe84b7339bc5f16c4786c
 DIST mime-0.2.6.crate 6719 BLAKE2B e9c859193c3360dc6a779640c4323129171a3e7f0ef07007b0cf8f38e9a745ac4f252ff7d2dda5a67348a98447e25d04f1909cae289db8c8e959dde6b118dc18 SHA512 30e0cd95c8961ddce61759fa2c7273dfd37d490f96a5715d558c6c7775457560268309c3ad1222ff8150beab8f328b3a958dc05729d9550233d3efa0a1e13137
-DIST mime-0.3.12.crate 14815 BLAKE2B c4d3a50b93e8f240085610135395d3d72ff15b4030d6338e08577e83c1a5e8a83ad25717b6a5a33800ee8ad3974d2dc6a6e559329b9688efd1a4dbb831d5ce07 SHA512 d270cc42029e50ac00f20c468121e05e614ff5b5a21d599414cce07244ca888a3bcd7eab4c8f2233a28d5d832590fbf39281573c14b14bacf59c128dd50a43e2
 DIST mime-0.3.14.crate 15035 BLAKE2B ab9fcc2247637465d99006899fc120ff60fb4b61f603ea65b15da594bef80ed2b9788e2d893126ed46c5e8cecc0aad2a93be855a043f9224ac07c07fd601734d SHA512 7079ac27a2a7c5534ab8af24f1d84ce78d9b3906a56107198e5ac43e7b6cc74a980a38bffee0f988e7b4a9b8d3bc052797bcbaecfae4c9470073ac34674f6471
-DIST mime_guess-1.8.6.crate 17437 BLAKE2B 13dbc6521fed028b3c3c2c9fc92da0a70782866c904c770ccd7b8edd83d4b58151fe8e0d3c30285d028b1c2281bc05d0f7b9bba9b8087762bc06c0f050883d34 SHA512 4835570090ae40031fa36f98f1461ae11e488690bf291e65b1416234cb6170b51f9fe054df866fce70838c013cdc28f471cc8991c884655c80f55968832b2e37
 DIST mime_guess-1.8.7.crate 17774 BLAKE2B c207a6c2c4894cb2a63d395069c9280cf9cfb12a769b6ec05d44e4a7391633d549173af7ee21d32c06ea397ed8c5a51157ff7fd7a81a59d2e827144c718551db SHA512 d40083e53cb463071e598a650efbf7573fd94293dec851c5dd9a6fe33472d557f02fea9a758a6ac9d4e3c2c82c8e9fe77bf3ccba118fba81e732e18e7e2cac6a
-DIST mime_guess-2.0.0-alpha.6.crate 17579 BLAKE2B b480910ab11e5709e428433c2ed7b462530fa709cd1fe241eff957b4e337901f42f678c9e5468016a643c0f79755a6158d371eabd9ae8f4a7ca0d852ed846442 SHA512 b32bdea0942443aede186317a7e3b3d2e36e3bda56e43794c040aad6ddc1fb847bd380f514299800e449f188208c218680d4d07f16ab30c9c7cbab02c5245733
 DIST mime_guess-2.0.1.crate 26646 BLAKE2B e0ef30850cb07de190677229161bb9ce37c7f7cfeda2cd2c54c6ebf8b7009e56a9c84935c55e5ed0430f546d4b259867132a702bcd29d3f25a2dd1b3a59da5ca SHA512 c4d83d8c05b1173c531eea48073762dcc5e80efc2609e06dfc1413ae2f3a3f7d89e533453aeaa75182a8b663c51c7ad0d4eb0b5b4450afc8e11fd74b84a9799f
-DIST miniz_oxide-0.2.0.crate 49387 BLAKE2B 2d41698d8dd4861991bbf66c853fdc163c63d4aae86e72383fb89d32ad714d7114c485c2f3da749ad382c4aec1c8dad74679c87603d92ae7b02348c05c48b9a2 SHA512 479aefdd98b5e7518053a81c4c2e0c86be1998158b6aca8467338b1593f282471e88f25168af0853a44448e46cdb68face063a449604e929e4f5ef9695df1464
 DIST miniz_oxide-0.3.5.crate 54531 BLAKE2B 858a8a47d26e3e06d59547f820f156d28556055f68527e2b19d7516b86d8a4133c225c06b2a3cbb0c2e25f2450358293d54db65ae85bbead1abbdb90f5dd42bd SHA512 6aee406798316986f836822d3d0942ee40f0d3ff707827a6cd407a7565628ad3e5e0b2f072de732bbe0b2d4dc2cf151f8d46f0ff4950c4b1d873ec90ab9f435c
-DIST miniz_oxide_c_api-0.2.0.crate 166923 BLAKE2B ff226f5fc3c0a40a462ccb642dc1fbd2a418f6f5f1866fbb9ed2ddb249c1f3bbeccd4dbc7b6d73918d664341a4ca130ffba8ed4b2dcaf9dfffdf37cbbd4da2ee SHA512 9c557372aeadfc916dbcd9237d54817732ce1b8a5f87afa62f0e5bf95e8512099a9a96b322852f39b44472b94d0d638af6405a2832c4c9d67f3dcaa7300f0055
-DIST mio-0.6.16.crate 126174 BLAKE2B 34e8634e11959b61abc52842b1c0afe9034cdfbe9923f8a0e65e9d4efdb0c13c46ee5d7272e86595ad8a1d3d9e987dd9b47e1074d7c66cee3f9d889401fdee64 SHA512 ca9290edfdbd4659c686a9f47d7bcd2177001fbfe02ce1fcf6e8aaff4c6e4ba52abb0d698b103337e4587789e7e31945886a90f5e334651d27ac7b109f560c95
 DIST mio-0.6.21.crate 129233 BLAKE2B cb39ed9e9d3b5f456bee86e33d8f0a8cf4784bed826b7ee7f40dd66a98a12b1113fc150fa3d1ea98bf0eb2778caa367abe193dbbdcc0d82b96207ef8682ac982 SHA512 2bc68f6ff424d3ae2ef67a6a1a708b4c42b05f616cad1b0061dce3157c6a46d0666173e65c6f8b7960051e21b526ab5acbdc835833b5496fda280719ad139c77
 DIST mio-named-pipes-0.1.6.crate 14766 BLAKE2B a372fc2f2393917811bd56c35cfe6616b879e59b220c7a56b92caaf1d68227ea2b388f0507b696b738c7e470041e84ec86e422066738a3cc5c52ac90c9c057ce SHA512 02e33e7b2d33eba7865ddb158bbf5e72b8eebf728e4f06831d71db431d9e444307f42ca490ea2d9a0388fab1734e1ef4dda99127036e58fabd1f7186221a3b61
 DIST mio-uds-0.6.7.crate 14389 BLAKE2B b01fbe5ba2e2f58d2bc513ef577c70890ab0a556313dc8e980d4f51d4622be9180215e2e9655e3f02aced40823bdf69b94a8b63c6b2624e28cd24fb5dd89b0c4 SHA512 fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04
@@ -208,227 +137,139 @@ DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0
 DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
 DIST msdos_time-0.1.6.crate 8445 BLAKE2B a9d2b0f5b353895fdd48ba9a7112b9d030964a97a17a739d0a079a3a4a2b594163bccfce423ab0ba963b0fd3cc4afcf76da6084a301cf9b1e487e2a406b587b6 SHA512 c6e053673a9ebdf442ff064b5353b7af9c660f1a498f487da7893d31cc7a0b6debff4ee9e134299eb94e3fbebfd16d7561940b302b1ce976ea5c7bfd5cc19fd3
 DIST multipart-0.13.6.crate 46966 BLAKE2B 9451ced730f74d77b114014cba065b935e2ecbcefc0a3fed5f3ad7c1c547b18cc552114261a688710a8afc90ad558e1ebcde9ddd0941d12a93ea6a8700d890d7 SHA512 751ccde3727b6c54d87a54111972c03ec397e2fb66f03958ebaee1ddd9d6d297e285c93c8fe8161d469aa281d52a46088eb165f740de3a110dd20e752fb94769
-DIST native-tls-0.1.5.crate 24838 BLAKE2B 4e24ecaa32f7f5c64e7725325296836a56b2ddf7a5ba4fdc8a246df618140e718a6784bb4b54555e6f8a1284563f9656dae403032f4c6e9f8eca570d6259399c SHA512 867b73e360625df1a803c80c9b89cbfa5d0ae09a82b1c041d3326b3d73e04821a22eb2ffa25ff6876dcaf50906012755d7712cc3049c15b70d135852561577de
-DIST native-tls-0.2.2.crate 29238 BLAKE2B f8407b3989be8c24181cb5134838b2b9532c6e00f310915cb8fb7d92721d3c9ba29c8b92d12d71c02b9862f064a0ec8c819981513a981b47132f7498a3d41f9a SHA512 4bff0f1e1833e46d069818ee53a74eed8d792430d222cccc9aadf28ce57246b3b9901f095d97e3567eddff85f59739ec02e1662955d23bba8060febcd7eecdc9
 DIST native-tls-0.2.3.crate 29087 BLAKE2B 0304db852e3b1261a791a5a8aba5dc6fd2e13bc32e6ade5ab0f58403583ea45324a4ae4359061c2a9137cc7f127404ef663702a22fe64f2489691de71eafc914 SHA512 9964d627c922261ea730076a2c8447784e0ceebd8e6218f5a61093021f10682c2fa25815c10711831b7d41c84b7c77cc1128a663669058882b0af6d70ac0bc09
 DIST net2-0.2.33.crate 20936 BLAKE2B ddbc96e7cc4877b8a66d019e7e65a260379cce19c87bf507701ddf1b00208e7a321d34882282fa650a52f6b9d878605a6fc3be461fbb7e10182dda04a04e5806 SHA512 e522b399071daf1a9b913429e2eee52503d9604114feaf6987e97b85c128246b9137e3dcf03f45ca93d623ca6a4b295c9b703db4c319af47498e07d7714c07a9
-DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
 DIST nix-0.11.1.crate 162326 BLAKE2B 96885b9054153d9244cc1fd5c346bbc9df4a35a39c84c7e8c9ea8b5c91bddec71cf330470ca06367f3bb89bb20a15c6d43488675c3abb2a43c6c1e26ba72ade6 SHA512 6ac6c7e95d23bb20ba94b7908b429f4a57551f816835f34cb2c273fbdcee29400689f689b697767572bbe4e7cb55ddbf49bcaffc42db820995b8b595506ab6a2
 DIST nix-0.14.1.crate 185227 BLAKE2B ecd12ae7580879c960cd828a22109e5a7f209a24c4208bc04d4392f36726886b66b147dbd3a1f3705edd35e53187553c125dfd47589a326c032aab0a3d3c9ba2 SHA512 c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3
-DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
 DIST normalize-line-endings-0.2.2.crate 5299 BLAKE2B 3d0cfdcf94f7beaa24bfe5b332f952b96bd915ecb4943b912cdcd20e02b4ee6274c7c3fa9bb39743a0a09990901cb8406b2a6a583ad62ab61800f33df48ad32e SHA512 d1581fce8b99e2dc6ac187255722e8aa07c6d03daab536b41d483fb961afdcf043c8fd92843ae3a0835c36c39e403b6bf263d5fb6bc0342d88c4be0e9a4fc1c5
-DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
 DIST num-integer-0.1.41.crate 19399 BLAKE2B 44b96c8f1295f0d3021303d7e3b49474b86fa7287a1f284867e18883617d642fbbb8725ddae0fd68b1ec70276977b87f4d040bc457e037562f4de374d042f178 SHA512 f979ace06e3c109e9b5217a85341117ad12bb6e8da1b7ad799d91a967e3da1eb785fb114294f049ed8a2022cd5269c1ff771bc319af3da0899df97a1e412297f
 DIST num-traits-0.1.43.crate 7659 BLAKE2B 313221a4364b18eb29e2d4c480209766c56b1ca2587a0ab8f668c71cfdefcd733d64be1430bea1846a77f075a26137fbe71f2f4d9be79688374cdbe9e0274ba4 SHA512 35ee0a41f8ae33b1e6656935585f540956a8155045992e7b488b9fdbcf0eb9c9adc90ed8128d45f248b9ac583114cf518c4c7de719b8c6627b29f2fbbac91f17
 DIST num-traits-0.2.10.crate 41810 BLAKE2B b1968facdefb08c2ceae9ca6c3818f03e781e8524488fea26f1a992d3c40af38376d3e732d2dd75c6f666a38d15dce20d9590c432558d65e8fc585e33ea12d3e SHA512 5f945c8310a9b3e78d59a070639dcc1831a80ba682860bade38e738beb36b0496d268d50cde6623d3d20b8f5e68f6ada53d0f21554dab1c18fc225d397ef3761
-DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
 DIST num_cpus-1.11.1.crate 11798 BLAKE2B e395b63d0c7050e06d4e70dd9581c0c005a673a1534b49fd4a257c3a210d3f48a32fb467aa4f05c69e1324ba0c1e117f3d0802df2cb54080d27ebf9d31d2117f SHA512 c3a943f5ff82eccee6f2e8af73e12fc83a82590030381cfdfa52c79b2f53012012b246fe8fa682606b7ddc011892d72d5579bc17ed072498170b51060c7e7f5b
-DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
 DIST number_prefix-0.2.8.crate 5493 BLAKE2B 4f3a159e1805030887d912016ca5af654dbb976bef9ac9b3c086c8c18333840c1405d06ba907a0dedd04c39d3a8d773749447162eb15fe52b0f9d857f3babe4c SHA512 7b8745e6bf91cdfdd11dac33187359272149981d2b25a960316dabc2f34c162fe33ab2755efd82dc22faa0f208b1fa4046989e887fd93b8630b37239b6b59974
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
-DIST openssl-0.10.15.crate 167961 BLAKE2B 64dac45c9274dcfb9610204593d9932e8b6261e2b0bde0d69a1ef7fb06111b8469b187e1e7f380a39176cb66766a2d7065201072eba793f748def707b93a1c94 SHA512 fc9a0d57848012d0937efc677cf2beda8182cdce2a01e22a00d6aeefe9ac98704608c22a152465ff2ca9f62668af4d25982fb67b90aff98a90be12192fb60b42
 DIST openssl-0.10.26.crate 186994 BLAKE2B f95162ec44905c5da7606cfce2d343ab9538b03774559aa8ab18ee8a9935f2dee542bd26a0ed8704c4bf808ef46569f19e405ac8c2acbd7b05e1cc89ec241a71 SHA512 6a0c2202b4b5d3099712a2badd464eb6e8d310abdeb265050272f7526fb5bf5575ad4a5a5a4f798a5e834b59f223a6a76fa3b2f9bbfc08bbf43b88c3635bd38a
-DIST openssl-0.9.24.crate 149235 BLAKE2B cb5c1d735aacea51e7cfcdda283a3466cace755a50282ea43e648dd09d37bff066bf9b6d8c1688a5415ad1d2bc2f11aa64d891fa5770b3e79c8a3502cb36d505 SHA512 3e969e0986b820ce83afa49ad38402d5d56591181fa3d01100ca5911b040949c5344afa3f78658a553dbf77d61eaf302cc35c901b9d160dd782015e08b6add27
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
-DIST openssl-sys-0.9.39.crate 43147 BLAKE2B 0e32347bbbc21c24d8b756f3a7b837d8c6b4cd5bb04e605c5633bedf07de8fc54e1de49bd020296289680c7179f5bf1180ec7d6a17e971779023f151c4feca81 SHA512 f22bffd75a95a60358bdc1296f4d5dbe5f193b27f0de3f391e9a72e663881678b71a7f11145b2a0a4649273cb383f21a1bf86ed26dd9781869403b4036d76426
 DIST openssl-sys-0.9.53.crate 45434 BLAKE2B 42fef72ebbf3bfcb8eeb6499d2965e297c4e4712ba06354020ae322aded58917e02a77028ddb165b5210e1352a29d74380a7ed93c1b6cb56aa722e803e0bfc70 SHA512 da0b34b5a58abf1b7e40dcdc1d9f4f6f0f8a4d5d8bb7b7417025a6ecf73145e80304541d2944050c162d7a9b1835434a9d7d2fb670d5cf1065055c09e35f940d
-DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
-DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
 DIST parking_lot-0.9.0.crate 35170 BLAKE2B 3de9050c5dbbc7a0b98a5cad05dd485142bb2a22e65216a20f6e87deb6d124b4502cdb3837dbdc992ff5ea62c67e1545bab269237988832d365fba265149d245 SHA512 148da5edc08da3b27bfcc94a1c0578f228ccfbdf7a7a6f3aa73ac34e290d795f4169553bc7c2b20227e095e8ac75446db51979b595e4d77fa7c76f743138a331
-DIST parking_lot_core-0.3.1.crate 26635 BLAKE2B c0da77758b3b4a1a5b7982f1304e3cd74b4345bfe4ab1e9dccfcaee828e1024419fc20c6069efad2ee2dcad0180350d240ae689a5b700e4b47a0b3b3808b6539 SHA512 3cca0091e839cb0b63dd17f989c1d3d196e9706b4adb227f9308cd2b43b68806dfdf0b7ea098592cdc520bff249ddcadf23d0c0a7c23eda179ac11594c26e127
 DIST parking_lot_core-0.6.2.crate 30598 BLAKE2B 048e87b1a785da927afc368290c2e1dd762d98239d862a1aad4850d9498b91e8d64c399bfda0586c23f02fd8839723af1d5e2ef3e714cd932ac11a111b978543 SHA512 5de5d9cac290d7d6e6a3e1fbba2784cce8b4ed163481e1cc6ec36498884b5e3cf0225c718551289be164d1a4e192de390201a083560898e4a42a4068661c0689
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
-DIST phf-0.7.23.crate 3841 BLAKE2B 9b5b3305687626f79c3846f4d24f3d2e8bda91af4284d61ae397ab1fbac1611725f7dad42aa026f6c7c57e23482ffc2e217df5b6736081d3552eec91257b3285 SHA512 8bc773f2c8993a1b2aa3d555fa56cda736b6574b602a3eac5a48faf3d937ba99a140d9d8d98b998caba432d8346364194849947a84df52bb86eb1bead31da8d4
 DIST phf-0.7.24.crate 4318 BLAKE2B 7bf1794bcc75b265c5d9a213eca653e857f1693ede35df6d53b3ffbc7c1493f0bfa241472e57bd235f18d9390232e53364a9bf5cbb18e67610392f5baed9f9dd SHA512 0140e9acb7dbf6ac2d17110e8efc9ef515e2f54b1b3b213d98507da6b9e9e3eb0995173c69b31c34f536ca9b06eab108015ac26d2207af79bec4e20d19d62e44
-DIST phf_codegen-0.7.23.crate 2866 BLAKE2B 40260597f05867b579d4d96fa686774a1d7e2e0d59d1adafd1b21c9403718f0c42aa1cd77c6266b7c9805c76ba1bdbc47a3f20bf4db3912df89d569a9c2504db SHA512 64142b8403f5b966ac17dca51bcb52a89cde6d365b5475c3e9aba5e6a808efa6bc9d5eac512dcaf9648ff02af0c2c06aba22b5ea8614b7c32a9a50cb630dfe23
 DIST phf_codegen-0.7.24.crate 2946 BLAKE2B 25edbfd08f0d585d594e68bf8ea085a4ab603b50efcda4bcfaf81e044e0718c4122bea3cdf4f039b78bd8ef9eb56c1e5f7545d888ec63d8b816a074d78c845d8 SHA512 2f01538937b89c0bb3e4f779b4347ae0d0515e6a99a6692a57898b8c97e33a02dbf918757b95800333cbbb60748593471e40260b767f8b87cb48e2a23a90d664
-DIST phf_generator-0.7.23.crate 2219 BLAKE2B 40ed4a207e9eeead6e243911682471a896d75b55cc31f38a508e16389533a4b5ac209557b595331a0cf0f9521f9f8874d2afa44447e406d79a204c3ef4c0a6ac SHA512 0837d40f937f11c2902112f754003fa7465ba710ad86d397b3c33cf949d0b50ce3693030d40a5e1b7bbb21445983cdc63f2f8be615a7d4bdc33ee4d970341671
 DIST phf_generator-0.7.24.crate 2261 BLAKE2B 30d1404517acd99c74584267d007d89fca6b7292ca9f286f5d26329351eef6a85abee4e2ba68b3b3e820232846f93eefe88c8d0a90e96ad2bcb95328b9b7ce02 SHA512 793d8d46fd2848f165099324ba36d6ee074a54e1c20236afa5c5429894bafd23740d1cb41f00b87e4d21fea1f78be7151ace7590e2e7cbc906d565e5eb7225f7
-DIST phf_shared-0.7.23.crate 2084 BLAKE2B c9299cea4778e0931268a669a558d99a242bc8dc4ba1f558d143e9690509562d917ae4e9cfc86ef7c7a90d73cda00f8668f0c77c0ded473e47d9caaee8f56403 SHA512 ae5036273bf2c724fe7661db59b3b537073b9291d1e20e0e8dc055fb144ea9d19fa769887cc7c6576c52eac47b7cd7075ffe7dbaaa83fccedaf4576223736a25
 DIST phf_shared-0.7.24.crate 2170 BLAKE2B d31ce11599253d92045464efb1b578df8a20a936cea60cbd295f13473406948b44c68ef42c605eeaee401a05c32b6282d5d62d48fdff70af400356e5e064cde8 SHA512 5d46e738eb9afa2c77c5d123ef47dc1f7ae767baa043cf3a937118faa64696e714dac57f01861bf58a39dac67048c55a301dd24401cbb1976a7f753873e49cca
-DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST podio-0.1.6.crate 10186 BLAKE2B 30f1ccfce0a1026ccbffbbbfae035fd3575b43c9226b6fb05c1dc7cceb31ec02de1dfed3cc497dd4fbcc611a767e3b5cfa3c751598663dd5c30ec457c6b5d946 SHA512 91901b941780db01f01848ed63fe44decf3543dd5163804fbd0118435ea60b43baba9d24bb1d182e929744a32ab4b2a0bb7fa9b6e9f3d32966bdd6b8ccc631f7
 DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
 DIST predicates-0.9.1.crate 24557 BLAKE2B 3559f5108a622d022f2ef4c0a99f7b41797e6d7b543810414b0ed86b1ef1b91c454e0153528c7b381c43dd9821614974a98054cfc3a7e418697d184345299ac6 SHA512 bd0dd5bddb524f669658b3670238b2dd87ff2d1c0620cbe8e17cd6e2d0e6b3b3e1bb8cef77968d106beb576b6564394a1e205fcc9286d87299c4f40afa4085f1
 DIST predicates-core-0.9.0.crate 8053 BLAKE2B aa05c5b838b4e419cd094cb1d920c4f0d1e817598c1cf22546727c1df1d1e58f179296a32d59b7ad9477684598f9ea007b67d26b620f25b5c60d527f467c1118 SHA512 d24fd091f5dadde6c3b3d9ca36f638640b50b194dd50ad6b7f8aacd53a51c08b4e188256596fdec5342ea6ad20549f046cd4591e2c7336c7b7fd01df23d71777
 DIST predicates-tree-0.9.0.crate 6240 BLAKE2B cf972038b40a5f3a6d970ddd53ab80d6e814734dbf7c59c341dd77bca6dbdf2fce1f673e3f44068d316e2b2b4d19c8f5e03662ef8c6fd392829b8f2bc415b377 SHA512 254dd3d05f17b9b72d7b007041176ac1732c76fab2cd67f7653c6a3f83fae48e466d04ad45a77b38098b807c291f14d56f02694755cfacb5e559326c067d7ed4
-DIST proc-macro2-0.4.24.crate 30970 BLAKE2B d6b0a5fe633c5773e6d8b4bc2c9f32c66f8072f85ff48bf449fd3d8ada87e639ee730f8bd3d3170acd1528806698bcf1c329c57f102cd79833f96e2fd1bb7e0e SHA512 57ae6a761fcc14f22277df025db6b09f1173035e1496d1c4906d9af9231c19f0b93750abf36e4013ae82799069869047a7e3f1b3e095344e55c603fe5a462d03
 DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
 DIST publicsuffix-1.5.4.crate 17028 BLAKE2B 9a75a854731d335c7351db5497b0a5231a1df53dcf000c6e87b2034be65d5d1dd8c5cd3f05b320074eb8c98f6f9fcc3be4723864e6f5394fc041a288861c8baa SHA512 39378405187d65d75e5519c24f8f74d226d13cb993aeae30d551872937a95fae5118be1ed3f93b336e3701de2425123ea46350a465158c5358bf2fc58162ea9a
 DIST pulldown-cmark-0.0.3.crate 44672 BLAKE2B 89c8545c930ecc50ca23569d29cf7d69aabd3c33b877077db2a8d84510c03d46eb473e354ca124e9df8f2acaeeb802f68d9482c80db9908f82faf62663efd4fb SHA512 522f75fff95e80a2db5a86bbb7d1dd89f86acaedb87e4f95634862e1b4d58e0717318dea85613eef912208e097a4a59a914da211e9e77bf904c062037267fb67
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
-DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
-DIST rand-0.3.22.crate 11318 BLAKE2B 6a8d7bd3a7044a8c1bf8d9e2701a65770365304338ab6b48ccdffdead493213cd7e442dd5a6dae3b5f372d3004c382cd073c60a924f4b2ce50f9e1d5964a996b SHA512 1b3af2048992341ce5a3bb5d5c9bc2580949dc5e92f7aa14d17bc3eb3cde4ff4ffc9201ff2c4dcc02dbfefd5307f0731775ec46825032dc1b576a2d77cb4cee5
 DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
-DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
-DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
 DIST rand-0.5.6.crate 137236 BLAKE2B 26ce5ac8fa86492fed467b68047a6a47f17af3720099410a3498c95531efe9d8329998df0ce693190c63d371c2efc67f07df9c1bed624ada18b5365f555b6c5c SHA512 0e2a643eadf6cd9f035eb720b540b838a00d6c790b1a99b36cec349c2e24dcaadcae6607f99fe86957e77b244d356dfba436a03c1d4d0756d6f8362c19087b64
-DIST rand-0.6.1.crate 126613 BLAKE2B e7779ba6b13aa58edc3632f250787d35ad486185d3307d17528b12bb6d2adf6eef8aa91c5f51f021fb8e037d4ab1fb64fa364ec093fae0a5bd79095d51e06791 SHA512 dab500d25d538d28bac5b9b60e3b262f64e9d0581c5c17f165890497f7cb459603b815e8a43451610e75d8f5390aa41aad57dcb532307c479ebb99f475f4d4a4
 DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
 DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
-DIST rand_chacha-0.1.0.crate 11637 BLAKE2B 423f7e835d9c69f49f991ef2ad00c40c8af929935de531821ef32054b39bed54991709e04b352a9f429c7c49f17548084f703353df3a768f1f31a655111b8ebd SHA512 b911dea149eeb859e532d17074a4db8527da2d048b6f59b0d58fdbb51dfe3e839092e1c614e748f471a7381d28605e994ef8783643bb419eedb2c4e04f3dd0a3
 DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
 DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
-DIST rand_core-0.2.2.crate 15450 BLAKE2B 407d86fff0cefa6786f4132a032c52d0c81291e3f1ad7f3de6a4b58f12cb744535d14d1be44244c3a21a4c562b8c48c1de5e096786d0f7da817bf4242b0fa310 SHA512 fc06e20d22751c55cf869707b527a55709c48d04d498b4301b4d629e4fde2e2ad0d9009734ad20f64f188f55b2e4d5f0ed8a81b7e681a8a0890a4900d63a0bde
-DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST rand_isaac-0.1.0.crate 16011 BLAKE2B 84cd447debff595683ceb97ae2b03cb31ca6e342769dc1ccfca0a20e5bc8474ca3c40cce4bfc3be59b2bc0c849b74848f8916a2bfcf9bf7c0d54b2e8b5ae3c67 SHA512 addd5b4fb2bfdafec8b3d50f607099ce8d9fd7c5cb5cfcd6603368e5022dda7562e2deb2efcf4d5f3304f248629160f906554ed40a0d7cbb19c4b807a36dc74e
 DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
 DIST rand_jitter-0.1.4.crate 18409 BLAKE2B f346f6856128218aad0e70e8b4b70a19f39b4b3161ae2199d893f6427ea1e2b7aed4024de311add4ea9a19de898f5b34668a4c7727c9e7b32325663eb6ddbf51 SHA512 fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a
 DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
-DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
 DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
-DIST rand_xorshift-0.1.0.crate 9194 BLAKE2B e35999cedfb58b4c2192fcb0d4b606b1535a4ff32cf0f9a8d337f029704cff285af741b507c98afa27040e04f2be23d53a7c749fbd86242469a4a85d61939f64 SHA512 6bdec89da3e3c07c8fe42ba4ce5c24d76ea81b522fad533ae172c5d402f109fd9ce793bc13647dc1db188202bd78f48a9ad55f0caa43f1b88c711f3f2c18a0bb
 DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redis-0.9.1.crate 52038 BLAKE2B 6fbc116442e0489c3b033a96eba2d39363a0b9e2b34aeaff6a52355cb2c2c5162a3707901d09b255aaf45f634a44b44ea0d14feea6285651e61908f2d6e19193 SHA512 b4f9a0c442268e1637aff4b65e11c6d23f3889b0aee9ad3d42f63286def2d470cfc99c2c2c525b7696493f99b6d73c5e9b47af633d5c86e0b0ef431e7a2b901f
-DIST redox_syscall-0.1.42.crate 14962 BLAKE2B 5a2992cb131f4750287148eccb0920584fab3e0366b2d5a486dce1b9400a933a9a53342815a4c75af4cf529f40163c41817009f76780002fbb108048109e136b SHA512 63747e029680b889aecbd8d3bd5c1e12e0218322a7384e090702e0c3d569dd7fb7c411b3e75f2a6b71361fedb1d5d0fc559248d1b8b826bba92595a591fabfe0
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
-DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
-DIST regex-1.0.6.crate 239455 BLAKE2B 0e81b18a220c6e81fb9185391f15faba2451b0fdebc7facc06a3ea76534ae32a76a6c573a686a72c62b30399939529fde08e6c33c4fe0d126df9cf5e11204456 SHA512 4779fe3896c131b418b07ec2622888b2b8dc64172744e6ff91c46a957646c796c46fcc5b1c37b5349f0c7a5adccee2e7af1e07121dfd2b59976bd0fde5b60bb4
 DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
-DIST regex-syntax-0.6.3.crate 240173 BLAKE2B 03e33c25c9e7fb90cba231e0ab655bc35135c0f0602de9f977f967de7a9a40a2aba9a48a30f49eb98dedae4277a03b17a64dbd59f0b14023ba9df764d0c9e721 SHA512 95e8556d13337ec25a9baff923528c0d1af10ac3e88cfbb6f5bcc40fb90f962cb473c88a8e3a7007ab9fa36cb063cc2348e79368296baedcc6053bfdf6bc7b6c
-DIST relay-0.1.1.crate 7331 BLAKE2B ca5d025d76f85b05a8453e264045871a5d552632db7f8bc61428798bd5b539ad27eec191ac153addbc86c77ec771df6058ad84d29395ddfc39558c416d8d9d91 SHA512 81b2aa587529ebf364d4b1a566acfd867623a33d32fe20c94551dc248ef28950de61094d7e1acfca618205c731cb3cb955bc8106d9a4c5c7c84f9c38b35b2261
-DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
-DIST reqwest-0.8.8.crate 55825 BLAKE2B b4bbde5f4229f1ebf797d47a4447fb9e882067f0b93d9eed645ec4eed5dad9aa96b14b439111107901ae45c9bedf341b55afe3a72cd4298704223dd97a030551 SHA512 3bd09864fd1bacd2d5868a25745c586e4287f24497338b74405e617faeb11ea6d132e222d10f9d3b36010708a68e6ce4d80dddadf6b44a9f9bf2ba53044a5ca7
 DIST reqwest-0.9.22.crate 105923 BLAKE2B dcdd1630f59469783c9b26d89640027820785e34cffbd226d4466bac62d5b50650b2e49ce744756cac10e1848215d2c865e6291e27baf4fba8bcfd961c2b3e97 SHA512 7a72bb0ac26314160b27a9c74c4c2e5249375095344b065a50513fc1f0bf782d35d51add67d3cfba591590abef3839c39c6cd873abda6606aae72ba0137b4281
-DIST reqwest-0.9.5.crate 63819 BLAKE2B f8f2a524cd542b234966712a07d7178ff24d57fe2fe809c9830f08e91f994575f7f6cb3accaf9e12188033ab9becd384b7c1b654862409cb42b65928d6e2d9dc SHA512 c63ee8937bc91427e6a40539cace7d91722660e517ee789e57584be49efe299f0a7e3ff7a8addcd74109fb69d8ec4cc0697508bda577a94eea6b471815a00de8
 DIST retry-0.4.0.crate 3875 BLAKE2B 2484122c3aeb1cbeb5b6152a2c3e9d329945530d3c7f01a8d4b9b83bcb7466ced9b0052acd523872192f7ce63c9b4f9d01dc7b86739c1e2ed0e44fab609397bc SHA512 e7581bf4b3d6217246a9fad57a3af5225c3cd0ef7916ab9cc4b4cd78b040ba5e708d04b0315237a7cbc61f644c5435e24006346f43016cedf1affded1b839be2
-DIST ring-0.13.5.crate 5419321 BLAKE2B 8f81b3fd2ef84574ec7763d40c1f37d7d8c324c8d00f49d181f152412ca084b0f765abfb09f5c380c6fd2b116eb9706acd96c724030d71f7950368a902ce1de4 SHA512 18c2bfa44fdbdd8006b114dc97b66979dd24bde852d793f67b8107c3a2fc73934a3817d4911d5e1dc9d0bf70053c7467c657fa87577d9608d10a4b7a9e63ba6c
 DIST ring-0.14.6.crate 5428922 BLAKE2B d544d611edba8c89351e8c2d5cba3e759512e2852afeddbc02881ba93c32e17172174ace446486656792bea226ce0f9592dfa2a6f806cbd652ccfd2ff0579fe4 SHA512 43a52861816a5a9e812ce2f9fff3ce47b14f17eac0df9657d4dc2cd6eae9540da6251882d8319738831124185d9ff18476a60f2bcefd09861868184872ee04c6
 DIST rouille-2.2.0.crate 71003 BLAKE2B d6ab434e666e471f019533ca394bfe66a1c4e23ea3c66dbefc7f5e8c37d9651ad013c0bc25d8f8c0742819b28fae028606a666ba741e0b424062acbe3d549c42 SHA512 b9b105d59f24773f9a29ddd293be671b8544790cacf83e6e53601d186c7f8b14f5f52556fc5424c1d060e54ba1c8dc1ec492f6a9b698404d7a4c41839bb6ca56
 DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
-DIST rust-crypto-0.2.36.crate 857879 BLAKE2B c486a2e43eb9ac9d2558bb39a249dcd689e86eef51d9a7613a3964baa633cebec824d5a490254dc06eca7a5faa471126de92452d62c522a3dbf494b9940a13e1 SHA512 0fac026d8799ecde523f20e7b34b9486343e48b95e79cd76bb6c8bfaeaebed550e45d59d85d8a3a58595f10c02a4a5e55691da15c203a4336a9bdb5480cd2e90
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
-DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
-DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
-DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
 DIST ryu-1.0.2.crate 42001 BLAKE2B c25f0454bfac40de3150b8c263c6d2842e64f86f441a69ab5e5722a2383a9a07c7539837f6e50996619eb0c4a5da212556a4dd21a761a250785fe0a9c4e18a3c SHA512 c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64
 DIST safemem-0.2.0.crate 6450 BLAKE2B 44598e47fa6185ec0890b4ba6d0e7b5f52f8892875741c3819559dfa61491736d4326fa1713916ca41d6daac72829ad31d0905f2e339a069a987d9715f340795 SHA512 71901f472668572e849504a8a830d4dd9a742729b0158d2c6865a5ad86e65cae8b5bb83707240ba03a7a74c610ace87f8b59bde68998d2bd66c19849aec4fc8a
-DIST safemem-0.3.0.crate 6947 BLAKE2B 1f3e86944eda42c890a5f5792b7e0a50fe6574b1cbb077b7f08aca7dfd33e26deb0fccb3aa96056de3d637d014658b682aa47b523f0efb1f8145af7bf34ce3a7 SHA512 c7d56204b29e9c0fcf925ccc43a2c910f6cd74d232c500b61996559a783ced3938cefa058128d72759e94edea683bb8922ac5ea631d16e31b58de093d6650b0f
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-0.1.3.crate 7078 BLAKE2B 175390d4c7cbe5b98b27b6d23adcef78beda50277f0035eb58d630591023fff92756e928d2089e915e166c5da6a8b1d5b3184e82576eab5145c1681d46b4e953 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c
-DIST sccache-0.2.12.tar.gz 244128 BLAKE2B 7d20af625ba954c950e4e54f789b3f755178b73d700453361a2a9c8603aa89a6044bd85dcb7895837cb2898ba3adbf5167bb023857b439e73c164cb70f924994 SHA512 1f7495aa7c0749c4bfbd85a88a304a6ed18cc9bfcd341f0f1a668a743ae31d355bc8c5b3199b048d8bcab3ce8e9c8b844a609e4c3009d4e5497dd080aa881a45
 DIST sccache-0.2.13.crate 244888 BLAKE2B c7326559d06afd2ae663836c302d597a6c094037c01172ca9453e0a589e79b117f6605a77ccdd6bce12f11aff3b136867bed94b51331d281a909413ecd587648 SHA512 1703f58c23be57c4d621cb7173a5fed1c7499ef558928b8ec3177d02c4a2f13052feae36b61bc292d209e846296d6cf77c43a848ca4d304c7b173df11d8c8eba
 DIST sccache-0.2.13.tar.gz 256562 BLAKE2B 46e2d5a494e870954faf8167087478dd90a16c87ffa4c99c59d7ef4c4451e7f639e6d0c0ec2514da90079d2c77192705b13603719746617bcc9c601d43b78ff4 SHA512 83c5a88e0ad6641edbe68f5756b5c5f0b21b60d2a07731ad32de6c23e2eaf751e544fca52ac36378ecc576bcf36cfd2a013ee3b16c743f0527db8661696f6ead
-DIST schannel-0.1.14.crate 38833 BLAKE2B 8825f6325f65c5aa4031a2260c4c54ad2a65634d2ce349bf6c31fc10a76f539dfe58d4de1e04fe6e48e885fabf5f720f5b4e4625f4a511e96c7cfe9837c901fa SHA512 550623a87f01c3c6181dad44d44397f172aa07c1b262a78d6eb38ca0676d68bcb8f231970c4eac87e93286225e17acae09551b07128c43b576ea77caae18c0b7
 DIST schannel-0.1.16.crate 39153 BLAKE2B f06cb0dcb3d93ac1debf396b23faf5df2b87ce98732ccf5c0ef78af0c36fc9825f2b716f0a5772dc71cd2b2e6ecb477a81c2dbfb6bbd4f84bf3d1187dd7cf187 SHA512 11bb68e759e2ac0bb57a214e64d86fcc49903dc70f9e0582ac4bd0343e94da44d8d34d22649ffae41dc975b4390e7d10f3adcf79d9fe8c9fc95c747c58947b2b
-DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6132c8e81ca8f37140f58d21e8a30dab56de35cc395b1878083f9e7b187af7e580bc61f8f38975b2e1193abb57 SHA512 9e1a517994f06dcdafa05f3ebe67958ed5bc751e6180cff6c891f48fbc143f3279aa841e6109be2c403b492162bdd90b23cf74aeb2154a34748c5d495789fd73
-DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
 DIST scopeguard-1.0.0.crate 11304 BLAKE2B 5871f050bbed81b50b05407926d66ef8ecedf21bf9617ee85a425b1f2694c14ec35014fda39dfbedae061d15dc2d7efb39b10f10b5697e854154358eef1e389e SHA512 4f2ca06ee2d9c46e42ab4c72596bc7c99fb7ed8db8e09bdceec010de51aae21497151c01fa72ec55f3bdf81ce964ba682ec64ee96586c5c315a5daa8bcee0b37
-DIST security-framework-0.1.16.crate 38648 BLAKE2B 73b1d36e8c977185485d21e5c13eeae034137e1e3d9c1db193a893129229ee10ee4e7103aafba5772467d6d751c59bd9aded0c6f828ebd937c18aff677348f25 SHA512 c7c51d0bc54255f02945d970f918a3e378adce2563b6a5ed81eaff1c50fa6610e17ce18bc3491c74e1481519f5b9007d9052f476602a7b96b319637d92672c42
-DIST security-framework-0.2.1.crate 39220 BLAKE2B 271e0cecf9bfb0fc0aa305d96e9bee753c6dddaba201e40beed76b3db0471e170dad447181068994b0fd8065604133fabcf88588a1a7a1ecb20049f4d97da635 SHA512 877f432af0e531d98028f01cdc3bf3efb4747c78b447face9335ed5039ba16da1b893a5bec77705cd1e5b2151f4d6674f6c6baeddabe46180b67a031031ed82a
 DIST security-framework-0.3.4.crate 48568 BLAKE2B 2502bbd48ad17114fba8cd88f9f8f2416856a7340e27c8271d70ecaeebe2b4f5dadc56e8222d1a5451bbd601581c7864211cce7987901a0c0ff805d8c983df5a SHA512 4c23e76834c0a2d013a2785030a8ce85658bbb144318eede6ea790029f8cc848045aa69f3ce8895eb2eb6708a50cf62a5dffb908d5fc5eee53bc203f9cf8ae46
-DIST security-framework-sys-0.1.16.crate 7754 BLAKE2B 713b72887d95a85182052b1706706551b6d11279647fb55cfeabde1377b2940fe9ea680a6977873ce96aa7661cd17b3d793ee292cb0a0f4ef94cb1da5636eb24 SHA512 5a5084bd0b63e831a13882723a7e7487460c718c871552dea09d4c6bc0a0535c3becb535260b7623a7e009aff026a49490b7dc0bb4699f2f69d21fd929938709
-DIST security-framework-sys-0.2.1.crate 7790 BLAKE2B 20fdafdfb5ae59033fc6b893f35219d84c758658f1f6b5a376d23064dc8ea357778b2c3c856bb43aa751b08f5ababf289b6882b4dab71b062ff9ea3d94e4d94f SHA512 ca18ddee68178f49cf8b50f79391dc43c6269dc879d14950b13fa510e5b46959a8af78cbd007f8445fd510866d79570f25eb0dddc0a72b1f7b4390285cd93f84
 DIST security-framework-sys-0.3.3.crate 9554 BLAKE2B 851c1c7e7d972b9f74d7278fc501c3894ffa0fea31954fdd2ef5e070c28c080cce04d35acfbdec9871c4544b218ad420ebd42bf6f426142046d805ea99dadc27 SHA512 a78a9affbdff5c44e63e555970748724a4cf1fb1e47a6a5645294f70b2c0960d3ef93d3289c3695d5de31c8f7a9b093e3ffb801a1631b474b5ac68e0b68bfe22
 DIST selenium-rs-0.1.1.crate 6546 BLAKE2B 7fe5ed7e62b7d6ead066ed2e6a731a9da16ee6accf466b81a7d2661e54f36470f648aa0fea00b5655638f080383e8cd50f679d96a3eb586ab67466b510f56983 SHA512 bd31dcf5fee7aa64a5868923329e4bf4c4e39d1b87c90bc7704b8f961b67b11001377a6288239e70a3d523113f37cf2b37552465f9e3365f37ac96a11cf7352e
 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.103.crate 73256 BLAKE2B fc7a2cefd3281b6a562e492d37e1f157de534fe078505467c43b34c6d86ec8e629b21dae9c11334ecdf024c16947e4924ef643c387fd48a9741f5270bb488c6a SHA512 49adac8e0df0cc74dd6fb6efbeb28876335cd9d58cbc5026a97555d1e9424ebeefa227cb2cd7a9ec6919e0b82c840e390aa207383c2a8166888b7eb28c32c4e4
-DIST serde-1.0.80.crate 73057 BLAKE2B 13a4a49db02b91eba4ff731a2cdbadca0998d46d4f8781d8a2b134e1db0298d3aad4239590e753b6c1f79838754fbd6715279ee0c33425bece03e683e578b079 SHA512 0606758eb1f29310fb2863e1b22c554d9ff290af9365787fd7d0bd76217c81ed9dbd95f3b55c782293db38127dd272368fb59e3b1b9a1e2bf053d69c9ca3abe9
 DIST serde_derive-1.0.103.crate 49652 BLAKE2B 8134c992b7d9d073e0f3a325b80307e11e2d9d75db40c0b80d15381658864d58e05bfbc601ae36d118ad174d0dfb59e6cb6d1f48b30af21fe7b03811b06e07d7 SHA512 5ec22c59ef496b6f5d91cbe7f6085ef6501e8ca43c62805835c76f53b0b649662c8899eac49fce2b281ea2a27f0baa348b5d0f1fba8809b478f68d823ca4ff04
-DIST serde_derive-1.0.80.crate 47136 BLAKE2B 467b36ef2ef78a41e05aa2adb1efe865cf2be755d2440039e666e40c6aafb8d7f34e4894b3665655426c4cac4d2ba904cdd9ea521983ec97ea640877481274e5 SHA512 e16bf0af19d325bb86a68eeecf34fb809f16666bce78c4dc281f24264e7977faba8c659cae3829082d8d6045fa347a405ccf68e9d27108debad7c695317e1e34
-DIST serde_json-1.0.33.crate 69738 BLAKE2B 72b396a31b156164c6f300d03a52f501dfc385e55f0abc7b2faf3c83ac361c595a1991e4342bf0e014970713ebf353d24a2233aa3941921e4546bd9779ada8e0 SHA512 5864c5922bed9f6c34db2163a14374fde73653f323ee69622f15510572cb88e8a645b4153ddb1e12e64bbf0e60f37895bb68982df68ac68a1a66c83df6cda2e0
 DIST serde_json-1.0.44.crate 70325 BLAKE2B c8f5836e3448bbf5fd666b30e747b90f84eb7dbaaf078026456082b5403bbcc1931c70528abbf0e605872271861c1e7dabfe1f42d5a13c2b02f5abb28b342e61 SHA512 ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4
-DIST serde_urlencoded-0.5.4.crate 12552 BLAKE2B b4f7b852afdbc961a99100838745948b1e61032b171d78f9c80f39a78ef0d40ac00ebc147b63e378b7b7ec1e4b28ce2ce6db6467e6ac2c1093fae0363832a425 SHA512 b32c2cf86c9c023b18ce5627992692e53a0848a1d44508c510e553731e6a4fb1ad30aef8f2cafac6ab0cf3faa45eb5f1df42cf8cbce36b673d2aa6754d3ef45b
 DIST serde_urlencoded-0.5.5.crate 12429 BLAKE2B e91e4c6a41d2077a45656814b6291de75dd361e0be39bc952ddb23e06b1b2f29f0fb612fef472bbf6fe10b089639417b3aa8603ca09c70b471c6804e8772c0c0 SHA512 9c4a82907619aa211a5768628ae1cc749980b2df267f325cc1457031720d4166edb0b67e2144324e7f655384000583ac2ddeda33f7ab995a390324e2ef4de145
 DIST sha-1-0.8.1.crate 10410 BLAKE2B 77528ab00684cd96d09862d045f0afb99c4eef4bd7c863cc71a435d9eed78dca3e77ca1895426587de5ec88d8ad2b62f746eb9643f1b9922b1483945c8cf0b69 SHA512 7446e7564b5903e588911008f9367f9d9b0d96ae883d299ee4f10ec3d7a30abf1af1bc9c4f2172226f09071413116c12a8a67419246f7a7de95e9fdeec3aacb1
 DIST sha1-0.6.0.crate 9244 BLAKE2B d992f1803fc17f8f8081ccbafd07ebb9d78056a705444b45dd51b2f57cbdaaf071685b8e6ad9f4fa21e032cc78b4305c8101b079594c7bf6e67894bb798b16b3 SHA512 32081c99a0cd5fd6e651deb711eb4c9a8bc71c12e26b25a72b2dba9a3286502e56b23d068a2899764ce1cc0c615c2c1b22a6c7aae63e07a758745b533e70ff0c
 DIST sha2-0.8.0.crate 17302 BLAKE2B ed37c8567479bade08207b73d61cb1af15b58a930b42cf422ee960e24a3caf76a6f3c08ea28ebd925f6d24835f2d0045bf7b0321df4c86923531d8fad253a320 SHA512 6d95888b40c7f84b245864891d4a3e8c06ed3e0cde1aaeacde2ef75c969e00b524fe6045aa9b978d0036b315cc74502f88aab0da67c6708b2450efa9119abdad
 DIST signal-hook-0.1.12.crate 25979 BLAKE2B 71670771ae8cde6c6e1b1746da0fd94041c56392b91f148e3c77ef0660c2c9dc33bf7ab25d632c8a270c51c3e500724bfcd49f13372d12c3c739b9af1afc0242 SHA512 e2b2308562491fa5e500aa4edc5f75eb40beb4c9263273c77da9f02e95331086cb80ece09b9a903bf775cb5a355957e01086bb5c0bffde7f5d1cb96969eac70e
-DIST signal-hook-0.1.6.crate 22576 BLAKE2B 92f667610fbfb62eef7ecff2f920828ab9497f9185dc3008f385070064bf3753baa4436cf46ef0b97d05b65d938bcd5b581f2f640519b4d3033e293ce0683cac SHA512 5cac2cf5220846ff6bab848d00735ee714c12ed9dea2e9868041ddd276ebfab9f37a93a682bccac21e0de73dc75a0c95a7f94102b4200b3a55dbad6aaa4c7cdc
 DIST signal-hook-registry-1.2.0.crate 14490 BLAKE2B 52c56376f5572787d78d4691201d51d219c623d2eedf912625128d6da8fb01f6930dbecbc5e5c021de098fb0a194fd6b35a9452f92a484095e9606ce96fac135 SHA512 f4552fbeb50f66a2ee1d9826fd74a8ecb3e6d242913c20ca7099d165afb55ecd359a44427b8c3eb73bfc4e3c887d972853b49a842472389454988060dd4aaa07
 DIST siphasher-0.2.3.crate 8717 BLAKE2B dc5f80933bf9a172dc3747d702ecc47827c18543a1955811c22ab15a3bd21ed8ff1bb6a99f96115231daa2184526fe6a12cd9f73d91655315077aa6b9c3fadd5 SHA512 7bccf3a0c988da97c36d5f80518a5adaca58385f7000697cf10771ab246e88509746e2ec9a356122d25c98f0acd98eef97fb97f81a92959622ed51dff61b37d0
 DIST skeptic-0.4.0.crate 3166 BLAKE2B d6a8dcd04896e3717469bdf407869e8dbed45fc1c2c326532e623d4283caa8c8bb0b48300e237c691a247cdd15b72569eb92f658152b70beddde65e10d0cfee5 SHA512 60eec263eea294a7b6bf2df43f3aa09141399f18eca90855f4f8caf05d8d87f489dfc73fc2a8aa330419ca0520935df7b61b0da2e44a8ac404bde8a255ff82cc
-DIST slab-0.4.1.crate 9479 BLAKE2B 3695c01f8aa9786edc64d2566abab20be6c155bd479b3da08e9c405028a4021e1ca8f937f1f29714b6f26513a0e753a602469c1e57a2bf84098e29c539551786 SHA512 ff8a967579f8d91548c03002f05f6612c6660796cd6fc35b325994f9bd48148ae124d58d9b991fe0b1d7bc111e9a6e43d4ae0be7a31a9faa126ef96ce82a248f
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
 DIST smallvec-0.6.13.crate 22760 BLAKE2B 83e573aadf1742122bbe1897bee09867d9225624474cf8c9a1bdd087a8e69eecf9567e8bdd2bcecdc8cc08f5f4c4f081bcf718ab062ee399c9a09b7f8c54948f SHA512 497e1a77414d545b44f099a69529c6c9a8be8cbc80a84bdc9e85428263518e6949b81498b9ce6ab2795508b1c3beb5e7e5aaa3623bbed2c041f8c3f4a0adfe33
-DIST smallvec-0.6.6.crate 21395 BLAKE2B a3fb3dca2ccacce5e88deaac19ba5e01cc2d78194f0b3ee35a7ea60e1534785845269eb742dedc11d5340bc8224e12cc280a4e16e643d1a63caef70a7459ab04 SHA512 922e67f2b6fd9b27ccc68c4a7dc2c99d5622b778fbd3723503f5a840956eb3b99528d9beee66425a4cce949dc867d675a8071b17b7b98df729ccf07637fac2c4
 DIST smallvec-1.0.0.crate 22962 BLAKE2B bbeb8bffe14faa66331c88b40e369912f5c75aaef3608b0fe5bf69301b5fdd9c6513ff18924d5200723943b5ae2ab0ec25708788f9b0efb870c598c1b64b4f8c SHA512 55cac16305ef45257d78536cce7a3f59321eabf5702e405c6e27a0ece0a8f0447a5ccadad60a1ef4286f9991609abd9293768507550557f5958545d788b60ee2
 DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
-DIST socket2-0.3.8.crate 30379 BLAKE2B ab805dbd3bf53e6ee59e117129b064e31a2bd92f3baf472af1975dd67fc97149fafc480fba4f29c0b7e2fe8d8f101c09d2cc5bc7c5d635418277ff7c3a883a42 SHA512 b543633e3acf6e8fe661f0162375619841346d5f1e51eb622e045712153e2d331bf32c90bd9a8c0cd7e84034f5d2827433788b54b3342f3eaacb537013f86a87
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
-DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
-DIST string-0.1.2.crate 3989 BLAKE2B 56fe4a944186fdca6d0c1153f179f20ae1be7c052f3e984e48df5b5c064c1f3d2610eedc04cf2e35f3a8fba18bd43ba8d5581eb234c6eac12df40168ae424824 SHA512 1c147d5f0be85e9b0821411864e3f4b71678d9b910506f98376108136cf4b6a3f65cc7d2a34d132becee33216b7cd4215f83023221a7863df3e8ef9cc3219881
 DIST string-0.2.1.crate 5081 BLAKE2B 27f02ed6a6545eac02d0b98852b2c362711dffe6dace552a24f8f3d69b8c9b0b60a147837c538f2fbdaeaab16b27eb7c554e9bc1aad6c2563b08f3c1a759ef9e SHA512 4d7ab65f12d63065e895947285d5aa1b9003324002b0f657e7ded975c90eebd63c1033ae9a01969c42d446b0ea878571af62776bcb4a8834cace173f908c76cd
 DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
-DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST subtle-1.0.0.crate 8097 BLAKE2B f810268d1d5e435ff51134f0e1cf07fcd86191a0e482d6b426a87a147624e8ec0f4b37585965c65a8f4a569688cad33a4f41e3c154bd01ae461de676df55c69b SHA512 cda69e4023749e75068f0aa6c46e839073f5daba24c5988ac79ace48ee21108de1e179e40745443c7cc57c3b74aada1d388845d9c0bba1f234937ee958e0aa34
 DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
-DIST syn-0.15.21.crate 146845 BLAKE2B 843c3d7a4853c50be188f7c67a329220cf8e65a467e9a63b3a28ad88fe89063bbde3873f10bbf81357cc5f192756c0c4b43162fe4412471edf914d7e5d0509e8 SHA512 606ffd4bcd74920e7023b2fc83a83087f4a559a9dec0a4a0d5fb6667b9887f98c413191a84b81ddba68e869dfc9fa7d31a3018f90eaed0ad96a039fc46074391
 DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
 DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
-DIST synstructure-0.10.1.crate 17836 BLAKE2B d80745963f581c02a3b9587d45586e2098632a4c21de22547ae97531bbc4f30a1b02989306999c67584c507a5b07978a48f65ad5e00ff55f39e8e0bb4fdbfa8e SHA512 5830eea0eab15c7ed737bfa14c7bbfc73f28af6964ce3148542066fb9760a80dbba82fd9a55078426346ba757e0aaba9addecadb1d0f75eac4f029a6e4c7cc19
 DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
 DIST syslog-4.0.1.crate 7131 BLAKE2B a6555d6eed6a0701cca7d58554f2ee612a5d18975dc1979414ac536128e0e7d4a67dde0ad2e40b5ffec823f7edd55dc45d646097fcd457fa6124de95411b4c55 SHA512 faff2117fbf377343149e30a4b338fdd799fb7e4bf425962c2523423f8322aae75f180e4a4c42f1497239400cc60a49cfcf65c00c48433ac956ff17e52063341
-DIST tar-0.4.20.crate 45525 BLAKE2B 43e29895b6c22b919ce1178ec763fedbf6565d88156630507099da7def5b61352aa0b988265c39d235dcf791098ae8c4a05405a1dd22a1cc0f32221c583871ff SHA512 0786f88e54f88ad99131450e55d5840832dac11d7a7f7d9a2e8bb69695ea2e98a568bf263a3ea5af08013c9da2b768a36698391cb52f9c8b84cdee5ae98bc13a
 DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
-DIST tempfile-3.0.4.crate 21125 BLAKE2B 27781b6755ef3ea66e31f42e89931e9d5439dc71456da95c399c00b1e5dd5037b17a7f5901fb8cfb33284b2bfc506b6dc5890704722f4154947ee413777f2564 SHA512 54890e6632f7fe81914b013fb63951eb651f7c833c6857db7dc701ca719108131acf97dfd5af4c821d32902618bd9e256ec4dd39edaa42f57f9f459a246b2770
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
-DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a30114c914d4ddbce63f428f9b1e9fc02bff80d91d4774202c3dedd65ad7b258a8a5af8049f60f4ee79ea5a21 SHA512 cbfe1f3653a31f07a8bdc0b46a5093f45e38b587b639b8683d361480937d65c531abab7c3af3ec2cc8aa3ac41cc3ccd93e31868fd7b327152e878a10070733b0
 DIST term-0.5.2.crate 37638 BLAKE2B 58a496673b9033416f40e29a0a53c0b8d50e413d3922d3685252c96fd880659961b4ee48281ece5b9d6d97e895d81839cdf886fb0a6945af25b873a905b09700 SHA512 421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6
-DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
-DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
-DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST threadpool-1.7.1.crate 15756 BLAKE2B b3451aa6cf8f8f1b86e19c91370fe48f73d02c9552c91fede4f6440b0b29c4d180ca8a3d7d95fc6f6e6ab6eb04113813c767367d64e171be7633545a4b966118 SHA512 e46733ea55a27a32868596562bbaf1e50508dea58359006cabd160b06cec4854c97b5d253cdcb8bfd60c7b3a33e496bec4159d0621efaa3cdcbc77255be4f275
-DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
 DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
 DIST tiny_http-0.6.2.crate 36408 BLAKE2B 00844e26df97404fbdda1ea2988e953d914df32b57622c5aaeae261ec9e9eaec6e41ddb441db0f27af691e76992840482fc4681bd8302360aedd96a652e4f9cd SHA512 bf7136a217d23f379b69429c07a47736e0660e9ffae3514f7f77adc43b9a28d2e732e6850e549429246e21a3f6c8a00e86e49d5d37bf13857478fa3c2cb62673
-DIST tokio-0.1.13.crate 79248 BLAKE2B fb2b76385c2ec8e05ff2e321f9c09fbdb4ea8589b80a5688ea155fee1c9b06342dff40e5aa9446b69cb7c6ae7804621ec4938055472c644752003a56bc3730d9 SHA512 9014af3d1cdd9f63790318f5a71d4a1b991c7721f453adfb067eede32e4d8f410f38e28109ac3f42de93013a46885808026102b134ec89e53580e64c46ca73c4
 DIST tokio-0.1.22.crate 70031 BLAKE2B 44a6d1ff8bbedfea304e4f44b5c4bf998876a632adfe611c3d851aa64ad092b7b0150c2b39ebeae8bb34cca6824922300bb3fb762cce6b5a1fcfa852ed8d86f1 SHA512 d92b8527bbeec84bb306686a7d29b705c36b59e9c0995154ed95d483c84952c838691f8c11615f481abb6c4fba470ba8968860a74a88b77dd67ccf659bf4e4e1
 DIST tokio-buf-0.1.1.crate 10815 BLAKE2B 0d3970a3722e3be109f8808bb7e26db618ceb22a8a1156ce219e6af9930b7f9f9948dab61fa4fa146e5eefcb7deb1332fcd643e0c3e64a879ce32305d0efeb94 SHA512 42f5db4f9ff1d0c6728c9ca899b85e40eaa92910d23f01dd7570c5988178879f3977ee2ad14f0f224562fa73ff8b01687dc963def2c62e93ac471903d5ce4e81
 DIST tokio-codec-0.1.1.crate 7617 BLAKE2B 868f45ddaa16cef0ec7143ae7d25d422fa4fd7fe59bc99a7ae4b97f700dd6418610b917a880f1fa5c939799168d8c31901d7186a0195c7b72bd130a01c787b7a SHA512 9c868545e8adc234a51b81966836b786019181ea25907bf14887ce26ed1cf5866f5df8898bbf6bb7c8d3626f145ce0465d3a79050d53f8dcffe98f71886f9044
-DIST tokio-core-0.1.17.crate 73933 BLAKE2B 055028a3c6fa910bb94f3a40c445b65103f87661655489c3e40e24cad0040c2e2c11e28cd6e14ba61269eb7bd091e93b68e718c9343ae09325aa320e998fbf48 SHA512 ecf3a38f88bcce8003cd334292217efb406e31e9cdeea115fd2b2c79c126cfac615aa6c975d5b08be30ac449e5bffa552e2b002b1b9a5e2f4e3969cdfe19d520
-DIST tokio-current-thread-0.1.4.crate 19400 BLAKE2B 1eadd257b7e6da5cba623f6b9365cab7f44864c344564d90b073f6ee32ad7a8f7176d2e8072323781ce1953a3a5f53a97c2305caa0565fd99dfd44ecefe16a98 SHA512 2d6c0af55470795b3ad237a2fd3e59b3d75831b04841219f57033556372f2d31af71500374022359fc661f7d606967c6b922a06c1e71e5bcea0759eea7c0ace3
 DIST tokio-current-thread-0.1.6.crate 19339 BLAKE2B c3fe401178089864fe59286566b84a325d8a4101b0b72dda11fefef945d5e14b5e6b6c7de7d87cf222f0ea3d1c95aa65f2c43fe37c2e766f8d70da66c7d060ec SHA512 321d8b99ea18827400a6b7899755eea5a8299e53985f5640a6fd82bf6c3c5c45c68e9d125666968976d05be407d6c15401380870adc231233cc532eb979353f6
-DIST tokio-executor-0.1.5.crate 10540 BLAKE2B 34a515a160907a64e177880e5d319e191a79c92a30dd12616d23b7e0b33a342651ae1943c4ac8c00658b64f1d4c2076f8ccc48adaf62ebf324bd2232069546a2 SHA512 488b75570e1f07c521972bd33b6313926c0e763385872f50858a58af1e738f2ea1a276e8899263a25a4788f641ba94f9280ad55c32978a97af9337bb0c8af987
 DIST tokio-executor-0.1.9.crate 12037 BLAKE2B 74a563d290276afca6c250f91ec54498629c7208d941a0ec7dc355cdc95c00e0fe09823c3ab83d7751d13673785676f1fb23af172cca4d612a381c21887f179e SHA512 c0f6a2c96fda364fff0a83cfd4c44a0c2ae1de712a355afd222e6b28f6e863e09645efe84d71b45cfe46f1d7bdb0a4f33fdabbeee6de01bc69f40a49e07d6786
-DIST tokio-fs-0.1.4.crate 12706 BLAKE2B dc09d985a2f242c00283cddd93842a1d9566953af60fcd389f1c574655b572c06b9ae93c8c483782076c630ff5ba4a3d86b31476a09fde46ec4089578771e860 SHA512 aa9393f9f9cf32ccba258821b22d6f3a7297ff2b4a84db934abfc66cd421239de581ad3d756815e47095435d045dcfcf6897124e0414f1fca7452f28644844d8
 DIST tokio-fs-0.1.6.crate 16102 BLAKE2B 4b31d365a898ad0fb20c6ae315aa60236d6423357997e34a5069597d72b146d7528a7ab974ff2e7f62d60c46461c1bd6c4b74208f61b2452088c4d8f9bf63aaa SHA512 8a123bdee5f2a6cacbe68f25baa5810a7686fefef8262b0a6b67e217ca6594a585dca52de581d33f4b71725bf03e003dc500f75ace88dba5cda00a52ce544279
-DIST tokio-io-0.1.10.crate 33143 BLAKE2B ed90d1aa36a90469fcdb95f59e0b9a5817945207002bde1cdd43adde936c854ce04dc60d62acb94955c4fcdb2669e7975e23ad5c3ab60880fb7511c8f381ddd5 SHA512 6e5327e5d555fa5b84bbe361219e2a1cf3c47ae8ca2f26bf38b258176e00af6e4c3602bbe0dc2636241730e0735482189edc5ac5300bf411c9963546f103792d
 DIST tokio-io-0.1.12.crate 33555 BLAKE2B 5646f1d0c226d223fdbf648d95cd690ad6f755c5dfa9a6bc4d5fe4b5df634029db6178d852d3a4c2d481d06eec763985186753088157557871e5ba6e8aa650af SHA512 57c675ade48f2885ab8f42dac7297bf4bc5f7abef2302f7964dc145ce29d503c09e3ff890de01aedcf0c860fe22d2161f9837d658457695b6205e601fac74149
 DIST tokio-named-pipes-0.1.0.crate 7055 BLAKE2B 3864a722160dc7f77c6cceb3c9cbc97f406873810163a3060419ab48d0c5e93542d6d7fdebab8ecc0d2f2169cb823d49d3c12b9537d8b0b7298f96e67a61fed0 SHA512 59726719949fbfbc9bd079ab0ffaed0b3ba570d4bbb8b1bc7fba83ef716423ac44ba43a95fd5cf7e625ea73a6da7c3723a42ccacfb530df3a06124d42926a604
-DIST tokio-process-0.2.3.crate 19886 BLAKE2B d1ba991041bc306d87b93e686da5f1a70d5f16a877c6b4c14ccd6d9aa2b795b120e2f55cfbe468240353d465ab248a727fd7dead085e0c74a810faaf28a33ea2 SHA512 d3fdef06ec7517f0ea708c3d3d17c63fc3bebd772b93683e1e09ea12a5b1d996774dfa8881d45ea77ba27d94d4149a42b455547a5c01402958a5dcd892bee232
 DIST tokio-process-0.2.4.crate 24856 BLAKE2B 7626c0800d53524679f36ddfaf70bb4245070ccf49e3fa5167b142258e201fd3cdef44561d24dcc0dc72e3ec5261970e58195296098f2c8675438b2bbe0f20a3 SHA512 a2018350db00f11499bbdd91a98ace58353a8363c464f11a4f517f9b63fb59113e963861bf61b34ca1f01184f31e501ed6e4133fa39852a2eb3246956cf9812f
 DIST tokio-reactor-0.1.11.crate 20789 BLAKE2B 441bfc33be1674710d73a0fa351f6a8750fab53d673ee43c52b0d1c9e7ca1903a524b2737e20740474e8fc1894339b00df4242d45e79b4e956a5f7b9b37eb010 SHA512 dd4d81d7ecd5ff5c5f597b28e9480613c760b5fac4b76946810ec2849bca11067ecf8de907dc5256eeb413b1041e4b2779cc0dca129f83a099af824acb75fb1e
-DIST tokio-reactor-0.1.7.crate 23740 BLAKE2B 8a8f499ae181809c0988d2baf6f843474ef884fe56c4e25f6786f524307845bc18c808f58f4299850402020dc3ccd1ed3e8d997169410a8e465323c85f8ab3ea SHA512 4859751a0eb2d423ad1216c0a63248b6dccfcd987e3d9c58cf4277d47c5123e9ae2e9a0e8a4f3178d83b46fd4d89c14a0e09a4ef3b7b10a3ff3a662be794077a
 DIST tokio-serde-0.1.0.crate 10150 BLAKE2B cd8a6f405e3ea4e6723001b6e751317a493bff497666e35004df5a9c2f3b39276cf496882a1afd4de1a0fca68f0f8b557bc9378eab0699594c893074d1a603b9 SHA512 3478bfbdcac2d3e88fb7481c6ecde0f93e4ba41ae2c9d939e59b9aeac3152fa5313067c22f78eeb9e58520da6cd87057de3be7f1a08a9028dcfc00094b09be41
 DIST tokio-serde-bincode-0.1.1.crate 3216 BLAKE2B 80075d235e91b9b68bc69fc175170cf7dab8264114c7d9c6ac182dcc92e774b4f3e4f2a9ba4d6493ccc78b47594c7c776e1780a93f86009eba5fd6ac23ac44f3 SHA512 56629c475cf6ee98bf5edfba4516f18926684fe8ec0dc5224dbd224d28f36de66b23176329604ba638d0bc29c1cdb0ba8d8e808fb3879d8389d096fcc1f3bde8
-DIST tokio-service-0.1.0.crate 8376 BLAKE2B bb2193af371d14c19a7f79760d4544bc5ebcba46d38d9b2836e46b6041c4b0c68f7902af51dcd3c83970084f271b1f29591b1fa461b854cb1bcc46b4db2c4d4c SHA512 a22b5a33fc957abeb8556ad1f01c6574a855b24053f7bf1ec23376df42b1e83f2fa0a538828742f24f586456e0e1314abe74ca3ac62d364f905b74c2e45903c8
 DIST tokio-signal-0.2.7.crate 15122 BLAKE2B af992448564696dbbcc01d85aa88f247e6e480dc95ea9d9a720dbeb3fb7ea4aec23639f4c43f67bb0302dc0a34d21ca1245dffc72bf28753e488fcb29ada60df SHA512 60cc31f9ea58853498dd19d858a7ec72bbccb0255c7d7f316b55c7e4aa21291f5609611ce5ccd2751d505417d8a3860d7374d6377916cbacf52a18c649448d9f
 DIST tokio-sync-0.1.7.crate 41666 BLAKE2B 80a29da76709a7d2ca7c1c2bb1a18e25218ded0383006f5be2f518c1abdbb476974709c16111b42820050e66f75bc3498a1bb835cfcefb76be302d5977476ab3 SHA512 041803a7e6056c7c3a0218e754a7ac2104ebe2ac9953a7ad7f0dfe6fa9c8f23cdefec0941912df3bef11ed129e85a13206279e3ed0d88424b18b367c2494b973
-DIST tokio-tcp-0.1.2.crate 10633 BLAKE2B 0298c8831f44500640f5362cb7a426e7215878e63376c05ff24a726fcd745e1f02678c0047b6525b55b3b508693388b1e266a414cb732d5ff12e49365af5993b SHA512 d250eeff3a1e8133cf20201dd3c54ba2a6f057407f051cda3da195437d0cb8eb0592e9467343145d85f916276bc76910434a5190af476cc845ff6e7e0e66e8b1
 DIST tokio-tcp-0.1.3.crate 12629 BLAKE2B 16a2763eeb2b65edd07f9b998535812efaa25584bfed5fd66fb1b2952893fa3ed330f597032b4140daf9635ba4f49e77aeabc2cea82c997dfc971bd97fa4f5d0 SHA512 ae42facabed1589764a8e4f789dabf5c7adfb3a67880a8bb6d7b0b6c082302a84b6acd8ec5f444dc59284407acad61518d60818eaeb34f874380f9593d540336
 DIST tokio-threadpool-0.1.17.crate 54547 BLAKE2B d86230fc8818550df958a08bb611f9697ee7effb323f3fefa54bd64d97b9a7cf77f638f6519e55f43d088931413739bc9c7a6923d63888459a41a0cce3f25fd2 SHA512 270b6e90e3a99e178293fbbd9fb7b0b51e2e5f5c094afd15eb0af21d24dfd74a1250225b9a686e12b02eb984cc671979eed2b9b08ddc13f57de69f7801bc4e86
-DIST tokio-threadpool-0.1.9.crate 48778 BLAKE2B 3bb9d6ae52fc7c12307e80e3af203cf2732180d8c013a8440be144c3ea70f10557d6ba10817e67906e889cedc7550e660f3746e441e388fa18bc7d53c2cbe141 SHA512 b2f4f2951bb581d6e1110f6c39fee1341dfec6605717e93bdd9fa1958c4ebb2b849af0e068521478b07f9fadb7384807d6f8922a4be4637c18d4d4e47793c13d
 DIST tokio-timer-0.2.12.crate 37615 BLAKE2B d712825ade0c356a2a6d012aee7f4eb966735227f0d16d1b734904d279cc645798964bdbca14f7715dde9accfb57ee1261e886eea388059b57e7d116ced30f8e SHA512 1b5dd8f5b14b86e1ca726047a656d199621dc33c6422a0fed183b34ebe69c049d65847e25ac7bccd369e03d89597f7e3dc05b0349dffbcf61646e738a0d3b8da
-DIST tokio-timer-0.2.8.crate 36835 BLAKE2B eb154c609a0d9a58794d90e4429775ca7a0f1f4752853825eb1fe0b9f75b86ec01b6bddef442e28cb5c85449534ed18b130ac5af03483b217713dca38a530c63 SHA512 5542ffdabb01f3d64774b87e2bfb124e09e3c0ac0edcb3ec5ba9dede09f26a6a43cd0266cc8e1b3e7c35892d3497a1916e9caa7b4119781163e75dc24f742030
-DIST tokio-tls-0.1.4.crate 25780 BLAKE2B 5d643d0cfd8d8093e61224f6be23563d955188735b7c98cf53c7a162a64e3bc2d1f14c11575f1cfd69133e1b02aceba090f3061eea842a97627398ed11be9e4c SHA512 d1308ffaa7ff1f2fe59e4ea9484d79bdfcb09d19c01d9b4599613d450ca304d27117ed535806394fa219fcd6ea4a859ffa1491b5905bb419c7a8478664e29cc3
-DIST tokio-udp-0.1.3.crate 10227 BLAKE2B 8080306c695b694ba9f25252474a9370279f7ee28dddee14575f73d36cb5731743bf0101736624eafd97f55e6f83f6be9806b8ad748411eaa382a2f90d7e874e SHA512 a2fd724ebe46b8fc8757558b6d267491b86ed5625ff91b212a6c77448231c72fa2b8e5c389cb27e93f2b924f48c88c154f23eb8721ecb93e7c1820c7c4dbead2
 DIST tokio-udp-0.1.5.crate 11529 BLAKE2B 4782a2d75852bcc972f7049e40f3f56927052a27e912f3126903a1438ab4be8b949d223baf4d30c68ceb1c9d1f14a3a0f85d58d4f9c08236beb189cfde4a753d SHA512 24b5eba25117ba3344d90329134f15be8631d1d9bae06a94f4df7f05b1bf6e1b309b776a0f2685fff2b7567a80331450a2027cb4bd264dbd5fd202913db6055f
-DIST tokio-uds-0.2.4.crate 11837 BLAKE2B 2419656eaa25c41320f51660a6d67134824cb3a1001c6164c440483ed7a002ca5ab59df8388b117b9a5a3addca3b47f5e450d5733dbf2b9eb2e741aa3aef62c0 SHA512 d59bcecd7a92c847cddfc5e5624828a7063dc1bac5515771a16e0d6987ad6a8777e779b45ed6395abb7588bad807695704c2d600e93f6617e09dcac1ae83d472
 DIST tokio-uds-0.2.5.crate 11808 BLAKE2B 03f37a5f68479955176d1df673c43d6e3d77a84025620fd83bfeee6439046a1c1b62bc9606164690ac21da5fab8de12cbd534664481c3d530d0ec178ad9c4e46 SHA512 964648b9ada5e072ce90bb7a20deed48a517a0e4c6b808b1fb8440755efdc35269b5a30ad312a5e228603e8f1f8d4b8e2f19f4aab10f75ea5b569ad402bfeb61
 DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
-DIST toml-0.4.9.crate 44116 BLAKE2B 079db18da9e3dd6ae448179f2e4d676ad9e8c3169366afdaaecc27b599c0ae624419014a52cd1237eda8e36fcc43be2fbf9a3e0bc502c12054638fbf30cd5b28 SHA512 3dc96d2f8ed72372bcbce960cc07391a674b80a9b40264ce0f8fd3feb05ea0eeaa81f7c0c85b4e1bba5b1bca89278e321f6e78328bbbf9321ce401b78d606b19
 DIST tower-0.1.1.crate 5910 BLAKE2B 30a81ce444e9877e967b5c63c02580c94a0f14cce66aa16742df25659e46bca027fd5c45151321d230900475963bdc12a696a8d6c3c7bb07bcd116cfd2f77759 SHA512 96b3bfd7af32c3809b663d8c58124e5ff9a7feb4bbd1184f4b1850caa002385228796fef224bec833b0974881474e29802dd8750b829c34e1b732251a57b8cc2
 DIST tower-buffer-0.1.2.crate 8924 BLAKE2B d5a3137767c8ce9014c92058898c1340d5f63778a20855c944e3cc032592e7ed4dcda8bc4f08a42e0553317ea115e2ad07dc48982844c211e02f21c7218fc3aa SHA512 388ada1c5fe5eebb665db66486c7b6dd99d10cf0ed17fa82b93fe4ef114368c7589b922e9bd82adf83ff2e448d4de925e83d9fd7b6e6f14d7a11131d4fbb9cd6
 DIST tower-discover-0.1.0.crate 3255 BLAKE2B f641d08f9810f4afb6a93b588e7a4a4ff248f8828a4db55d111b06387c7847264fac0570abb3934f6f540867e47c1b45f1820b251a0845756b32e9f645ec89e0 SHA512 459b0f37f9fbbcca5b63430b18d85aa30bb43570bf4f048088e99ed8616856d0c5fd512ba2b38c4bad9ae6702951f70f09d1a1dda1a94b3b938683730c02f6e8
@@ -443,64 +284,46 @@ DIST tracing-0.1.10.crate 45624 BLAKE2B 469642b7219cf8b753cabd1a59e236200274153a
 DIST tracing-attributes-0.1.5.crate 7763 BLAKE2B 0bbd8321d07a597f5e9f25ade9ee65f2b93ff82a9d2b8602196bc0d6192589148b89a43ac84db44abaa7cb5ba80113ac22e6d259eded975eaf63e2458a879c32 SHA512 a464a20ff7ecdd3e764bc5fcd07bb1337d95d5e806e4f05622139efa56073cb4236987ce020239ea3f75d5d6db1d731ef1b6b17197bbe21434e2401e1f7ef5ac
 DIST tracing-core-0.1.7.crate 32540 BLAKE2B e57a1a809176d2656f7745af40fd02653a90db008c18c9e1a6cbd2bb145ac5fc61f79676775d0c7057d0d3e6e37ba5a169bfcc280caac252464a973862f4961c SHA512 04b5307b40260aa4f0835de3518440071c8c9bb1aeb69235784f68cddc7cc27f524eeea6aa0e19e531f474c6563f85e8b0d85d53aeb1669e4939f0a46d127257
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
-DIST try-lock-0.1.0.crate 3195 BLAKE2B 70a97d35322f488382ba0bca516a672d464f963ea9c91ed0696aabbf3a14fcd759fa3b06dac4005026213cff1091326e57f25e9df919cef48794c1fa5c679690 SHA512 bb00cfa02cae996fab0d94623c71d261a73d6f8b189b75ca9c1636739c53b700e8bd915311eae54851b5f184f0999209bb45ab748828666b2cd2a9b4d3803d1f
 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 twoway-0.1.8.crate 31774 BLAKE2B 68402b15e61212c986c06322851985201e4a24dd3f06eae607c2581940670c476b330d61d48cc5edb54c7622590f2e75139f0d4460873262d8efd958dd21e5d4 SHA512 326a7954891ef399b85e4e7bf1a0afda0cc9057883e7a19c4590492921ef3570916fb50929071b2e3825e57282482525f4adf2f6b49ee12dc0adf8186ffa4629
 DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
-DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicase-1.4.2.crate 3907 BLAKE2B 0800a061c30d4d32e36ba0f07045e8d6073eb1fc492c3e4130e9a08e9e3fcc0c4f971bc928a2bd35590d51a9c432b34a5f2e95fad41b3e89d1e357787c55a6a3 SHA512 f92ceb4b9b4757a813fcf23949c8a9770e5169aec19d43c7ea9c3b49b365a2d4ef619255693b5dc30b974e6fe5bed857fa0743caec0ad88abd5b5c80df96fcac
-DIST unicase-2.2.0.crate 19587 BLAKE2B f83ab62d23aaec93555ed1c342c720bbcadf9d6b14a443bf956c8b8a930136ca55fed66a7f412ea39c6a936e8da535fe20f83e564c08b924d7290b39cc32b86e SHA512 7aad01e881c18536d1f758303661d9ddeaecdccd13c7e41ae2f11f7d1030fe36dd164234aa1b4a9ef3c0e4dd847f451423a80b68e80c17663286b9c803de20c7
 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.11.crate 91048 BLAKE2B 2dd12260a77d9ec10af73bc46178cd49144a8c5206fbd7240c6bd933eb9cb854efedb947b63af165cec51e1677671ddcf2924bb55c4b759dfd2d0939db09f290 SHA512 bee8fd546d4d1ad1179b31790fb5a087daece8a0435d8ba85def9c1d1827a8ce1ca643924863f01515e8fa6f78a47041e1bcda644a33427c65a50c4eb47d5d81
-DIST unicode-normalization-0.1.7.crate 330545 BLAKE2B abffe09db26d75c7ff8d09a485c0966e3a6ff1192b5edbbf4fd1e6915bbc9214242d6ae9d99dccf304c0d75b61006b4edbcd680d7823cdd47b8ed5a7075ef685 SHA512 4b4d3737244b1425ef8000318316decf8e167d3c92524e92bdd3c34798cf6fd1388ba7651da67d565f07d4640e9881145334fbcdfb8f20c33873d6e40ef3630e
-DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST unix_socket-0.5.0.crate 12261 BLAKE2B 833c47f6359554cb76cbac50ed91380a2dbe406f75e6b366a29a807f6981973fc84560ce83f8483743ad31bc0c53d8be40f215f7cf0822b7405195bee474e79b SHA512 dcd3589f042491540a69176dde6944710deea7317ed0de6912725686473ca15b34dda0a67490252bc8ef5c1ffdf7aecd7b76aa81a27a34b3c4870305c89412e5
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST untrusted-0.6.2.crate 7526 BLAKE2B 6886853aa5a9152a47534ff6ceb419782163d3c57a06b2f592cb7d00d07eebfee38a87f198c25bd3a4ad3b9f406afbed1993b4001c0af179d099723a07d5b779 SHA512 45ef8c556a13868a13d5bc6aac26281677edc7bc647b03b51a1294cf83d7699c712c1bc0a1453dbea643207f9aede11550aa7b16750d83048f88ac7a8c93b574
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST url-2.1.0.crate 64776 BLAKE2B aefc8cd2be90818c757312c354a0bd39ae08a52fb7d5a2a4552ffac3488a4bbc60c3f502ea5cd861aefbab02b0748e4bf35c49592b8fba4377cc17207c666d0c SHA512 1736f512039771b4a365df84937f039e1a0a3c90b827614af47403934ccc4af60077ae13ab585bfb1dc5bd88222edfc890b4ac2ab31872adca2e31bdf5ae45c3
-DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
-DIST uuid-0.6.5.crate 26185 BLAKE2B 60e120be31fcfe5f3fffc7a89b394889d20ac2f7adea486bcfa619c361ab925c630ca8dd9b28d8400da40eb967d64879aac6ef0fa59bfe3d4097e79daeb07915 SHA512 e69530284377ded546f9face98af6fe312664a152fa6a8aefaa4030b978e098ba55ff8ab8fcd2d54abf344e9d45a8f2188c4d7d4092baa213c11f74491f79d80
-DIST uuid-0.7.1.crate 32775 BLAKE2B b5d5d558a3b9091dd9c938a8f493de1ba11bb805829881acde4fc7f97cd565d3a87cd793c36dcf0503a33961ad44cb08e25b9b64d76fc884b760a7120947f5e0 SHA512 6559d538ee7a0ec8ec01f86dfc650a46aea8c7dd7c828c3e6c907c252573ec088261726eade02b89fa626b1058a6a5b3f679f507a506cc75ef838c885194453d
 DIST uuid-0.7.4.crate 36325 BLAKE2B cc27afbfb37e01cf83ffbfe239e175019cc1ba77ac14d6392bff833b3482712a8d808cf17aa4e922a24e4728cfa60bc96bf03b0053b0126b65fb7fb583adc1c3 SHA512 5c0d5f85b05db505ba6736437c78fc62e7a961ec1fd7d262749c282ae41bc1b1adda373644790de64ebebf59a200f8e610767f3e5fe0caf87305ecd5a229c265
-DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
 DIST vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version-compare-0.0.10.crate 15171 BLAKE2B 37360c74f73ad9916dc9cd40794d0f26679406b7b85953a07bb5646330aec4ed2dd45d1a93d40a213c82d5881e14f99e176eaeabfca9e3641fb8713da2133035 SHA512 60632d563cd694a983ae8e1809d8df6e52d9cae57a5609f69eb29edb4aa4bca57c35808c4463a53bb64164d756027c61fe44c3a1f69dbd717127d58dc5a03446
-DIST version-compare-0.0.8.crate 14852 BLAKE2B 45d979e5c6ca2391f0e55260a5fea7734437731115468d3fdca29ead7433e3440b15e0619610903654bca702dfc96558550752b54b1d87dcbb550bd19f3d1b40 SHA512 15a26fdbcce0a41c8a9b89347001d26f9e1b9d682ad24f7a1ec30b0dfd1fb67d4938e5f1d45c43b7558e6682727c73932795f08d86e6fc07afead6ef7c1c9114
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
 DIST walkdir-1.0.7.crate 17883 BLAKE2B 23366528bc49b213e0926e24186b2a1240a5ff7e5cbc5be3c271a416c1417bcc5260b976746f8e0bd3265f4adea45699af661cd998dc15f3aacb878044587c37 SHA512 d5752c39c055dcd163bd74db3495a16e1865fd32e3f0cd779455fb818e78106ee4bdf0cbbcd36331f860c5ca8de658f848988a47194c5b9e130f28a77c4576d3
-DIST want-0.0.4.crate 5357 BLAKE2B 499a5394eddfa50f4fce288f6155c1a6fe664d3d52a2a23f623087655f33854ab475f67d9f748c17e437218b7c029a0ece4d3c32d4bbe061348a50fe537b4600 SHA512 4d6fa1a8c194081efeb6188646ee764da3a3de4374529a6b0af70cd5ff001491b6a87d4281f6ca40d6640308f0435f6b4b838b52e20afe3944ae58c885b6134f
-DIST want-0.0.6.crate 5434 BLAKE2B 46cc6ffc8c5edc4c0b7e48475a82e339e1ce746941823fedb3bdcd1942bfaa9d59800f465470002fa7cebf4d88614d1236cd92736c10690e04810e85aad2c1d2 SHA512 65612379ffb46e5baeae46c7f6f3f3f03133ed9a99c5746bb405fd9b1bc3715739be199cf0f4ee3fa1ac5a2f624ca59fae75bfc14de19b4d5c80270c74f82a86
 DIST want-0.2.0.crate 6265 BLAKE2B 4db642e6016fcb0e2b1ae595836af4ccfa3798a1333b71347ea5fb30c95dd6aa0fb8dc827fffe274503e284abb0bc73ad11955f26dd77c5c265cc4a041ffb698 SHA512 1264e8095ba41b6cde85517538449d99f05a40207437bad9b618af3668ad675a3517b3d190e8b962820e2c302146d8d0571b665a1176c090ed75a4e83e8c5b59
 DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
-DIST which-2.0.0.crate 6590 BLAKE2B 4a937db99477dedabe135e9b39ba8483a5c2ad9cb71208c4ea1aedc3a3ad132e431c7ea6325e1caf0aaa6fed4e13bc84867507bb924612caa4db6cb680eadf78 SHA512 4ec91a8116c624b5edfac0c051b015e67ba71160fc5294d4f6d06909ad7261b107eefa3b3930564bb07506b07fe73a882f641b77b4917abf4c1f69be15c2c84c
 DIST which-2.0.1.crate 6953 BLAKE2B 866b1ff726cdefd9b3c201ac5e0649b7b6ea1a8ce42ea26ef5afa3f557326d327728fdb50fb4955476934b0623d3cb2bdab7c57f2c0063d2dae6a7e88748fe27 SHA512 30fffa533f50031b1f0d8cf5b1d7648ee3f0f1dd3e498ab1712fc272983ed415a30198222196cd87c8c0a2a6d342a6927cdf79191f0d81a8390b054169d98a76
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 DIST winreg-0.6.2.crate 19338 BLAKE2B d866995d54b69077efc1bb900235a4c00d9e69779cb365ad2fc97686a6c13de6a91d6204856ea35a18b86a7f32e8d4ac1ea2d2c096d7dd3e42f78400752cd3e2 SHA512 a2b6a7a0fcdb1f81dab62e1626089b6fd753a2233f9496505420ccb7997765c34293ce07b724b8179646345e0f6819eca88a6c167a03d8439a386fe53e184102
 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 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
+EBUILD sccache-0.2.13.ebuild 6884 BLAKE2B 1f985a8d84fff6eb3b8acad305f4e7d5b6854bb4a025d424c5c9f720b19f2f7ad9742ae2718eb901a268ae2a4cbc033b9898f9571a1581ecccb08f22a24d92c8 SHA512 4e09df60ac5fa04ad5d6c8ed67b35fd2861005a8af18a899516dd67303e740f020b776b7b00a6d0ebcb6da0ec3cdbe761f5409f144c2ebf22d0e23fadb96aa21
+EBUILD sccache-9999.ebuild 1994 BLAKE2B 32dca6fcf84640dbeb66c865b061b8633e2ad5c90f62a6f196d858b061dfc88b09917a386841b569b1f7c1f53533c350febcbbf4f7a9447d0061361128c2d765 SHA512 f8b591c12a3bf3d169e80902f20f27c6a5c96c2be74efa52a02886d739e8af524d21b29306d041179997a4337e7a9ebe188ded359599a3fe38ac370af18431b3
 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
deleted file mode 100644
index 188882f12843..000000000000
--- a/dev-util/sccache/sccache-0.2.12.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# needs itoa-0.3.4 for tests
-CRATES="
-adler32-1.0.3
-aho-corasick-0.6.9
-ansi_term-0.11.0
-ar-0.6.1
-arc-swap-0.3.6
-arraydeque-0.4.3
-arrayvec-0.4.7
-ascii-0.8.7
-ascii-0.9.1
-assert_cmd-0.9.1
-atty-0.2.11
-backtrace-0.3.9
-backtrace-sys-0.1.24
-base64-0.9.3
-bincode-0.8.0
-bincode-1.0.1
-bitflags-0.9.1
-bitflags-1.0.4
-buf_redux-0.6.3
-bufstream-0.1.4
-build_const-0.2.1
-byteorder-1.2.7
-bytes-0.4.11
-case-0.1.0
-cc-1.0.25
-cfg-if-0.1.6
-chrono-0.4.6
-chunked_transfer-0.3.1
-clap-2.32.0
-cloudabi-0.0.3
-combine-3.6.3
-conhash-0.4.0
-core-foundation-0.2.3
-core-foundation-0.5.1
-core-foundation-sys-0.2.3
-core-foundation-sys-0.5.1
-counted-array-0.1.2
-crc-1.8.1
-crossbeam-deque-0.6.2
-crossbeam-epoch-0.6.1
-crossbeam-utils-0.5.0
-crossbeam-utils-0.6.1
-daemonize-0.3.0
-derive-error-0.0.3
-difference-2.0.0
-directories-1.0.2
-dtoa-0.4.3
-either-1.5.0
-encoding_rs-0.8.10
-env_logger-0.5.13
-error-chain-0.11.0
-error-chain-0.12.1
-escargot-0.3.1
-failure-0.1.3
-failure_derive-0.1.3
-filetime-0.1.15
-filetime-0.2.4
-flate2-1.0.5
-flate2-crc-0.1.1
-float-cmp-0.4.0
-fnv-1.0.6
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-futures-0.1.25
-futures-cpupool-0.1.8
-gcc-0.3.55
-getopts-0.2.18
-h2-0.1.13
-http-0.1.14
-httparse-1.3.3
-humantime-1.1.1
-hyper-0.11.27
-hyper-0.12.16
-hyper-tls-0.1.4
-hyper-tls-0.3.1
-hyperx-0.12.0
-idna-0.1.5
-indexmap-1.0.2
-iovec-0.1.2
-itertools-0.7.9
-itoa-0.3.4
-itoa-0.4.3
-jobserver-0.1.11
-jsonwebtoken-5.0.1
-kernel32-sys-0.2.2
-language-tags-0.2.2
-lazy_static-0.2.11
-lazy_static-1.2.0
-lazycell-1.2.0
-libc-0.2.44
-libflate-0.1.18
-libmount-0.1.11
-linked-hash-map-0.2.1
-local-encoding-0.2.0
-lock_api-0.1.5
-log-0.3.9
-log-0.4.6
-lru-disk-cache-0.3.0
-matches-0.1.8
-md5-0.3.8
-memcached-rs-0.3.0
-memchr-1.0.2
-memchr-2.1.1
-memoffset-0.2.1
-mime-0.2.6
-mime-0.3.12
-mime_guess-1.8.6
-mime_guess-2.0.0-alpha.6
-miniz_oxide-0.2.0
-miniz_oxide_c_api-0.2.0
-mio-0.6.16
-mio-named-pipes-0.1.6
-mio-uds-0.6.7
-miow-0.2.1
-miow-0.3.3
-msdos_time-0.1.6
-multipart-0.13.6
-native-tls-0.1.5
-native-tls-0.2.2
-net2-0.2.33
-nix-0.11.0
-nodrop-0.1.13
-normalize-line-endings-0.2.2
-num-integer-0.1.39
-num-traits-0.1.43
-num-traits-0.2.6
-num_cpus-1.8.0
-number_prefix-0.2.8
-openssl-0.10.15
-openssl-0.9.24
-openssl-probe-0.1.2
-openssl-sys-0.9.39
-owning_ref-0.4.0
-parking_lot-0.6.4
-parking_lot_core-0.3.1
-percent-encoding-1.0.1
-phf-0.7.23
-phf_codegen-0.7.23
-phf_generator-0.7.23
-phf_shared-0.7.23
-pkg-config-0.3.14
-podio-0.1.6
-predicates-0.9.1
-predicates-core-0.9.0
-predicates-tree-0.9.0
-proc-macro2-0.4.24
-pulldown-cmark-0.0.3
-quick-error-1.2.2
-quote-0.3.15
-quote-0.6.10
-rand-0.3.22
-rand-0.4.3
-rand-0.5.5
-rand-0.6.1
-rand_chacha-0.1.0
-rand_core-0.2.2
-rand_core-0.3.0
-rand_hc-0.1.0
-rand_isaac-0.1.0
-rand_pcg-0.1.1
-rand_xorshift-0.1.0
-redis-0.9.1
-redox_syscall-0.1.42
-redox_termios-0.1.1
-regex-1.0.6
-regex-syntax-0.6.3
-relay-0.1.1
-remove_dir_all-0.5.1
-reqwest-0.8.8
-reqwest-0.9.5
-retry-0.4.0
-ring-0.13.5
-rouille-2.2.0
-rust-crypto-0.2.36
-rustc-demangle-0.1.9
-rustc-serialize-0.3.24
-rustc_version-0.2.3
-ryu-0.2.7
-safemem-0.2.0
-safemem-0.3.0
-same-file-0.1.3
-schannel-0.1.14
-scoped-tls-0.1.2
-scopeguard-0.3.3
-security-framework-0.1.16
-security-framework-0.2.1
-security-framework-sys-0.1.16
-security-framework-sys-0.2.1
-selenium-rs-0.1.1
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.80
-serde_derive-1.0.80
-serde_json-1.0.33
-serde_urlencoded-0.5.4
-sha1-0.6.0
-signal-hook-0.1.6
-siphasher-0.2.3
-skeptic-0.4.0
-slab-0.4.1
-smallvec-0.6.6
-socket2-0.3.8
-stable_deref_trait-1.1.1
-string-0.1.2
-strip-ansi-escapes-0.1.0
-strsim-0.7.0
-syn-0.11.11
-syn-0.15.21
-synom-0.11.3
-synstructure-0.10.1
-syslog-4.0.1
-tar-0.4.20
-tempdir-0.3.7
-tempfile-3.0.4
-term-0.5.1
-termcolor-1.0.4
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.6
-threadpool-1.7.1
-time-0.1.40
-tiny_http-0.6.2
-tokio-0.1.13
-tokio-codec-0.1.1
-tokio-core-0.1.17
-tokio-current-thread-0.1.4
-tokio-executor-0.1.5
-tokio-fs-0.1.4
-tokio-io-0.1.10
-tokio-named-pipes-0.1.0
-tokio-process-0.2.3
-tokio-reactor-0.1.7
-tokio-serde-0.1.0
-tokio-serde-bincode-0.1.1
-tokio-service-0.1.0
-tokio-signal-0.2.7
-tokio-tcp-0.1.2
-tokio-threadpool-0.1.9
-tokio-timer-0.2.8
-tokio-tls-0.1.4
-tokio-udp-0.1.3
-tokio-uds-0.2.4
-toml-0.4.9
-treeline-0.1.0
-try-lock-0.1.0
-try-lock-0.2.2
-twoway-0.1.8
-ucd-util-0.1.3
-unicase-1.4.2
-unicase-2.2.0
-unicode-bidi-0.3.4
-unicode-normalization-0.1.7
-unicode-width-0.1.5
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unix_socket-0.5.0
-unreachable-1.0.0
-untrusted-0.6.2
-url-1.7.2
-utf8-ranges-1.0.2
-utf8parse-0.1.1
-uuid-0.6.5
-uuid-0.7.1
-vcpkg-0.2.6
-vec_map-0.8.1
-version-compare-0.0.8
-version_check-0.1.5
-void-1.0.2
-vte-0.3.3
-walkdir-1.0.7
-want-0.0.4
-want-0.0.6
-which-2.0.0
-winapi-0.2.8
-winapi-0.3.6
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.1
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.1
-ws2_32-sys-0.2.1
-xattr-0.2.2
-zip-0.4.2
-"
-
-inherit cargo optfeature
-
-DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
-HOMEPAGE="https://github.com/mozilla/sccache/"
-SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 BSD BSD-2 Boost-1.0 ISC MIT Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="azure dist-client dist-server gcs memcached redis s3"
-
-DEPEND="
-	dist-server? ( dev-libs/openssl:0= )
-	gcs? ( dev-libs/openssl:0= )
-"
-
-RDEPEND="${DEPEND}
-	dist-server? ( sys-apps/bubblewrap )
-"
-
-QA_FLAGS_IGNORED="usr/bin/sccache*"
-
-src_configure() {
-	myfeatures=(
-		$(usev azure)
-		$(usev dist-client)
-		$(usev dist-server)
-		$(usev gcs)
-		$(usev memcached)
-		$(usev redis)
-		$(usev s3)
-	)
-}
-
-src_compile() {
-	cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
-}
-
-src_install() {
-	cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
-
-	keepdir /etc/sccache
-
-	einstalldocs
-	dodoc -r docs/.
-
-	if use dist-server; then
-		newinitd "${FILESDIR}"/server.initd sccache-server
-		newconfd "${FILESDIR}"/server.confd sccache-server
-
-		newinitd "${FILESDIR}"/scheduler.initd sccache-scheduler
-		newconfd "${FILESDIR}"/scheduler.confd sccache-scheduler
-	fi
-}
-
-src_test() {
-	cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
-}
-
-pkg_postinst() {
-	ewarn "${PN} is experimental, please use with care"
-	use memcached && optfeature "memcached backend support" net-misc/memcached
-	use redis && optfeature "redis backend support" dev-db/redis
-}
diff --git a/dev-util/sccache/sccache-0.2.13.ebuild b/dev-util/sccache/sccache-0.2.13.ebuild
index 4d2c3f7b8319..83a45411fda0 100644
--- a/dev-util/sccache/sccache-0.2.13.ebuild
+++ b/dev-util/sccache/sccache-0.2.13.ebuild
@@ -363,14 +363,11 @@ src_configure() {
 		$(usev redis)
 		$(usev s3)
 	)
-}
-
-src_compile() {
-	cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+	cargo_src_configure --no-default-features
 }
 
 src_install() {
-	cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+	cargo_src_install
 
 	keepdir /etc/sccache
 
@@ -386,10 +383,6 @@ src_install() {
 	fi
 }
 
-src_test() {
-	cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
-}
-
 pkg_postinst() {
 	ewarn "${PN} is experimental, please use with care"
 	use memcached && optfeature "memcached backend support" net-misc/memcached
diff --git a/dev-util/sccache/sccache-9999.ebuild b/dev-util/sccache/sccache-9999.ebuild
index ea404f54b9cf..8cd33a9a3b17 100644
--- a/dev-util/sccache/sccache-9999.ebuild
+++ b/dev-util/sccache/sccache-9999.ebuild
@@ -57,14 +57,11 @@ src_configure() {
 		$(usev redis)
 		$(usev s3)
 	)
-}
-
-src_compile() {
-	cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+	cargo_src_configure --no-default-features
 }
 
 src_install() {
-	cargo_src_install ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+	cargo_src_install
 
 	keepdir /etc/sccache
 
@@ -84,7 +81,7 @@ src_test() {
 	if [[ "${PV}" == *9999* ]]; then
 		ewarn "tests are always broken for ${PV} (require network), skipping"
 	else
-		cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+		cargo_src_test
 	fi
 }
 
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index de16c6f19f9e..008e3ad2cbf5 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -10,16 +10,11 @@ DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be
 DIST scons-3.1.2-user.pdf 2557502 BLAKE2B 1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321 SHA512 9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169
 DIST scons-3.1.2.gh.tar.gz 5534888 BLAKE2B 63e8b069cfddfed6a2ce8bcb7816b51b1881ca7a1a3e552f2eec5ecd1deae80720b0acfb711ab17067efdc9d0e4aea696e9f4eee6b374071bfc60e7bb79cc58a SHA512 b096501ea37e62f596f16b46b4022ad7979f359b10849d4c5fa17731a6c3ec34e0890374de175a8aa7539ae677777142ccf5dfae39a74696efcdbcc00e89bccf
 DIST scons-3.1.2.tar.gz 668298 BLAKE2B 14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203 SHA512 bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33
-DIST scons-4.0.0-user.html 1414886 BLAKE2B 1005a79040a4e035fa667a7c2f6231300c5fcade558d373eb6af36f4a8fdfcdb9c48ca0e5ecc36add72548f4ce6b904a745cbd6275649e1a1ce0e9172843259d SHA512 d4ce7b528ae714617a20adf49c66beb478d432f33f095ffb05f30038b2295cfe658c1dab421563dfae674bd0d4c343b98058cb8decc5393883675f4c9a7cf5a6
-DIST scons-4.0.0-user.pdf 2468838 BLAKE2B 6541fbc9d8f409ccde07746cb2a6e046fe4a4b868c2b6b80401c30c9d99a27acb2a4aedba9f47ba9e4cf8ac62510bec43a9aac33cba6912b837e13baeb996353 SHA512 cc62fd88dc0dda77515328b434492f8dbc0b4f615a2f3bb4841391ded7fbc738050b2ca7308c820d55efa59c28540391bd546ecec909b1fa7df66a944bdaa8aa
-DIST scons-4.0.0.gh.tar.gz 5584060 BLAKE2B 316be6af0cf52181391ba3251315a0d7da6024a3c650c3de927ff9db041aba096a95f09a7a13f64f78e20473490eb08fb2b0da191c9c3957fad9113e2d3dab14 SHA512 8277c8ceeba5e9612e8c757b3ab736cf116f66e707f4127b1e09f21d3a71ca7fd13dde0453f73b97c168cd05d8ba97084c010f3dcc1e29bb26ebbbeae9ea8338
-DIST scons-4.0.0.tar.gz 2874600 BLAKE2B 439b4e32cb62f5b9546af771eb292a5ff36eddb23fbd169fe065d2dbc3c3916d0551a2807bf765952384e46e036fe4b6142b739b5cfe385217539e1a22daf5ff SHA512 38c8f6600bc5f4b5385eb65ff1e98e8464dcea2a1128173f883a06822eca2e250998c666418a9cbbe2c30ff26da4de3c5fdd68381e68708d93e59bea8680337c
 DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cfd1848be797a9519bf94834cd4174d3da3274ef77f64106c1cc182c3f8cef363e3982f5c227d3a6dcbeadbc847c2 SHA512 f1165836ad80c90caa4d936ffc86c0ed20ea4c5e7854c36fee3a2c575b1c05c731d4ece9554e43292e6da30176ad9f31f31cf12f84264307c1494f79b06f43c7
 DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d
 DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6
 DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc292af63c6ca43e2948745e416ee6d757d98129ee30d0e0bbab90664889441a5bb86d4c9dfc649ca1dbef7536 SHA512 400b11323d48f04395b519dfafb6fce15a6dea92013f599dc4895b112629c0a06c7d2806755c74047d001d60087b94f39a118f512b7ee8de6214a4ffc7310468
 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 2622 BLAKE2B e452a9c8b103ed5e93e948cc833bd41b4e782cc664c9e90139ce2813ca97fa2ebf31be8a7cdbba17ab42ba0d471a07dfef8e8f648578f79a566cbfc0a3e7fe8f SHA512 3d7eca7dc0c1598d667d6d036611da36aeaa0950e4691c82379f1d7ac9c299c8a7eec82dd7e0844c2ea4404f1efa60fec6d53dcde3c6ee9441a0c0866e422333
+EBUILD scons-4.0.1.ebuild 2878 BLAKE2B 857c90f6de1a879042a221e8a357648e3e19e580c77c1edaeac690cc2437ad0c956b94c860f51d368a0f69164e3d32c0d3ae135da1f03b3369b32d6a474b5507 SHA512 c426aa0fb9ed89c968d411d67045c94684110c1aa1e677ee656e5c780119c1c0fd07041cc8c6692ddbb660bf4963842cbb117e411ffebb88a06b25440544e50b
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-4.0.0.ebuild b/dev-util/scons/scons-4.0.0.ebuild
deleted file mode 100644
index 3325adc75936..000000000000
--- a/dev-util/scons/scons-4.0.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="https://www.scons.org/"
-SRC_URI="
-	https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
-	doc? (
-		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)
-	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-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"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-4.0.0-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-	else
-		mkdir -p "${P}"/src || die
-	fi
-
-	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/},$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
-	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
-	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
-	# unset some env variables to pass appropriate tests
-	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -a --passed \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib"
-
-	# runtest.py script returns "0" if all tests are passed
-	# and returns "2" if there are any tests with "no result"
-	# (i.e. in case if some tools are not installed or it's Windows specific tests)
-	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
index 191cd21327a9..eaf9eb29e710 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 )"
 
@@ -62,9 +62,22 @@ src_prepare() {
 	# and fix manpage install location
 	sed -i -e '/cmdclass/,/},$/d' \
 		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+
+	if use test; then
+		local remove_tests=(
+			# TODO: does not respect PATH?
+			test/Clang
+			# broken
+			test/DVIPDF/DVIPDFFLAGS.py
+			test/Java/swig-dependencies.py
+			test/Java/multi-step.py
+		)
+		rm -r "${remove_tests[@]}" || die
+	fi
 }
 
 python_test() {
+	local -x COLUMNS=80
 	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
 	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
 	# unset some env variables to pass appropriate tests
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index 316fe5d0c439..639cbf249ba7 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -2,6 +2,6 @@ AUX statifier-1.7.4-clang.patch 344 BLAKE2B 6e5d2f48fa20c34c999cf898f943e9e61133
 AUX statifier-1.7.4-fix-build-system.patch 2104 BLAKE2B 019248feff682a75b90d1aca7eea425aded1b0f01e8dff4bd24410a474ef1350ed8215803915cb52df53866f6dc996428742d0a9187f55bbff17ce30894dd6b3 SHA512 a9bf5adf1206bbca84084df0680785e1f31902fb7ce4d455593ee35e0195ef9546de641d2f5372843afb7c8584fb04b1b13ee7973813ee8561a2282f2162cc87
 AUX statifier-1.7.4-musl.patch 673 BLAKE2B 1b1d46c44ae7675dd757219a40d0f255455308c27a0515c32ebdc629cbb6e1777e4a7d673c51cba42b7b82b4608ed1e69ab3d2aa7bda93b4171c0e9670e608db SHA512 285ed4d06080188b45a10c3e5da83c7e28e198cbe2f20dc84befa4d4b83850278c4f8e444898f6c419b8e13e41140875eb1e7960d9633a03b396a716c53bd03e
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4-r1.ebuild 1162 BLAKE2B 98ecff2983258fb635c773247fa50ac120bde4890f2e1e25d9552ceb7204c03ceedb5352c2e8818b0b51f438cbfe98a5da9b854c1fc713d927fe5ea2061ebd21 SHA512 22acc206a52fbc15c519beb60e913a7d77d2a7526570b6161eedab8cc354e6d0352058c1fdc5a277962213de4ed84d61a15475d4279bd301fd978611ed2fc4b4
+EBUILD statifier-1.7.4-r1.ebuild 1229 BLAKE2B 822088381acfb84841cf8d5c7cd7d57096ba2f4aaf639d2fd03f55f9a861344e544f6ac3e9286404a4ce2de64413f8d0f8a5ea6e878bb2cdd63df4e58bacdb50 SHA512 02b14177f3c298dcaddf76b92213467505c19de30df517500702cceb315de6e8dcbf86d2466e06577bd867b10762e75c7d0a96ffdbfba5ace5b1ecb7b7ee81c7
 EBUILD statifier-1.7.4.ebuild 1159 BLAKE2B fced9ac949c3f45db5a114c082724d94ad524c1272f9f0ec16b34f116a9d839fa656c6e41efcffed0d8af43484931ccd12d2ec15ff58d4ccea7372950f359b35 SHA512 17b53d41ffa6dc4d7ee6706b5b0f93ad713db6d88b51292a5d39800b3f68a8e3ab308c43b8e85a4edd9dc37cd1c74114a859ea7c70ed37603dd27024d4157280
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/dev-util/statifier/statifier-1.7.4-r1.ebuild b/dev-util/statifier/statifier-1.7.4-r1.ebuild
index 5bdd7e9ca4e7..64a5975d6e72 100644
--- a/dev-util/statifier/statifier-1.7.4-r1.ebuild
+++ b/dev-util/statifier/statifier-1.7.4-r1.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
-inherit multilib-build toolchain-funcs
+inherit flag-o-matic multilib-build toolchain-funcs
 
 DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux executables"
 HOMEPAGE="http://statifier.sourceforge.net"
 SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -32,13 +32,16 @@ src_prepare() {
 
 	# Don't compile 32-bit on amd64 no-multilib profile
 	if ! use abi_x86_32; then
-		sed -i -e 's/ELF32 .*/ELF32 := no/g' configs/config.x86_64 || die
+		sed -e 's/ELF32 .*/ELF32 := no/g' -i configs/config.x86_64 || die
 	fi
 }
 
 src_configure() {
 	tc-export CC
 
+	# Debug flags are known to cause compile failure
+	filter-flags "-g*"
+
 	# Fix permissions, as configure is not marked executable
 	chmod +x configure || die
 	econf
@@ -53,6 +56,5 @@ src_install() {
 	# Package complains with MAKEOPTS > -j1
 	emake -j1 DESTDIR="${ED}" install
 
-	# Install docs
 	einstalldocs
 }
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index e0398a4bb6ac..b717ca7d58cb 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 2347 BLAKE2B 564760aa40eed8d766be3f9f02cf89f5785abb7e627dbb09a9eb20ca623a0e17aff59992ee82e9e564df0c4c684e7552c800d4bc04aff72777827c31cafe92d0 SHA512 c7a595d3eb1c6e320d65e68b9b52c1f6f816237d0b881f5c91c88068877bb62e46fe3fd51db18e93f8c1761e098bb2da6da52e44ebbef202c7bfb0d279138fcd
+EBUILD strace-5.8.ebuild 2346 BLAKE2B 92f60380f83865c45f25a76347a47baee0fa23e240dd7d7879ac31a47a8a6e8614b37d9c8ef4068463527c1c0f31e5f05091febd9082515191faa30ffa1cff45 SHA512 9793e5ef0ad81c97b7bf7e29d3233a1504adce9dd1ace85cbb5b7b04e6b1e9f38b88d8b28c9d36dbeee6dd644615a6068ef45021355b9b587b0b00503b60b929
 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 00c488f0efbf..ccb5d555782b 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/sysdig-kmod/Manifest b/dev-util/sysdig-kmod/Manifest
index e7e5fdc793e7..733c86f49324 100644
--- a/dev-util/sysdig-kmod/Manifest
+++ b/dev-util/sysdig-kmod/Manifest
@@ -1,7 +1,3 @@
-DIST sysdig-0.26.6.tar.gz 923918 BLAKE2B e022eba30977f5300c80a4806926d3e755b1395f05475c1fe925b86823670e397ad29e8bd18b1beaa893cb1bf83c329960c1bf9ff6faf0a5144343e88d52a4a0 SHA512 94784f0dfe46924b81d8804d950a9563cd18f4aa8b1cacd7e27e3974ecf7215223e03bdab001f408f64eb6c72f0da5082fd922d63079119427eb493c77e15795
-DIST sysdig-0.26.7.tar.gz 924647 BLAKE2B 31973410e8e166d82c3851eceee8bdcd808db8181e8330841ff746a2d2c35936fda9dcf23c16697e37da339a647b534b17d0c1bb58c547621f2a3f926fca5016 SHA512 37f3544b1994c8c9048c6ff886da0c2ea6cbfe0a1cedb930b2a06bb85fa9da80a8197409a99b95245dec9ca1957a0f1fe989f688a549739d71ff778087d20b76
 DIST sysdig-0.27.0.tar.gz 933094 BLAKE2B e412bd2a35a62b580344a49e2deee85764710f91327cd63b42913dc361ee96943ffe51b90ee745c420454f0a4be455606d486a91ab3e103d7e396f04dc3f1ff4 SHA512 102150cc641165a6c18ce71e3c6148dc10700f614fec7e1909c29172e3cce02dfa16af56aabdcd420499d0aa89f90fee8f26d92a250b0a521d1b9d416c6a678f
-EBUILD sysdig-kmod-0.26.6-r1.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
-EBUILD sysdig-kmod-0.26.7-r1.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
 EBUILD sysdig-kmod-0.27.0.ebuild 945 BLAKE2B be025ff85bfdf7de187e06439e44e1336604d282163b889c9af3846d64b278c1454f4a9f33ff5be19f2089688227b4d980b5b9e802fda4e5e08b18f5d68f62b7 SHA512 2373a4b32538b65d293832b93167f5ffbc1b6f4eed9fdcac10104c15d5eed955cd8239368fe5be929b6bf28c59cd678ef6ead0f9701ee9fb8b90f3e82b145acd
 MISC metadata.xml 325 BLAKE2B a4fb1518abfc94ae4f45d30f85ab3cfec6139025f302fc46725275e1a0ef9d789de1f55b07330dd7aed44cfee60c688d4ba95e3f67832f5581066ad833cf2e2a SHA512 51815b800827d94d1c554de9fde3d97b67a4f2f83847826a8aaede5c84dfab95401526ea670bd84e79ba435a1439c109ef3b27e313cb2bafc0c49639bf02ff68
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.26.6-r1.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.26.6-r1.ebuild
deleted file mode 100644
index ba7201399d5c..000000000000
--- a/dev-util/sysdig-kmod/sysdig-kmod-0.26.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-mod
-
-MY_P=${P/-kmod}
-DESCRIPTION="Kernel module for dev-util/sysdig"
-HOMEPAGE="https://sysdig.com/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( MIT GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="!<=dev-util/sysdig-0.26.4[modules]"
-
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e '/USE_BUNDLED_DEPS/,$d' CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-	)
-
-	cmake_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-}
diff --git a/dev-util/sysdig-kmod/sysdig-kmod-0.26.7-r1.ebuild b/dev-util/sysdig-kmod/sysdig-kmod-0.26.7-r1.ebuild
deleted file mode 100644
index ba7201399d5c..000000000000
--- a/dev-util/sysdig-kmod/sysdig-kmod-0.26.7-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-mod
-
-MY_P=${P/-kmod}
-DESCRIPTION="Kernel module for dev-util/sysdig"
-HOMEPAGE="https://sysdig.com/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="|| ( MIT GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="!<=dev-util/sysdig-0.26.4[modules]"
-
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e '/USE_BUNDLED_DEPS/,$d' CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-	)
-
-	cmake_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-}
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index b81c87800e70..32ed4f7e8f96 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,7 +1,3 @@
-DIST sysdig-0.26.6.tar.gz 923918 BLAKE2B e022eba30977f5300c80a4806926d3e755b1395f05475c1fe925b86823670e397ad29e8bd18b1beaa893cb1bf83c329960c1bf9ff6faf0a5144343e88d52a4a0 SHA512 94784f0dfe46924b81d8804d950a9563cd18f4aa8b1cacd7e27e3974ecf7215223e03bdab001f408f64eb6c72f0da5082fd922d63079119427eb493c77e15795
-DIST sysdig-0.26.7.tar.gz 924647 BLAKE2B 31973410e8e166d82c3851eceee8bdcd808db8181e8330841ff746a2d2c35936fda9dcf23c16697e37da339a647b534b17d0c1bb58c547621f2a3f926fca5016 SHA512 37f3544b1994c8c9048c6ff886da0c2ea6cbfe0a1cedb930b2a06bb85fa9da80a8197409a99b95245dec9ca1957a0f1fe989f688a549739d71ff778087d20b76
 DIST sysdig-0.27.0.tar.gz 933094 BLAKE2B e412bd2a35a62b580344a49e2deee85764710f91327cd63b42913dc361ee96943ffe51b90ee745c420454f0a4be455606d486a91ab3e103d7e396f04dc3f1ff4 SHA512 102150cc641165a6c18ce71e3c6148dc10700f614fec7e1909c29172e3cce02dfa16af56aabdcd420499d0aa89f90fee8f26d92a250b0a521d1b9d416c6a678f
-EBUILD sysdig-0.26.6.ebuild 1446 BLAKE2B 8cacc86c38675a24c5b8d7e6402259ee6cf88035e08967bdfa43c24025be755cc326674d10189a3dbbd4331380b3b9f911375aa98507db8da708c4f93e6668f9 SHA512 2b2bec125737f8c5741b76c83844af1694c5753a2c9e10724d0e6483e2bc985162cbe85b0f724d2f49478e3b279df6e1de67235beabb7d6fb0051d077e9c775d
-EBUILD sysdig-0.26.7.ebuild 1446 BLAKE2B 8cacc86c38675a24c5b8d7e6402259ee6cf88035e08967bdfa43c24025be755cc326674d10189a3dbbd4331380b3b9f911375aa98507db8da708c4f93e6668f9 SHA512 2b2bec125737f8c5741b76c83844af1694c5753a2c9e10724d0e6483e2bc985162cbe85b0f724d2f49478e3b279df6e1de67235beabb7d6fb0051d077e9c775d
 EBUILD sysdig-0.27.0.ebuild 1446 BLAKE2B 8cacc86c38675a24c5b8d7e6402259ee6cf88035e08967bdfa43c24025be755cc326674d10189a3dbbd4331380b3b9f911375aa98507db8da708c4f93e6668f9 SHA512 2b2bec125737f8c5741b76c83844af1694c5753a2c9e10724d0e6483e2bc985162cbe85b0f724d2f49478e3b279df6e1de67235beabb7d6fb0051d077e9c775d
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.26.6.ebuild b/dev-util/sysdig/sysdig-0.26.6.ebuild
deleted file mode 100644
index 55a20f694f42..000000000000
--- a/dev-util/sysdig/sysdig-0.26.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 cmake
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://sysdig.com/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-cpp/tbb:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	dev-libs/protobuf:0=
-	net-dns/c-ares:0=
-	net-libs/grpc:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	test? ( dev-cpp/gtest )"
-PDEPEND="
-	modules? ( >=dev-util/sysdig-kmod-${PV} )"
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCREATE_TEST_TARGETS=$(usex test)
-
-		# done in dev-util/sysdig-kmod
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove sources
-	rm -r "${ED}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.26.7.ebuild b/dev-util/sysdig/sysdig-0.26.7.ebuild
deleted file mode 100644
index 55a20f694f42..000000000000
--- a/dev-util/sysdig/sysdig-0.26.7.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 cmake
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://sysdig.com/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-cpp/tbb:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	dev-libs/protobuf:0=
-	net-dns/c-ares:0=
-	net-libs/grpc:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	test? ( dev-cpp/gtest )"
-PDEPEND="
-	modules? ( >=dev-util/sysdig-kmod-${PV} )"
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCREATE_TEST_TARGETS=$(usex test)
-
-		# done in dev-util/sysdig-kmod
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# remove sources
-	rm -r "${ED}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED}"/usr/etc || die
-}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index ef21f5fa70e2..10f4ceb094df 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,9 +1,5 @@
 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 2718 BLAKE2B 91d339b14668b8d8bbd2e3d8cb3b414735f1b3cb677160cbf2e14ac3da25b13ea77c4fdd1d873efdfb9b47be462b5caa7b9494ae9c61f869e37e38a42ac4d8e8 SHA512 534c02ebbf088e0f8dc7b5ed094c12905d2421e495d85fcc920675c89fbf4d2012b33882a0a223e14cc5c76b6ca29540fd44d3aa592b27ab0b3173bffad1d1b5
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-2.4-r1.ebuild b/dev-util/systemtap/systemtap-2.4-r1.ebuild
deleted file mode 100644
index 9fbfcdaa6e39..000000000000
--- a/dev-util/systemtap/systemtap-2.4-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit linux-info autotools eutils python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="sqlite"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	sys-libs/libcap
-	${PYTHON_DEPS}
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		staprun/Makefile.am \
-		stapdyn/Makefile.am \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable sqlite)
-}
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
deleted file mode 100644
index 84eb6c8cf3ca..000000000000
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit linux-info autotools eutils python-single-r1
-
-DESCRIPTION="A linux trace/probe tool"
-HOMEPAGE="https://www.sourceware.org/systemtap/"
-SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
-IUSE="libvirt sqlite"
-
-RDEPEND=">=dev-libs/elfutils-0.142
-	dev-libs/json-c:=
-	dev-libs/nspr
-	dev-libs/nss
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	${PYTHON_DEPS}
-	libvirt? ( >=app-emulation/libvirt-1.0.2 )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.18.2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
-ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
-ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
-ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
-
-DOCS="AUTHORS HACKING NEWS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-ia64.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-
-	sed -i \
-		-e 's:-Werror::g' \
-		configure.ac \
-		Makefile.am \
-		staprun/Makefile.am \
-		stapdyn/Makefile.am \
-		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
-		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
-		testsuite/systemtap.base/stmt_rel_user.exp \
-		testsuite/systemtap.base/sdt_va_args.exp \
-		testsuite/systemtap.base/sdt_misc.exp \
-		testsuite/systemtap.base/sdt.exp \
-		scripts/kprobes_test/gen_code.py \
-		|| die "Failed to clean up sources"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-rpm \
-		--disable-server \
-		--disable-docs \
-		--disable-refdocs \
-		--disable-grapher \
-		$(use_enable libvirt virt) \
-		$(use_enable sqlite)
-}
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index d18c7865186d..abc883822e3b 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -3,6 +3,6 @@ DIST uncrustify-0.69.0.tar.gz 1600390 BLAKE2B 89f194679fe0601c866cb239c8fc900bd4
 DIST uncrustify-0.71.0.tar.gz 1704631 BLAKE2B 3dc9122647e2c173a776c4ad24c93d7b88fdd00c6c4f3070e68fd7a272218335063d8563446a3c8e72ff68e41d00a265aca76682a8cea201a33230377d7e425a SHA512 220ecbebb1c1d6abadb96c339e4ca9b264a04fa08bc83e9b0fabba5fae425efd1911d175d18b635521614ec9c33aa389fadaeec62ebf28a5d71e595900a92181
 EBUILD uncrustify-0.66.1.ebuild 765 BLAKE2B f42a1a63aac961eea17b1ad905c8c4eb86aff8068cf84f2cae98ea8127e948c99671146ccbb31ce2c3fbed32379a242c12af114504886c325a253ee08c2d0a3b SHA512 20fa1b76422958c787555f8fed41e53d423f87fe3d0fed653665c3cf08ef9677dd9ab1961bd39b930be9e224fbe84f16cd15c39d97cd1139be0b2ddf3cff5223
 EBUILD uncrustify-0.69.0.ebuild 767 BLAKE2B acbd07ad8b8413dd1fb3507cbb6069fd4e68f2f19188dda594ece618eee32de82fedddc80c836f6089116d5fe67884b8a9911bffabcd4ed2586b316a771d8a1f SHA512 943936fcc13c958a2b3fa50434c46420794c9ac9ef43aef9476f8eb32c94895f0f8afd31b8214866d86ae4b288624d395d348f9b7e8c0d0d2085d2255c4e0696
-EBUILD uncrustify-0.71.0.ebuild 697 BLAKE2B fd0e10e65699f94e5832618baa4bfb69338d352ff348aaca442696235146d17f2f052959bac69549400fee95c4ca73ef0186bd4ffa80f7494f363e6196c345ca SHA512 9edf623f799b347a8cc0ae540c72e7ae9be6e7da940628109e1cee789af5a09319d15fb7e34cd39b3e0e03e1e78e7b9c2576e676afe3b524f43f807147bc0abb
+EBUILD uncrustify-0.71.0.ebuild 696 BLAKE2B 5b7ae61725234925279f7f894ea2200357e6a83748f548988baf48a5c2441dce39a500d6514c1bb6c9cf83b9c046407bc4b855cf9eb17860d410d215c96bda8f SHA512 deca6e91e73f52a1660621ecb1b542a7c1cbbf84fb83b7afc2dd735db395efc11c3ae6f165527595f55ff43cc191774d51b641a5fad028fc2789a4d3d069de66
 EBUILD uncrustify-9999.ebuild 697 BLAKE2B fd0e10e65699f94e5832618baa4bfb69338d352ff348aaca442696235146d17f2f052959bac69549400fee95c4ca73ef0186bd4ffa80f7494f363e6196c345ca SHA512 9edf623f799b347a8cc0ae540c72e7ae9be6e7da940628109e1cee789af5a09319d15fb7e34cd39b3e0e03e1e78e7b9c2576e676afe3b524f43f807147bc0abb
 MISC metadata.xml 499 BLAKE2B 9418af314e83877ee50d76d87b3fbe9223ed7ef21d53ab85d5a916a46bb631296ca2babb8b470049003e1b6889185df52bdb62c9fd1f2f371d6902885dc4f399 SHA512 e8a379440acebe626dc28ecd4de5e76e1a684e67441bcce6720eb4ea834102c4d020d91a5950ffd24fc297ccd5ea8386850b0bfe0771352539936345d8b1f3cb
diff --git a/dev-util/uncrustify/uncrustify-0.71.0.ebuild b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
index ffb8d0941d9f..32359683b286 100644
--- a/dev-util/uncrustify/uncrustify-0.71.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
@@ -7,7 +7,7 @@ if [[ $PV == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	scm_eclass=git-r3
 else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 	S=${WORKDIR}/${PN}-${P}
 fi
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 69b43ca45f6d..3c3b3a23197d 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 3763 BLAKE2B a4bb3c950abb3182774ef903e1f1db2da8f509d596ac1efb2862e9f533eb665149397993d723a19a64d5f063dd8a29d2b15840954acb617eb35c7a83c4dffa96 SHA512 0c860af27187c55662cb493e63d84fab5af59355b7443499b9f8613beffa2ff9a8c5e1f92b94edc6b714a67c61edd988d5079a44d8645f0c41feffafd911e5ee
+EBUILD valgrind-3.16.1.ebuild 3761 BLAKE2B 5f4a709fb8bdb360aab17ca7047f62e66322072f72102028d0244df1b6350d97bd1c4332d801e18f95e0cded1a2f23625a4db0b27485dee7b302472d9137b433 SHA512 b3972805f1ca91e477601179b33c01ebe21e0ace88ed88678ed1af37d015e64ccb0ce77b8278a9bd893453c126a5000a08b66c1cf5aca677e06ad6946a9d3283
 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 47ebd7d04072..cfa35de040f3 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 )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
commit	8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree	230f3135ceaace633cf93e9838b185c4a6664c2e /dev-util
parent	9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)