gentoo resync : 13.11.2021

118 files changed, 2887 insertions, 1191 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 6f6a4b25d723..66f6b8900ac9 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 44fb2859dc13..3d48a83d5bbd 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -19,5 +19,5 @@ EBUILD bazel-1.0.1.ebuild 2743 BLAKE2B 3ae56ff90ef4002eb48e88f788b8a63e02bc7f0a8
 EBUILD bazel-1.2.1.ebuild 2742 BLAKE2B 16874c3b0ee6b24af9a117d9d3cb31f61e76cf4e43804542e759982eb8f3b5ffd48349103df0a2b5c545967e8c5b519fe3c6ab7cfaf7676e64697840b5f48a34 SHA512 38acb30144a86330428f0cd125414a940fabfe468b7d28150e5aa6027f1870ea55adfdd84518f716524d232e6c6c862c7d04a03c40cb26c5b5b529f418c022ad
 EBUILD bazel-2.0.1.ebuild 2678 BLAKE2B edc83ee6b2b061a7ac28af348ba88bf1ac91acbc46302f483f4f783351afba4ea820f5fceffe04b131948e11d582f3d33c68fd05a1b7c04469cccce1770b8f84 SHA512 71c082a3382ab2f3954690a11ac0f41162f5ea3a2294841029b4602d20572bdeb0353ca7bd6f7a48cb678f8f00f8bd5eb0316b90293be7dc9d4ee2de2b602721
 EBUILD bazel-3.2.0.ebuild 2845 BLAKE2B a6988e3db928d1856f852169f0419a9201467a6dafe8f90154ed42afc421858df271f0704ea59b0084dfaea632eda45854f77f5245c8885594071012a0c8c312 SHA512 de6859234ea01e045f90454c71fff97bfc4ec299e3a7119739d0bdcf439d0f29b5679dd5df1f4102a5ed3249caa5f80cc5d19a5e899735d6a37fecd0f6595c44
-EBUILD bazel-3.7.2.ebuild 2852 BLAKE2B f59433a9c301d0484a4092262767fc1e0b90924182483f680edcde73951d87f7ab90ee537b08daef0563b64ac15e635519249009142ef2a263df5bfcfd138757 SHA512 ab404286bc832f864242ec8e1d34a45e946d18f8de0958f15c5cefb1dd7cdfef31830ad0e19b2029e97106c64f5da3dcb95c092f5cab90dc32400cd7de2806f3
+EBUILD bazel-3.7.2-r1.ebuild 2677 BLAKE2B d45baf321f0c4588cf6906034fa103d624b82bdf02d9d1e7f8cd293ea063aafc1e7848b7382da87137b91335cdb193abae32ac69c59a27fcbecc041adc40d5b1 SHA512 a26504d8150b1b6d9af5bcdf021e50c1e0555095f15df9a4b5706dfb47bd3ac7451cd5a023ac68edcdfb85890f96fcd10152cf0cb9039d95398662e11a32d74e
 MISC metadata.xml 845 BLAKE2B df4fadd622f9bf9221313050afe7fde503179d4b91c4b3b1485eefe1d5ca411f1d93d5ec875cec070587c5522e51bfd5ba6d62430014218bc0189fa440f6a2d9 SHA512 96fe79b25e3e2f32fa551793e208c7c5344fab9cda8b59a51eeb19bb01cdcb30bf24ec575bf4e732775d40fcfc4aa356a75b3592114cbaf4d88f38887184aa6a
diff --git a/dev-util/bazel/bazel-3.7.2.ebuild b/dev-util/bazel/bazel-3.7.2-r1.ebuild
index 8f687a47d16b..161e10ad821a 100644
--- a/dev-util/bazel/bazel-3.7.2.ebuild
+++ b/dev-util/bazel/bazel-3.7.2-r1.ebuild
@@ -13,8 +13,7 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="examples tools prefix static-libs"
-REQUIRED_USE="prefix? ( static-libs )"
+IUSE="examples tools"
 # strip corrupts the bazel binary
 # test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
 RESTRICT="strip test"
@@ -71,9 +70,6 @@ src_prepare() {
 
 src_compile() {
 	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
-	if use static-libs; then
-		export BAZEL_LINKOPTS=-static-libs:-static-libgcc BAZEL_LINKLIBS=-l%:libstdc++.a:-lm
-	fi
 	VERBOSE=yes ./compile.sh || die
 
 	./scripts/generate_bash_completion.sh \
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index eb82a7f22334..10815b63e2e2 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,10 +1,7 @@
 AUX 60bcc.env 32 BLAKE2B dbbfb31408af7f3375b02981113d81d71075d339fded45db24b2168baa9f3ffe51205447c12eb9c3f06188fd32db591f21bce41edaff473a40b10320067447cd SHA512 a040c762df54a0218fb3fc4a6609b0e924003be689eaff629fabe69e1ed224fc38fdaac377624944718e5b174ac413edf3730cd0a228bd73bf8ef8678e97d73c
 AUX bcc-0.14.0-cmakelists.patch 444 BLAKE2B 3832bdfe3fdb3946889fb614c3f89220dae7b319329ad45649edda0f7c9cbd8c8e90ce200c6f7df4913c3eceb0cc729e83d90b7dcc8af991e3f59b5a772f9cc8 SHA512 05f2c50e7daabe9118ea4e6dfd6d8dc155bb0311fbb2fbc491c2740d6f5081cc95ec7cb8faf19751eb161bcf60d30be87e0b6c88d032bf88ecae48af5119e0df
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
-DIST bcc-0.19.0.tar.gz 5171216 BLAKE2B 72f0364106f894f21990865209b445eaa9640c00a27060cef220418be87625150cdc8062168dacd1370ebd01c99c2d49853869b518a3a07bb601720412b9a970 SHA512 b6180462a45c768f219e026d8a4b43424b7cad4e07db8101725bd2bc31ee4de117774c0ad8d157502c97c1187057b45c7a491e7198ac2c59e6d56e58797f4df3
-DIST bcc-0.20.0.tar.gz 5193274 BLAKE2B ea78004d114e8187d82d6e58bf2c8e17d93b96a651a5557dcf3c405dfcf5ed0df3a2147f35d1b3831aa5aca5c1caf59742026740bb6da02dfda7c1dd7ef8161b SHA512 fa7c50a4fc64846ad798b6652101aa414cda53d08779cf48bd505191189cb23da2838f7511e700d59e086d35216f4e3bc9867b614738061630984dff3c4576dc
 DIST bcc-0.22.0.tar.gz 5247927 BLAKE2B 896d22c9540180e015f7be03b2ce8e6957fd7ba3e7f28fb57247bc8455b35bc82ecf321140e80f714bc01a2c01721e0544e249bc07be7b467c650788014793f0 SHA512 946ec8ed96a83cb7a9d7e44436901445588dc5e37c5cbc8b720a7a0d226b2769ab780294fa7c52099f579f4f1b6935f662be19c739d13979044723dce8ed7792
-EBUILD bcc-0.19.0-r1.ebuild 2258 BLAKE2B ce5df0ce4181d14c1836e52ea25f40d31cc3776cb823540c839b6890854859aaf08eb78e229b9ab69066a40157955f1a6eb68c566a499b842d520b091ce917a2 SHA512 ec0faa3ae0a97e31d6424c621fa5166929f98a0fdbc13aef749bce6e5beb98c4a765f8db67a3554f8380fd82de89db9004824990e4a9deba1a2bf4e616eb0cbc
-EBUILD bcc-0.20.0-r1.ebuild 2258 BLAKE2B 329dd78d04cc25a380fa4421a1553442e8084af2a615c160b06354e92bbef5003e2283969872eb608216443135848b397c9e15a78ade1e0d50a6849f2ce17035 SHA512 138bc254388898b03ebf0d17b95651753f6c08e5496e6b0306ad2380ba343333d2d32169f0851e2121e51d57c733574cde9557b6cb31e73e5023dc45bb870e3d
+EBUILD bcc-0.22.0-r1.ebuild 2502 BLAKE2B 4b48547c387bcf109adf746eb57eb04d93c41c6116b481beb9654dfaf82470ec34f5998cd9da0badbc308d4b0409ee7efcc4b2f1874265e5f12ca22fda4e9fbd SHA512 44f531b55f2a27be716276bf646ae2652b7e55134636c0c229fb1d327332842e8ec7211a8a9a4402e2362e17574e6fcbc375d2e0697c96250f35f5b02f554bee
 EBUILD bcc-0.22.0.ebuild 2533 BLAKE2B 948441d97a61b7ef0925bc6c03c130ebb56d25ada7be353bd087efaf8d37423c2b9ea407b93efffa963cd09c999e941f9f24efa20c863f07f3dc8b8b9a7084f8 SHA512 180d12f060eda41a33e57539f22eb7334e116a7d3227a2bc041e897213f19344ccb499b5d9e7ec4d455aac66e896ff88d989c866a727aad8ba304dc9dd4c4a29
-MISC metadata.xml 387 BLAKE2B 01669ac6fdf60ea78bc4c7fff0838ea0877a961591fd5fd069e4e4f44a991978c1de7966ae175d761d06ab5c78a142ddb451b116f29c182944795362f3c219f9 SHA512 6fc774ad3f929b31dbe44ab2413c480e4ddb5fb7eec0566fac65190391facd50fc65b6bd91a4dde51b00be2e1c1ef157e74e0f4bff0a5417df1e56a0e79f700c
+MISC metadata.xml 501 BLAKE2B b958c89640d4cfe0cd5951fbfe65394b84a606c2ac4e73893b46fb950ce7a53f9a9623636bb8f3926c0637539c1aed3107cbf1e6aa52fc0d8a9b948977fab747 SHA512 32e576ce7431409c9c3a69f3ac1d5f757b6ec9807fa86d38a93db02721b0e10771dea786c646513f952fc6603e64df2eefa5797ef2103c55a9b1be60bee522b9
diff --git a/dev-util/bcc/bcc-0.20.0-r1.ebuild b/dev-util/bcc/bcc-0.20.0-r1.ebuild
deleted file mode 100644
index 5e202f2d11a0..000000000000
--- a/dev-util/bcc/bcc-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake linux-info llvm lua-single python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	~dev-libs/libbpf-0.3:=[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-13:=
-	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
-	lua? ( ${LUA_DEPS} )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=12 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
diff --git a/dev-util/bcc/bcc-0.19.0-r1.ebuild b/dev-util/bcc/bcc-0.22.0-r1.ebuild
index c331a015d805..a5029626a40d 100644
--- a/dev-util/bcc/bcc-0.19.0-r1.ebuild
+++ b/dev-util/bcc/bcc-0.22.0-r1.ebuild
@@ -4,13 +4,13 @@
 EAPI=7
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
+LLVM_MAX_SLOT=13
 
 inherit cmake linux-info llvm lua-single python-r1
 
 DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
 HOMEPAGE="https://iovisor.github.io/bcc/"
-
 SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -19,15 +19,17 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+lua test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	lua? ( ${LUA_REQUIRED_USE} )"
+# tests need root access
+RESTRICT="test"
 
 RDEPEND="
-	~dev-libs/libbpf-0.3:=[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
 	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-13:=
-	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
-	lua? ( ${LUA_DEPS} )
+	>=dev-libs/libbpf-0.5.0:=[static-libs(-)]
+	>=sys-kernel/linux-headers-5.13
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
 	${PYTHON_DEPS}
+	lua? ( ${LUA_DEPS} )
 "
 DEPEND="${RDEPEND}
 	test? (
@@ -40,7 +42,6 @@ DEPEND="${RDEPEND}
 	)
 "
 BDEPEND="
-	dev-util/cmake
 	virtual/pkgconfig
 "
 
@@ -49,9 +50,6 @@ PATCHES=(
 	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
 )
 
-# tests need root access
-RESTRICT="test"
-
 pkg_pretend() {
 	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
 		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
@@ -61,7 +59,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
+	llvm_pkg_setup
 	python_setup
 }
 
@@ -72,6 +70,13 @@ src_prepare() {
 	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
 	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
 
+	# bug 811288
+	local script scriptname
+	for script in $(find tools/old -type f -name "*.py" || die); do
+		scriptname=$(basename ${script} || die)
+		mv ${script} tools/old/old-${scriptname} || die
+	done
+
 	cmake_src_prepare
 }
 
@@ -89,7 +94,7 @@ src_configure() {
 		-DCMAKE_USE_LIBBPF_PACKAGE=ON
 		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
 		-DPYTHON_CMD="${bcc_python_impls%;}"
-
+		-Wno-dev
 	)
 	if use lua && use lua_single_target_luajit; then
 		mycmakeargs+=( -DWITH_LUAJIT=1 )
@@ -100,6 +105,7 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
+
 	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
 	python_foreach_impl python_optimize
 
diff --git a/dev-util/bcc/metadata.xml b/dev-util/bcc/metadata.xml
index d8e5feab7aa9..b1c79adcf2e9 100644
--- a/dev-util/bcc/metadata.xml
+++ b/dev-util/bcc/metadata.xml
@@ -7,6 +7,10 @@
   <maintainer type="person">
     <email>chutzpah@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">iovisor/bcc</remote-id>
   </upstream>
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index ad64f8750641..e44fb6539631 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,14 +1,13 @@
 AUX bpftrace-0.10.0-dont-compress-man.patch 722 BLAKE2B 583969e9f4457a49f17f33d984ab2585ec2e6f6976846af4d39084ce41bf334892b0971d1a1571e9495d4a05eea680412899d1fb23a8eb25a9b9cab84c3b101b SHA512 1f588dd589933c2fbb0ca79a5782c542cb137e748a442b9904153f76d142ae117755e1c24acfc50947e6040afbad78f31ef0c181082695f63ebb61b3acbe4b6a
 AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4b5ae28626f6905c45f6510f84b7c6f28aa3b5174f1f48a30763990b2a3cc50c6336249fe1dc4cf31656871a8adce43c8d7 SHA512 332e6cc4d1c21e917451c9aa6028b082f53dde8221419ba45ad7ae6321e444b3f67ec8366cbd56638d8f8b68a3be06af892eba765c810744951af1de9b994113
 AUX bpftrace-0.12.0-fuzzing-build.patch 491 BLAKE2B 6fcc78660f69742247bedded028a4c18f933f32c424bb5d11976ff5ddbe16587948e6c75303e75daad440f2cd578fb1a4c3682ca34657a3d2b83a0f67843f994 SHA512 ab9f0b8115ac17130841e7d9b1ad59e5f2a6836acd48ab1d5c3fec45ce75a7833d033a37cb1ddcdd72cd794c202cdaeb287689f67bbb2a9baccb8628c3ff2a59
-AUX bpftrace-0.12.0-install-libs.patch 6364 BLAKE2B e4b59b882c04f58c711f61653f2cb5f28a99f06891d979372e854bae1f125dba43bb64a65a14bd8e85ac97ae8b3e933ab1cc61a2ff9253113428394fbbebe599 SHA512 d9efc5bc544cb97eda647c84ee917851d3c63ff9648b2d026a8e699d5b0d3755f06983984c793cbf2efe865f15588d7d1e414e7b16026067aa5bc5dafb05c456
 AUX bpftrace-0.13.0-install-libs.patch 5716 BLAKE2B a50df0b1aa633aeea97af0c9db22729ef81af11722340bd8f10e3d66082e5ff002f2c73712667ba918cbcc51d194980dbf5ad95381102cecd218afa4a394bf31 SHA512 437af44d5953c1510e56aed3ee39c12ff2e06adb3c4fb16e335c4de1ba8dc2aff1f6fdf92cf2e1873ada4574b460b3d7788e5b52f9422c7bf66dfb92375dc7e0
 AUX bpftrace-0.14.0-dont-compress-man.patch 1760 BLAKE2B dc07764635e845729e684b0817ccda599824481b7a60f7b89f8a18081fedf84b003ffb06c0cd8c289d8100c58e9fb7959174a3cbd165f485169ecea38a9f19cb SHA512 386a4d6cd46973db42c43f6790ffda165b8697feb576d14e95631a2f1bb26aca37c67ae0ee6f09be5983aa292653dac496a1f207de5e36dfcf986bb78b614bb1
+AUX bpftrace-0.14.0-fuzzing.patch 499 BLAKE2B 3dfbc2594676c37c239c92c94b475cbfa9b30ff785bba436e0cf5729deac51c7f10826ddb9603f02bd39645af626e0aa2565b46ac79ede40d936203def321391 SHA512 bf2a3569097274a46e5ed9fe8ea014ae3a0c9f42684e56b948cd6ec458e022d98aaecaac7577150e3a78c81583e678fbfa0f798c342e827ea7af9a4c2b128f0f
 AUX bpftrace-0.14.0-install-libs.patch 8077 BLAKE2B ae165fd4eceae5d159d28b9a0fb29e8c12dd565c127984469ad55675e115f48ae0de471ddb3b88699560472e63f0fd4fef187708d722f5e42e749f0cbe066ae1 SHA512 3664a93d9ab6f824ea2c7689020287a8cc3da45c27a146a3301394e5adbde56a899727d7fd15d912dd7b2ba8e9c84508e4c5b563d551e7315ec05c1f9eddfc7d
-DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B 3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993 SHA512 a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345
 DIST bpftrace-0.13.0.tar.gz 952412 BLAKE2B 8e3f6f28b0c652e2257e1a970b80b87ba5ac5e94dc26719bffe16a0bbff48efc2b9ab5bc03e5fe4b764f5c9c3df16039d931f1f13c1f14327880838a373edacc SHA512 16b3f11c365cc7e306045a5cb6bcf6c66b92d746884f6587ce7cc4c76841b284757bff7b38b9838eb3db129e996e4f1b13afec34da57981362dadef8460816d0
 DIST bpftrace-0.14.0.tar.gz 991314 BLAKE2B 3222068d7f84c13f736197cef2d188fa31a25db6bd266afe5cbacb1c062155b5ebd5d0310fbad56c15574a795766a33b12624f0252b0bc0677bf05324f414df5 SHA512 78f2d9a4d54c0dda1947b924a828777b402befc3a05031b609da4d256907df1e64f946454a9be7317449f49706f02a881febc4e63d2ef2f4e76924ea19e36ddb
-EBUILD bpftrace-0.12.1-r1.ebuild 1717 BLAKE2B b2e89c2456ab0dbdc38ce8fead1297cc4241a1f454fcc8d93fda913468b01f8f398155918089c5b2f7a91b8fde1d06e3c96ca126e4694d433b5624a62655aaef SHA512 9a28f395f250d80c001f34935e75667d39d2a80f07e4c4c37d9acb61707c5856bca560c70e1f5130a0c23aa2242b1ea3a6d2d8cf2f59418271bdccbcc69227ed
-EBUILD bpftrace-0.13.0-r1.ebuild 1717 BLAKE2B 983e2a0bab14db717143b9f3a43a0ed1f4424ad98cb77967f16d9dd97b968f4b4e4de98c41e5b9d33bef6f44ad52ce3ad004382471912b624950c871af38a750 SHA512 a2a27e804e0f851324ffcdb430f7278907fdac3056f186eb54ca8a1586991ba9fe52dd0c9b173b6b193ea2f6a2eb383f8af269b586c3b66eeda8a42cb905d5b4
-EBUILD bpftrace-0.14.0-r2.ebuild 1816 BLAKE2B 8799e8f61573d696482d1ea6b4a27a8619bcdc1f61a0e9ceed7c43f91bacc08a5b077f695eedefb58bfc9cbee03a2f1bb4e37c373359361168be8795851b2ffa SHA512 042049b0e214a95bd5479088b8ceba0d13b6330933fd56297c16727813b7917c727083310aeef4c1cf1801628f065a01c3929998ba3d38964dde729f698bebee
-MISC metadata.xml 385 BLAKE2B 625639d1899cc754d8622934822d467802c908ec386311103b8683c2bec45f1ac28b42704203ee97caacd08c6a96fcc84edde3dcc7b6f3f10f918cf67a656754 SHA512 7e15d98bff6109e41edd085924d9ac6a8bece5ff534e840576ca8c9d338f80e80a77b0ce7f822a8c10a41cb7d58a02a09ae54917136c450a98338124b7b24f9e
+EBUILD bpftrace-0.13.0-r1.ebuild 1701 BLAKE2B 26ac82532abf6d1b194f7770dec7c9b6fa8e137ad1927924e02c84339fe0765b3942c8f8fd28b1564ff44afd26653a8abb10d230d56ed9606648633606791bcb SHA512 b800a79a0aa70c5acb8fd4f9b37cae9d99c82684063ec5544f537c0128cb21f490c062b8ae539f08ed28dcac4db75eac5b8c1b4e5274b7156fbffe182d0f18fc
+EBUILD bpftrace-0.14.0-r2.ebuild 1800 BLAKE2B 595833564e6d29016a523502877ab550a65d8749f6afd4a090ee10fb0c06470488c00ea8379b8f84cdce994651e2b323402c7b1663a2113db90b4b1a101c3c5d SHA512 37f6b42c84c82107b51b035d94e7ff704587c6241e05e872ed98cf6ad4a17acab24f66265339dc57e905a82b868acc4182f4a245cecdb52a5871d4db53757574
+EBUILD bpftrace-0.14.0-r3.ebuild 1714 BLAKE2B 920871a51ced4378659f415e3f08ed29a3b2aaee9613977b0efa090d86429c1a464c71fa7a9d5ec73a134f38a9086c9af8519ca88c60c008233796ca3e4af9e6 SHA512 b667cdbb36ffdace520ed8c29c384ea50c71679f1e798f1e5921a59307ef2c3202789bd8fcc988d0c1776ab88feebc869de6d9f60a071721e9a3fc3b56d1dead
+MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild
index 3437f2e80ce1..bf4eda842dfa 100644
--- a/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.13.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs llvm linux-info cmake
+inherit llvm linux-info cmake
 
 DESCRIPTION="High-level tracing language for eBPF"
 HOMEPAGE="https://github.com/iovisor/bpftrace"
diff --git a/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild b/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild
index 483f341c4909..bb1d9b9bc095 100644
--- a/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.14.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs llvm linux-info cmake
+inherit llvm linux-info cmake
 
 DESCRIPTION="High-level tracing language for eBPF"
 HOMEPAGE="https://github.com/iovisor/bpftrace"
diff --git a/dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
index c36af3ddcf98..fb376800eda5 100644
--- a/dev-util/bpftrace/bpftrace-0.12.1-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.14.0-r3.ebuild
@@ -3,59 +3,53 @@
 
 EAPI=7
 
-inherit toolchain-funcs llvm linux-info cmake
+LLVM_MAX_SLOT=13
+
+inherit 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
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="fuzzing test"
+# lots of fixing needed
+RESTRICT="test"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/libbpf:=
 	>=dev-util/bcc-0.13.0:=
 	dev-util/systemtap
-	>=sys-devel/llvm-6:=[llvm_targets_BPF(+)]
-	<=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
-	<=sys-devel/clang-13:=
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
 	sys-libs/binutils-libs:=
-	virtual/libelf
+	virtual/libelf:=
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/cereal:=
 	test? ( dev-cpp/gtest )
 "
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND+="
-	>=dev-util/cmake-3.8
+BDEPEND="
+	app-arch/xz-utils
 	sys-devel/flex
 	sys-devel/bison
 "
 
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
 QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
 
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.12.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.14.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.14.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.14.0-fuzzing.patch"
 	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
 	"${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
 )
 
-# lots of fixing needed
-RESTRICT="test"
-
 pkg_pretend() {
 	local CONFIG_CHECK="
 		~BPF
@@ -70,19 +64,25 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	LLVM_MAX_SLOT=12 llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
+	llvm_pkg_setup
 }
 
 src_configure() {
 	local -a mycmakeargs=(
 		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_SHARED_LIBS:=OFF
 		-DBUILD_TESTING:BOOL=OFF
 		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
+		-DENABLE_MAN:BOOL=OFF
 	)
 
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+	# bug 809362
+	dostrip -x /usr/bin/bpftrace
+	doman man/man8/*.?
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
deleted file mode 100644
index 04c08b3efa8b..000000000000
--- a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e4544559..272ea18d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -92,9 +92,10 @@ find_package(FLEX REQUIRED)
- bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc VERBOSE)
- flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
- add_flex_bison_dependency(flex_lexer bison_parser)
--add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
--target_compile_options(parser PRIVATE "-w")
--target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
-+add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
-+target_compile_options(bpftraceparser PRIVATE "-w")
-+target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
-+install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- include(CheckSymbolExists)
- set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
-diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
-index a95c60a1..f5c4d676 100644
---- a/resources/CMakeLists.txt
-+++ b/resources/CMakeLists.txt
-@@ -1,6 +1,7 @@
--add_library(resources headers.cpp)
-+add_library(bpftraceresources headers.cpp)
- 
--target_include_directories(resources PUBLIC ../src)
-+target_include_directories(bpftraceresources PUBLIC ../src)
-+install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- function(embed_headers output)
-   file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 37ee2204..8b2e1909 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -145,7 +145,8 @@ if (ALLOW_UNSAFE_PROBE)
-   target_compile_definitions(libbpftrace PRIVATE HAVE_UNSAFE_PROBE)
- endif(ALLOW_UNSAFE_PROBE)
- 
--target_link_libraries(libbpftrace arch ast parser resources)
-+target_link_libraries(libbpftrace bpftracearch bpftraceast bpftraceparser bpftraceresources)
-+install(TARGETS bpftracearch bpftraceast bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- target_link_libraries(libbpftrace ${LIBBCC_LIBRARIES})
- if(STATIC_LINKING)
-@@ -194,6 +195,7 @@ if (USE_LIBFUZZER)
- endif()
- 
- install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS libbpftrace LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory")
- if (KERNEL_HEADERS_DIR)
-diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index 76bb217e..6d243a7e 100644
---- a/src/arch/CMakeLists.txt
-+++ b/src/arch/CMakeLists.txt
-@@ -1,15 +1,15 @@
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
--    add_library(arch aarch64.cpp)
-+    add_library(bpftracearch aarch64.cpp)
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR
-        CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
--    add_library(arch ppc64.cpp)
-+    add_library(bpftracearch ppc64.cpp)
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR
-        CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x")
--    add_library(arch s390.cpp)
-+    add_library(bpftracearch s390.cpp)
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
--    add_library(arch x86_64.cpp)
-+    add_library(bpftracearch x86_64.cpp)
- elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64")
--    add_library(arch mips64.cpp)
-+    add_library(bpftracearch mips64.cpp)
- else()
-   message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
- endif()
-diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
-index 3d444fb4..c2cf84ed 100644
---- a/src/ast/CMakeLists.txt
-+++ b/src/ast/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_library(ast
-+add_library(bpftraceast
-   ast.cpp
-   attachpoint_parser.cpp
-   callback_visitor.cpp
-@@ -11,17 +11,18 @@ add_library(ast
-   signal.cpp
-   visitors.cpp
- )
-+install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src)
--target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
--target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR})
--target_link_libraries(ast arch)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
-+target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR})
-+target_link_libraries(bpftraceast bpftracearch)
- 
- if (HAVE_BCC_KFUNC)
--  target_compile_definitions(ast PRIVATE HAVE_BCC_KFUNC)
-+  target_compile_definitions(bpftraceast PRIVATE HAVE_BCC_KFUNC)
- endif(HAVE_BCC_KFUNC)
- 
--add_dependencies(ast parser)
-+add_dependencies(bpftraceast bpftraceparser)
- 
- if (STATIC_LINKING)
-   set(clang_libs
-@@ -45,17 +46,17 @@ if (STATIC_LINKING)
-     if(EMBED_LIBCLANG_ONLY)
-       unlink_transitive_dependency("${CLANG_EXPORTED_TARGETS}" "LLVM")
-     endif()
--    target_link_libraries(ast ${CLANG_EMBEDDED_CMAKE_TARGETS})
-+    target_link_libraries(bpftraceast ${CLANG_EMBEDDED_CMAKE_TARGETS})
-   else()
-     list(INSERT clang_libs 0 libclang.a)
-   endif()
- 
-   if(EMBED_LLVM)
--    target_link_libraries(ast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-+    target_link_libraries(bpftraceast ${LLVM_EMBEDDED_CMAKE_TARGETS})
-   else()
-     llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit option orcjit ${LLVM_TARGETS_TO_BUILD})
--    target_link_libraries(ast ${clang_libs})
--    target_link_libraries(ast ${llvm_libs})
-+    target_link_libraries(bpftraceast ${clang_libs})
-+    target_link_libraries(bpftraceast ${llvm_libs})
-   endif()
- 
-   if(STATIC_LIBC)
-@@ -64,11 +65,11 @@ if (STATIC_LINKING)
- else()
-   find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
-   if(found_LLVM)
--    target_link_libraries(ast LLVM)
-+    target_link_libraries(bpftraceast LLVM)
-   else()
-     llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
-     llvm_expand_dependencies(llvm_libs ${_llvm_libs})
--    target_link_libraries(ast ${llvm_libs})
-+    target_link_libraries(bpftraceast ${llvm_libs})
-   endif()
--  target_link_libraries(ast libclang)
-+  target_link_libraries(bpftraceast libclang)
- endif()
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 8d546f9a..105dcd11 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -1,4 +1,4 @@
--add_compile_options("-Wno-undef")
-+gdd_compile_options("-Wno-undef")
- add_compile_options("-Wno-switch-default")
- add_compile_options("-Wno-switch-enum")
- 
diff --git a/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch b/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch
new file mode 100644
index 000000000000..6c759a9e1ca1
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.14.0-fuzzing.patch
@@ -0,0 +1,18 @@
+https://github.com/iovisor/bpftrace/pull/2059
+--- a/src/fuzz_main.cpp
++++ b/src/fuzz_main.cpp
+@@ -17,12 +17,12 @@
+ #include <unistd.h>
+
+ #include "ast/bpforc/bpforc.h"
+-#include "ast/clang_parser.h"
++#include "clang_parser.h"
+ #include "ast/passes/callback_visitor.h"
+ #include "ast/passes/field_analyser.h"
+ #include "ast/passes/semantic_analyser.h"
+ #include "bpftrace.h"
+-#include "codegen_llvm.h"
++#include "ast/passes/codegen_llvm.h"
+ #include "driver.h"
+ #include "log.h"
+ #include "output.h"
diff --git a/dev-util/bpftrace/metadata.xml b/dev-util/bpftrace/metadata.xml
index 3e240d7784b1..3b275bd1ca56 100644
--- a/dev-util/bpftrace/metadata.xml
+++ b/dev-util/bpftrace/metadata.xml
@@ -4,6 +4,10 @@
   <maintainer type="person">
     <email>chutzpah@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
+  </maintainer>
   <use>
     <flag name="fuzzing">Build bpftrace for fuzzing</flag>
   </use>
diff --git a/dev-util/btyacc/Manifest b/dev-util/btyacc/Manifest
index 37a7e4491472..eff90f308621 100644
--- a/dev-util/btyacc/Manifest
+++ b/dev-util/btyacc/Manifest
@@ -1,5 +1,5 @@
 AUX btyacc-3.0-includes.patch 175 BLAKE2B a0da73e29099239e97d8fd67edf2743720fc3e97946834319c249e9bb0dd1949c70b492d3ec3fffed32d992dddc7ed2cadbf7cb2280b7cc24c26b1f00854b46f SHA512 c0ba2cf5ca3575862a6c683cf5a9461cc7008e7c8662732ef64ba68f041e810aceb8f0f1b75becc8cd910c87c60dc830e8823b15986fedf345319bedb50e3dd4
-AUX btyacc-3.0-makefile.patch 535 BLAKE2B f5c7f893dcbe98c17dc74efc6310924518447ea4d719af3dc700daea72d0106e5217d69cfb82b498a81392c8f0a447c92afcfa10954f4b7418efa76de3382dc9 SHA512 54df54a45147a7ca5c76d0c6665a46210af170671ba04762e8de80c0269b0a1aa947c1be049aa8660f8b96d4ec204e639f2a810130676d69fc54fb28c929a190
+AUX btyacc-3.0-makefile.patch 527 BLAKE2B 4b3644ebfd12c9c26203af40f7c8b87039ee7e56dfc77816d2328c5f450d8114dfe07fc66bdaa0c830304cd0ac6e483fe6b58debe9b427c4b9771d4a360ec6f4 SHA512 51feffff688edfc1fe6b55b3616b68018aca372fe8f0861b8967d7122c955d46fa86a7f8f4f56b8371fd0257039c4432b09b9409daff49cb7e740f66ce8f8f46
 DIST btyacc-3-0.tar.gz 74770 BLAKE2B 298d6ba020a47a8d894044c464c12efd3ed94b878cd152f4287a35fc0a8ec490186b7603909691cbf036f425fa96316c6cda8b8270b07e3c5c0cd11777d5e62b SHA512 55312e3de7cc783e1386ea98c97464d8d40bb496ce2ce36c84cc559e4c6982fbac730e76b8d44c4a44565f545ac50fb75f802bd8a1b4c926b1fc1af1a0058ef4
-EBUILD btyacc-3.0-r3.ebuild 909 BLAKE2B e9e94df1a3803ee25fe1036a48622d7ca95aa4de608965119701607e9f7a3bbccc78ad7512acff03f3f0b8c8d1cca8728053b5bc49517464ffe6c1b660c1e90c SHA512 20d26bf63637a539f535801a8a8fd42b08e0fc4c9112c384bdcc7cc8372a62056875d0897b774abfc9aaf63b96fff8d88ef50d1c4f1e2da114a986f0e9872f7a
+EBUILD btyacc-3.0-r4.ebuild 788 BLAKE2B 7d3b5739fc6d6013d6268bcb125d0a797f6e98efcc5f85392b870155da861fe2d45b21c3d771eb3743ef7592bcc2489a0d04eb08fad7363d0691a4769f270726 SHA512 2191280ad2ff0e974fe74d2e273534035e9e5e453ea4266e54dacac3e18309956d55fc075d95681000a950e60ea477619c35073a9374090ff9b2db47b2253509
 MISC metadata.xml 248 BLAKE2B 2ac829e1663815f752e218e9ee474448a3d973c075939d578699f57790581498adfe9bad180a79fcc6ea0afc339f57d25cbcc0fdd430f82d192c23c03d15e465 SHA512 55c2e2e06f91e13fd73b9545c51d4169a47f040ead41eb1368479940b026def820de67137312b64a6203f80b57a421c8895ed690386a79086fa0ba6c3557aa47
diff --git a/dev-util/btyacc/btyacc-3.0-r3.ebuild b/dev-util/btyacc/btyacc-3.0-r4.ebuild
index 8949c4f6fe14..750243f22758 100644
--- a/dev-util/btyacc/btyacc-3.0-r3.ebuild
+++ b/dev-util/btyacc/btyacc-3.0-r4.ebuild
@@ -26,10 +26,6 @@ src_prepare() {
 	default
 	# fix memory issue/glibc corruption
 	sed -i -e "s|len + 13|len + 14|" main.c || die "Could not fix main.c"
-	# Darwin doesn't do static binaries
-	if [[ ${CHOST} == *-darwin* ]]; then
-		sed -i -e 's/-static//' Makefile || die
-	fi
 }
 
 src_compile() {
diff --git a/dev-util/btyacc/files/btyacc-3.0-makefile.patch b/dev-util/btyacc/files/btyacc-3.0-makefile.patch
index 60187256d1a0..d55ff4317652 100644
--- a/dev-util/btyacc/files/btyacc-3.0-makefile.patch
+++ b/dev-util/btyacc/files/btyacc-3.0-makefile.patch
@@ -10,7 +10,7 @@ Respect CC, append to CFLAGS (but not -g), append to LDFLAGS, use system LD -jer
 +CFLAGS	      += -Wall -Wstrict-prototypes -Wmissing-prototypes
  
 -LDFLAGS	      = -static
-+LDFLAGS	      += -static
++LDFLAGS	      +=
  
  LIBS	      =
  
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index f2dc14ab29e8..5eb62dc90da8 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,3 +1,3 @@
-DIST byacc-20210808.tgz 895366 BLAKE2B 29e0e2e3b2f12ef9f0173a829ecfcfde9303b5cdd642c3a7919bfd663eb9b0ddd3cef0d25f5dccaf37a1e8579e781e4dab78788e332c30a497ccd85656c15837 SHA512 fcc6acde33259fa854d4d2cffdd22a70b81deda86b5cfe5c6b5e49a1148fef1de4efc888bd3739ebbb98885690faae91b13a4a184df90f8e94524b7e4cf8d3b6
+DIST byacc-20210808.tgz 891489 BLAKE2B e349e960cdbc654b148ec8412f8502e26976f8a933e3846fc4ff308440c8c8058b3422dbc0a709b792ec727c62f3b4ed7d0679d9d5da69fed8c4e08daa801625 SHA512 cde092dbd845364752aca228a838b97fc34378c7dd7f860c614d13c8ec7167b8416422ded82864d22e8c3c447b47b30abca591ef8ab667c49f9fa070d68114c4
 EBUILD byacc-20210808.ebuild 604 BLAKE2B 2be284664b2437e13f227cf4c367dc1fff380a310291e8e26fc8c12bf1bd8692e56516f4290e42a5bb8ad50f885ac5009a8106f4650e448352fc914cf4b11082 SHA512 225bdd4f85097765aeaa2f039471e1c4e4b6c90f0738327bd55dba01b7f1261e975cd352fea3aa4be442881c4d8f3b580558ad04056c21d2928656ddcd477db0
 MISC metadata.xml 356 BLAKE2B 3f7f63e3c9b146f59f1f5af0d683294a58b264e2945fd1a30635c64d462f4615395a49b6acedaeb3ae6377061e85b2496b898db6d8b39a3b8ac8f3cd800a666c SHA512 6f1890fde8b83fe6821ac2e9d298f4dda67bd1a15b26e54d51de685cba60b7f938e4cea3f335635773bb54f4a7fadc9a41e52dadebbb41897c042b4c995ba634
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index bab878d47f69..98614508fa88 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,5 +1,3 @@
-DIST catfish-4.16.2.tar.bz2 270051 BLAKE2B 41048edc3933664af389ae7120e6f2b25f6c92632a4d00b999eef4e26e0f6eeeed70320ed740f26a0649e423e3b8316e33b8c671a282ae1a4474b3cc6bbc4824 SHA512 a1dc2839106d55e11e537478402b44d3794cdcf326c5984bd95d0d5a8bad52d91df1be22ba347d23f030d0c62fdf2b90a507e2abc30ed4b4d1804ab8dbde1dbe
 DIST catfish-4.16.3.tar.bz2 271642 BLAKE2B cebadeeb478a041ba6f815aec81b18d317ebf468bfe0699e33c4550a2f4b1b3377cbabd08d7d6504c3d94169b2be68d35ade9bd77e018ea7c099370ccf4ac124 SHA512 23ffa160b0593033a9696644fd00c48e4a6f54dc25448f975f0949aece50d8e4fbb45b9ad086a8e14072ac1dab27e0b4ecd19af0f31a5b4a775b17e18b00c7bb
-EBUILD catfish-4.16.2.ebuild 1197 BLAKE2B 085361e1637e506cdccb07c50464fbb7e2ecbbc6517c0ede48907100f3764f787b98bbc452a7f5b179f5bb30e20197c62078dd28f72e458bee5265370d550a05 SHA512 27d63ea3fba37a90fc0b0e78f7a2e8133fb6a5c74890bd26958f261f219236e4038b13a0eb14a814b874d727cfbca0efaf3e9d44ca72d02d065bf1cc1232b9a7
-EBUILD catfish-4.16.3.ebuild 1199 BLAKE2B 8981e4dc834c3690a0cf336f9f7a3aafd95fbf74462bc9e85bc81b2abc34c0a5ac9f4db8219a8f14d3e7cbefec4cf701395a01b8539ea9353378df13b3de09a1 SHA512 60b9f1691bb3c278d68c7eb7d85e89e09c2ad9a894655661da798d6f5052ed01534b7fd4f111f091507e576f654b8d5b1b4fa28a132b068bc03ec3523c7f3b8a
+EBUILD catfish-4.16.3.ebuild 1197 BLAKE2B 085361e1637e506cdccb07c50464fbb7e2ecbbc6517c0ede48907100f3764f787b98bbc452a7f5b179f5bb30e20197c62078dd28f72e458bee5265370d550a05 SHA512 27d63ea3fba37a90fc0b0e78f7a2e8133fb6a5c74890bd26958f261f219236e4038b13a0eb14a814b874d727cfbca0efaf3e9d44ca72d02d065bf1cc1232b9a7
 MISC metadata.xml 217 BLAKE2B dbd6f28308a539b2f2d27b9b2bb6d44ce324db803a3ed7218ac091711f3cfcd5f01f505c084c0b714f19257af70483906135c68caa1964252b6a9c9fe71b4ac7 SHA512 ba66b524e0287ac4326c527d973ed2ff6a40e330f38f3f1333db2c66a7672e6b24a6212ddf430ee454ed943d89d04a12e42eb670f3dcf1567f59c6e51d5677aa
diff --git a/dev-util/catfish/catfish-4.16.2.ebuild b/dev-util/catfish/catfish-4.16.2.ebuild
deleted file mode 100644
index e598039ab371..000000000000
--- a/dev-util/catfish/catfish-4.16.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-# yep, GPL-2 only
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.42
-	dev-libs/gobject-introspection
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	>=x11-libs/gtk+-3.22:3[introspection]
-	x11-libs/pango[introspection]
-	>=xfce-base/xfconf-4.14[introspection]
-	virtual/freedesktop-icon-theme
-"
-BDEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-
-python_install() {
-	distutils-r1_python_install
-	python_optimize
-	rm -r "${ED}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/catfish/catfish-4.16.3.ebuild b/dev-util/catfish/catfish-4.16.3.ebuild
index e20eafa63bda..e598039ab371 100644
--- a/dev-util/catfish/catfish-4.16.3.ebuild
+++ b/dev-util/catfish/catfish-4.16.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
 # yep, GPL-2 only
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.42
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index c852da911af7..e02ac1bfa524 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,6 +1,7 @@
 AUX cgdb-0.7.1-respect-AR.patch 807 BLAKE2B 6689327f2a41f52d772b1d1f2714bac4f4cd40e994b51c6b12a8c9c5d40ed6616cb03128753e60bb773a6c6b46d26fb6d9d80c67c0ac8432e5f17e34b70105d8 SHA512 db51c83bec17cf05e9b8dfc7d92b253999e545c2c1a002db2f63edc0a08d0c831fa6b4b5177e972844755f4df455ec268e5b3554115f5fdeafa071d1df0dd4bc
+AUX cgdb-9999-respect-AR.patch 378 BLAKE2B 684cd519d7fc856c9d1b66c97b5a8311f136ed0458f73e79bf23ab3a2e84704d5b98480c1d8a7f8eb9a4434d9e6a6e0828e285ebeabe215e9b7d234f16410155 SHA512 e075fee139e373befb1d027ff9ce57910ab2adf877e8e03fbcde9133e494ac0b657acb0a5cd6433fd9d3d39c5766e3d2ab8d5ed69d2b2a6a18f97aed90d96646
 AUX cgdb-test.patch 2132 BLAKE2B 7308e2817a0956382a2949baad003ff0adf10989825170fcc953979d9f39da245584de4245d4d86b81e9cb74cccf11628ce3448a736cc3e89ae6e9dfabc3112e SHA512 8c5dde409035134ee75115c99a9b257a6c711750fbf662478d33911a015cccf4bf1a1ee6ec9d72d7075b0ce6dfae98a30ec60f4d2447f958ba322ced71be203c
 DIST cgdb-0.7.1.tar.gz 314768 BLAKE2B 767a57d071fa4e3c75d231a1ec879d871669fcda9c733d157d380fa525dd321f1deb68d7ef7f424b3f36a115043a0a0faae271f24746f934e288ba7d9a4e7fa1 SHA512 050c7bad963d51c1a2cb309530319ca77e9d236f419fb0abac4ab5030ff1068d799fa626959a8b3036321711de98bddf40d264bf9367ff5697075e30ca8168c6
 EBUILD cgdb-0.7.1.ebuild 1541 BLAKE2B 9ec609c8cd1a8f9b5c89e3ccb160119a5bfc3f31171f056aea03060789cf1813df45702c727600049d76324c548f9f292dc41423b2539b9a3391db9c4264a287 SHA512 647bef5ac18b1f0ba19bbf4e3b2148f760c564cd7f74e4a66721c2417ce46a1605331e29f19615fbc1e843419e8955b42da70494f2c78a770162466c5b072ce0
-EBUILD cgdb-9999.ebuild 1486 BLAKE2B 462a9e9fef68d24af10cf84bf7aff8585d87cd9d854aef53d0aa70dc5a7d166799006cd34a9d1f61b1ace6044576cc0230b3842aadea4037524b16524a693c20 SHA512 0813893bf020b8a77607712df53bdeb694f84b3b2254da0282131384dea8458f0c62f01355601d78ecb0ddc4a7c5e3fc22804f9fa1c3ff6397015d9dbe34400b
+EBUILD cgdb-9999.ebuild 1398 BLAKE2B 3e153439307e809ab81f30c9c1d4c4b6f8a1d92cd8a2f2026891b9257a5f4e00e157f342a845a5d2425b658f6633d69393a2ef99856209da343242f1a25b3d74 SHA512 fce4d64f769b1c4d55859514bee9a9f77b05f5e97a2a372baf9ad9f3dcf3ea83ba88340c6aeb4aac996fa66e8535a901a7544852fdd2314bcf60319e619d71dd
 MISC metadata.xml 371 BLAKE2B 374f6b79292f6bcb5e4fb612d7c72e888be0f32d1ef10cda456b168dbd6ae0f6297ba9d508b86c01c1ba2bc979e9466be9dbce776451ba368a9c558cd50ace88 SHA512 139e032fe97e70d530940ef728124a177647c6012263adcf25afba829c5cfbfe9b2bc2cf0a230ea1b93d1628976b3620650d7aefd16a1bb23646b081db2541db
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index 191687d3b093..75f88b51bff1 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/cgdb/cgdb.git"
 	inherit git-r3
-	EGIT_REPO_URI="
-		https://github.com/cgdb/cgdb.git
-		git@github.com:cgdb/cgdb.git"
 else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
@@ -23,8 +21,10 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	sys-libs/ncurses:0=
+	sys-libs/ncurses:=
 	sys-libs/readline:0="
+RDEPEND="${DEPEND}
+	sys-devel/gdb"
 
 BDEPEND="
 	test? (
@@ -32,20 +32,15 @@ BDEPEND="
 		app-misc/dtach
 	)"
 
-RDEPEND="
-	${DEPEND}
-	sys-devel/gdb"
-
 DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 
 PATCHES=(
 	# Bug: #724256
-	"${FILESDIR}/${PN}-0.7.1-respect-AR.patch"
+	"${FILESDIR}/${P}-respect-AR.patch"
 )
 
 src_prepare() {
 	default
-	cp configure.{init,ac} || die "cp failed"
 	AT_M4DIR="config" eautoreconf
 }
 
diff --git a/dev-util/cgdb/files/cgdb-9999-respect-AR.patch b/dev-util/cgdb/files/cgdb-9999-respect-AR.patch
new file mode 100644
index 000000000000..ed5f200b3260
--- /dev/null
+++ b/dev-util/cgdb/files/cgdb-9999-respect-AR.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -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
diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest
index 5bc4188214a4..60e1fb1a56c6 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,3 +1,5 @@
 DIST clippy-8.0.1.tar.gz 8206852 BLAKE2B ed23f62457877fb3173977e1b7092c808adc5d5bd9b1d83747ac42573117adc38865abd1e722073532800f543978e5d67ba7c88416a4335c72bd6b8a3045ff5a SHA512 d9a9ee3b40bf0271779765447c67da817551b5bf2d5d1e9f8073fb4596c622e013fbf7316ca39087db7b7f478b18d07f1fd06f1778abde2734c83112573d5f8f
+DIST clippy-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
 EBUILD clippy-8.0.1.ebuild 806 BLAKE2B 3a12042685e907d89c81a1115036b37279915e728b73c48b171684fd07380730295b8606da97b0525fa9ce73215477dddfc531ba39061acf48dd7ab8cfc2ba66 SHA512 133b754ba54cc5b160fc8c53d989770cf23fe31b4e5e7c828305a69c8ce7207e5627df8a8b6865356ae2c3699da0137270a2a6a44fdecde826a44253c38d2f0e
+EBUILD clippy-8.1.ebuild 808 BLAKE2B be962344e52a02f9afa7f360d93b28527c4634f3ff0c3045fe04fd17dab721575b07a6b8b64c0843ddae6742a04ef8b50c35723e2d451b1b1fd367c48804fd78 SHA512 9f0e779fcf28a8516a760a5027584f522e9a1513a5ff492b4a16116158ba7fa786c707aa90bd763a5448f67fd1d1c54b60edf8ffd202b29ff1b707c985eb7e90
 MISC metadata.xml 326 BLAKE2B b909c2525951476b2905e143974e734364023b9ac622f01ddae1e16427359ea47af02af11a3bb6ac5c51ef519c9c66995c8cba31d9ca41f1e48f33106a0678b3 SHA512 ee570ffd0054e2c132d637b41921bb25f3172fdfb0bcbc5d2214eaa3bb95c109ca58a5e6cd7ebd386de497ef3e20cf3696243dcc5e82fc4cfae25bba51be4db9
diff --git a/dev-util/clippy/clippy-8.1.ebuild b/dev-util/clippy/clippy-8.1.ebuild
new file mode 100644
index 000000000000..9fefa0ae3fc6
--- /dev/null
+++ b/dev-util/clippy/clippy-8.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="frr-${PV}"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools python-single-r1
+
+DESCRIPTION="Standalone clippy tool built from FRR sources"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/frr-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# standalone clippy does not have any tests
+# restrict to prevent bug 811753
+RESTRICT="test"
+
+DEPEND="
+	${PYTHON_DEPS}
+	virtual/libelf:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/flex"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-clippy-only
+}
+
+src_install() {
+	dobin lib/clippy
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 0454c62e7b5b..bd5ff9edd618 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -9,11 +9,9 @@ AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b65
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
-DIST cmake-3.21.3.tar.gz 9630442 BLAKE2B dccf4878745f6ddb87ea5fd1a0b6c728e32778afd15e3074d057234dc898e399133343bb10826f8882323bfc9d53f22c98b51ab6e39af29da58c54ed0b9d14c1 SHA512 0571b78443906c5ad51fb0fafbd32d565caf628cc150b1190802cb819e8497c108ea6b7ecaa03133df2dbbceb730696d24b4df38468c92088c769ce4076d9e9f
 DIST cmake-3.21.4.tar.gz 9630991 BLAKE2B ca6b6c50d984cc6713f3e88e1a6438c360d80c34927e60a20cc006ba47df2b91a290f1578d556f58d2d40711848a9b9caf36f65a043df892b81c1d48e3edb0d8 SHA512 0262a666f6da106576c26215580c40b54497bcdac400e847e1799716c31c71068293e719416338132a7da6122826c08ff50ac23dfed2711ab42631e96303f544
-DIST cmake-3.22.0-rc1.tar.gz 9769355 BLAKE2B 03398d2aca8c7f354d1b0d4f6447780cf8699ab388f342dea9266f0d2ecb0eeb38d5e51df9f6a9509d62db8b78b8774c76c82976cf1d263b1c572a00e96e698f SHA512 ed2a7c0832fd6fef5909745b6d540d1eee4b7f6681dca6e2b5cd22ea1a2be795fc1cb3b25792719211d7fe94871aa12253f4ce088985652496b3fdcbf0000e20
+DIST cmake-3.22.0-rc2.tar.gz 9770230 BLAKE2B c0ef4af36c9eba10b31c0c9b9c76cc67001ae796dff1bcef783d2a1a19e096c8367a1f80a87110f5adacfa507d3af7bef740da8a56cc3042d5085c2e15cad91b SHA512 ccb1e45ef25100f933a2238f73c0dbb65cdd602c6a8de36cce34696f9e5c54e061b67857c2d83ea8da6583394d2c51afbe6820dfd49ff3a4a19e6f4a40796fde
 EBUILD cmake-3.20.5.ebuild 7034 BLAKE2B ec62fb9ae6b4cf3b2e28142a571c217bfed6d9c1489d5d7ced9250690df058ca3ff5dda3b3a59800b770c7afea56b200b309a2bb8eb7763da2fdfc6a45794407 SHA512 1155e55439ff5f46d78e447a74a7f7a5600e8a4eb123f233861675462caeeffbdc1cfa38ea44d5ecb1a77f3db302017c750399f645d78e37adbe9649e8b21978
-EBUILD cmake-3.21.3.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
 EBUILD cmake-3.21.4.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
-EBUILD cmake-3.22.0_rc1.ebuild 7042 BLAKE2B 351fa7dcc56444e75a914a17cdecc1c1f910a00bcf809969449ecffadf1b2800a196f228e9307f6422c8ffed248541fa2b573cf4af6a658546ff949bb71a4b0c SHA512 e72af310d008431e2e7356d37996cc7afa4b6680bfb283a8a1a025abcfcaa818a53bc2406c5659c12d4d6cdf2d0ae45b3c107a874a07be6314e8f947a2cf9937
+EBUILD cmake-3.22.0_rc2.ebuild 7042 BLAKE2B 351fa7dcc56444e75a914a17cdecc1c1f910a00bcf809969449ecffadf1b2800a196f228e9307f6422c8ffed248541fa2b573cf4af6a658546ff949bb71a4b0c SHA512 e72af310d008431e2e7356d37996cc7afa4b6680bfb283a8a1a025abcfcaa818a53bc2406c5659c12d4d6cdf2d0ae45b3c107a874a07be6314e8f947a2cf9937
 MISC metadata.xml 338 BLAKE2B c3ace8da183f0d5e1a12d79d1b77a58fc2fb5700c045ebc899f4aad3854c418169fd4eea525cc91dffef54e4d7a3244d4c74f76285aa8975a469c49b46b79762 SHA512 fd24e8861001d9baf86816ffd22e919f92c3a7635690d7257fdcb20f4115921c304d6bc9fd34deda27b89b5e173b0a80c30ec985c066f2a343594d4dc022bcab
diff --git a/dev-util/cmake/cmake-3.21.3.ebuild b/dev-util/cmake/cmake-3.21.3.ebuild
deleted file mode 100644
index b1cc1455ac6c..000000000000
--- a/dev-util/cmake/cmake-3.21.3.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=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:=
-	>=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
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-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
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${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 # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap 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 actually bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
-	#    TestUpload: requires network access
-	"${BUILD_DIR}"/bin/ctest \
-		-j "$(makeopts_jobs)" \
-		--test-load "$(makeopts_loadavg)" \
-		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|ConfigSources|CMakeOnly.AllFindModules|CPackComponentsDEB-components-depend2|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-		# disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	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 || ! cmake --version &>/dev/null ; 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)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	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.22.0_rc1.ebuild b/dev-util/cmake/cmake-3.22.0_rc2.ebuild
index a9b3de7323d6..a9b3de7323d6 100644
--- a/dev-util/cmake/cmake-3.22.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.22.0_rc2.ebuild
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 64eff22be47f..f076c9cd7873 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,3 +1,5 @@
 DIST conan-1.36.0.tar.gz 1283280 BLAKE2B 024b94debd899adcc561713111494a49822cc721b3da022c34c5625454cc5d80ffdcc2ce6375ee4c719fecc2b0d4771191862a83b74613019b680662304c6761 SHA512 d1259a83795877bd9730e735a5cbea9457b3160d0f358e46a672fcd20c794feb2fa24970efdddc4ca1be8f1299db45793cf5bc7724d259bbf4f8f6a0e502f5a6
+DIST conan-1.42.0.tar.gz 1399488 BLAKE2B f0297ad74bdb47d1240641a0f6bd5f343a0a8f5723f554dffd2f7da969e3ee58cc97c3bb187f1586eb6ad4377106648c70fc4fd2672744639ffc940e5f4de316 SHA512 cd982f95e8bac5f66be16a326fc34d3db014b6a21138a10a7e92d6debfc578413c4d9737f371130b01ae35b14c82c0f11c2a09dc74e4d913a189d9cc34446d93
 EBUILD conan-1.36.0.ebuild 1871 BLAKE2B 5e815fa2ee82eecb8ab594846eb0d0c896aa9e286b8c6b19b9e490f39bf6ed9eaded3fd77491e8d66d85d6073abd6689f89e6ddd1637e8dcec4704d696cc8585 SHA512 2f7ed222ed5f84bebd75ef897652e42a545b0f14ce799e06482bd0cf8ca643bac78d0910815d9f7dbd6cb4aaa991792bf59dfcb188015eb16b403a20b49d78a3
+EBUILD conan-1.42.0.ebuild 1744 BLAKE2B 835a9ad149b094c93d3415427987207c561ce906739df90264d40320fe09763eb1833514fb909b59dae6718fb43a4343f769feafeaeb355aaf79e1178dcccf21 SHA512 0151f774cf76a1078ac1de9d236b41e848605f5003067885e5eed26a43337ad84cf4bd69d8a6004db0cb9f4225d7cf5fb7cbdc93ca45dc2cc4ca3b76ebb1b840
 MISC metadata.xml 770 BLAKE2B a6449d035d354804266fda862537f1005e4fff043bc5e8d28245392d7c7281e87cffb68029a5f8c941c2757f7343897eeeb8121376ec4b752d0451ca540c7ad8 SHA512 9666ab3361098a48ada5370ab5d897e9b1fabbea50d5eb141895ae8c7ef537317f087735f0924482b1248d3c6558dcd33cc65f4c085b029541f4d5c6144a8be8
diff --git a/dev-util/conan/conan-1.42.0.ebuild b/dev-util/conan/conan-1.42.0.ebuild
new file mode 100644
index 000000000000..4ea924b09769
--- /dev/null
+++ b/dev-util/conan/conan-1.42.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/"
+SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# overly strict requirements?
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
+RDEPEND="
+	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/node-semver-0.8[${PYTHON_USEDEP}]
+	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.26.6[${PYTHON_USEDEP}]
+"
+
+# Try to fix it if you're brave enough
+# Conan requires noumerous external toolchain dependencies with restricted
+# versions and cannot be managable outside of a pure CI environment.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	# Fix strict dependencies
+	sed -i \
+		-e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \
+		-e 's:==:>=:g' \
+		conans/requirements{,_server}.txt || die
+}
diff --git a/dev-util/cpputest/Manifest b/dev-util/cpputest/Manifest
index 5654f1b6aecd..c40697911c48 100644
--- a/dev-util/cpputest/Manifest
+++ b/dev-util/cpputest/Manifest
@@ -1,3 +1,3 @@
 DIST cpputest-4.0.tar.gz 1163749 BLAKE2B 2ae0f4658662ead0fe5a46a0ae521edf7677a7b64e3c7ce9bad374c4f953ea5a548cdfe1d9128821ab5031211c10f02d0728085e68db02e0d021ea16d8b38f1c SHA512 69f39fffdcd965c871e598118db38ddb74a3e75fd7a7965f8d236029fa891f6fcb6b671147c166ad08482bbd0737537fafe90aa8439a0ab62389f19150cc39d7
-EBUILD cpputest-4.0.ebuild 592 BLAKE2B 73d7c038ea6741080f10a88417eeb709dfeb31eb52909a7d1000f5f83ee3b446534c6daa0a01017ea44b3e0239a816897b5c098193ea5d2606635376403fe1b3 SHA512 de73bb6a00890c7359ab44ef539a849dd6cca1b7267d580dc302baf2ff1360478a6a5b25d3943572dbe08ea35fb33ae4c2bae1e54f623ef9d8cfbd11450dfba0
+EBUILD cpputest-4.0.ebuild 599 BLAKE2B e674bb652806da1ab46c14b6b4f18aeafbcd78a0173f6ed5b147ff6d06f99af79c3a6b8f027920cbb29e18c0e151b34573cacb1c887429d83ff82d94db4a4ea4 SHA512 142bb03e9ba267e46d6b7728a2d52b9cfc112c679027114e88fa1c7dfd2b71daf026bba6164cc1356bb7459e9e84311fc0c952f8ceae3298d45022869b089a6c
 MISC metadata.xml 330 BLAKE2B 3dc8b1447f19e0fd8426af0cefc3e3dcb139bf18cbadc7049dbbf1c1ecd4464bdbcc3565a57adf30b8699b140d3211a314be2a89b10c0b200517eb902545bfe6 SHA512 e3cd8f85cb871e1cd5b219275babd3b4d6039775908c5779d55de18ec0896b938df4ce721435d8f94245249e62958d8ceebca8ebc7e191b50661c44e977b3dd3
diff --git a/dev-util/cpputest/cpputest-4.0.ebuild b/dev-util/cpputest/cpputest-4.0.ebuild
index a3cf73658e60..0b624814f4ae 100644
--- a/dev-util/cpputest/cpputest-4.0.ebuild
+++ b/dev-util/cpputest/cpputest-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cpputest/cpputest/releases/download/v${PV}/${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index fdaa14e091af..aa3d2237ef0f 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,6 +1,6 @@
 DIST debootstrap_1.0.123.tar.gz 78175 BLAKE2B e507ee76817eef20cfea4e37eaf893f8e64acaa791806ebd55bec97b8e60eb3c59b68bfe5e6023dc6e73706bde2468db46b84f0176ec46d086c3ea9423a206c7 SHA512 3b23f61528d4993750ba22b8765c10cfb9695793177017d9e4faf546da076be6660c5d6e0d1bf30bafe14f6d70f886190d3ec42a0057b895f40e860475eea794
-DIST debootstrap_1.0.124.tar.gz 78498 BLAKE2B ae3075c6eabc1c76fea370ac5781ca0343b0912e03c086f02c011af10ab4c51f2503743705bc0dc52bcf6afeccb97f167802e2034f2182a8c7bb6148fb5d4e0c SHA512 bc028f7fec85b35a5f826044d8aff22b6fdf69e7e2c5f5c95e4b92327bcffa6411b5b21869833d10fb1f70316271149470921ad4310d61fdd3c73b65bd8009f1
+DIST debootstrap_1.0.126.tar.gz 78939 BLAKE2B 53c729def947855464e25aeab69bd0347a15ce6426d03ec2e6e714535f444f5373bf243a8aed44408504a74d7ea1b169cb73d3a874245320cd1033854f14f9a4 SHA512 81dd7d70224ef75a2071a23b6c7b66f9ddabdb6a6b714a862e44b40c4914a896415514ce577a633d93b597c414d6a9a34d6af4db26cbff75b3b1e64f4a1b44ba
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
 EBUILD debootstrap-1.0.123.ebuild 1179 BLAKE2B a3ab2788c9ed0fa9f1c28ac92d47035f6eedfe3561a5b677e632e8595f14dfefa1384d51d3ee40415bbbaa00bfe261f4bdeacd2aa6286f3a119cb4e463354226 SHA512 c8cd5b8e721918a020a7f16aafc30105f1867529ff6bf3020fd19a4da83acdeb2401a8618e0b398714c15ba358437889f46b3f6a6f531bd708c1d7b1363624e2
-EBUILD debootstrap-1.0.124.ebuild 1186 BLAKE2B 94f390474378525a9841a835cabfa949c93cc49da839ba506311556fa71d2b77c72aca3544321e76332189095d85695148887f8224ff7286d1f80a5fa84a69d8 SHA512 db1877100e1460bfa858fa7fc6a715dfa8e2ebae0e74d0eb08fcd117138d4599ab7dd491196cd74c3ea3be0bd79a237ad7c2e846151b8f80bc5c40de9209c78a
+EBUILD debootstrap-1.0.126.ebuild 1186 BLAKE2B 94f390474378525a9841a835cabfa949c93cc49da839ba506311556fa71d2b77c72aca3544321e76332189095d85695148887f8224ff7286d1f80a5fa84a69d8 SHA512 db1877100e1460bfa858fa7fc6a715dfa8e2ebae0e74d0eb08fcd117138d4599ab7dd491196cd74c3ea3be0bd79a237ad7c2e846151b8f80bc5c40de9209c78a
 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/dev-util/debootstrap/debootstrap-1.0.124.ebuild b/dev-util/debootstrap/debootstrap-1.0.126.ebuild
index 4cc27d3d8911..4cc27d3d8911 100644
--- a/dev-util/debootstrap/debootstrap-1.0.124.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.126.ebuild
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 8864e1f57501..45b66621aa5c 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -5,6 +5,6 @@ DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefe
 DIST devhelp-40.1.tar.xz 318172 BLAKE2B 83f71b66538b700790961e3dd3c7c7a75199f499a1fb32eb01e62fd5d11e72ae4e860bcfab2615bd4d417d5c57b89dad7eb2f1de4930e39e544d42b57a193b97 SHA512 4c541db9a2222dce4064f401c1d0a9f3233e2dbab17206358dfcce360286f69698248d08172fb236a692b125d8cd3a5bb76b6377b01b52c3d096fa4528400acd
 DIST devhelp-41.2.tar.xz 1455736 BLAKE2B c531af6cded6c9624581e4d14fb4d7713afbdcf173ec2a82e49789af1752568790dc346cc0293eddc68c0943fec4f742de726953de34441771711a938ba858fa SHA512 99a75ff19bf1b4613c312921452f190334e3e2036c28cda070169e3d1d352a5d2e7a56a393326efd679076257412e281dc94b628429119fcad58060d1a88ea98
 EBUILD devhelp-40.0.ebuild 1781 BLAKE2B ed190ff0984a757e3a3cfcbc7d9ac3fbd5eb97d516bbfa1c21931f91334364148fdb76bb436af362f1424a0981861497946fa77a1871db735a8bdc5ede77b52a SHA512 fe83470f41a3530c4ef091a63cd0de81cb8b9536a6f3f702427867e099e76a32ba977e4287e77647331fa1e30518990bd7a47496f87ef1d9d8d8f4692f166bef
-EBUILD devhelp-40.1.ebuild 1783 BLAKE2B f30fcb56ccdd27e2457cc772bb053d379a67b624ce192261bbe07e504f1a1f7f46cff15d60971fe6cb3102068f891ba5f256d4ced83bdbabf7c5c319a67d2c33 SHA512 1b1291e8ff363711ec70f7436f9bbab10d0b9a58f75563eb26e8b4586d398616bd7eb745e2d673a4af45b4ccaf60023bf4d13a2b63f3237cb37f2eaa73995320
+EBUILD devhelp-40.1.ebuild 1782 BLAKE2B fc580fb91d5b1e1733c05f948f6bb2e1f83da617d41d4e1bd1ad979228d290cae44b34de858532039c7573d8daa52ae2682d68fa69f0a6d515014e04d1adae8b SHA512 3d05ba5f0e9f1808139bf6a6ec3ab2f731e57fe65fe474904ae1abc81d07932021c47a0ccee67f2489a709772bfcfe0e7aa2e9d1d43992bda3c8f33e8a79531d
 EBUILD devhelp-41.2.ebuild 1950 BLAKE2B 707e82f453d1959713c344f411d4b81898b30e1abc403658f5345911acfc66d15f3014f7fbdc0f06f6627bfc2b7e2338859306258f823577d7adad6cc10e19e1 SHA512 b93484e9b1002c34a219af0ff774340a3d932cddfbf3dafcf3fef81c3f53c7a070ad82234a48294fa2c01f19b178b177986678d801f0dc8662840fbec135b61d
 MISC metadata.xml 338 BLAKE2B 50e6d39aa8a020fad15ddf7fe529f56c440696730b7400135d5ce97694d15feb64a1bd02bb156b21faf7e6fb1772e10f5c90ddaf0cf62dd19bbe8cf8af8462fa SHA512 5a00a79928fadab11128ec6d73fa4f119c9a93b69ddc0ac4832d94a1d72b6e1eb1e5c128839281c4ec272b5fe6ec6608ef1b344d6a7f8b46ea59989bca5dc8a6
diff --git a/dev-util/devhelp/devhelp-40.1.ebuild b/dev-util/devhelp/devhelp-40.1.ebuild
index 777e0daeb1ba..ef47f98c8097 100644
--- a/dev-util/devhelp/devhelp-40.1.ebuild
+++ b/dev-util/devhelp/devhelp-40.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+ CC-BY-SA-4.0"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="amd64 ~arm ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 ~sparc x86"
 IUSE="+gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index b6e65d30af9f..794771fe62e3 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,3 +1,5 @@
 DIST dialog-1.3-20210621.tgz 563430 BLAKE2B 8ffb630ed67f303facd79ca72aaca89d32c55a2b504293105a72c596409828fffd3e5e5f603fb5bec7f8748358a03ddadc7f1cd6fb989d1b31af1fd8f1078d97 SHA512 bde13aaf215127d143aa0d37989e0bacb6bc23f007681aeff27683efa01a483106710ff756358e396c23e4c1f0355cd8a2b3bb362ae1c3a1a997e00835d53c2b
+DIST dialog-1.3-20211107.tgz 566509 BLAKE2B f2c045f60185c34eec18b878219fae10a5acca2dc8bec5d379de069c939a0079e1a95925f860944108c97c8ef4e32041966c423d8b294b2102311c9aa085301e SHA512 a6626092692ca61209f67caa7c5dec91f637e3ff002488a0e117ec80ce8fdf0ef50d3b11f67d84d8abb06145347a100de76223fb4b1f971a755c28de1be860ac
 EBUILD dialog-1.3.20210621-r1.ebuild 1280 BLAKE2B f3a52a7bb5ebfaa1b18be1d85c8d1f6dc970afed683cfa54c4c468e6c3abb9e741c97da1765d30a18c3a99537e3e3f1d05b263a7fc2a20c2870dd48418a1e616 SHA512 599039faed3b0a25e2c23382e4c837dc3a8c3ee5bd86921bc0be7046e0aa991d13cdbfbdcfb866784f583062447dd5a27a896af93255b42f5c11ca35bc5c1493
+EBUILD dialog-1.3.20211107.ebuild 1288 BLAKE2B cac0fb5481a56a82bfc72811b63044cd0c79d2dfcdc0dfa2371e34af141076dfb4a06618229897924c6b8d971ead2ffb0634bb2385a3e24cd28c1420f5de67c6 SHA512 054319ff13d7bf219700d700456ed1b2120a6d2abaababd45ab481c68213db55d241cbd935c75ff7cb7677d0e46d9ec426839e651e65b463ee8ce5008eddadd5
 MISC metadata.xml 461 BLAKE2B 82507f66df52f2e9c4f51c52fc346a517e4244b4902dac4d557b52c01fbcdc9547ec8b0b572870a2860f995932973fd2b97698fcf748fe4762f210e4b12b655c SHA512 b07779508297ef58d1fd0349700cb7c609a1d503ce99c4fc3bda84c5441dd52064116680459510adbc6e1b6d9173d53fccbd3d6c2130caeb1d822dca5082a334
diff --git a/dev-util/dialog/dialog-1.3.20211107.ebuild b/dev-util/dialog/dialog-1.3.20211107.ebuild
new file mode 100644
index 000000000000..d9eb069d20c7
--- /dev/null
+++ b/dev-util/dialog/dialog-1.3.20211107.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-$(ver_rs 2 -)
+
+DESCRIPTION="Tool to display dialog boxes from a shell"
+HOMEPAGE="https://invisible-island.net/dialog/"
+SRC_URI="https://invisible-mirror.net/archives/dialog/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples minimal nls unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+BDEPEND="!minimal? ( sys-devel/libtool )
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
+	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_prog_LIBTOOL=glibtool
+	fi
+
+	econf \
+		--disable-rpath-hack \
+		--with-pkg-config \
+		$(use_enable nls) \
+		$(use_with !minimal libtool) \
+		--with-libtool-opts='-shared' \
+		--with-ncurses$(usex unicode w '')
+}
+
+src_install() {
+	use minimal && default || emake DESTDIR="${D}" install-full
+
+	use examples && dodoc -r samples
+
+	dodoc CHANGES README
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 67b2a338c965..e971a478b72d 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -3,9 +3,11 @@ DIST diffoscope-186.tar.gz 2685030 BLAKE2B b9fcb05fbdd939ece3727f232777c56119aa5
 DIST diffoscope-187.tar.gz 2699208 BLAKE2B 193eb0575814df7ee1d0a0e989a936782a52d4c8dc3e56d47db7ff5d631776559a604755e1d1be6687c1168ef7bb9d899f3b5ea8cab9506ef5b2da195485d7e0 SHA512 b3ba6743c9c4e0460f56a0830801f72e00bf7500c54dd9392e6e1de470a3b7348d900a8b9012f17b509abbc59575c7b9ee8e1048b3b23e5813a5ddabeadb1be4
 DIST diffoscope-188.tar.gz 2703049 BLAKE2B 2d517a6067a70221a34545456e23eefb42b5dbae1daa3459366ad429446844d64714ab5d229cd909de533b8994e870d16314282454ce2ebbf3408685e6b94f5f SHA512 b2c17bd577d5450439d2871f027f675f4e5bbfdc26e0f18bbe3579f214b023e1610a2095aec4b9d91c52e4a4c3e5fb226209e8f1c643b1c82ec190124d5d47d5
 DIST diffoscope-189.tar.gz 2703482 BLAKE2B 9c3a86b71d02c456b72955ddc2c9df580c60c898b00cdebaeea369065536b531fd93cbc12f25d9d94ca6bf1cb11bf90f28e6c77f3573a623b35174e59466778d SHA512 4c9a8c909cc18fa524be3979e211420b1240b7336a5895ec7e8682786e01952c6ae2ed494796aa08cdff2b21d13a55c4f47cb8e947743407e38790e8b40fb04c
+DIST diffoscope-190.tar.gz 2704083 BLAKE2B a2a0313f87fdb9c20b0dc696a1aea570857dd7005e0f69dc2dd139bca86a4b5711f98862b60f4d1a581bf3e0dfd38ef3be96991b96862584f289f1eb80415480 SHA512 646380d52730cf2efef57e3fa2995c7b2d5958d75597a59a24027bca1fc35c5b59dd96352faac9b7bd1d5bc053064f11760877651d52099f6b1ca0b3ad65d63c
 EBUILD diffoscope-180.ebuild 3300 BLAKE2B 772740c2ff3ace8fe0d25181eacd6b5dd6e5a10c19d450a95771cc1f7d93b8c4427d3d683d3a92a62db593a011d3788a9f8e14a782391352d06b689a7d7eb086 SHA512 c7a2f2a21037214cb024524966ac0e30fb21297e12ef93fa440a69d86a931f9f8272340e4861ec5cbbabc3b1178724299d5870cf9e2668161ddffd37bd217036
 EBUILD diffoscope-186.ebuild 3257 BLAKE2B d555e26e75a60536d7f029202cfd37da1748a6a6c54c7413a2f6cfbead22073d15c4b121009e17f981ab714418dc1c48004ebb7f6124f640aff26e659345be13 SHA512 3a7755c5559b806d70e5c89e356ea2515ea517c22a7bfe5d681799b9445002bc22a3fc66b488db00210a7fc6c372776be95a8546757dc8453d00b9005d86ad27
 EBUILD diffoscope-187.ebuild 3259 BLAKE2B c37f83432809a3f68eadd09f916a8f89602555600f2139f56bb0d20cee66b4823b4ab53b3b23d57423bab6ff07453eaaf99d70a4277f445b83f6e13a8a50caeb SHA512 d880e78e3dd9619cb8b1f614a1ed0163bef10489707468f5223e9c89517a18862a9f08c8dfb00ffd4fca170db492d1ae43448a26aaab72347b451dcb1ac172fc
 EBUILD diffoscope-188.ebuild 3259 BLAKE2B c37f83432809a3f68eadd09f916a8f89602555600f2139f56bb0d20cee66b4823b4ab53b3b23d57423bab6ff07453eaaf99d70a4277f445b83f6e13a8a50caeb SHA512 d880e78e3dd9619cb8b1f614a1ed0163bef10489707468f5223e9c89517a18862a9f08c8dfb00ffd4fca170db492d1ae43448a26aaab72347b451dcb1ac172fc
 EBUILD diffoscope-189.ebuild 3293 BLAKE2B 26e073fdc8f3fd5d40e8794f6fcba5abf8498652e0a2cf8b15dbe7fb8e1eae67cf6b290233e45ce3af43ae1a9ecb3ccc0afe1166db7a0bd0b428d922dbf6973e SHA512 c11b5e22b64c95763995798f7b153d34c1d866982d82f9dd6b4cc61899e44217d83c2ce9e60a7638fdd8b3d6b7317b535a0b768806fc014d74e427b3c5141db1
+EBUILD diffoscope-190.ebuild 3291 BLAKE2B bc2d73c19425cb02d4594514f9ae8c53e5bf5304360cd82b9bfc338ce914d81e41f6bde68b2aa9c3137a0de1dbb6c15a0992d2808bd97b5a28189d8818bab362 SHA512 bb63244ba0a19fe88ded3a684bf3cf78f7b6519c6708f073b7d1fec1f12373beffd7398066f6f95978dfd25783e1e87fff49dab97202bbd4beef10be7568859e
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-190.ebuild b/dev-util/diffoscope/diffoscope-190.ebuild
new file mode 100644
index 000000000000..405700c77a18
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-190.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+
+RESTRICT="!test? ( test )"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="test? (
+		app-text/docx2txt
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local exclude=(
+		# test seems to use different tarball
+		tests/test_presenters.py::test_text_proper_indentation
+
+		# needs triage
+		tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+
+		# needs triage
+		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+
+		# img2txt based failures, bug #797688
+		tests/comparators/test_ico_image.py::test_diff
+		tests/comparators/test_ico_image.py::test_diff_meta
+		tests/comparators/test_ico_image.py::test_diff_meta2
+		tests/comparators/test_ico_image.py::test_has_visuals
+		tests/comparators/test_jpeg_image.py::test_diff
+		tests/comparators/test_jpeg_image.py::test_compare_non_existing
+		tests/comparators/test_jpeg_image.py::test_diff_meta
+		tests/comparators/test_jpeg_image.py::test_has_visuals
+
+		# docx2txt based falures, bug #797688
+		tests/comparators/test_docx.py::test_diff
+	)
+	epytest ${exclude[@]/#/--deselect }
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index d6c49cb1d99f..aed9f82d78de 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -6,6 +6,6 @@ DIST glib-2.68.4.tar.xz 4945212 BLAKE2B 2135e2bea778714494b9f3ef140f20639f95dd34
 DIST glib-2.70.0.tar.xz 4796812 BLAKE2B de393961c8c2b98fadc1cc0a3647de4fb9d54193e000005c847468e48baa30abcc518d94e1aaa69e09414ee0218c5502f872e08818bcc404aa0c61f94fe2c156 SHA512 fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f
 EBUILD gdbus-codegen-2.68.2.ebuild 2182 BLAKE2B 741ec8a0d0b2d882043adab8f0e1226c6aff3414ab29b8b4ec8e321fcba5cbdd242e02e8a20d6538c3b7fca3672b2f5aa6d44f09debbce61d6442a377e78cfa4 SHA512 4e5ae6e7b0afadf83abee18973a71e0c0801f8cfded55df24baeda5bc182222f77935eb4a44cd881d6271c14f6972be097e9567c956a152ef15bef967922093b
 EBUILD gdbus-codegen-2.68.3.ebuild 2182 BLAKE2B 741ec8a0d0b2d882043adab8f0e1226c6aff3414ab29b8b4ec8e321fcba5cbdd242e02e8a20d6538c3b7fca3672b2f5aa6d44f09debbce61d6442a377e78cfa4 SHA512 4e5ae6e7b0afadf83abee18973a71e0c0801f8cfded55df24baeda5bc182222f77935eb4a44cd881d6271c14f6972be097e9567c956a152ef15bef967922093b
-EBUILD gdbus-codegen-2.68.4.ebuild 2187 BLAKE2B e1d928ee47ecfcf112b03ac11ab4e6c76a7ecb5e5c222ed314beefd7ae1eed0def275732a138dc86e0383dedaffa8a7a6c0ab962d0c69c8ec3c43a0a432c76f3 SHA512 ca205adfefc84e7895f9bd7f12a9850fd776c6401063ca0b60010bf4c3cc4137e2040ab59347b120a0554a58fcc4400d2ec7948b9c0454392ebf83783fd2a957
+EBUILD gdbus-codegen-2.68.4.ebuild 2183 BLAKE2B f43f374f521311b92c6c22b18a498fda0f67376e4ccef0267051717e0475946175e5bdc0060bf27b6c3d88a6bd6ead6df1c249149dc8b3fd40c253766c56956b SHA512 79d0f7a65b858d35a0d35d269514df389a855be19054866b81d6caaef92ae848434770a72b74f896d87ba33b8cd765034c69a5fad9af64b7fae9b922ebf8b0ca
 EBUILD gdbus-codegen-2.70.0.ebuild 2191 BLAKE2B 7e930b02948aa484521a4d77b8e11fa307fedf74b0949d51bb07e26e1033ff53951f64ab1555ac7d31b8ff24ad4fe3066d69033bdcd94841bfa56d2222ee3f42 SHA512 023e2212b493defdad865c65ef3971ca7d9f60587950158ee261f2f289552614954a9b14ead1761c9bf33e0e45eed0f233ab670a7813b162e861bc70f15b44b9
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.68.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.68.4.ebuild
index c07560eba792..cbfb6ebcd040 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.68.4.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.68.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 8d24ddf20c80..76ff7c48b8a8 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,4 +1,6 @@
 AUX geany-plugins-1.37_use-stdbool.patch 1392 BLAKE2B ff3e64bb921b01cd35943d9fcb0a860d65ac71eb70298456c36c84713e71431838cb05823886faaa1d93050b759090625513dd263187649b89120cc3217a202d SHA512 9fa5960d9eb6418de7acb8efe94f9148deae1cb72864c149abc4ae1b22e23f53bd6905f72a901e052f33a445d31d8c5c0cd3dd8efe535ee58910585e759b0dbd
 DIST geany-plugins-1.37.tar.gz 4711239 BLAKE2B 7f4fd121f6f0784aecf2dcc04d208c89e502b23debcbc40889f93c1421e414c33c8634376cfe01e91c370f70818d33b373b88698f5cb0ee23dff5edee9d781cf SHA512 47f8d7170593114c773067a8132c724471cbf881582a0a739da578ca42533783d8ecbccb04e039f2990ceed440bbd2d94e4be4a28e336c7f74b8e11a15ba4ce9
+DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
 EBUILD geany-plugins-1.37-r101.ebuild 2959 BLAKE2B 47de3cee422c58a9a6c7e311b0e63f6ce48eeea824ec9c728a503212022e230d0fa48de5ec67ec3cef9c7d98713138ba69253a01009a8a7d480ec557fb0cf66c SHA512 a70bd981c05c18e174e4943b91dbe39828b17aabe93e44b2c8f76adb675de304f91eada551ff8763edcfd1e954003efc6940732a3e5364a6e77006d55403ae20
+EBUILD geany-plugins-1.38.ebuild 2909 BLAKE2B 0b3044e3e4581a1e8f69239effb907ac7c54110697c760991000b5e27cf14d78059f0a9b812d8e2ed51e22551f5233edaa01f3dc27869e09ebc0cbae2ba4c4a8 SHA512 9be67e68d1027f9cd298bce615aa5ae57260697fefde49544da327bb4c10446effb442a0fb005a1889fc4f6b6ac8db97bac092f1dcfb42b1602afe9f9ab8e16d
 MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a
diff --git a/dev-util/geany-plugins/geany-plugins-1.38.ebuild b/dev-util/geany-plugins/geany-plugins-1.38.ebuild
new file mode 100644
index 000000000000..bd644947d156
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.38.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+
+inherit lua-single
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="https://plugins.geany.org"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope soup workbench"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-util/geany-1.37[-gtk2(-)]
+	x11-libs/gtk+:3
+	ctags? ( dev-util/ctags )
+	debugger? ( x11-libs/vte:2.91 )
+	enchant? ( app-text/enchant:= )
+	git? ( dev-libs/libgit2:= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtkspell? ( app-text/gtkspell:3= )
+	lua? ( ${LUA_DEPS} )
+	markdown? (
+		app-text/discount
+		net-libs/webkit-gtk:4
+		)
+	pretty-printer? ( dev-libs/libxml2:2 )
+	scope? ( x11-libs/vte:2.91 )
+	soup? ( net-libs/libsoup:2.4 )
+	workbench? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}
+	scope? ( sys-devel/gdb )
+"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		$(use_enable nls)
+		--enable-utilslib
+		# Plugins
+		--enable-addons
+		--enable-autoclose
+		--enable-automark
+		--enable-codenav
+		--enable-commander
+		--enable-defineformat
+		--enable-geanydoc
+		--enable-geanyextrasel
+		--enable-geanyinsertnum
+		--enable-geanymacro
+		--enable-geanyminiscript
+		--enable-geanynumberedbookmarks
+		--enable-geanyprj
+		--enable-geanyvc $(use_enable gtkspell)
+		--enable-keyrecord
+		--enable-latex
+		--enable-lineoperations
+		--enable-lipsum
+		--enable-overview
+		--enable-pairtaghighlighter
+		--enable-pohelper
+		--enable-projectorganizer
+		--enable-sendmail
+		--enable-shiftcolumn
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-vimode
+		--enable-xmlsnippets
+		$(use_enable debugger)
+		$(use_enable ctags geanyctags)
+		$(use_enable lua geanylua)
+		$(use_enable gpg geanypg)
+		$(use_enable soup geniuspaste)
+		$(use_enable git gitchangebar)
+		$(use_enable markdown) --disable-peg-markdown # using app-text/discount instead
+		$(use_enable pretty-printer)
+		$(use_enable scope)
+		$(use_enable enchant spellcheck)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		$(use_enable workbench)
+		# GeanyGenDoc requires ctpl which isn’t yet in portage
+		--disable-geanygendoc
+		# Require obsolete and vulnerable webkit-gtk versions
+		--disable-devhelp
+		--disable-webhelper
+		# GTK 2 only
+		--disable-geanypy
+		--disable-multiterm
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# make installs all translations if LINGUAS is empty
+	if [[ -z "${LINGUAS-x}" ]]; then
+		rm -r "${ED}/usr/share/locale/" || die
+	fi
+}
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index ae870e32a038..3ece62266c91 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,5 +1,7 @@
 DIST gi-docgen-2021.6.tar.gz 1253449 BLAKE2B 8eb115c8554d122c0caf11a9d56ed423e4764ff3665cebe0f5d5c7eecc2df2c39885e213254bc2f7ca252ea8aa2fc57795497e43d348ce892515bb7c9a2fbb34 SHA512 cf319d30e82aa3dc84af106aeb2aafb9623225445773e7017080d2530fe03975160a233a0d60429eb2b420c17e329712b7f2321615ec4d63a5723b162606eccb
 DIST gi-docgen-2021.7.tar.gz 1258424 BLAKE2B 455dee52ab19e5aeb52169caad65119ddf0c149651cb663b026f9177d9ed0914c662c26969f3a2cfea2bff9caafe0432be06d7cfad233497e70b44517f0f0417 SHA512 8a12007d0caa71cdfd7766420935049131d22a35358fc55ab7953323f251149f92744274486856f930bd3108d54fe12bda4114aee541c41e5aac75c788570fd9
+DIST gi-docgen-2021.8.tar.gz 1261322 BLAKE2B 8b33f0284a25052626f326ca8bdd91007f242a3e3c9efaf9e69ea1f20bc6acc0142fa1b4f06f185172c1cbf80e4848e23650b9fdff9ccabc81ae31f9bf6d2085 SHA512 0c1d0b3fcfde54541e85f7408634aefc438004d1fb997a0df546340c66b0fcda526232858f7b731d18aeb7bd11a5290efc83f1b206463463a3dfd98e3ea9d731
 EBUILD gi-docgen-2021.6.ebuild 904 BLAKE2B dfc1f4647ba5ca2ab7114bee289fdd0e23031d6d59bd15896f2c6fe40507f64595fac194b2c43c507607de1d309d8933442177475b9d6649387aa53e698e9001 SHA512 2da11140070f01623fd7416d507e903d9adb4ad8e0572990c806149585f002acab61be402286117752cbe07e0a84b16844e1254c7ee73ee91c895008d5d561b0
-EBUILD gi-docgen-2021.7.ebuild 915 BLAKE2B 598a2b6a4cf3a0aba2a0ce53a4cf301c76e6f5b70aca80313fef41ef799309037d74378d5baab0f842293de3b7c1d1797159b6ffdae9d098c94d43e429651b8a SHA512 f24a61e1dba299ff5645398da946cdc9ce726b68fe4a8b74246a41abd914e669d884e10ccde6ec3f8ebdb6644eaa70c454a31924ef9c4553db4adcc0e5f99aec
+EBUILD gi-docgen-2021.7.ebuild 911 BLAKE2B 6346cb3177e913b847d940467f320b777fe6ca63b7741f0325212714f64823c1562c3393ed587d2cf7c68e335f69897ef90f7a7772257acd84900014bc8f2993 SHA512 5c7c21c7853fe8cd666d06dcc6d302aabd2b38189f9b3c1adc05333fb4a50c164daac06086e89b9cd447f5c5eac8df42b0059b9eaf360782cb8d3079faa9ec49
+EBUILD gi-docgen-2021.8.ebuild 918 BLAKE2B e8dc18e6a686aaa30ec8f99cc2bfbb5d6f378a9c1ae8b8931e13c0b4aa21597e7d42ae5e24adedeabb16ad82da350ebadef637d79d9ad2c4f2e2c64aaad0a808 SHA512 e355421843d82998fa2a9cb03ac061918ef535c97f68621cb1d33190e5f34a0c92e867e1f72289f6506e318caed43403244c046ca561c348b57f54eb81043dee
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gi-docgen/gi-docgen-2021.7.ebuild b/dev-util/gi-docgen/gi-docgen-2021.7.ebuild
index 5da4c8fd4485..fd3c9a86bb6f 100644
--- a/dev-util/gi-docgen/gi-docgen-2021.7.ebuild
+++ b/dev-util/gi-docgen/gi-docgen-2021.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-util/gi-docgen/gi-docgen-2021.8.ebuild b/dev-util/gi-docgen/gi-docgen-2021.8.ebuild
new file mode 100644
index 000000000000..cd9167886b84
--- /dev/null
+++ b/dev-util/gi-docgen/gi-docgen-2021.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="A documentation generator for GObject-based libraries"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gi-docgen https://pypi.org/project/gi-docgen/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/markdown-3[${PYTHON_USEDEP}]
+		>=dev-python/markupsafe-1[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		>=dev-python/typogrify-2[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 4708e07cf71e..f6e216e282bd 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -4,6 +4,6 @@ DIST glib-2.68.4.tar.xz 4945212 BLAKE2B 2135e2bea778714494b9f3ef140f20639f95dd34
 DIST glib-2.70.0.tar.xz 4796812 BLAKE2B de393961c8c2b98fadc1cc0a3647de4fb9d54193e000005c847468e48baa30abcc518d94e1aaa69e09414ee0218c5502f872e08818bcc404aa0c61f94fe2c156 SHA512 fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f
 EBUILD glib-utils-2.68.2.ebuild 2324 BLAKE2B 14053ce23924b454e18751045fecaf44fab2ddfeae9c92c94d51c4330c4e8e011481fdf36f0d3900f2df8db8fe6300df4b72fd806ddef79c0513e84dcdd18bbd SHA512 e9d496fd828a32ef852877913fbb1fc855fce580ed135e175644220429a4d49421278e7f6e4adcaf1474ed390284d287b3eb00ecbac37e6d585beaf70d6d641b
 EBUILD glib-utils-2.68.3.ebuild 2324 BLAKE2B 14053ce23924b454e18751045fecaf44fab2ddfeae9c92c94d51c4330c4e8e011481fdf36f0d3900f2df8db8fe6300df4b72fd806ddef79c0513e84dcdd18bbd SHA512 e9d496fd828a32ef852877913fbb1fc855fce580ed135e175644220429a4d49421278e7f6e4adcaf1474ed390284d287b3eb00ecbac37e6d585beaf70d6d641b
-EBUILD glib-utils-2.68.4.ebuild 2329 BLAKE2B 42b005aa4bcb86071e9dbddf85e42016f6d63081a0d7e2727510a77db734f2998499ed460ca6c5ecdcbe845fe9b20b086a9d041309f9f3faf093f3c453cd51b5 SHA512 0693c6c7c5b4d82b751861e7036916ff02c5da58e9e248d911070cc57a0a4d9b614fa5e00ef315ae7f870ac652588d0f66b7be057d2bb4811942132cbb1a6aa9
+EBUILD glib-utils-2.68.4.ebuild 2325 BLAKE2B 18a9aa68cb4debe9b453c1fc27d80ec03b8ba6cd543795f65a05e03f10a9a6332d88f7a02aa2eba38e727c49b7a573a91bb3f21b93d3e8f25d8cb34e4071ef4d SHA512 5ed765e837315805aa81bf2eaed07c2551470d6c1b8f0255d6be3e188d960e31a5d9de6dd2b40257dade3299f1da2837244886d70b42001b3dfa03326f63faba
 EBUILD glib-utils-2.70.0.ebuild 2333 BLAKE2B 947e66dd635d26de20f2bb0c4e060d16266edf7e38019f636081c19d659b11a9b626859d8311b32b82726ea3d762d27bce24f9d073c757d80b7ee6bd2880a8e5 SHA512 f135dd2a58622314db75d94663c6515f2f25086484bdae9bd0055b1058cfed68f205358e84c86d966d521c669f7bbb48a41544238caa239ea283bc3c7f3c2f5e
 MISC metadata.xml 333 BLAKE2B 70d0e83f8a0437baadea4b6771019a55d0d6f6a292bcb4263a7d811ec0b63a2ee4838b94371e03d62c4c43678eb7ae542b611166e2aecdea8c5194955ef1cda3 SHA512 0eab24184eba31bfda9752b62211472d6d8607644a2a3c2352a4483bc34975b87252aa5482a76499c5afe30414a75ba5958bd5bbf1bc755850806824e4267031
diff --git a/dev-util/glib-utils/glib-utils-2.68.4.ebuild b/dev-util/glib-utils/glib-utils-2.68.4.ebuild
index f72e71c77f4b..bd85373df4df 100644
--- a/dev-util/glib-utils/glib-utils-2.68.4.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.68.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 907d1a96ca6b..240568f9ddb0 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -5,6 +5,6 @@ DIST glslang-11.6.0.tar.gz 3419655 BLAKE2B fb510b0e6e5986da117fb3d1ea7f1c543c5ac
 EBUILD glslang-10.11.0.0_pre20201216.ebuild 890 BLAKE2B d2ae97e1228f30154c2e0674284aeee59943c6b97c619a594106e0765353c14a58e5a03ab03a024a934ccd6b6d66091764af9ad181dc79f577a495037415ef77 SHA512 889bd334d5a13e3ad22e97de659687bdcdc575f30cb45e21a4c253e469181008a5fdb05ef6ca5a21dc03ae22ef3ebbcf88ac8d09941c1d7ce0442942d826f5a0
 EBUILD glslang-11.2.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
 EBUILD glslang-11.4.0.ebuild 855 BLAKE2B 76f4c363a7ef228854cd948e1017f92c5cda2bca6240a4e011745775981a35266e06a84d9aa77092d111b4685218027facdf7390a020f1bfb074598ce5529ea7 SHA512 c6032b4b76e3cdcb80ff17e7c6dacc1df7930fc58869a6a48df3132665f4ad6661cf3b726f70ad2b5ee660331f90daa1607285aec6dbabcaa063e3b41d963f5f
-EBUILD glslang-11.6.0.ebuild 861 BLAKE2B 8e8d0ba9c6267dd859cce1f5f0bc27f70cd22be0a5cecb524f282b3d8cec5bb7e2d317116178d20d8f9c1f78e5178fd32727e82c0eb118d4064fd6b8fbdcdd4a SHA512 934af1c892fce857e59fd344108a8175b76a8c148ffdba33675033366801903586e359f64db56271adb46f8afacf0ba733983e4b40fdbce093a3522c8ea938dc
+EBUILD glslang-11.6.0.ebuild 859 BLAKE2B cab542c2f789c6464b1bdc17eaee365fb5c1e75b3868a316c16c077b7d5be2f1b24c4733f74a1d80e43506c23fd3d2b6b42f377980aaa12a91f09fcec424842d SHA512 34847bce96d7556c4c924aec8d38faf539ff52638e0bc15c99e2d6169048b5d4d23982a5a4aa23d9fd7a3afd47ca130b13bb1d1dac3fafdce087e9135d95789e
 EBUILD glslang-9999.ebuild 758 BLAKE2B 6a3a5b145b048e33843d1db82b7bc94765b793a87c264e45e351a62d1d1162252e1f718fe62f859145a6ab83fb1c286ef9df26e9ed7d80646f5c0e58a541194b SHA512 6d3e6b61e5b5680b37c8cfde18db1de5d28de91211fd1d7d2a2d347ee4e1573ce7d6008d6ced6f76251bf7f629334ea706b281ca4db6d0011054ab4362bc4418
 MISC metadata.xml 330 BLAKE2B c3874bbe807a8dd1a55897feadfc0a89e4cb806441390ee7e7cc317f3b533a08338a669834122ede89cefd9b6532d789aece2c29fcc6cdfc7f76a81bf382192b SHA512 1c591a28214fb76334171e4a49c8ac302b6f174f265749ad005f2503df1312e8303c92a68248775ed3db98d65107471f9cfc8cfb758c89261f283711beaac764
diff --git a/dev-util/glslang/glslang-11.6.0.ebuild b/dev-util/glslang/glslang-11.6.0.ebuild
index ca3f1905892b..1780e47fb90f 100644
--- a/dev-util/glslang/glslang-11.6.0.ebuild
+++ b/dev-util/glslang/glslang-11.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 0bb42c4e27c6..ec9afb5c3367 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,4 +1,7 @@
 AUX gn-gen-r4.patch 1559 BLAKE2B b92f487d4153ebd885d9cb1ca6889ca52b5afcccdb9a781fae568b861152a2cc3d9e61d5c406c5365311337a131fa99447528011af511b7aadd0975f692fe85b SHA512 b286651983f94894faf992da12a1ed51776c8207275e1b1e1776d0caf83615b02cb3d57198aec8b3736944b9cb8749028f79ebc7a700dd30babf122cfe5884d3
+AUX gn-gen-r5.patch 1563 BLAKE2B ff909ef01743ca36d866257ad3bc2a1ca7a4e894b6a0c7672d08d0e1cd412b1056477f77ab64c75fa67a5c21794cecdd87f6bb75ebd963fff0ee3599523c73f6 SHA512 bb18dc2900084ca15ee12addec56d32cce520cb0d229bddbb69e8da7cca144887a6eb7267ea449613505dca4cdeba8ef0e4e69595fc202289d2f3c5fed2e4971
 DIST gn-0.1807.tar.xz 682644 BLAKE2B 5beb3c03b0ae467cb98eff2069ef6e4355cba56c57e2717139b698fa563efc404dd1cf0b3fd196f432ca3a13b0402e895b46407cb90bc16b63963710fd5be060 SHA512 82f468e389d08a46e582f816d056813af9bfc810ad0bd84f02731c17c0e2c6140a62e827b8a3c5f89eef467f9bcfc2e88dd7aed325a7955d8584e753fcd09103
+DIST gn-0.1943.tar.xz 706792 BLAKE2B 51889ad85e86e702c2690c5c23010d666ef0467be92d982e6dea2eec2e20774c04425900cad64672c7782bf36e62984e612c04ff0f1c7e9598f2877270cf8504 SHA512 4e3270e13e35fa0ede3c81b563b72a9e9baee18b6412d32603d3c7a327315ceea86dc28c9c3b01c9e9f4d520e222dfeabe152f946eb0947d9285359568934864
 EBUILD gn-0.1807.ebuild 1270 BLAKE2B 8a5480578e8d7e7fca80018f33416ecd0b50fc5ef07ae4b6a230df73f1aab351c8fb094244ea2ecda1fa923d42ba9027d7c6d385ceb5b1d42eed037eb985d65d SHA512 314b48cfbdf1a7a73baac2d8e7e141bed9d740d7a75f9c7ebae372230c86f5bff6e1f288be248517f0473381ab95aad7805f7dbd83cc91f50b9da3ea8cd0093d
+EBUILD gn-0.1943.ebuild 1296 BLAKE2B aeabd2372704d1861b9cdab16e5b9ecfc5d9ae84419e80e7f170365aa757026cd81dab2f625f7141d40c27d39779b0b312556cfa8d5841874d25b42c3a63416b SHA512 6e6662163e194a72b7959725dc08d05b9b12a5f1d2ded55dc11609c34a4dd09e23afff049b1d31f81d338ffd36ca08977a5b2269dd733a9eb516d04a4d182625
 MISC metadata.xml 221 BLAKE2B ce7615d8eda5f58e7729bf86156010821052ae580769c3be3922f1270f1211bc5cf297afc5c68db67a46c1c01450c08751fc3cda0995d62bbe60da64d21802d6 SHA512 6ffee27f859f923795e8ded3a5544a82473f72568e96475374b937adbf0963f81d46fbcf4752a9d4eef3f071cadd3dedf141f43802b58c6a788243c7f05114cf
diff --git a/dev-util/gn/files/gn-gen-r5.patch b/dev-util/gn/files/gn-gen-r5.patch
new file mode 100644
index 000000000000..80966b3c7f5e
--- /dev/null
+++ b/dev-util/gn/files/gn-gen-r5.patch
@@ -0,0 +1,46 @@
+From ef45f2e73264e62ad3fb24d064453a17099da8d7 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 14 Mar 2020 18:02:51 +0000
+Subject: [PATCH] Remove unwanted cflags/ldflags parameters
+
+---
+ build/gen.py | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/build/gen.py b/build/gen.py
+index 265b1f5..06c6d8b 100755
+--- a/build/gen.py
++++ b/build/gen.py
+@@ -343,11 +343,6 @@ def WriteGNNinja(path, platform, host, options):
+     if options.debug:
+       cflags.extend(['-O0', '-g'])
+     else:
+-      cflags.append('-DNDEBUG')
+-      cflags.append('-O3')
+-      if options.no_strip:
+-        cflags.append('-g')
+-      ldflags.append('-O3')
+       # Use -fdata-sections and -ffunction-sections to place each function
+       # or data item into its own section so --gc-sections can eliminate any
+       # unused functions and data items.
+@@ -383,7 +378,6 @@ def WriteGNNinja(path, platform, host, options):
+         '-D_FILE_OFFSET_BITS=64',
+         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
+         '-pthread',
+-        '-pipe',
+         '-fno-exceptions',
+         '-fno-rtti',
+         '-fdiagnostics-color',
+@@ -411,9 +405,6 @@ def WriteGNNinja(path, platform, host, options):
+           '-Wno-cast-function-type', # Casting FARPROC to RegDeleteKeyExPtr
+           '-std=gnu++17',
+         ])
+-      else:
+-        # This is needed by libc++.
+-        libs.append('-ldl')
+     elif platform.is_darwin():
+       min_mac_version_flag = '-mmacosx-version-min=10.9'
+       cflags.append(min_mac_version_flag)
+-- 
+2.32.0
+
diff --git a/dev-util/gn/gn-0.1943.ebuild b/dev-util/gn/gn-0.1943.ebuild
new file mode 100644
index 000000000000..57230dc162ed
--- /dev/null
+++ b/dev-util/gn/gn-0.1943.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit ninja-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
+HOMEPAGE="https://gn.googlesource.com/"
+SRC_URI="https://dev.gentoo.org/~sultan/distfiles/dev-util/gn/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="vim-syntax"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/gn-gen-r5.patch
+)
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	python_setup
+	tc-export AR CC CXX
+	unset CFLAGS
+	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++
+	echo "$@" >&2
+	"$@" || die
+	cat >out/last_commit_position.h <<-EOF || die
+	#ifndef OUT_LAST_COMMIT_POSITION_H_
+	#define OUT_LAST_COMMIT_POSITION_H_
+	#define LAST_COMMIT_POSITION_NUM ${PV##0.}
+	#define LAST_COMMIT_POSITION "${PV}"
+	#endif  // OUT_LAST_COMMIT_POSITION_H_
+	EOF
+}
+
+src_compile() {
+	eninja -C out gn
+}
+
+src_test() {
+	eninja -C out gn_unittests
+	out/gn_unittests || die
+}
+
+src_install() {
+	dobin out/gn
+	einstalldocs
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax}
+	fi
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 6315da2a9d07..20854d1a13ee 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,12 +2,8 @@ AUX jenkins-bin-r2.init 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e2
 AUX jenkins-bin-r2.logrotate 479 BLAKE2B ccfe2179a1c3a5a49140373bb594fd4fd2c40edb7ffc7fcdeef6dd7a8da0116bb7f1d7da42f914b779651a6b69c147cbbacd02bb6f5fc1ecd7a8b3269ace56de SHA512 b06d0900e92d14fe6bfd194d5eee667e40a49a13d57c6a1720767a925b5647da1d7b2e6239e7d64d86ff7798df215cac6332e09a89e11ab6fe1a1dc42ac818aa
 AUX jenkins-bin-r2.service 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
-DIST jenkins-bin-2.303.1.war 72292947 BLAKE2B a2d04203cad85ec6ec7f1cc93a2bab90f0a614fef227b7dd3dbf26f5e31e0ecf0540527dfd23fe060505a8d90b92d0f82501fa3406a099641ea3ec84642a8ab0 SHA512 6ff8a93ecd8a61a800908193ccaff580ce07713b413edaea6433616422adb9e2c0e0cc2d1db4f435a19684ff8ea287275204c787598d94586ad47ea6971fb682
-DIST jenkins-bin-2.303.2.war 72334258 BLAKE2B be7abd1e3e035fccbed6fea13fa5fac169108f9e8f6d23b2a2811123a477d5951ade97fbd6b8db0865df6f83943b89f0f2b164a68e5e449a5a5f98b80f0e5880 SHA512 a005d539df37c7b07c51efd5ad4a7aff02612365f65a00e6ad76e9e564f3947caa8dc2dd456fc26f3a9bd575f5e8042f3cce2a0afb2b882ad6a70132d28b80e2
-DIST jenkins-bin-2.308.war 72116636 BLAKE2B 403fa7c157af52edde7bd08c970c39fd5207f0c20201aa0e186b7904e401776df3d9c77f363a0e65cdf8d611671e8ebbb149eb04a94a20ea9c5d9da8f39c1dbc SHA512 ee995fcde3f34f6dadb637fdb45fa1acc85e62311a3d616709acb86a1850205ce6cf7660e8948af419a663c39f5f924e3d121a4f0cb3a0b0d151c3d686ea08f9
-DIST jenkins-bin-2.315.war 72148539 BLAKE2B 1c0d561d94ff2a8ea94fe8411f5139906e72fb3bfd00cbc4323c73a2dc6f88980a6e0e087b7604798ef539be9dc5bbaef46fa3e5bb85843b307cddfa7803c140 SHA512 e4b0b4fdf8ae4488f3cd2c3907583d38536551ffbb77a882c04d6c3ba87c76cf63c2ef4bae5d682516138f62e545160048c6a68074699c96d6fb002f87172572
-EBUILD jenkins-bin-2.303.1-r1.ebuild 1124 BLAKE2B e01505e9ccb32d5a5ca2dfeaadca40c4ccdf9e474da6b7de505203630b04d2bb05ce364aa2f3f17c2cc13bb2b698cef313f28e133f04158aa2a7978d95cb3d21 SHA512 990ce61b6e8a85e2f1a8dd546af90811999fd168c8fd3012f692f06b4b3245d1023da258e27dfe1aa35d2b74d1920fd53dba4b755840542c0b872683a8311e98
-EBUILD jenkins-bin-2.303.2.ebuild 1124 BLAKE2B e01505e9ccb32d5a5ca2dfeaadca40c4ccdf9e474da6b7de505203630b04d2bb05ce364aa2f3f17c2cc13bb2b698cef313f28e133f04158aa2a7978d95cb3d21 SHA512 990ce61b6e8a85e2f1a8dd546af90811999fd168c8fd3012f692f06b4b3245d1023da258e27dfe1aa35d2b74d1920fd53dba4b755840542c0b872683a8311e98
-EBUILD jenkins-bin-2.308.ebuild 1117 BLAKE2B 3362086945f3b5eee4fcc66ac21fc75b5812912b8aeb1e1e137b5ea9729fa3d4bd748dd4d0ca8f69bf6d82d829e8fd32f28856ed329f8642e7bc4277a3303d66 SHA512 99d2509501dab25b6de95ae9a9accd40517a8ebae66bc7da246d0a81ad0c7782ed7aebc179b32e14f9c6932a73f5dae1d971de0a74a02b3c76c27ea8c5ee428a
-EBUILD jenkins-bin-2.315.ebuild 1117 BLAKE2B 3362086945f3b5eee4fcc66ac21fc75b5812912b8aeb1e1e137b5ea9729fa3d4bd748dd4d0ca8f69bf6d82d829e8fd32f28856ed329f8642e7bc4277a3303d66 SHA512 99d2509501dab25b6de95ae9a9accd40517a8ebae66bc7da246d0a81ad0c7782ed7aebc179b32e14f9c6932a73f5dae1d971de0a74a02b3c76c27ea8c5ee428a
+DIST jenkins-bin-2.303.3.war 72338143 BLAKE2B 530f65a678a91b710ba9fdb380bc37083d8d76cf5ddcf7cba1744e5d4cb5243cc62d6898ca03dbb990a4fd92f302f129f0c9f95d2ab77f40f33083313d7b1281 SHA512 f1dfa22f88dc68ea06e554584c8ab2518640a3ba3ad8ff8bd6ff5e587a5bd506bf58d1a57ce27085019614dee797e8412f50856a57e68fcf416490c7f8402c16
+DIST jenkins-bin-2.319.war 72239109 BLAKE2B e344dc6d9cc92dfad390c49ef9a4e3ad2e91c26870035a3763dabae51ddd48c33e8ec9d3c403ab4749c0628d61e0846f58969112a5c8cefac8b9522a109e401d SHA512 67954544699aac446ae172c1a9b08913821f21ceb1858a0e7e63e5105ef24354424f1ecbeee551d2b3c1cd02a1aa67f28c463f3bba3964ae3ee9efbbe528db82
+EBUILD jenkins-bin-2.303.3.ebuild 1124 BLAKE2B e01505e9ccb32d5a5ca2dfeaadca40c4ccdf9e474da6b7de505203630b04d2bb05ce364aa2f3f17c2cc13bb2b698cef313f28e133f04158aa2a7978d95cb3d21 SHA512 990ce61b6e8a85e2f1a8dd546af90811999fd168c8fd3012f692f06b4b3245d1023da258e27dfe1aa35d2b74d1920fd53dba4b755840542c0b872683a8311e98
+EBUILD jenkins-bin-2.319.ebuild 1117 BLAKE2B 3362086945f3b5eee4fcc66ac21fc75b5812912b8aeb1e1e137b5ea9729fa3d4bd748dd4d0ca8f69bf6d82d829e8fd32f28856ed329f8642e7bc4277a3303d66 SHA512 99d2509501dab25b6de95ae9a9accd40517a8ebae66bc7da246d0a81ad0c7782ed7aebc179b32e14f9c6932a73f5dae1d971de0a74a02b3c76c27ea8c5ee428a
 MISC metadata.xml 398 BLAKE2B 371ef010b09278ac9185194c2431f7026039445de0d9b353b560d4e69a52452b275a5739332bc33029b678c91b76b65f377ea4417ef52cfd242aca91dd505b53 SHA512 f071cbac4947308e68d23ce4d3a14a61deccc1633a31f28d464ebac7d566ff8fb300246fec1a1603823dc2d9f0a13a47cfa84f5423eae3f08e683a4a183699cc
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.303.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.303.2.ebuild
deleted file mode 100644
index ad97440c6bbb..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.303.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="lts"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	|| ( virtual/jre:1.8 virtual/jre:11 )"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.303.1-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.303.3.ebuild
index ad97440c6bbb..ad97440c6bbb 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.303.1-r1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.303.3.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.315.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.315.ebuild
deleted file mode 100644
index efecbbe7a113..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.315.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-DEPEND="acct-group/jenkins
-	acct-user/jenkins"
-
-RDEPEND="acct-group/jenkins
-	acct-user/jenkins
-	media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	|| ( virtual/jre:1.8 virtual/jre:11 )"
-
-S="${WORKDIR}"
-
-src_install() {
-	local JENKINS_DIR=/var/lib/jenkins
-
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r2.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.308.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.319.ebuild
index efecbbe7a113..efecbbe7a113 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.308.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.319.ebuild
diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
index 2a48e5c17c5d..0c3618ce80e1 100644
--- a/dev-util/kdbg/Manifest
+++ b/dev-util/kdbg/Manifest
@@ -1,3 +1,5 @@
+AUX kdbg-3.0.1-fix-rare-memleak.patch 1113 BLAKE2B 8bb235a47294c2d9d541dafcceedad3038db795aa869b6ca940a51da50d300db1e1d3735171e7e91c5eb43d21167dd3e8b2be50590689a8886e4b9d8f1eff626 SHA512 1caff1850cf21d09b46cc19ea8caf80066b2501901db044328bad64b89559759207629237d602146d214389055b780c180e100d8ee642b3d165da94a99f633fc
+AUX kdbg-3.0.1-usable-trace.patch 808 BLAKE2B 8286f826354d8b9035f2b4cef753206074d72e3a8aa1c5fd1888052f22a8725696e1f2326dc0a202d5ec3ad9675fff199e78daac14a69ea29eb5108ad945e7ea SHA512 71f2feb9ca41f75e78a5d689d1e76d7de0d48d03d54250f94beab03553a93eaa7f9302f6e6fe4dec670e211ad7b591e5abef4800bfad57711119ab0e343b203d
 DIST kdbg-3.0.1.tar.gz 431143 BLAKE2B 869bf9765650b2a4a2330f99303b51f599df764848ff18442c8c6813421fece2671e5e78a0e8c66a59bd77f06a7f02677ec08a49fb9a28874b92b0f84bf8f74f SHA512 9f3e0073bf37e56fa8ad0c3ae5f0be80331d8963b564ff376aee40c3ccebab5b5a482c31f110fd0f4dd14f9614cff31102d8edf62ffb33f4ae361d24346543ea
-EBUILD kdbg-3.0.1.ebuild 1012 BLAKE2B d9a32758cb10b088b6ef32918f2f916f28dc229fd5ebc7e3a92ac61c7114c0b2b775858c1b8d7fd40b730bfd9c390e2c0670eb932ec409b383457c603ba8aac1 SHA512 690819b49a08c5412e5292cd929a4fbc8d4b6521d0fa5af4f2ff13b4e8a85739acf32b9ecc6f9d476b539c885020e07fc1ed5d0605cb538e5f285943019d19f2
+EBUILD kdbg-3.0.1-r1.ebuild 1107 BLAKE2B 739f32b8ec849e1be12246bfbab3738e24a0a5ba23cdb96a7ac816b2b4bb1a2e0319ac50e2b1b3fa45aa3c46a70dc98a3df5c6b52a1413f3ef65ab980aaa3d48 SHA512 90fca25efdcf4470983ef5ca7c678a926f56520cfc6ce8e3c409158854b38e825c962245a035722b73904a51df639fc529a25238f196527e4a2716e82811555a
 MISC metadata.xml 372 BLAKE2B f633a86dc35ba0a596d161b7789f01b22b32c4f501c9a5b68701ad352555956a433dadbf8856c1fdb0f331abb39fc89caee0cf2da6cf295095be993b24d1f414 SHA512 9f19dcf19b03626e2263f3bfccc611e6013da09b97de69a6673c5e79b9f1c1b3622d540d6e49bff59ced02f632ccc4b8734950690c4363556fa622edb3e576d9
diff --git a/dev-util/kdbg/files/kdbg-3.0.1-fix-rare-memleak.patch b/dev-util/kdbg/files/kdbg-3.0.1-fix-rare-memleak.patch
new file mode 100644
index 000000000000..44a2b33623f4
--- /dev/null
+++ b/dev-util/kdbg/files/kdbg-3.0.1-fix-rare-memleak.patch
@@ -0,0 +1,35 @@
+From 0feb0986f220126177084badf67813ccdbaa996c Mon Sep 17 00:00:00 2001
+From: Daniels Umanovskis <daniels@umanovskis.se>
+Date: Fri, 13 Mar 2020 13:48:19 +0100
+Subject: [PATCH] Fix a rare memory leak in the register display window
+
+---
+ kdbg/regwnd.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kdbg/regwnd.cpp b/kdbg/regwnd.cpp
+index edb0e55..93008f9 100644
+--- a/kdbg/regwnd.cpp
++++ b/kdbg/regwnd.cpp
+@@ -274,11 +274,12 @@ static char* toRaw(const QString& hex, uint& length)
+     static bool littleendian=(*testChar==1);
+ 
+     length=((hex.length()-2)%2)+((hex.length()-2)/2);
++    if (hex.length()<=2) return 0;
++
+     char* data=new char[length];
+ 
+     if (littleendian) {
+ 	uint j=0;
+-	if (hex.length()<=2) return 0;
+ 	for (int i=hex.length()-1; i>=2; ) {
+ 	    if (j%2==0)
+ 		data[j/2]=hexCharToDigit(hex[i].toLatin1());
+@@ -288,7 +289,6 @@ static char* toRaw(const QString& hex, uint& length)
+ 	}
+     } else { // big endian
+ 	uint j=0;
+-	if (hex.length()<=2) return 0;
+ 	for (int i=2; i<hex.length(); ) {
+ 	    if (j%2==0)
+ 		data[j/2]=hexCharToDigit(hex[i].toLatin1())<<4;
diff --git a/dev-util/kdbg/files/kdbg-3.0.1-usable-trace.patch b/dev-util/kdbg/files/kdbg-3.0.1-usable-trace.patch
new file mode 100644
index 000000000000..8336d2d53255
--- /dev/null
+++ b/dev-util/kdbg/files/kdbg-3.0.1-usable-trace.patch
@@ -0,0 +1,23 @@
+From 8f2add1046c2d23294496bc0bc7c00d18c6aa0a2 Mon Sep 17 00:00:00 2001
+From: Daniels Umanovskis <daniels@umanovskis.se>
+Date: Fri, 13 Mar 2020 16:23:02 +0100
+Subject: [PATCH] Change output for a trace so that trace is actually usable
+ again
+
+---
+ kdbg/debugger.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kdbg/debugger.cpp b/kdbg/debugger.cpp
+index 3751e4c..7d43eb9 100644
+--- a/kdbg/debugger.cpp
++++ b/kdbg/debugger.cpp
+@@ -2225,7 +2225,7 @@ void KDebugger::slotValueEdited(VarTree* expr, const QString& text)
+ 
+     ExprWnd* wnd = static_cast<ExprWnd*>(expr->treeWidget());
+     TRACE(QString().sprintf("Changing %s to ",
+-			    wnd->name()) + text);
++			    wnd->exprList().join(" ")) + text);
+ 
+     // determine the lvalue to edit
+     QString lvalue = expr->computeExpr();
diff --git a/dev-util/kdbg/kdbg-3.0.1.ebuild b/dev-util/kdbg/kdbg-3.0.1-r1.ebuild
index a6909362f272..eb20f7aa1bdb 100644
--- a/dev-util/kdbg/kdbg-3.0.1.ebuild
+++ b/dev-util/kdbg/kdbg-3.0.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.85.0
+QTMIN=5.15.2
 inherit ecm
 
 DESCRIPTION="Graphical debugger interface"
@@ -33,6 +33,11 @@ RDEPEND="${DEPEND}
 	sys-devel/gdb
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-rare-memleak.patch
+	"${FILESDIR}"/${P}-usable-trace.patch
+)
+
 src_prepare() {
 	# allow documentation to be handled by eclass
 	mv kdbg/doc . || die
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 3324afbf9c35..8cb74913d022 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,3 +1,3 @@
 DIST kdevelop-pg-qt-2.2.1.tar.xz 660904 BLAKE2B b3874ee4f36d43f6d39a28a79f4638601340ce0545c2fe965393e9fe266a960e904ce5cd3215a7903f7b011f2e138d3be8999563366ce796f50524084a36192b SHA512 0ef3daba60ee6c7d4602b31610bdc68709a730d4c3443770eac1aa1d298fc03e10b38bc0d2e34dd44df5bba1c3af945c87e80d8aaa818e0b1787121f056c78a9
-EBUILD kdevelop-pg-qt-2.2.1.ebuild 492 BLAKE2B db1956e6282aa0caf8ef3ba25430d663edb699a05b26d16951f66c2552aabc1d7af75e9804050e76836a62da2ff1b138ab5b036c875839a9c29a9fe2fbaf3eda SHA512 2be1178ad167df317436653d1154b1ce3d5ffb425e34117c1e451d3bae4f35766edfeec0351dba1912b92f52e57939dfd4a8a8b4b33fdad7761faf61d58d504e
+EBUILD kdevelop-pg-qt-2.2.1.ebuild 499 BLAKE2B fbcdee58929c24c0ba6e524a34e58b85b4ef34aca871aa407bc2e97b61feba68c32ab59d5cc9a998b0b99d1b4cdf079b678cf0d0bfe56b79144de711ae60aac0 SHA512 69a57031d065845e7a41ac3155a0e63f0d5c03e9f8c0cac65b1d0ec9d7becf69b13012f68b8f31ac8c8db0d6fec578ea023ee10cf2c3fdb6f4b673dc44a4a81e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
index 715ae9df9aa8..37b4acb25ce1 100644
--- a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index ec74095a02fa..60f90b1f18a1 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,3 @@
 DIST kdevelop-5.6.2.tar.xz 7128828 BLAKE2B 605b16f1666201f49e119499007a2031c4a2b28e7eb5c3b7bbf8bcd8aa2dc069708740831dc9fe327a8c9baebeffeeda5dd6d16c24c21a2be66c7475bf194423 SHA512 d5ec09b3eda439436bee4dee88612deedf02caf949e74cb7d8405fbb40ae6f16ae1b5278da0574f41c43d186edbeec6b8c40918ef7f5fafa437e07a8c4ae92ce
-EBUILD kdevelop-5.6.2.ebuild 4171 BLAKE2B 857e9e39f937b5a790328c14d80c7c590b0e3633f13c0c29c35c6bb6f52b4e4a016e9d3ba5aa838890338016aa5060c2dfde080533307fcce2451fe169214fdc SHA512 db5dcdae7a5a8de829eb241c5e56fc1a78910256f28d8249e0f21cbb5ea0a4fdf8c8b8763081527670001b7a50e4782e7c78c2ef4f418125573202816e2480fa
+EBUILD kdevelop-5.6.2.ebuild 4178 BLAKE2B 5c84a13004dd3f7b630626292ca843415d14521c475eb5b021b50fae0552b8e99390aa311d2647f03bb2e4eae668007ecf5e07a5484d55072490586101ff32bf SHA512 6392d3caec99dcf6b98fff6dd2c316bcf969f11c4c1a03863959ba344a9267283962feb7c4c60443803e942af854d1a86fa46f8098a77411be536ab6d30fb33d
 MISC metadata.xml 623 BLAKE2B defbd6a6a992f04fe71d13ca0e6da0b6c7015992f148f1fdd0d844430c44268e5c765c46afabee4af650992556e81acfb1024c94e6e274aefbbf46b65b9762af SHA512 4b022d64a261251c01eb9c8d8ee8aafeac6309272274fa8493f5bb8480cc93be482b145a70fd1a36bc30feaf8649ae17addfe8d7bcf57f78173e0f198805985c
diff --git a/dev-util/kdevelop/kdevelop-5.6.2.ebuild b/dev-util/kdevelop/kdevelop-5.6.2.ebuild
index 45c37a3c05d4..cbfb2cfc4eba 100644
--- a/dev-util/kdevelop/kdevelop-5.6.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.6.2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and mu
 HOMEPAGE="https://kdevelop.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index 9303f291fe44..daa84abb86c2 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -3,5 +3,5 @@ DIST libabigail-1.8.2.tar.gz 258919334 BLAKE2B 6e06c888dcc3f5e0fc5d4046e69f14ba0
 DIST libabigail-2.0.tar.gz 286383045 BLAKE2B 2ba6f59bcd7a1484c4a60c6c9f212ad76af239a552d2cc9e47748e0db52363afadd7a99ef3e123c263de34b416f71b9d679bf2a5c542c419bb38ee75f3d5c57b SHA512 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180
 EBUILD libabigail-1.6.ebuild 1505 BLAKE2B eaf813c7f56b0d703e03ae350885ed6beb54fa7dd08bc62eb58c7b935d4d4a9857f7c8f0e130ee74334bb52c1f967e334d835922ea52569f435df5857276adbf SHA512 5b6db24c5a22f369675f0a1e308ad42b4e79940a8e632503c28f43c528051227a2cb808e050c2cc5918fc519002bedcabb3f8a745bc7c3a125596650a57b84d4
 EBUILD libabigail-1.8.2.ebuild 1513 BLAKE2B e54abef6af668ccc017e137c8e592f6371f9348667d06c0aa332a327ac322308c6e4b3ef02ead3c7afef2dc5b5ca1f4c422db54ce65a46d85ee26c56ccf0b706 SHA512 6efb448acfd4f8c201f0fbd3c3aa5c49d8fce8aafa1dd366e32f9205aa10cacf6ccbb316f1faabce30179cde75ac9146c067e226218f84734c3e743a79fd65c1
-EBUILD libabigail-2.0.ebuild 1511 BLAKE2B 1f55400229d03135d498d97f4ebf19ed6572d6be7e4a9c3c0ea076397023cbf5d7350555f2811b0102869f9235cf1a3a14f45ffed4c04ac12dd5551a3a10f63f SHA512 fe3c229ceb59618de0d6aba930405391b2142132f22ee049321a0ba14333b59f8955dc871039c29db0c95fc8dcc4c3e5a63bab208209cbafec80d98de78d6660
+EBUILD libabigail-2.0.ebuild 1523 BLAKE2B 384f61efa8c0fe47f37d942bf3c51b5babb4521642b07713af7ee3bd14a7f2ed70391263869cc80c6c2df8f76ae97fa94293e42c7f0d3a12030b0d9311d081b7 SHA512 3af195ddd5bea6e5340bf7313ff5d26260fc5f719fea39e18b3af2574ccee3bcdb7c5ba08b86203583b599922b2ea3a9848177e300f9edc62b12b9df7a6f6770
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
diff --git a/dev-util/libabigail/libabigail-2.0.ebuild b/dev-util/libabigail/libabigail-2.0.ebuild
index 16dce70710f0..f08e55d27ecf 100644
--- a/dev-util/libabigail/libabigail-2.0.ebuild
+++ b/dev-util/libabigail/libabigail-2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 4bd87eb716f5..3ec193793a98 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,11 +1,9 @@
-DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822 SHA512 8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
-EBUILD lldb-10.0.1.ebuild 2286 BLAKE2B ac5ee6653bce26265c7bc52f5461613ed0ddde5cefe930aeef268e1115656eaf122681342e606b42786fadfbf3437c6903d87df96c236b074c530c1c78eeb90e SHA512 38d1a73a7961ce42a7a50b94b08da1a340cec3f8e7c2c1272fc959519bd18523872116418e46f5baa4451f41d76082edbf186b618e9879aab447fc79097a5756
 EBUILD lldb-11.1.0.ebuild 2305 BLAKE2B 5db45d0360ca8cbcfb1e15989d183b8583edd437bc39c1a5e15e5c969b646340dddc2b94b4e34bc843df26887421c376bb15f9ecb3321e7da05dcf23c9030855 SHA512 f63c15a9a12ee7d2bd343dae7b18cb5b0ab77477d35e051e81974c73f51d6887afab14a4dd1d593fe10a6ee5b88cb407c98019d658839b5c22565b123cfd7d90
 EBUILD lldb-12.0.1.ebuild 2443 BLAKE2B dd155b7715cd38eebf62d14c139bb0030db953a2f4f14f3c4779f64e70ccfd3c3f64067ffdad3ee407388f69cb6733420197facefcd25297b0f2111d1912044e SHA512 dca2e443a146b1baa60565eaf5a5cc86cb8deb9b9b10594ddbfcc356e62f67f99dd4ba769817c008c753a5ad854e0fb04e96f00c6e3e081bdf6faf3091291689
 EBUILD lldb-13.0.0.9999.ebuild 2568 BLAKE2B 3c58c2ed3cef87d9b86c1e3d0afc1908f5c79f331ffccff373c2cfed8078f6279c661d2f49ed6477ba64ceb92e5305b1eba5a6d7c18a9f05f7bdec086b8b1b3d SHA512 c63d65166b24322cb0e597ddc4c19a1aca7ff676eda37089587e9e126d75d11d445161a04ec5605a2acbb5eb474bb49ec12f34674bd2b90aaf625f5033e31377
-EBUILD lldb-13.0.0.ebuild 2591 BLAKE2B d05a38ee072c451f299b6add0b534b1188f5975d05b8c47738a68bff239171cb36b30f9a783e7b56b01460f572ff59fe99bce3378711674ca5238c08c6becf06 SHA512 1b0b5efa1f67b5b3c7482153b717ffc84e327a1f2f95a8a629d3084305b3c3e47ccbc48a8450a32d522b4011cdde224c76e344bd2db4f72c5deba88c78f315ff
+EBUILD lldb-13.0.0.ebuild 2587 BLAKE2B 916ff9a21b0fb99086f4f4039f227481adc63c41c3c480a319da7f1896d8a970d16b3bf813516b0ee3a56316182ff6cc4e61da1f391253d6d3be51c2c5fab367 SHA512 18955a92513b72d3e7fe83d9ad720d650cb2e084af9896c01e3828e19b74c5e2ba7fd523197b70eb190074399f9ce6ccb9d570b1d5ed15212996e9c61b673ab2
 EBUILD lldb-14.0.0.9999.ebuild 2568 BLAKE2B 3c58c2ed3cef87d9b86c1e3d0afc1908f5c79f331ffccff373c2cfed8078f6279c661d2f49ed6477ba64ceb92e5305b1eba5a6d7c18a9f05f7bdec086b8b1b3d SHA512 c63d65166b24322cb0e597ddc4c19a1aca7ff676eda37089587e9e126d75d11d445161a04ec5605a2acbb5eb474bb49ec12f34674bd2b90aaf625f5033e31377
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-util/lldb/lldb-10.0.1.ebuild b/dev-util/lldb/lldb-10.0.1.ebuild
deleted file mode 100644
index 7233f5c56bb8..000000000000
--- a/dev-util/lldb/lldb-10.0.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="+libedit 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_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_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-13.0.0.ebuild b/dev-util/lldb/lldb-13.0.0.ebuild
index 0369511ea6f4..dfaa91af8965 100644
--- a/dev-util/lldb/lldb-13.0.0.ebuild
+++ b/dev-util/lldb/lldb-13.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="debug +libedit lzma ncurses +python test +xml"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="test"
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 826dfde25589..0942638cfb71 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,5 +1,5 @@
 DIST meld-3.20.3.tar.xz 615248 BLAKE2B e60e6e9437c27cd217d39d045a5a23000b5b52e99387cfe0612c32ffb31205e467a13c8f42f478515bc8ba0d27814963649c362a7a95ac53e98f14398fd0cb3f SHA512 88052d1a59453e780a7842d2bf4d42ac5db8f5b4aa4b1ec3a931fb8d982d45fd212cfb75bb8395a2ad7b380a6e0c33d020a0562b4ffdf4afdc74d92d6d5751f0
 DIST meld-3.20.4.tar.xz 617020 BLAKE2B 70bdd7c6ecfd4dd99d1bc0b503900da65563ba74469b97590da4971d0597d4023cf74a3fd6300701d73fe7ed1b646089a5b23527e4a519313816f53c31632dad SHA512 e7b5c07e68972e7e8e4d396140fa2ee627609728533269f1bc52e9339e89a58f0949a1e8ec7b7847eec3eff5a67ea0bd5e07ad8002d2c640d173f9b0c4aa724e
 EBUILD meld-3.20.3.ebuild 1558 BLAKE2B 679c2847a81bdbc3c10c7d5f264b0f2a1141cb653f30ec4549735514002cb254e879928169808705909da112f0f965280bd195caa107c125091deed03e2560e4 SHA512 e4056c9e458f1fafb954df2edfe531fe23d5939b8da1837e9e4ab31be6fcd8c2ca736825d8af626cf0ff3d20d629983cb6cd50f478f5694e7e42f1bddcfef917
-EBUILD meld-3.20.4.ebuild 1723 BLAKE2B f2728bb3015ff3805686313f839d8c3b38b43b9f03dcd0637a4b900ac0246779856c020a9ea4810e5bea11a2b3704155d339e8e33c5019bfd4c88b02ca54eb30 SHA512 e4e80fa30b15846f391b91b6b880ee67658fad3f6780cfeaf0e19bbc941043f7977d49a2fc3093a7b741cda10699ae7c7fe598c7bb9b8b9771fb7deae7ae0ad0
+EBUILD meld-3.20.4.ebuild 1722 BLAKE2B 9bb349bb82fe68d8d4926caee95b6130f96a97950775299a30eac29651a600500560912ddf168c6646f6e159d1c446dac790ceb678f327901c6bd0d198816687 SHA512 27c8b77149ae956d84658aa4c84b604746d70b4e086945466c071c6caab33ddbf5ab48e8fe14765d5f61aa4948e994edffd5a41303562db77ca67c74f4065932
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/meld/meld-3.20.4.ebuild b/dev-util/meld/meld-3.20.4.ebuild
index a82d9d544364..9223e1ebb5f3 100644
--- a/dev-util/meld/meld-3.20.4.ebuild
+++ b/dev-util/meld/meld-3.20.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://meldmerge.org/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index b39483ecc243..312fd6abfcea 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,9 +2,9 @@ AUX meson-mcompile-treat-load-average-as-a-float.patch 852 BLAKE2B 669dfe4e4cff5
 AUX meson-tests-rust-add-libm.patch 828 BLAKE2B 1d1165703aa3c82295a25860d85c6f3e468f21a11a90c6b8e92f4ddd6f91a5769bcf4f409bbe788da1a5bdf6daa4f02d7e30cb3322b08ae65be324c0c3bf34e6 SHA512 51d67c2c2d45ac1e1eb2b7b82f4a6283361afd7507ab722a22d6e45c2b9c2094bfcd97e5e67f3215da6239a1cfee68bd37441b7657b5618eabc758fffe5ea633
 DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963
 DIST meson-0.59.4.tar.gz 1953211 BLAKE2B e8699c274e60708e798ab7a57e096e606ba1552d4062a909610f5a8db8d27b864a9b9f01f32d68f65e0dcc2a75add7916617861edcc6058fc44c312e7a56048c SHA512 e02d13a4af592078c4dc34a1d9531e49d3b99f0996bcc2b04d9b9b446f0f7748fc2ccfeb9e6090a9fd2d95ad06594c770f90a87fafd9b1974117f24c5fb491e3
-DIST meson-0.60.0.tar.gz 1994364 BLAKE2B cb9641a8ea6cd2592e40f8a3d2046556977cb978a4296cbe0ba221a27fb52db676b9217767a7bda203eca8ed1d40fa4adb2599096005335d150ff45ab7cd7591 SHA512 05275f003445672c1613db6c4c62ab39bfedc64cf2261f91d361a2aa24116a08185874b2e5dfa7daeebd584313bd91f4e0856fe68b36d8709065f80529902dda
+DIST meson-0.60.1.tar.gz 1995258 BLAKE2B ba9fce07f4b1c54cd65b8cf4e6c57c95f2729f42a9ff1bae3907802dcdedd933c2031b1d9546b608cbb87c1364170d32501cbd6e856cc95a713930efcadc8ae9 SHA512 ffaa99622b0c2ec74edda7dcdebf981cd3acbc62f36bde37241cafa2ce27e520f6901eebaef978a1f8b2e1d40d540e7085d0e0723d385064988baacb5b79f31c
 EBUILD meson-0.59.1-r1.ebuild 2804 BLAKE2B 8ea60235201c73c667985ea4cb48d45ced5453e2da646352cb52368a6b28a4fba4d664c1405254205a1697dcf4e94885a1028c28faefa35f93ecb715197a3b32 SHA512 bdebf4f3646e6d32318647d9edf5a1845edcc0e23ce36fb2d498c3d53260d68a7b89050d8371153c8394da7d89ec5aec5d9aff8df878ce03311979f086b9d61d
 EBUILD meson-0.59.4.ebuild 2757 BLAKE2B b64fd553319824c0c05059a41b639b4b8260196f17c4bca32cb587ff9775d11d97cf75e5634b1880105920169a950abc777946182a6c54da04d7f108cb406d1e SHA512 d43bb51ac9853a6820b40c2e683882982aea1ed8334d000459c7fa46607d56c8737651e48f313062345c68f1ceba66197e46f6d7d5bddfc08693ad242403ba54
-EBUILD meson-0.60.0.ebuild 2689 BLAKE2B e29c9c15d646c24ab35b59d94a9a28d5e63c31934e5809b29ff2e2112a188e24226301c7cb1b972caeacde9e5891e0e45e4658359b8445454c8b1840a4a7b68c SHA512 0dfd427362a59bd7435fa6b5d9eb79c74cef0ed63035693fa52031a83e1475476726673e36e520e270cbbbe5a8c37a1b0f1eb11fa49ad3a22398fb254034624c
+EBUILD meson-0.60.1.ebuild 2688 BLAKE2B 07df2f86ca9079443f8709f5f2231799793d03c844f3d31cdec3ca7491053f5126be078f62d928b9e770aa6957d8b769f8d5b0bc13884186a531516e7004218a SHA512 f953b6ce95a3bcfb187ff52e0214a32faf297fec1a280161c0b4e07d77b60cbe643511cbee915a27d17cf0fe4c2a2e0246750354bdd83119408fd273a1790131
 EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4
diff --git a/dev-util/meson/meson-0.60.0.ebuild b/dev-util/meson/meson-0.60.1.ebuild
index 55ddaad08258..b1532c0364e4 100644
--- a/dev-util/meson/meson-0.60.0.ebuild
+++ b/dev-util/meson/meson-0.60.1.ebuild
@@ -9,7 +9,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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index f98b57a8f605..f3070d8034b6 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -5,7 +5,7 @@ DIST ninja-1.10.1.tar.gz 211216 BLAKE2B cb27beeef903ff7c5a00f2ac85b36e66d9c41bcb
 DIST ninja-1.10.2.tar.gz 213959 BLAKE2B b8160ca6d58cfa0edb93d16b7dfb9776d290c42e54b33b78cd925f167c80f8794e4cc30af984a526b8263c7904a734cf0770d3c27283d21d02f18d3e2eb70032 SHA512 895412ae1cbc83c656e92f282602a29300e08274e9dea0da4464202ae556e7a1ab03bec057f23da4756bbd91bd2d744cd7a64b336740fd2782bb4db5c3b7b496
 EBUILD ninja-1.10.0.ebuild 2675 BLAKE2B f8958f60c6c20dd27a3870d298e7ff858e8fa13c1cdc0a2196a6bdc40f8c8916e64f58b477a96c039589adabdbc5f32ac13341b369a3d46df2074856ff2ccec8 SHA512 a041b7a8ed0af8d2baecb24eb65ccb733a8e8b470c797a928ad19d4b60c69dd602a70f72e0cdc3e629ccd00babdb5d28c905095d4afc2f35527c42e8a2447775
 EBUILD ninja-1.10.1.ebuild 2636 BLAKE2B 4690234896f3da8077c563cd9de1aa116e2d7f0574a35d29cb0ec199643666033a69de8d391fa50d80ff1f7f908dd634492c9ba21bc246efec97e38b916dd65f SHA512 f8b0f36e19ba2d8da5928daa752ff81d8d39ae39a0ce88b48298839726b166007df76caa64942fe48029b367b52d38b724b4f870dda50c050583cb262a8abb45
-EBUILD ninja-1.10.2-r1.ebuild 2792 BLAKE2B e12ce750afffc95679e63b7dc5bd1dae0cdcda9f02d6dac80a1e3e5c9c1249184c0b928e3a29d8ab9c6646b648d686dbf2de0f4ecea0b8747f5e7ee4e7ce71d5 SHA512 b6b6fefca3b1b4dd3023e6c9411bfcdd9e7e6e9bba8357e4aacde4aa516f13f4e7aed5830107bff3c8b4f28f44f26df821a6ebbb645aa1c26a5dbc3ffb401a9b
+EBUILD ninja-1.10.2-r1.ebuild 2791 BLAKE2B d5f280b35c12bccab15bab846c37dc113e2e4f7289c7a5fa8d2c6022120509dd6eda4533de8ded480f359f50344c2aa7d51fdb5220ee63c60609f974f3727d98 SHA512 deb6ca0a388baf02c9340a18521024a9d6ea3af56d2cad737c960c4c2f4153ea0e24e45b6cf04e6e29df2fab55cf67e9724fe51baef9fd353b5510c59f37828a
 EBUILD ninja-1.10.2.ebuild 2644 BLAKE2B e81698718e910451373000b38961579120228c39d0e586275423591975bee009731e7c8eb66d246a44acaf307c8a9976caa130a71c952db73c6c31bb451fe2ae SHA512 edfcd252fe80865c573e0f0f85aca151a3152bd46d06dc5bf7d162d56c1ab637e5d942437ba40cdd4d27f29402b6acf71dd0be4b5a3955b25134a84b31786abe
 EBUILD ninja-9999.ebuild 2593 BLAKE2B 7dc734e7ff64046e9eb0bf73b5e7455f3452bc35c9dc5288cd70c290211649956e7dbb0654b72aecbae9e0413a2e24716c362282a2ebf22db7e94bc7f9cdb1a8 SHA512 ba8bc261502d3395d3f1a8c8f136565365d1731fa94c15664a1accaaa68c7ec36ae7f2c971a1344c2256c0e73329d2625a0043f0695eb24d43c648bb935ce99e
 MISC metadata.xml 341 BLAKE2B 4bceedc688b9b13ad2abb63a709c72d4f814ce502342d2b6059143d0bc9672dfd7a0734eba4fdbc6efd1859adf2f2c9f654d756af73ab22b0d8c51329a42388b SHA512 f440b2242abf1fe2e41be8fd80542899bbfa5265c2b424058f0ed89ffedf6c6ea890a2ca3bec5f1313ba4222b21a82aedde9fbd0870a6348dcae8d7013e537a6
diff --git a/dev-util/ninja/ninja-1.10.2-r1.ebuild b/dev-util/ninja/ninja-1.10.2-r1.ebuild
index 2fd15adf8f96..6fec4675062b 100644
--- a/dev-util/ninja/ninja-1.10.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.10.2-r1.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 ~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 ~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 cc8b137275e4..afa8f0e4a462 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -4,5 +4,5 @@ DIST cuda_11.4.2_470.57.02_linux.run 3833993301 BLAKE2B b12710da9f31e3255f31dd6b
 DIST cuda_11.5.0_495.29.05_linux.run 3392192516 BLAKE2B f23587ff49e3fb247b3d7f6959695079955531503b202b4a93d907f81a8598ee01d44060cf60df0b0099d7f53d8025acf9e0d1766fb79639eb1b049f30919973 SHA512 577127699e8f91892f29b58b959cc15ed48dd96940184cc23970efdf419671a8232b5f291d39cb1721f465d59539eeb1c9a3d528acfd776fa8387ba235fea2e7
 EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3928 BLAKE2B 00b7552cbc2663ca5a95b9a89e076816e10d4629a9c276e8258debf0de67fac36e29b4937d42637d4890d0cf27773d3a7409ee121838df956878c7ed6f1ddf13 SHA512 2ce3292d3128e7dc647b9dfe0694b53ca27ec50b37238f894a2736c8a9e2617b918c3fe85492e9589bc4dd6ebba42f4ad3dea4385d86262fd1b15e03b3df4c02
 EBUILD nvidia-cuda-toolkit-11.4.2.ebuild 7157 BLAKE2B 612adad65b311fdc6c609ab1af213486f5f8a13f40f805d3ed1b48036248ae9cd86012dc019727db57cf6ee9b09658d4b799e302895e9f059b48ad9b9316db90 SHA512 b3f3202162548f79f60d04be1e4a144148daba3068a8e1b84648a92acfa21c3ab6d7a409f1f534ce9357bd22bb3638a87be877e721c1023ea42dc413c7f6a060
-EBUILD nvidia-cuda-toolkit-11.5.0.ebuild 7157 BLAKE2B 3eeabf492013f812b4feb6f99f64d272a9c7e71da21d32c3a8db10dd418291676f1e2b8c7c7e4261fec9273de8e0e35854b4e1ee7f51cfc208fc3e6045cf2ea3 SHA512 a3d48c5f0c0a6da9e138c0747a35ba5602f10eda97eba55f49c861e9ba9ee05f525832cf9c67124379925c88add1978395badd32e3c52a406f6329be17a8ba52
+EBUILD nvidia-cuda-toolkit-11.5.0-r1.ebuild 7325 BLAKE2B dc4132b57a37a1452ea986760a98a22e95331fdddce181ea663acbc3edfef323d2c70d77b9d90a452b809cbb1f58431832dacbcf3626e33c9aa3faee3ce1af88 SHA512 2b24100da4130a9ba7ccce8c140fdef6d67162877db7753d4d906b4dce57d33c3d6b79d2718ac0f3a5a376e40e51e87d9c1d4ec92c64f88cba9fe8fc792161b7
 MISC metadata.xml 725 BLAKE2B d956929a7ec405eda0ca359de7edac9760a5b781af053c1ef54405612eae5380796601d13a443c48aed6ff0e7819339d8728dfe3b7a27fef17781aa1a1b6b36a SHA512 c8f9bce93904f604b5bd89367dc7d06c977ba574f3ed8bfe9f8afde0bd7b55706987a79e3e4d3cd79d609cac83a8db2efa693e348a6c825136872ea5d0de4df1
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.0-r1.ebuild
index 84b21d734454..51c84f24e682 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.0.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.5.0-r1.ebuild
@@ -135,8 +135,13 @@ src_install() {
 
 		# check this list on every bump
 		local exes=(
+			${ncu_dir}/ncu
+			${ncu_dir}/ncu-ui
+			${ncu_dir}/nv-nsight-cu
+			${ncu_dir}/nv-nsight-cu-cli
 			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
 			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/OpenGLVersionChecker
 			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
 			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
 			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index d91bd1e4e133..71281f299bbb 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -1,6 +1,9 @@
 AUX pahole-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
 DIST dwarves-1.20.tar.xz 688728 BLAKE2B c57f390f7e1d20c861a4acb8cd7fe238a3f7c3f2d915d96fc051dba2587942e8fabfa4f524d18555c486863fa02bc4ab63d90e90d477f376dc5e547aa36cccac SHA512 306bb74c498527a5a9bdae4d304e90511336cab627d9acad5237d93cbb48efe11dbca4418c540fa03e3ecdd168ce224cabe9fd2f6fbb50520d0dd17741c80817
 DIST dwarves-1.21.tar.xz 910480 BLAKE2B b6dcdaf008a7714838904b0bc1050e6af4617e00e168f45a3f1a5d4611a05c898182f3395b2f10478240e05c22ce82a3a7381a1ea7ab41684e3b05ea6e73620c SHA512 69f510025f5790a004c356546f7d92996ad84c4ff1636876b48f1c7d81bf66c83da70f11a1912d65b46f81bea79418782021396a018e74baae5cad9221af14e1
+DIST dwarves-1.22.tar.xz 922016 BLAKE2B 79ba94bcbec6ddc9ebcc6d9e72ed63c8704ca9a97bb3df1910114e89cdd4e7cc75024e4281f15f06be8f5b4656dd957a44d561a16beff1af14d8c7dc32fbd184 SHA512 d45b19505cd59eb2cbb42304ab599661355a4085262cb202757822ec1c05476c851dea85e922f9421efb8a978ab475a6a6545757c6ab080f13ac77c5f7186606
 EBUILD pahole-1.20.ebuild 1083 BLAKE2B e9871955c4cd61088cc6786d49f9dfbc452452b20642a3cd41c5e80dc06202c4f06440e9ff3c9932b2adb3c42810f77a140e3ef3272a99cd992b7c68c8f2fc3c SHA512 25ec68471c69b006ee099eb6cfbc4cad24fa939d08e41ac2e0d513d54487f9cf591a55b6d3fb06ac686849076b3a9466b176d045f0caa24a20b6a2dc19b67e4e
 EBUILD pahole-1.21.ebuild 1086 BLAKE2B 0b2282309ad6c03460139dcfc7a7c6e40f47c8412f2e859be4bd8903b6675ff8bbde5866004c80871ec7050eca1fafba48d357ff7c3b4dd0828d7aac8363d25f SHA512 bc23ebca73cb1614f98e06e84cbb8846377ca55768adb3bfc527681cb5fb217463e972e24decdeab1802fa725da89e6caa78f1ce9df55a02a17ddc4cc580a412
+EBUILD pahole-1.22.ebuild 1086 BLAKE2B 0b2282309ad6c03460139dcfc7a7c6e40f47c8412f2e859be4bd8903b6675ff8bbde5866004c80871ec7050eca1fafba48d357ff7c3b4dd0828d7aac8363d25f SHA512 bc23ebca73cb1614f98e06e84cbb8846377ca55768adb3bfc527681cb5fb217463e972e24decdeab1802fa725da89e6caa78f1ce9df55a02a17ddc4cc580a412
+EBUILD pahole-9999.ebuild 911 BLAKE2B ec5df7cbea0a1b49be0d7db79019631ed578b2a9373114d17aa3467b87f31881af3e9ec7f06045e64a2450b8195425b6e0be95154f438d6f29e26e9ed530da12 SHA512 dfbf8229bf0f96528a870b6aec5f839d7d918bf3d23f3650f94c2d77d09f0fce8fdbc7f574cdf19d5d4e2b4e90a2b67500b29fce1505e251be11504054b2d032
 MISC metadata.xml 672 BLAKE2B 2178381434a5293df5a6a07a8c84c20a4f98d011c90ed2db911085639689224509445e16197ff88e0ab6fb7e6357bc96291feff21a44f350f51b1031e1882477 SHA512 2cd1f865e42bd845bb3831a1f6c8060e469e0afb3acbaaec2989018481a6f93e0fdae9afb74413c00db6967069cc6d0447548c3b4c238a70db07ee8786fe1e99
diff --git a/dev-util/pahole/pahole-1.22.ebuild b/dev-util/pahole/pahole-1.22.ebuild
new file mode 100644
index 000000000000..6e645bb8300e
--- /dev/null
+++ b/dev-util/pahole/pahole-1.22.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit multilib cmake python-single-r1
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+LICENSE="GPL-2" # only
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.178
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+MY_PN=dwarves
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+if [[ ${PV//_p} == ${PV} ]]; then
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
+else
+	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+fi
+
+DOCS=( README README.ctracer NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-python-import.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
+}
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	cmake_src_install
+}
diff --git a/dev-util/pahole/pahole-9999.ebuild b/dev-util/pahole/pahole-9999.ebuild
new file mode 100644
index 000000000000..7ce8b9b051bf
--- /dev/null
+++ b/dev-util/pahole/pahole-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit multilib cmake python-single-r1 git-r3
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/pahole/pahole.git"
+
+LICENSE="GPL-2" # only
+SLOT="0"
+KEYWORDS=""
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.178
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=( README README.ctracer NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-python-import.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
+}
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	cmake_src_install
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index dc7726cc773c..f3c5ded9b980 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,10 +1,8 @@
-DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
-DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
+AUX perf-5.15-clang.patch 8700 BLAKE2B cfe9ab41fc2ac49d2d7cbdfe2a4b009dc1c0dad93fb1a54e5ed541208afccb2f55ae420db6321ac360c5b2f6351b04f458fff21abd581d4da5e3296608c3b3da SHA512 49a88809100bdd63241064a8b19e866ba2d91dc78dd279c979982cbb96e91061f6a93ded1a596364f1d7b3410ed10811ae21c23b046370654c3f32c9d0d468cc
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
+DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-DIST patch-5.10.16.xz 498880 BLAKE2B 14061b505285f24938fb955ccc7f9fbd78ccc0b1026bffb17a89fdad08ea54bfee7bbb841123d9af4d0720a960a27c649c39852af7e2be8a286af926c7bce9c0 SHA512 be9cfe1ae6697956ca7476cedc212a8cbd9da2c3c72096a89afaaf73c5b6655fd04d458f96c472f680c5513c0ea3e4449c4092a958425b6040f0c7774453cd2f
-EBUILD perf-5.10.16.ebuild 6860 BLAKE2B 7535ca0e30e06f5dd246fd2b66730830f4ef29f71b09e7604ade827c4d73e652cb90adb4793c0e52d2dcd765a2e843f55905f7318ca44c2f810b5069f7c2665d SHA512 235d5ba2f366d90ff98bb9810c9eb3ddd01de4bef9fdd6405c8015f918d58826b912aa76b877cad1bd143926a27b1ce53541a231efc9b7a58e0f43ff3e1f4e19
-EBUILD perf-5.11.ebuild 7094 BLAKE2B f823eeb8a1c8eda5b8670da5f0105e1f77a01ed8430049a54d312770727039bd135f9a1dd75d2e86c02f3682f78dff9d74ecbec5e669bad06b979075e51fa41f SHA512 ede87c249fb0fcbe81d2c1abda30bb4fb4d367037d03fdb672f6bef120956e4ec2f2b14e203c3aff4c83ad9e5eec3902b9e655c63ee1f2f46f0bab2dcf97fbdc
-EBUILD perf-5.12.ebuild 7282 BLAKE2B 84d877419334b403addb3002d601630e658400460b38c719067c000caebf2e74e29ec32ce661af38e6177639380e9849333fd3ac41a1f98851419aaee172812a SHA512 f7bb66045fd9b17ddfcdd5a06f45905ff2b9b7015a45c35c7d0a1dee1b834bbf382c42613565d0027141f58440b21e7c4e1deae309a928b4519961e031a2c411
+EBUILD perf-5.12-r1.ebuild 7445 BLAKE2B 5b9b2f1ba4ae9a04dcc62598f52874cae7a2808cdaffa0e7985d9f22caf8c1a7a3ccce75f193e79b607ec8c7740bf2ef30b3a9120ed604905106dac56fc8c1ee SHA512 ac9ac27d9de771928a43bdd199a90e6467548f2cccf6e3caa31e13cd2e8de21b5087bc048506edc4e5b0159810902f35413d2c5c5e3089df04b6b382d57f7cda
+EBUILD perf-5.15-r1.ebuild 7390 BLAKE2B 9db8e94d5b1e649a8de66cc9439e38e8756d3aa651186b9a0822f0b3de3d2f270c446b27aedec684f16f6bf0da3c0b17f6ff078e9be8f86d8de4ac5143229bf4 SHA512 fa8fe1a5ae1ebc6f27cda543f03695df195cbec05dc4c1f730609f2387d2f81cbdb4a6b31ba6814680cc521c15a13c606afb8a62b175185b8864d69d13500d99
 EBUILD perf-5.8.ebuild 6757 BLAKE2B 490ff9045ea6dae5b14aca9e91d322d0e6d7879f2efd4bf9a4f2e919569b752e9933ba8be586f7615e81a04be28ffb5a5ca832a7491df13cfa6e67ddaf8ad86a SHA512 da92c2600d4033fedefad6e1f73a56261f2bb3b38b3a0c0fb195347d20509b8f3797386a75f52faab5981622e85db9e38cae805fcb8a86a1d2ce6916e95f5b76
 MISC metadata.xml 1702 BLAKE2B 8b74cde853ea6566ef940b18c5122bf9a863379c2b658751ac859449108126b6c198ee3399947903598cab0bf632eb873c6c5cba5b3adbede17dcd54c4524b86 SHA512 c64706cdbeb2a5b01a6aeb7876753e874a800cf053336839d1536c77d0e49270fc548620e4f5f93dbfebcf088921ec216831aba4e17ee1af95131a5015d17243
diff --git a/dev-util/perf/files/perf-5.15-clang.patch b/dev-util/perf/files/perf-5.15-clang.patch
new file mode 100644
index 000000000000..5ea0c75f27f1
--- /dev/null
+++ b/dev-util/perf/files/perf-5.15-clang.patch
@@ -0,0 +1,231 @@
+From e1f1cbfe812e4a019034105ab5e81fd9f0742353 Mon Sep 17 00:00:00 2001
+From: Ian Rogers <irogers@google.com>
+Date: Mon, 11 Oct 2021 19:13:20 -0700
+Subject: [PATCH 1/3] tools: Bump minimum LLVM C++ std to GNU++14
+
+LLVM 9 (current release is LLVM 13) moved the minimum C++ version to
+GNU++14. Bump the version numbers in the feature test and perf build.
+
+Reviewed-by: Fangrui Song <maskray@google.com>
+Signed-off-by: Ian Rogers <irogers@google.com>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Daniel Borkmann <daniel@iogearbox.net>
+Cc: Ingo Molnar <mingo@redhat.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Leo Yan <leo.yan@linaro.org>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Michael Petlan <mpetlan@redhat.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Nathan Chancellor <nathan@kernel.org>
+Cc: Nick Desaulniers <ndesaulniers@google.com>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Sedat Dilek <sedat.dilek@gmail.com>
+Cc: llvm@lists.linux.dev
+Link: https://lore.kernel.org/r/20211012021321.291635-1-irogers@google.com
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+---
+ tools/build/feature/Makefile | 6 +++---
+ tools/perf/Makefile.config   | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
+index eff55d287db1..9756e589e4ae 100644
+--- a/tools/build/feature/Makefile
++++ b/tools/build/feature/Makefile
+@@ -296,7 +296,7 @@ $(OUTPUT)test-jvmti-cmlr.bin:
+ 	$(BUILD)
+ 
+ $(OUTPUT)test-llvm.bin:
+-	$(BUILDXX) -std=gnu++11 				\
++	$(BUILDXX) -std=gnu++14 				\
+ 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
+ 		-L$(shell $(LLVM_CONFIG) --libdir)		\
+ 		$(shell $(LLVM_CONFIG) --libs Core BPF)		\
+@@ -304,12 +304,12 @@ $(OUTPUT)test-llvm.bin:
+ 		> $(@:.bin=.make.output) 2>&1
+ 
+ $(OUTPUT)test-llvm-version.bin:
+-	$(BUILDXX) -std=gnu++11 				\
++	$(BUILDXX) -std=gnu++14					\
+ 		-I$(shell $(LLVM_CONFIG) --includedir)		\
+ 		> $(@:.bin=.make.output) 2>&1
+ 
+ $(OUTPUT)test-clang.bin:
+-	$(BUILDXX) -std=gnu++11 				\
++	$(BUILDXX) -std=gnu++14					\
+ 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
+ 		-L$(shell $(LLVM_CONFIG) --libdir)		\
+ 		-Wl,--start-group -lclangBasic -lclangDriver	\
+diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
+index 14e3e8d702a0..ddbe86defe39 100644
+--- a/tools/perf/Makefile.config
++++ b/tools/perf/Makefile.config
+@@ -285,7 +285,7 @@ CORE_CFLAGS += -Wall
+ CORE_CFLAGS += -Wextra
+ CORE_CFLAGS += -std=gnu99
+ 
+-CXXFLAGS += -std=gnu++11 -fno-exceptions -fno-rtti
++CXXFLAGS += -std=gnu++14 -fno-exceptions -fno-rtti
+ CXXFLAGS += -Wall
+ CXXFLAGS += -fno-omit-frame-pointer
+ CXXFLAGS += -ggdb3
+-- 
+2.33.1
+
+
+From 3e5c11995e04a9e3351330c34c4c802ce50df46c Mon Sep 17 00:00:00 2001
+From: Ian Rogers <irogers@google.com>
+Date: Mon, 11 Oct 2021 19:13:21 -0700
+Subject: [PATCH 2/3] perf clang: Fixes for more recent LLVM/clang
+
+The parameters to two functions and the location of a variable have
+changed in more recent LLVM/clang releases.
+
+Remove the unneecessary -fmessage-length and -ferror-limit flags, the
+former causes failures like:
+
+  58: builtin clang support                                           :
+  58.1: builtin clang compile C source to IR                          :
+  --- start ---
+  test child forked, pid 279307
+  error: unknown argument: '-fmessage-length'
+  1 error generated.
+  test child finished with -1
+
+Tested with LLVM 6, 8, 9, 10 and 11.
+
+Reviewed-by: Fangrui Song <maskray@google.com>
+Signed-off-by: Ian Rogers <irogers@google.com>
+Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Cc: Daniel Borkmann <daniel@iogearbox.net>
+Cc: Ingo Molnar <mingo@redhat.com>
+Cc: Jiri Olsa <jolsa@redhat.com>
+Cc: Leo Yan <leo.yan@linaro.org>
+Cc: Mark Rutland <mark.rutland@arm.com>
+Cc: Michael Petlan <mpetlan@redhat.com>
+Cc: Namhyung Kim <namhyung@kernel.org>
+Cc: Nathan Chancellor <nathan@kernel.org>
+Cc: Nick Desaulniers <ndesaulniers@google.com>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Sedat Dilek <sedat.dilek@gmail.com>,
+Cc: llvm@lists.linux.dev
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+---
+ tools/perf/util/c++/clang.cpp | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/tools/perf/util/c++/clang.cpp b/tools/perf/util/c++/clang.cpp
+index c8885dfa3667..df7b18fb6b6e 100644
+--- a/tools/perf/util/c++/clang.cpp
++++ b/tools/perf/util/c++/clang.cpp
+@@ -43,8 +43,6 @@ createCompilerInvocation(llvm::opt::ArgStringList CFlags, StringRef& Path,
+ 		"-cc1",
+ 		"-triple", "bpf-pc-linux",
+ 		"-fsyntax-only",
+-		"-ferror-limit", "19",
+-		"-fmessage-length", "127",
+ 		"-O2",
+ 		"-nostdsysteminc",
+ 		"-nobuiltininc",
+@@ -55,7 +53,11 @@ createCompilerInvocation(llvm::opt::ArgStringList CFlags, StringRef& Path,
+ 		"-x", "c"};
+ 
+ 	CCArgs.append(CFlags.begin(), CFlags.end());
+-	CompilerInvocation *CI = tooling::newInvocation(&Diags, CCArgs);
++	CompilerInvocation *CI = tooling::newInvocation(&Diags, CCArgs
++#if CLANG_VERSION_MAJOR >= 11
++                                                        ,/*BinaryName=*/nullptr
++#endif
++                                                        );
+ 
+ 	FrontendOptions& Opts = CI->getFrontendOpts();
+ 	Opts.Inputs.clear();
+@@ -151,13 +153,16 @@ getBPFObjectFromModule(llvm::Module *Module)
+ 
+ 	legacy::PassManager PM;
+ 	bool NotAdded;
+-#if CLANG_VERSION_MAJOR < 7
+-	NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream,
+-						      TargetMachine::CGFT_ObjectFile);
++	NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream
++#if CLANG_VERSION_MAJOR >= 7
++                                                      , /*DwoOut=*/nullptr
++#endif
++#if CLANG_VERSION_MAJOR < 10
++                                                      , TargetMachine::CGFT_ObjectFile
+ #else
+-	NotAdded = TargetMachine->addPassesToEmitFile(PM, ostream, nullptr,
+-						      TargetMachine::CGFT_ObjectFile);
++                                                      , llvm::CGFT_ObjectFile
+ #endif
++                                                      );
+ 	if (NotAdded) {
+ 		llvm::errs() << "TargetMachine can't emit a file of this type\n";
+ 		return std::unique_ptr<llvm::SmallVectorImpl<char>>(nullptr);
+-- 
+2.33.1
+
+
+From aa2b4e5e920cbaadc0fed9b8aa7c4498feee3dd5 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Thu, 29 Apr 2021 13:44:48 +0200
+Subject: [PATCH 3/3] tools feature: update LLVM/Clang detection
+
+Since LLVM/Clang 10, individual libraries have been merged into
+monolithic libraries libLLVM.so, libclang.so, and libclang-cpp.so.
+---
+ tools/build/feature/Makefile | 8 +++-----
+ tools/perf/Makefile.perf     | 7 ++-----
+ 2 files changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
+index 9756e589e4ae..23478bd06093 100644
+--- a/tools/build/feature/Makefile
++++ b/tools/build/feature/Makefile
+@@ -299,7 +299,7 @@ $(OUTPUT)test-llvm.bin:
+ 	$(BUILDXX) -std=gnu++14 				\
+ 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
+ 		-L$(shell $(LLVM_CONFIG) --libdir)		\
+-		$(shell $(LLVM_CONFIG) --libs Core BPF)		\
++		$(shell $(LLVM_CONFIG) --libs)			\
+ 		$(shell $(LLVM_CONFIG) --system-libs)		\
+ 		> $(@:.bin=.make.output) 2>&1
+ 
+@@ -312,11 +312,9 @@ $(OUTPUT)test-clang.bin:
+ 	$(BUILDXX) -std=gnu++14					\
+ 		-I$(shell $(LLVM_CONFIG) --includedir) 		\
+ 		-L$(shell $(LLVM_CONFIG) --libdir)		\
+-		-Wl,--start-group -lclangBasic -lclangDriver	\
+-		  -lclangFrontend -lclangEdit -lclangLex	\
+-		  -lclangAST -Wl,--end-group 			\
+-		$(shell $(LLVM_CONFIG) --libs Core option)	\
++		$(shell $(LLVM_CONFIG) --libs)			\
+ 		$(shell $(LLVM_CONFIG) --system-libs)		\
++		-lclang-cpp					\
+ 		> $(@:.bin=.make.output) 2>&1
+ 
+ -include $(OUTPUT)*.d
+diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
+index b856afa6eb52..d0ff0ddf9c18 100644
+--- a/tools/perf/Makefile.perf
++++ b/tools/perf/Makefile.perf
+@@ -410,14 +410,11 @@ EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS))
+ LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
+ 
+ ifeq ($(USE_CLANG), 1)
+-  CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization
+-  CLANGLIBS_NOEXT_LIST = $(foreach l,$(CLANGLIBS_LIST),$(shell $(LLVM_CONFIG) --libdir)/libclang$(l))
+-  LIBCLANG = $(foreach l,$(CLANGLIBS_NOEXT_LIST),$(wildcard $(l).a $(l).so))
+-  LIBS += -Wl,--start-group $(LIBCLANG) -Wl,--end-group
++  LIBS += -lclang-cpp
+ endif
+ 
+ ifeq ($(USE_LLVM), 1)
+-  LIBLLVM = $(shell $(LLVM_CONFIG) --libs all) $(shell $(LLVM_CONFIG) --system-libs)
++  LIBLLVM = $(shell $(LLVM_CONFIG) --libs) $(shell $(LLVM_CONFIG) --system-libs)
+   LIBS += -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM)
+ endif
+ 
+-- 
+2.33.1
+
diff --git a/dev-util/perf/perf-5.10.16.ebuild b/dev-util/perf/perf-5.10.16.ebuild
deleted file mode 100644
index 4aee115ceb6d..000000000000
--- a/dev-util/perf/perf-5.10.16.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
-
-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="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-	${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
-	)"
-
-RDEPEND="audit? ( sys-process/audit )
-	crypt? ( dev-libs/openssl:0= )
-	clang? (
-		<sys-devel/clang-10:*
-		<sys-devel/llvm-10:*
-	)
-	demangle? ( sys-libs/binutils-libs:= )
-	gtk? ( x11-libs/gtk+:2 )
-	java? ( virtual/jre:* )
-	libpfm? ( dev-libs/libpfm )
-	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
-	java? ( virtual/jdk )
-"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/perf"
-
-CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
-
-pkg_pretend() {
-	if ! use doc ; then
-		ewarn "Without the doc USE flag you won't get any documentation nor man pages."
-		ewarn "And without man pages, you won't get any --help output for perf and its"
-		ewarn "sub-tools."
-	fi
-}
-
-pkg_setup() {
-	use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
-}
-
-src_unpack() {
-	local paths=(
-		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
-		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
-		pushd "${S_K}" >/dev/null || die
-		eapply "${WORKDIR}"/${P}.patch
-		popd || die
-	fi
-
-	# Drop some upstream too-developer-oriented flags and fix the
-	# Makefile in general
-	sed -i \
-		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
-		"${S}"/Makefile.perf || die
-	# A few places still use -Werror w/out $(WERROR) protection.
-	sed -i -e 's:-Werror::' \
-		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
-
-	# Avoid the call to make kernelversion
-	sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die
-	echo "#define PERF_VERSION \"${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' {} +
-
-	# Fix shebang to use python from prefix
-	if [[ -n "${EPREFIX}" ]]; then
-		hprefixify ${S_K}/scripts/bpf_helpers_doc.py
-	fi
-}
-
-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="${EPREFIX}/etc/java-config-2/current-system-vm"
-	# FIXME: NO_CORESIGHT
-	# FIXME: NO_LIBBABELTRACE
-	emake V=1 VF=1 \
-		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		prefix="${EPREFIX}/usr" bindir_relative="bin" \
-		tipdir="share/doc/${PF}" \
-		EXTRA_CFLAGS="${CFLAGS}" \
-		ARCH="${arch}" \
-		JDIR="${java_dir}" \
-		LIBCLANGLLVM=$(usex clang 1 "") \
-		LIBPFM4=$(usex libpfm 1 "") \
-		NO_AUXTRACE="" \
-		NO_BACKTRACE="" \
-		NO_CORESIGHT=1 \
-		NO_DEMANGLE=$(puse demangle) \
-		GTK2=$(usex gtk 1 "") \
-		feature-gtk2-infobar=$(usex gtk 1 "") \
-		NO_JVMTI=$(puse java) \
-		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBBABELTRACE=1 \
-		NO_LIBBIONIC=1 \
-		NO_LIBBPF= \
-		NO_LIBCRYPTO=$(puse crypt) \
-		NO_LIBDW_DWARF_UNWIND= \
-		NO_LIBELF= \
-		NO_LIBNUMA=$(puse numa) \
-		NO_LIBPERL=$(puse perl) \
-		NO_LIBPYTHON=$(puse python) \
-		NO_LIBUNWIND=$(puse unwind) \
-		NO_SDT=$(puse systemtap) \
-		NO_SLANG=$(puse slang) \
-		NO_LZMA=$(puse lzma) \
-		NO_ZLIB= \
-		WERROR=0 \
-		LIBDIR="/usr/libexec/perf-core" \
-		"$@"
-}
-
-src_compile() {
-	# test-clang.bin not build with g++
-	if use clang; then
-		pushd "${S_K}/tools/build/feature/" || die
-		make V=1 CXX=${CHOST}-clang++ test-clang.bin || die
-		popd
-	fi
-	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	_install_python_ext() {
-		perf_make -f Makefile.perf install-python_ext DESTDIR="${D}"
-	}
-
-	perf_make -f Makefile.perf install DESTDIR="${D}"
-
-	if use python; then
-		python_foreach_impl _install_python_ext
-	fi
-
-	if use gtk; then
-		local libdir
-		libdir="$(get_libdir)"
-		# on some arches it ends up in lib even on 64bit, ppc64 for instance.
-		[[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib"
-		mv "${ED}"/usr/${libdir}/libperf-gtk.so \
-			"${ED}"/usr/libexec/perf-core || die
-	fi
-
-	dodoc CREDITS
-
-	dodoc *txt Documentation/*.txt
-
-	# perf needs this decompressed to print out tips for users
-	docompress -x /usr/share/doc/${PF}/tips.txt
-
-	if use doc ; then
-		HTML_DOCS="Documentation/*.html" einstalldocs
-		doman Documentation/*.1
-	fi
-}
diff --git a/dev-util/perf/perf-5.12.ebuild b/dev-util/perf/perf-5.12-r1.ebuild
index 74ab0c5a493d..3d3079203e9d 100644
--- a/dev-util/perf/perf-5.12.ebuild
+++ b/dev-util/perf/perf-5.12-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
 
 DESCRIPTION="Userland tools for Linux Performance Counters"
@@ -32,8 +32,8 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
+IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
@@ -52,12 +52,11 @@ BDEPEND="
 
 RDEPEND="audit? ( sys-process/audit )
 	babeltrace? ( dev-util/babeltrace )
-	crypt? ( dev-libs/openssl:0= )
+	crypt? ( virtual/libcrypt:= )
 	clang? (
 		<sys-devel/clang-10:*
 		<sys-devel/llvm-10:*
 	)
-	demangle? ( sys-libs/binutils-libs:= )
 	gtk? ( x11-libs/gtk+:2 )
 	java? ( virtual/jre:* )
 	libpfm? ( dev-libs/libpfm )
@@ -69,10 +68,12 @@ RDEPEND="audit? ( sys-process/audit )
 	systemtap? ( dev-util/systemtap )
 	unwind? ( sys-libs/libunwind )
 	zlib? ( sys-libs/zlib )
-	dev-libs/elfutils"
+	zstd? ( app-arch/zstd )
+	dev-libs/elfutils
+	sys-libs/binutils-libs:="
 
 DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.19
+	>=sys-kernel/linux-headers-5.10
 	java? ( virtual/jdk )
 "
 
@@ -81,6 +82,11 @@ S="${S_K}/tools/perf"
 
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
 
+QA_FLAGS_IGNORED=(
+	usr/bin/perf-read-vdso32 # not linked with anything except for libc
+	usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed
+)
+
 pkg_pretend() {
 	if ! use doc ; then
 		ewarn "Without the doc USE flag you won't get any documentation nor man pages."
@@ -178,6 +184,7 @@ perf_make() {
 		prefix="${EPREFIX}/usr" bindir_relative="bin" \
 		tipdir="share/doc/${PF}" \
 		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
 		ARCH="${arch}" \
 		JDIR="${java_dir}" \
 		LIBCLANGLLVM=$(usex clang 1 "") \
@@ -185,7 +192,7 @@ perf_make() {
 		NO_AUXTRACE="" \
 		NO_BACKTRACE="" \
 		NO_CORESIGHT=1 \
-		NO_DEMANGLE=$(puse demangle) \
+		NO_DEMANGLE= \
 		GTK2=$(usex gtk 1 "") \
 		feature-gtk2-infobar=$(usex gtk 1 "") \
 		NO_JVMTI=$(puse java) \
@@ -200,10 +207,11 @@ perf_make() {
 		NO_LIBPERL=$(puse perl) \
 		NO_LIBPYTHON=$(puse python) \
 		NO_LIBUNWIND=$(puse unwind) \
+		NO_LIBZSTD=$(puse zstd) \
 		NO_SDT=$(puse systemtap) \
 		NO_SLANG=$(puse slang) \
 		NO_LZMA=$(puse lzma) \
-		NO_ZLIB= \
+		NO_ZLIB=$(puse zlib) \
 		WERROR=0 \
 		LIBDIR="/usr/libexec/perf-core" \
 		libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -219,7 +227,7 @@ src_compile() {
 		popd
 	fi
 	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
+	use doc && perf_make -C Documentation man
 }
 
 src_test() {
@@ -254,7 +262,6 @@ src_install() {
 	docompress -x /usr/share/doc/${PF}/tips.txt
 
 	if use doc ; then
-		HTML_DOCS="Documentation/*.html" einstalldocs
 		doman Documentation/*.1
 	fi
 }
diff --git a/dev-util/perf/perf-5.11.ebuild b/dev-util/perf/perf-5.15-r1.ebuild
index 9de12cc7035b..d676dd953495 100644
--- a/dev-util/perf/perf-5.11.ebuild
+++ b/dev-util/perf/perf-5.15-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit bash-completion-r1 estack llvm toolchain-funcs prefix python-r1 linux-info
 
 DESCRIPTION="Userland tools for Linux Performance Counters"
@@ -31,9 +31,9 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
-# TODO babeltrace
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit babeltrace clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib zstd"
+
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
@@ -51,12 +51,12 @@ BDEPEND="
 "
 
 RDEPEND="audit? ( sys-process/audit )
-	crypt? ( dev-libs/openssl:0= )
+	babeltrace? ( dev-util/babeltrace )
+	crypt? ( virtual/libcrypt:= )
 	clang? (
-		<sys-devel/clang-10:*
-		<sys-devel/llvm-10:*
+		sys-devel/clang:=
+		sys-devel/llvm:=
 	)
-	demangle? ( sys-libs/binutils-libs:= )
 	gtk? ( x11-libs/gtk+:2 )
 	java? ( virtual/jre:* )
 	libpfm? ( dev-libs/libpfm )
@@ -68,10 +68,12 @@ RDEPEND="audit? ( sys-process/audit )
 	systemtap? ( dev-util/systemtap )
 	unwind? ( sys-libs/libunwind )
 	zlib? ( sys-libs/zlib )
-	dev-libs/elfutils"
+	zstd? ( app-arch/zstd )
+	dev-libs/elfutils
+	sys-libs/binutils-libs:="
 
 DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-4.19
+	>=sys-kernel/linux-headers-5.10
 	java? ( virtual/jdk )
 "
 
@@ -80,6 +82,11 @@ S="${S_K}/tools/perf"
 
 CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
 
+QA_FLAGS_IGNORED=(
+	usr/bin/perf-read-vdso32 # not linked with anything except for libc
+	usr/libexec/perf-core/dlfilters/dlfilter-test-api-v0.so # not installed
+)
+
 pkg_pretend() {
 	if ! use doc ; then
 		ewarn "Without the doc USE flag you won't get any documentation nor man pages."
@@ -89,12 +96,14 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	use clang && LLVM_MAX_SLOT=9 llvm_pkg_setup
+	use clang && llvm_pkg_setup
 	# We enable python unconditionally as libbpf always generates
 	# API headers using python script
 	python_setup
 }
 
+# src_unpack and src_prepare are copied to dev-util/bpftool since
+# it's building from the same tarball, please keep it in sync with bpftool
 src_unpack() {
 	local paths=(
 		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
@@ -132,6 +141,12 @@ src_prepare() {
 		popd || die
 	fi
 
+	if use clang; then
+		pushd "${S_K}" >/dev/null || die
+		eapply "${FILESDIR}"/${P}-clang.patch
+		popd || die
+	fi
+
 	# Drop some upstream too-developer-oriented flags and fix the
 	# Makefile in general
 	sed -i \
@@ -147,11 +162,6 @@ src_prepare() {
 
 	# The code likes to compile local assembly files which lack ELF markings.
 	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
-
-	# Fix shebang to use python from prefix
-	if [[ -n "${EPREFIX}" ]]; then
-		hprefixify ${S_K}/scripts/bpf_helpers_doc.py
-	fi
 }
 
 puse() { usex $1 "" no; }
@@ -168,7 +178,6 @@ perf_make() {
 	local java_dir
 	use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm"
 	# FIXME: NO_CORESIGHT
-	# FIXME: NO_LIBBABELTRACE
 	emake V=1 VF=1 \
 		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" \
@@ -176,6 +185,7 @@ perf_make() {
 		prefix="${EPREFIX}/usr" bindir_relative="bin" \
 		tipdir="share/doc/${PF}" \
 		EXTRA_CFLAGS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
 		ARCH="${arch}" \
 		JDIR="${java_dir}" \
 		LIBCLANGLLVM=$(usex clang 1 "") \
@@ -183,12 +193,12 @@ perf_make() {
 		NO_AUXTRACE="" \
 		NO_BACKTRACE="" \
 		NO_CORESIGHT=1 \
-		NO_DEMANGLE=$(puse demangle) \
+		NO_DEMANGLE= \
 		GTK2=$(usex gtk 1 "") \
 		feature-gtk2-infobar=$(usex gtk 1 "") \
 		NO_JVMTI=$(puse java) \
 		NO_LIBAUDIT=$(puse audit) \
-		NO_LIBBABELTRACE=1 \
+		NO_LIBBABELTRACE=$(puse babeltrace) \
 		NO_LIBBIONIC=1 \
 		NO_LIBBPF= \
 		NO_LIBCRYPTO=$(puse crypt) \
@@ -198,10 +208,11 @@ perf_make() {
 		NO_LIBPERL=$(puse perl) \
 		NO_LIBPYTHON=$(puse python) \
 		NO_LIBUNWIND=$(puse unwind) \
+		NO_LIBZSTD=$(puse zstd) \
 		NO_SDT=$(puse systemtap) \
 		NO_SLANG=$(puse slang) \
 		NO_LZMA=$(puse lzma) \
-		NO_ZLIB= \
+		NO_ZLIB=$(puse zlib) \
 		WERROR=0 \
 		LIBDIR="/usr/libexec/perf-core" \
 		libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -212,12 +223,10 @@ perf_make() {
 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
+		make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die
 	fi
 	perf_make -f Makefile.perf
-	use doc && perf_make -C Documentation
+	use doc && perf_make -C Documentation man
 }
 
 src_test() {
@@ -252,7 +261,6 @@ src_install() {
 	docompress -x /usr/share/doc/${PF}/tips.txt
 
 	if use doc ; then
-		HTML_DOCS="Documentation/*.html" einstalldocs
 		doman Documentation/*.1
 	fi
 }
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index ce932a3dc4fc..d3a519233e7a 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -7,6 +7,6 @@ EBUILD pkgcheck-0.10.1-r1.ebuild 1552 BLAKE2B 3ada505dd9f21bdce2f683ac27b7ea30f8
 EBUILD pkgcheck-0.10.3-r1.ebuild 1609 BLAKE2B fd96f50c732590d9bacc04267e3e2df094cbfa33bb6be1322aded8c7473c9af12c729086aa759ca3c8a96c0452ebe7e1c7ec97373f55169d99dde10dfb58fe52 SHA512 72043d1cf02676bba1ede0864eeb991b319c7e7c83af1447736d774de0e591f0ef97e714ed441cd4ecdf0933c652382b9031577baac0035ce66af3687f339075
 EBUILD pkgcheck-0.10.5-r1.ebuild 1618 BLAKE2B 6cc7ab548f27a7b1d9ae9ccd86367db964d50c834a6efbbd61a8931596fdd9e6d62a32a615d6e1fe25a6aa3ff3f79dd11d4709608b0f82333fb0715fb30b3213 SHA512 2631da14401dd5fe659180ca8285d24ed10419fa0b4d7fb9fc39c11f606375ca860b6f8d68690bb8ff20a7447a8e59cc3309ca916a92bb819555b54068e433ec
 EBUILD pkgcheck-0.10.7-r1.ebuild 1610 BLAKE2B cfbf430001df15083e5f03ed504d698602490e122a2aa943e864746fc8e37f53f4d0ccb4348afeb0ceda1b9d061b822904f7da6db4ce909c79a60bbab74283d9 SHA512 259e13ace6e8d05734bf5a86bbf83a2dc35e95916ecf8c725c87b00a7464425128c50b8e7d2ed46f5ccc2e9649df3dc37148602e6503704b1cdf223ae87102bf
-EBUILD pkgcheck-0.10.8.ebuild 1573 BLAKE2B f1f1ceadf0cc890dfd31ff3c06e0a5182fcf68650d7054ec8f13b5f84e82a807452daa3150da407904e06d9af8fe2910608f2b73a4d5ad0768e0c7beb9b84c8a SHA512 ab489bd05bed67046792b414efd79932a195a3df0f6194b9242330613874e595a3960d2ae0054e28eb07888b8288bdc819829e137bbb32919611db8684f66a37
+EBUILD pkgcheck-0.10.8.ebuild 1570 BLAKE2B 5fbfcab3674e71f430bda4cab99cfb01e39bcaf4432df61f66efad0f57afde0762b7201eb0bff09bbae02cbb5f02d2672f5230181c8ee2f73fb4bd3aeddacf98 SHA512 f0b40f28659adf64a708e37d8a56c82eb996ef0203d9d63c2dd93ad3af2a2157910810a9558e610b160bbb97ea80b545dfb5fc558f1169d657612cda99e796d5
 EBUILD pkgcheck-9999.ebuild 1573 BLAKE2B f1f1ceadf0cc890dfd31ff3c06e0a5182fcf68650d7054ec8f13b5f84e82a807452daa3150da407904e06d9af8fe2910608f2b73a4d5ad0768e0c7beb9b84c8a SHA512 ab489bd05bed67046792b414efd79932a195a3df0f6194b9242330613874e595a3960d2ae0054e28eb07888b8288bdc819829e137bbb32919611db8684f66a37
 MISC metadata.xml 329 BLAKE2B 30154e72c975701c69832cdb72ac9d2464ce5ac65ae107ed1a0d55269dd80664532b529a1ad5a907a948446244b9f41d13c2d19484b45d208f8757f5192bdd32 SHA512 e51404fef8bb71baba825a6700ba9c9ea3680e2892016daf38d3979d33c77c07ea88f95b00c6c821907fbbda129c35ecbcc00b0128111e18290b110cfac5e316
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild
index ceb25cde418e..47ab81147925 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.8.ebuild
@@ -11,7 +11,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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest
index 556212c2b9be..c65c6afc5ea1 100644
--- a/dev-util/plan9port/Manifest
+++ b/dev-util/plan9port/Manifest
@@ -2,5 +2,5 @@ AUX plan9port-builderr.patch 882 BLAKE2B 1526bad2833a416cfb214f047f2f14bda89ca82
 AUX plan9port-cflags.patch 312 BLAKE2B d09a4bb70451beb0cb6de05be37c6d68334d51f4db882debde4e3f3accf3aec25054ad5411a3c7289df6b556f59c1a729005f1c21247545158879c429462843d SHA512 29c4419bbc36330b322541b625bbe9131ed14d01008ba2ab2865a175918506de1e96a2b078246d1d6b6bc48537f90f74b1a72b223d74dc73d13cb7cf63d33c58
 AUX plan9port-noexecstack.patch 384 BLAKE2B 7f887894113677df743f64d7b1015aa65837818aff3c8d93bb553177da377a5975e7f8841addfff6b533771085490d306124adaf62a834615f0f5ca46f455bf4 SHA512 833a331d963e1f02ce497ffb293750cd6c535b6b2d6d26a2218264d3a7aa098b30f95cb3968fbaa3a734505286ff560e65f0390154af6a324078e3d7f80385be
 DIST plan9port-88a87fadae6629932d9c160f53ad5d79775f8f94.tar.gz 23413373 BLAKE2B 6145dd77c9e4b33ebc6d68f42ed69e320e8bfcaae474a16afb3a62e30c13a39117d7013f3cc075eb48c95a5600c4fdb457e45f65f7b25ad2acc7b19dc9cf8e64 SHA512 f008969274e790238b58ebd0d0dcfaa730557daf974797f8c4014c36ac39995b330db9c6d658655358fdb2be64905b83c35e2287b7cd66b2d3249e1da1a3e119
-EBUILD plan9port-0_pre20210321.ebuild 3763 BLAKE2B 81ac6c9cbc85293a9ad357a14aa19aabb9434f1cba33797ff753cd01986a44780755e97653573239a9e7b9ac12b78899a1299823d62228935605da3f33e639b0 SHA512 045a58dbe28b113b405ca3dd4acc06d43f9bbf9d251efc39609adf882e45e02b2c3cd842df077c9d2088b0b5c81c6bf0fdeae8344ef9b3013a16810cc08d1ab4
+EBUILD plan9port-0_pre20210321.ebuild 3770 BLAKE2B 1301ab238c1bfdee211cba8a8affa038a4a80b1620ec694a0ae3091464f01c6045b4eeb97aecb2d5ea08d434e702bba9b3f48482118cac48965342044fb6afaa SHA512 9841e41f44145ecf36fd06b4004d7911576963d8ca05d8d352b46228eed4c99f419f05acc4aebbfb4a374750a50bc818e90eb8d707c6eda93a14af18309a2f97
 MISC metadata.xml 567 BLAKE2B 5349e937351c817a0b2eb9cfd8dda0304328f40552763b2203873aa1b5cc801d1cbf6e81b324baed935214df008a21d1240eb6762bf95b700b1546213609770d SHA512 a5875c210d9dd8795bee06d3b02146f54dd6f3d8415598ceee4f4e8234f70bc415b3695520acb44149c6daac773cc389265b95d0ffd3000231796bf68610fdec
diff --git a/dev-util/plan9port/plan9port-0_pre20210321.ebuild b/dev-util/plan9port/plan9port-0_pre20210321.ebuild
index 4b5f80a4b8b6..05d59ffcfd7d 100644
--- a/dev-util/plan9port/plan9port-0_pre20210321.ebuild
+++ b/dev-util/plan9port/plan9port-0_pre20210321.ebuild
@@ -18,7 +18,7 @@ LICENSE="
 	!freefonts? ( BigelowHolmes )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="X aqua freefonts truetype"
 REQUIRED_USE="?? ( X aqua )"
 
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index 8c0406788897..e6211c5921fd 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -104,6 +104,7 @@ DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a98
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod 2670 BLAKE2B 211a6d7642da991f148a7998fd35875f316a143c62337214ff428b4eecc7dee7db044e42f337edf531edc70b9aa99f46e349821864a63d384c7d050e414a608a SHA512 fdfed8273d2014838eaed6d4d2b0d92ae905fd796a0fec6c5a0eb27d15ec31c72e1e79973d909a1ac01df1a2e5afac99bf17d5cc7d08f507474c8e8e7ea88ef8
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Flog%2F@v%2Fv0.1.0.mod 121 BLAKE2B 6463ba6a856a7bb4efcd00a3369f6593b31b8ef39da4bb16ce1acd741c0808d2243ca7787c0a52d4653a5b402841159e97cd4b42e0f6172ad39429beb2b06993 SHA512 564f0a1b0318004a7ed478c8f3a371ea2f59efd56eb2efec4fc806183de1b4a065d5b44aab6dbd40446d28caf5a74545a7ff6a3d428b1b41cb6df5eefc11e5c3
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
@@ -139,6 +140,8 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c87
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip 206762 BLAKE2B 13c74350dfc3bf39540c37f6b7771f18930d6bfd6a5c83c27c723065da6458e0de544a6fa4d57c027e6c67eb528493c620228a56249b889f00d67a064218dbb0 SHA512 3d92469995664037149e3e11363db685b3175fff01f4ef3b578ada273853a16131b3c97899b497ab75ffbeb6191fe59a28f073779828f719681b8e15182b6211
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2 SHA512 8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
@@ -150,6 +153,9 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod 105 BLAKE2B ffd22df03c1b351f
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.zip 126991 BLAKE2B df3a677c6b6838cab5de9c42768cc05193561ce6a5d38c1d090b31d79e9e7a31ba4b256bce05c29436e3fc10e5eb8f7157d6ff35d93562e8259a28b8678bbbde SHA512 9dec7c9cf1317ebd2e4dae9fb3dffe62a077473e2969b7c70b97c332a3e9d713d2047ea929ea01253fc7e2636fcb3851b6cc0cbe1ae16db26ae0ff99bc96d8ba
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip 130974 BLAKE2B 6e4efb8abb584c3839c7b1ab80c8060c125b695bddddd44c57f72c0fbf9de85d40595ecff57f57ddb533e34dbe72a95e0e8043d91d462d68818699f194766e90 SHA512 9cff1690cb177e70b1d67ddd305e4317e3d1ef2825f5f3ed4639210f7f2ee6e89ff03970495757b922f16fade5fafae5cc14c8da2b95694faa3fa48c63f3313d
 DIST github.com%2Fgoogle%2Fgo-github%2Fv25%2F@v%2Fv25.1.3.mod 419 BLAKE2B de181547a4bd01155a94ad09e6f7a063331226e9326f04c12510ac24394a993dbef1f47a15d5d26e8900e32983ab6248cd497bf2f425ae09062208d4df0a7f78 SHA512 f6f169309e2f1a7148f7bc21e3153daf740a4c7cd2a761150f1693adece8746299899e2de8e00b1640a23e7bebdc401b3ad3260c98d33b0be0f4c4cf87cb7700
 DIST github.com%2Fgoogle%2Fgo-github%2Fv25%2F@v%2Fv25.1.3.zip 367913 BLAKE2B 9ecd3755b255a76a8eb63a9b86534b462f82ca32d1f812d66ce7ff4cbf7e5757bf90f3f6daefac86752de682070f45cdb7847f1d8852128d2e1e3474fac9bf4a SHA512 ac58908808c346f240a326db38e4dd9c1627fa320fcad31747a486f102d14f4a1509253c70e4cd967b2e9d29ef2d7ea198a53ccac1c573ac8d29ef2acd1ffc71
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
@@ -205,6 +211,7 @@ DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
 DIST github.com%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod 44 BLAKE2B eb9ba00998f4a45590f7ab28d94adcda4e2b511ae7078f5583bfdcc792d34b6eded81b8c0f71ced35b782cd1bf344542673677915b44b9eb31873e9c5d69e133 SHA512 4d591cc0f2d11ba450f294361950972fe0dd71bdff5bb0c3e72b673cad6ea990335680bf7650093e1f9978bc8556a0ef9329ae2e8a14c10b7de668aead7afe33
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.11.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
@@ -285,6 +292,8 @@ DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.mod 468 BLAKE2B 4ac6ec5b71271218f33b753092c494ec6dd01e73373df68af2f399d8d8ba32de0f02150c1c5fdac8518ac244391f126cdac602c63ec862bff559d76015cc78f5 SHA512 9c6244491c9a3012c4a2e575cdb361f7fa577f391ced254adfd8d567c361f073ce23ddd57a0f18ec3327189cf97ad737254c0d0ef2872085af6af7bf9dec1d72
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.11.0.zip 240896 BLAKE2B 4745181476be50303fdf0e66ec147d643995c809a1fd969c846f656d453025f2cd67089f3065b41bede74bfcaa65e5307dd9541457ed7f7ace31b6b567e2e135 SHA512 20c4e6baf239cbc8c8a754ec1b9ee814ff29df1b41332f75f7440b27864bc28397071f3f4d60ba6ff4d0aa531b7a20857e11ecca93057784f76f03876151e8f8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod 375 BLAKE2B fdacadbb6c23350ffa04e625324420df9b523d9fe5bccd8bd1d8f6d592d7ef5a2b4620c1d16c78bbbbbba2716f3edd015cc16ae5b0c3c31e5959ed12143ff3b2 SHA512 e98ebe9ff7f5f5c893ce7a54c12b3d5b86ae1f99a5117875bfb78aa2b59d9e9a95bd54e45e1a16e8bdfa79f38192626f49366a0ea4e36a25681e7448b544b144
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip 226158 BLAKE2B 899457f410f559d70cac7131e9c6057bfd749964b8b133943635b0ee78a12485d933718569d085f51dd34f831114c2f74986818536cf21ad642dac793b00390a SHA512 5c4d5e70be8984c9eea4211e06e1f9478fea4ee4cc227167b9a99d87fa773e060e42aa4866eaed39e58a251821840643d5117b12006a6809902daa08cca14b2b
@@ -299,6 +308,9 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod 817 BLAKE2B b4cabfb9363
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.19.0.mod 739 BLAKE2B 6a475498d76be0ec42814e1d5a932c707711b9538e8507afaa36a3ee6d26b78392f750e9553f960cd9768f3ba6a88b3d8c338b102ba48260c91b0f5b48e1cb06 SHA512 5d321367c7b93f913cb524c688dc515dfe28a0cd712665b61ac12dfebac8a67fd19ba578f8a3666b557b41670eb9f3cc718fb93ca413851552efd695859b7c4f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.19.0.zip 180339 BLAKE2B 67964e38da2ae81a187fa7c980de3472a9b866470c01c570a7891eecdc12f0f181782a916abdcec10e718792e91a9ea6d532651596c75c4364645049e7b62ac2 SHA512 a5b8a63ea03697672701610278283a715760a0c4fd1fa1ea9249cff6364cdcc55ac3bfef1a20e658c0f2f6ac1835ffd198c64f9ad4c7b72947f9d9a42da62b0f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.26.0.mod 794 BLAKE2B 91c9bb4469ac63bd98bdd1ce4d2f2cf3a233f62f6c30b1da0b2a94eb1215a975f3a19cf066c6bc5847fd1a642da6082b8377825987ab5ba21620c2ed9ef26af4 SHA512 05a0bd8a7de559925fc5ba7753d9fc80db41271fedfcd0ca3137f9620c68468c0bfb706e0b4915151657c74a5d64f52a5594736e19fa1421aa65124f551f0ddf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.32.1.mod 583 BLAKE2B a104cd758a5cc7962ce174ce93e8cdcb0320f4bc20b21ed3579a201e85ac851322ce06087d4f5514317731f97903a3e118d1001eb3ebd614158c1f7de9113e3e SHA512 550dd35c6ce6d98886c4f73ad3afedca13e12e39ba3c0958a4cf05a92db92187787591d33ebdbde6d961a451c615bed95cb75ec36b3e91ce0f2b12805d82d248
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.32.1.zip 180639 BLAKE2B 3f710b2121951ca11b7d5e8c4ce3d1131e679ec414d9881150da8e1117aedd39410ad1b75716a7f5e7ba2f01e2b5081dee36ca14d5aa0190cba0deea4aa3b4f7 SHA512 80533dd4a9a2bc03e8a74b19919e870f447e45cd0edad75822048412616963db9095411fb970d859b583e08b9302d99a75640bab185699d19fff1940b45beae2
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
@@ -307,6 +319,8 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip 262428 BLAKE2B 6334337329e564dfddb576464864b53d4da3cd7c0988cb6b0eeefd3ea9141f36429f09c1f75d11560dc12e23751fe5c52a4c7d46cec0ed3454fd3684562bad72 SHA512 8dc2a0f05fea67aa9a64d2e91807cd9fc111be3ad4fcde2b8f53757ed38a478467f5edf68f990d124e1019cdcfef133cbd0278600df8abdc1c0971808d729956
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.mod 198 BLAKE2B 954749eeaffd58f7885eff94ed89b9c933b2506dce66db05c8aa640fc7e8ff21032d855776ad091c86d43b77bd9e2d1db3cfa7b176f2984ea66c4a49b4373d9c SHA512 539fdd264ff10a459bf00eefdfcd2d3d079426cbcce7c4ecd27e1191d6392e0451804bddd5a39f7279e3c91e63a40ed882ebe1bcce7e71913d6109b7b6ba403b
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.6.0.zip 282768 BLAKE2B 22c62ac51bb14578571aa93f0acdecb984ca370b4617122078b28b8ec5ab4ac8cbd6e986d60335d5f9848028f51f94d8fcdae3d8b428c8d3c8196d97cb2f04db SHA512 1b73a550dfdda98e41da9ace048b230ba05bfe7518cec7b5f877c11afa58bdf9d53ad25fa848e316fcb5b25ff6eabb0a2d2688c1cfbd9642a8670b72c3f90a92
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
@@ -353,6 +367,8 @@ DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.zip 53254 BLAKE2B 55083a93da944305baacb592cc1145f191412b4fa0a98ff3f4180484d7a3bf4dc65561d71670b8a462126f10ea82a3ca2846f73bacde8c9d8c485e895b329598 SHA512 127df97ad28854e4db92b6ef8f147c50eecf49e6a3f70dd0524325f24aa6bfe977127513443cd8926589587654212acfa4cb8f153e2290b8b27aaa09dd846368
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.9.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.9.0.zip 63866 BLAKE2B ee1a2e2435fb60c580eebf13b18688995f839766e63d494d9ac90efa04ac7c0b46132f6e723276c58217ac9c1a25ecedf87eb01350e9d4f0000091df581b6585 SHA512 d131ebe8ca70a134c7117410f990817c266ca49e0d87b95ee1b7cb1aad9f869c72c25da2e880cb70be2eefe3fad5009d37127dd3ee95d07ab2540aded1baf8ce
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
 DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
@@ -431,6 +447,8 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.zip 1504684 BLAKE2B 988de9602740660bd9c8484f9413e65219eae6a8f906c0f0450443abeb8808aece8644957e8a405284e7fd1ee234d48318751db72ee825050f78b3fa13307f58 SHA512 9026af554df3cd3bc570a3a521a29007f906a1523852619f7e8e1d1b2e3504bb60e40bdefa5a003a8eb32da4a9dc98ebc4e6ca615fe87ca4269b7b3351414a56
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.zip 1566157 BLAKE2B 34caf278d6440392338ac082a6b532066b9dc29a381f8afc063de39980814e97c72dbdc933151dea18ecd95ac3786a6b7a25d40c73237d7ae600e6f9b2f484ba SHA512 4692d098499dcc3c1781380ae4e7fc0245a8539c26e5d6b86f8b83bab14c241cd6599855992e24a5974f794f9129fc3812d216f45bfbe07cd4a303084e7491cc
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
@@ -438,6 +456,9 @@ DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 B
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.zip 127150 BLAKE2B c0110145f4de0096ebc40ea44b55b85716ee29800dfe7a7e04028af1b2506c29a79c022d743d4897c4ac4a9b90c41d2f632b0ac1ccb5507c54170562cdff6bc4 SHA512 32aca9055edaa1dfe7b504b4b378433a41198e07a1c345caa7751b4aa2f8b4deac8dd309bc3029e6d57aaf2c50471c79c4539fc5fec7ad3f1f36180f8d8d931e
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20211104180415-d3ed0bb246c8.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20211104180415-d3ed0bb246c8.zip 140007 BLAKE2B 4dfa9bd365c976500335ec3b201468902e8c68bf2da8b0f9bd5e5b6a8c7709b4bdc977fffae65aec1f978cb0f23ffc9bf0817d27627a47c8c9c7e2ff2218d1c0 SHA512 d86d532c6983e31521e02a456c873f0fc43bfa36c938e4d95520d18cdaa8d468c564840c24f72733abdf004142fc188e607fcf865863483594aee8c6d76f3452
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
@@ -446,6 +467,7 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201207232520-09787c993a3a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -485,11 +507,18 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.zip 1480477 BLAKE2B 2ffaa66f67ed1288d8d023e3dfabb89c8f5b52088de9835bc3654a2f13f7c3497bf2e1ed22e9b1f319c1d41117f77c9ab6bb412bda3973f8b759e8cb31ae7b35 SHA512 7bf8fd5344022fa8d414662d6ce45978ed424bacb7970eb57b32935106c6240103a4dae3e7476857c3048082eb4d92a1cd5aa218b800684cabd7c7b30e3c45db
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.zip 1639382 BLAKE2B 3d70aca9182ad2dd59a1260987d32b876da2d668a5181e6a94ce07f252399a5e861787ef0ddf5d3fb45a93c77b3289243fe23f724150f0719c0519dbc9db6a3e SHA512 ef385003c7858782b40f36e70eb0d4af9c9b18cf705872e474c7720eb2de61b889a6a9c85a2c9e1ecde43522cab440f97afba80598ab26f1c11703fe1e76eb77
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 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.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 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.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
@@ -628,6 +657,8 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.m
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.zip 1561863 BLAKE2B 45adceaa2751d3fd4fc1b55517aa1b11708013db858c4f52e3a8435629542a89fb53cc69fcc9f1b1345ce488c550d57ef0465313154d60a5a2fd958db75499f7 SHA512 b88c991dd4b03a46e8e5becfe22b50130a185988eaef4c0504a4da9dd3af7be7a060d1b8aedc199092d9813bd7ddc06a105340aa2925b6cc6246b2100b6df279
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
@@ -658,6 +689,7 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.3.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e402cc1765fed30253eb87e9e87aecc8096130e973623f53ded2a7572ca3d464e4db9de524cd651b3aa8fbc9fa0ef6bdc4eb9670b4d8652f4dfc SHA512 d814675e448688f6a506397bedb262fb2583c913ec1f8ca9ffc11206bdcd7e1f4ee3c561aee366eb2cdaede8c522a6f58f116236f3033bc7e91ec139bdd140f9
 DIST promu-0.11.1.tar.gz 54669 BLAKE2B 5c72fd4a851d38eff067b8edbe547815ece02a5d03431400b1f74517dcf1698fe45bee57c7c4d99a6dcdb065411f8de6efc83b5eca6a86574a2326d8339b0fe4 SHA512 d2bd87ea311f46e98ae0c3f5342cb3356a2d675af38b06f3232046e21eebead642ece671ab579d37ccf21e5b370c6cef7384d9e3ed857d930326141df342ec52
+DIST promu-0.13.0.tar.gz 46099 BLAKE2B 674580c4b853881db6307f065678afdb561fcab51be6ad3ac604849b6a7f3c63b1eb5f5be4f4ee533f25e087b3ed19bb7584ee5c72b30b8c0e33d19f690cc115 SHA512 04feddf514417e636498d111b0cc9678af4b1c2be16eb61f257e013b10ec427b5055d54150a76dce0867d659ca7e8833702e29bdf32cb00d5d02dad906c3de21
 DIST promu-0.5.0.tar.gz 643970 BLAKE2B b61e8421b5e68f3cd0ec125faadf64c7491f54cfe03de9d6497cb627e5d548b58fafe735c76a5a86a55489aea56dffb6e02d52acd1ca977ea32ec974f34475ac SHA512 b895c0b5b5a33bd0c2372e8c1c698b8548b1b7086849161ffa99bf9718f4b7f3a57bcf218681d84e4cc5ef31ef39df7e6c59345a84441369ec3ec402999ac4de
 DIST promu-0.7.0.tar.gz 1706673 BLAKE2B 52dea1bef127dc20fa67b2efee750d9a22c8847fd48ea73b3d03eb0f95f2690977f8082bc71f27215a68c5277d8219ccd4ff93d8af7966fdf9df7286e4f45d03 SHA512 9f332e55c944de1ff87e86b696eb99f24dc1f5350a180ae62e403a798bd6e496d9fe71e18c07a2c870509fae4d6b3ded2274b1b986614f1abe9f74e3ed8e2a60
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
@@ -666,6 +698,7 @@ DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 EBUILD promu-0.11.1.ebuild 36534 BLAKE2B 9a921d52530557fb065834811f917201a3f4911320b52f68c1038de7ba009c3e00ed3decb91d926a0a81006f968915538c926b708e5bc59c65052e9bf4d0dba0 SHA512 c8a7801e66d81ea84aa6b16f89aea89066c1c45e56d6f87261ceb302de8154f5ee5dc90867048cfb44e9e50b84af43c4cab958373fbc00a3e9716ff86bb9069a
+EBUILD promu-0.13.0.ebuild 26474 BLAKE2B 0b92d3d17dc11185cc49bc5d72942f705789ca89ec5c7cff782ef87ecb2b1b1381b775f54eb2affa0b7341460b2a69bb62c951c36bb56a84cf3324a75d061076 SHA512 a6aea1e91affb7247ddbfdc0365a8b3a224d3926540ee5cfc2d041d5b22664420676a70cfc324f56e916a52d1be53bb431263339259ed5565a3e03e00531ac59
 EBUILD promu-0.5.0.ebuild 692 BLAKE2B 1e48f2a5623f23f99dcaed0df8cf52414881eadd5fce9a1c531d9ce4136bc85bd63d58d4d02fe3a19403c94bd3c8ee86e2c54bc2ca76d8fe31952cf6866eed32 SHA512 94c364c71829fb9ec92f9a7f64bda1dc394260eab987836f0761ac7c8eab94210ea07d938cc317a3c8e57d7f9caabd158d082de5691e9db7ab36dca6aa7ac589
 EBUILD promu-0.7.0.ebuild 691 BLAKE2B b850cf08e94ed607ca4c5b764d588f953b21f71c1d4b34f503b910b253bd9e77e5d6f94fb37c0180f63ff7012b43ae104a4e638d8e1f6ae2a546494c9e1423d6 SHA512 ebab9921457b79e55cfb4f713ca31f5c153cb03ca87498988257906190b3687ccd54e78aa8b4dae101193a3945656aae4f507221457df5dc09c0ffde9c0444fb
 MISC metadata.xml 326 BLAKE2B 0bc0dbf28c2526a54a8b297e39236b2a9d0b5217a536bf4b2212bc11e7f623e27e076decabc9619998b086e05adc400549f7f4c1e69f0402385cfe81dae8edcc SHA512 65e2385909e9445bf26f3852805fe1e8310ded82f036b0ea5023900fd0df9e2a2774d80edb295b924fe720b917e1bdec72bd5d31c4051878e87132056fc573e2
diff --git a/dev-util/promu/promu-0.13.0.ebuild b/dev-util/promu/promu-0.13.0.ebuild
new file mode 100644
index 000000000000..bf5f0f2ae0e8
--- /dev/null
+++ b/dev-util/promu/promu-0.13.0.ebuild
@@ -0,0 +1,513 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+EGIT_COMMIT=b1a2edae78614c8b0ae9e2faa88d14098e96f6d2
+
+DESCRIPTION="Prometheus Utility Tool"
+HOMEPAGE="https://github.com/prometheus/promu"
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.38.0/go.mod"
+"cloud.google.com/go v0.44.1/go.mod"
+"cloud.google.com/go v0.44.2/go.mod"
+"cloud.google.com/go v0.45.1/go.mod"
+"cloud.google.com/go v0.46.3/go.mod"
+"cloud.google.com/go v0.50.0/go.mod"
+"cloud.google.com/go v0.52.0/go.mod"
+"cloud.google.com/go v0.53.0/go.mod"
+"cloud.google.com/go v0.54.0/go.mod"
+"cloud.google.com/go v0.56.0/go.mod"
+"cloud.google.com/go v0.57.0/go.mod"
+"cloud.google.com/go v0.62.0/go.mod"
+"cloud.google.com/go v0.65.0/go.mod"
+"cloud.google.com/go/bigquery v1.0.1/go.mod"
+"cloud.google.com/go/bigquery v1.3.0/go.mod"
+"cloud.google.com/go/bigquery v1.4.0/go.mod"
+"cloud.google.com/go/bigquery v1.5.0/go.mod"
+"cloud.google.com/go/bigquery v1.7.0/go.mod"
+"cloud.google.com/go/bigquery v1.8.0/go.mod"
+"cloud.google.com/go/datastore v1.0.0/go.mod"
+"cloud.google.com/go/datastore v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.0.1/go.mod"
+"cloud.google.com/go/pubsub v1.1.0/go.mod"
+"cloud.google.com/go/pubsub v1.2.0/go.mod"
+"cloud.google.com/go/pubsub v1.3.1/go.mod"
+"cloud.google.com/go/storage v1.0.0/go.mod"
+"cloud.google.com/go/storage v1.5.0/go.mod"
+"cloud.google.com/go/storage v1.6.0/go.mod"
+"cloud.google.com/go/storage v1.8.0/go.mod"
+"cloud.google.com/go/storage v1.10.0/go.mod"
+"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+"github.com/Masterminds/semver v1.5.0"
+"github.com/Masterminds/semver v1.5.0/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d"
+"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/chzyer/logex v1.1.10/go.mod"
+"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/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/envoyproxy/go-control-plane v0.9.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-kit/log v0.1.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-logfmt/logfmt v0.5.0/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/mock v1.3.1/go.mod"
+"github.com/golang/mock v1.4.0/go.mod"
+"github.com/golang/mock v1.4.1/go.mod"
+"github.com/golang/mock v1.4.3/go.mod"
+"github.com/golang/mock v1.4.4/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.3.3/go.mod"
+"github.com/golang/protobuf v1.3.4/go.mod"
+"github.com/golang/protobuf v1.3.5/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.2/go.mod"
+"github.com/golang/protobuf v1.4.3"
+"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/btree v1.0.0/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.4.1/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/go-cmp v0.5.1/go.mod"
+"github.com/google/go-cmp v0.5.4/go.mod"
+"github.com/google/go-cmp v0.5.5"
+"github.com/google/go-cmp v0.5.5/go.mod"
+"github.com/google/go-github/v25 v25.1.3"
+"github.com/google/go-github/v25 v25.1.3/go.mod"
+"github.com/google/go-querystring v1.0.0"
+"github.com/google/go-querystring v1.0.0/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/martian/v3 v3.0.0/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+"github.com/google/renameio v0.1.0/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+"github.com/jpillora/backoff v1.0.0/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.10/go.mod"
+"github.com/json-iterator/go v1.1.11/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/julienschmidt/httprouter v1.3.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/konsorten/go-windows-terminal-sequences v1.0.3/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/text v0.1.0"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"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 v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.7.1/go.mod"
+"github.com/prometheus/client_golang v1.11.0"
+"github.com/prometheus/client_golang v1.11.0/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/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.10.0/go.mod"
+"github.com/prometheus/common v0.26.0/go.mod"
+"github.com/prometheus/common v0.32.1"
+"github.com/prometheus/common v0.32.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.1.3/go.mod"
+"github.com/prometheus/procfs v0.6.0"
+"github.com/prometheus/procfs v0.6.0/go.mod"
+"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/sirupsen/logrus v1.6.0/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/yuin/goldmark v1.1.25/go.mod"
+"github.com/yuin/goldmark v1.1.27/go.mod"
+"github.com/yuin/goldmark v1.1.32/go.mod"
+"go.opencensus.io v0.21.0/go.mod"
+"go.opencensus.io v0.22.0/go.mod"
+"go.opencensus.io v0.22.2/go.mod"
+"go.opencensus.io v0.22.3/go.mod"
+"go.opencensus.io v0.22.4/go.mod"
+"go.uber.org/atomic v1.9.0"
+"go.uber.org/atomic v1.9.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-20190510104115-cbcb75029529/go.mod"
+"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+"golang.org/x/mod v0.1.0/go.mod"
+"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+"golang.org/x/mod v0.2.0/go.mod"
+"golang.org/x/mod v0.3.0/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/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-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+"golang.org/x/net v0.0.0-20210525063256-abc453219eb5"
+"golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod"
+"golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8"
+"golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/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/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/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-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40"
+"golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod"
+"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/text v0.3.2/go.mod"
+"golang.org/x/text v0.3.3/go.mod"
+"golang.org/x/text v0.3.6/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+"google.golang.org/api v0.4.0/go.mod"
+"google.golang.org/api v0.7.0/go.mod"
+"google.golang.org/api v0.8.0/go.mod"
+"google.golang.org/api v0.9.0/go.mod"
+"google.golang.org/api v0.13.0/go.mod"
+"google.golang.org/api v0.14.0/go.mod"
+"google.golang.org/api v0.15.0/go.mod"
+"google.golang.org/api v0.17.0/go.mod"
+"google.golang.org/api v0.18.0/go.mod"
+"google.golang.org/api v0.19.0/go.mod"
+"google.golang.org/api v0.20.0/go.mod"
+"google.golang.org/api v0.22.0/go.mod"
+"google.golang.org/api v0.24.0/go.mod"
+"google.golang.org/api v0.28.0/go.mod"
+"google.golang.org/api v0.29.0/go.mod"
+"google.golang.org/api v0.30.0/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.5.0/go.mod"
+"google.golang.org/appengine v1.6.1/go.mod"
+"google.golang.org/appengine v1.6.5/go.mod"
+"google.golang.org/appengine v1.6.6"
+"google.golang.org/appengine v1.6.6/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.20.1/go.mod"
+"google.golang.org/grpc v1.21.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.25.1/go.mod"
+"google.golang.org/grpc v1.26.0/go.mod"
+"google.golang.org/grpc v1.27.0/go.mod"
+"google.golang.org/grpc v1.27.1/go.mod"
+"google.golang.org/grpc v1.28.0/go.mod"
+"google.golang.org/grpc v1.29.1/go.mod"
+"google.golang.org/grpc v1.30.0/go.mod"
+"google.golang.org/grpc v1.31.0/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.24.0/go.mod"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"google.golang.org/protobuf v1.26.0-rc.1"
+"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/errgo.v2 v2.1.0/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"gopkg.in/yaml.v2 v2.3.0/go.mod"
+"gopkg.in/yaml.v2 v2.4.0"
+"gopkg.in/yaml.v2 v2.4.0/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+"rsc.io/binaryregexp v0.2.0/go.mod"
+"rsc.io/quote/v3 v3.1.0/go.mod"
+"rsc.io/sampler v1.3.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/prometheus/promu/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${EGIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+	go build . || die "compile failed"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc -r {doc,{README,CONTRIBUTING}.md}
+}
diff --git a/dev-util/rocm-clang-ocl/Manifest b/dev-util/rocm-clang-ocl/Manifest
new file mode 100644
index 000000000000..f70f011ca7ff
--- /dev/null
+++ b/dev-util/rocm-clang-ocl/Manifest
@@ -0,0 +1,3 @@
+DIST rocm-clang-ocl-4.3.0.tar.gz 3241 BLAKE2B 1a646d64e42a8884a7714b4ca25d888aa1e84d68be3f6ceacefcf7836340133740c8df85f152fadb40d463af76eb659f0fd11ebd2b0a6a3c0da3b7ac64bf541c SHA512 059d0d118205d6f4c2a61222fc74709a86bbe71687615debcc1698f73c28a769379b909cd18742b4d3340ba30a65b02da9224fbe5fe0e2fb005d9a45f22dfe9c
+EBUILD rocm-clang-ocl-4.3.0.ebuild 912 BLAKE2B 0c5a8985f4eb050a2faa5b136523383ae03addf1d6b38508ff67c118436398c74e90488c20292832a87d1b0099a1ef9e0d8bfff65e21036a88e5f7f17e898779 SHA512 4b6410884e506cbf847ee57581cd820bd4fbb9158c4c74281ef3c4bd4cf07f34e50d20abe724e1dc2b39c8c0e88de673943207f8a741e4df0608c8ec5d8f0d58
+MISC metadata.xml 452 BLAKE2B a5cb97ebc54cd63cd0f83b12d12d5be16e732e8151bdddfe1cd23655f8f271e7df45441268bc9a0d25c211c49dfcd6ce3901f0684ce43156514e78eab5e80058 SHA512 7e94c60c456503b4fe4f351ac322fae0ee5c3db8a43b43ba1a5aefb23d45495135d8370e82f1f5b8431fc12bef2f94a4f8c9bae2b0a28b25a621ed0684c424b3
diff --git a/dev-util/rocm-clang-ocl/metadata.xml b/dev-util/rocm-clang-ocl/metadata.xml
new file mode 100644
index 000000000000..da47ad0ef39f
--- /dev/null
+++ b/dev-util/rocm-clang-ocl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>gentoo@holzke.net</email>
+    <name>Wilfried Holzke</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>xgreenlandforwyy@gmail.com</email>
+    <name>Yiyang Wu</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild b/dev-util/rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild
new file mode 100644
index 000000000000..4c12bb9c3831
--- /dev/null
+++ b/dev-util/rocm-clang-ocl/rocm-clang-ocl-4.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="OpenCL compilation with clang compiler"
+HOMEPAGE="https://github.com/RadeonOpenCompute/clang-ocl.git"
+SRC_URI="https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-${PV}.tar.gz -> rocm-clang-ocl-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/rocm-opencl-runtime:${SLOT}"
+DEPEND="
+	dev-util/rocm-cmake:${SLOT}
+	${RDEPEND}"
+
+S="${WORKDIR}/clang-ocl-rocm-${PV}"
+
+src_prepare() {
+	sed -e "s:HINTS \${CXX_COMPILER_PATH}/bin:NO_DEFAULT_PATH:" \
+		-e "s:/opt/rocm/llvm/bin:${EPREFIX}/usr/lib/llvm/roc/bin:" \
+		-e "/AMDDeviceLibs PATHS/s:/opt/rocm:${EPREFIX}/usr/lib/cmake/AMDDeviceLibs:" \
+		-e "s:\${AMD_DEVICE_LIBS_PREFIX}/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" \
+		-i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
diff --git a/dev-util/shellcheck-bin/Manifest b/dev-util/shellcheck-bin/Manifest
index d11fe2b7aeb2..517615611ce1 100644
--- a/dev-util/shellcheck-bin/Manifest
+++ b/dev-util/shellcheck-bin/Manifest
@@ -4,6 +4,10 @@ DIST shellcheck-v0.7.1.linux.x86_64.tar.xz 1443836 BLAKE2B dce108606eaca97b720c9
 DIST shellcheck-v0.7.2.linux.aarch64.tar.xz 2976204 BLAKE2B ffaef155797c6fdedd1c06630394353b9340481837ec49fb1f1a661773b0c302963a05e51d3d42414c3fed811397428b03db4eb00b85d0f65cbd8f0327a6f538 SHA512 467cc6455d665638e7803a36f1be65ccfb9dc92c5573b143110e8e259e50fb2213b8346fdef43bbd3e6077ec4d78fd6c30e678c96f472e6f056448b43834f7dc
 DIST shellcheck-v0.7.2.linux.armv6hf.tar.xz 1205332 BLAKE2B 675b8ed49d29e24995ddc01f1809c93dc07654c0d364152c98f76dc0e6cc37f733ea08385025650d37e06393c3e81deeba54d188b2eff37a9cdc88dcfc948e82 SHA512 e4978167122178ed5d3475d7632bfc55331f412915f832c96118a436dd656ecdc47ec99c724643de3c091a5132c43b851e52f6d987aa4d39ef29e797b538e274
 DIST shellcheck-v0.7.2.linux.x86_64.tar.xz 1382204 BLAKE2B f06b6cbbace309b2abf856c2c06ad15a7800298d437eaa94ef03502bdcba6736cf7aebf45d0c939dae4baf4f303bd352fdafc169d32267b02dae8ea425d24b38 SHA512 067e2b8ee1910218de1e62068f7cc86ed7048e97b2a9d7c475ea29ae81c17a944376ce5c240d5c783ef3251d9bee7d7d010351958314eadd0fc88b5decfd8328
+DIST shellcheck-v0.8.0.linux.aarch64.tar.xz 2996468 BLAKE2B b38f1ff04949d9069eaf835fa42a2497e0cc6c8a10ea66167156dd4e7ba1b9dca1449cd1b23cb6df63f5f8e19aff566d481a08522d61d527b8bd0756a09dd52f SHA512 7082a5002a1ea2403cd6c24665149a0444960a66dc2002f2e38726a6ed4f7f0499a051679cef8de619e401e8754b13a65624fdb108d7225cb486219184c44c12
+DIST shellcheck-v0.8.0.linux.armv6hf.tar.xz 1228088 BLAKE2B ebf8f1a89d2562498e055c50d75cac683d2d185df2a74e5863eff63fb36a2bb1f502c73a35ea704b0933f2c55bbd5b48925cd1c2ad5172007b1d8ee1868f482e SHA512 a00a00a58d00d0879fbd9f601902eb96105da0b9ac5220a4176dce73d22c1ba8108435fb6f8c0ae0b450e32a207f49ecaf84d7830feb512359f27e8eae2ec190
+DIST shellcheck-v0.8.0.linux.x86_64.tar.xz 1403852 BLAKE2B ab18c0cea2d0f6a664ccedca807c263167e187824238cd414d30dd03bab88fe0687d3e47d1778eb5399a34c49dddda9a2fc5e75cced17a6dfcfccec1d0e8d848 SHA512 89317d97adb341e627b709e86477734ce236e9fb290de8a8c41cdc62769a3225622fa609deffebeabe9edb71f5639a086f61b677947e3ec4bc07c540fcbd0973
 EBUILD shellcheck-bin-0.7.1.ebuild 683 BLAKE2B b287d7090e1891cc1e383ed7177294f40b077327ec913fa7022436c0d0fddd108e52efc00cf6b029d50b5b1d0a2cdf6d969bfdc98934e715eba7bb2da9bdcbeb SHA512 3ff2d6f73c5d050ded97a29c999d7bee7944e23f60a366ad14f09f869ba6844ea051bcc2595c06557c324f829b0fdcebc816f157d784813c0f9cc8d2eff4be95
 EBUILD shellcheck-bin-0.7.2.ebuild 684 BLAKE2B a7a1f1c34cf5ba77912f7cc51e0462fc0a5967af34262a5d67f0f080a1002f48cc8288c1403b043b034ac47c16b74ecb8ac4eb952c620ee5cbb7a41bb2cf300c SHA512 faf089d908286499849135c4d8d980c5981f5b27befa7e0fc3a60fa496ef547607edccd066cada202753c3678d533cce133448c4ba2f4dc9f7056733e8f494dd
+EBUILD shellcheck-bin-0.8.0.ebuild 684 BLAKE2B a7a1f1c34cf5ba77912f7cc51e0462fc0a5967af34262a5d67f0f080a1002f48cc8288c1403b043b034ac47c16b74ecb8ac4eb952c620ee5cbb7a41bb2cf300c SHA512 faf089d908286499849135c4d8d980c5981f5b27befa7e0fc3a60fa496ef547607edccd066cada202753c3678d533cce133448c4ba2f4dc9f7056733e8f494dd
 MISC metadata.xml 336 BLAKE2B 3e56fb0711ad1fd6f5a1618c79c78bb1480299bdc7c45f6145e3204c3ce43c36660f547932cf6f1ab41ac2573ca48c73030b1514b7d85d2f577cb6036aaa9fdd SHA512 07556354a2661d6f8ce483f3e5c761c2125b077117449d0184051ac922b778658c13a33045f187fd1a83f427e12622cf23c6126997b0e972743d35b334585eed
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.8.0.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.8.0.ebuild
new file mode 100644
index 000000000000..c825ca6b13ef
--- /dev/null
+++ b/dev-util/shellcheck-bin/shellcheck-bin-0.8.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${PN/-bin/}
+BASE_URI="https://github.com/koalaman/${MY_PN}/releases/download/v${PV}/${MY_PN}-v${PV}.linux"
+
+DESCRIPTION="Shell script analysis tool (binary package)"
+HOMEPAGE="https://www.shellcheck.net/"
+SRC_URI="
+	amd64? ( "${BASE_URI}".x86_64.tar.xz  )
+	arm?   ( "${BASE_URI}".armv6hf.tar.xz )
+	arm64? ( "${BASE_URI}".aarch64.tar.xz )
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+DEPEND="!dev-util/shellcheck"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="/usr/bin/shellcheck"
+S="${WORKDIR}/${MY_PN}-v${PV}"
+
+src_install() {
+	dobin shellcheck
+	einstalldocs
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index f39219ce405a..fb5bf012c659 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-headers-1.5.4.2_pre20210526.tar.gz 406038 BLAKE2B e10042a4c09668a6eb0d2f08a873794e20d83e6f7be40d58c3a59e1d96aa6845060a9fd7e90ea4e6a940eddbabf6b725be756ea64b49ef9034b34dc6c33fa5bb SHA512 ef9b171c168963a3f25643a3ce5f6a5df3b811daaf237700f793c1d313016c148b107b0d8cfe81fa4cb72f8da87a3da58387545f7bd76d15927c4742d0dc2b68
 DIST spirv-headers-20210817.tar.gz 414897 BLAKE2B f10997c6bca46d48a592ce12b59817d31b0e5cd77fa0518c8ecb0d1da56d54a49562fb8f6fd355feb964f93129a6304ec14ed2a5f1776c130c8e3b727fd93192 SHA512 837ebac5afe05b2eb08029058240a8f08d49eca701201f93181e3a9076a15b67421122e8322a4230d6e21766dc85396be6415d352769791d6a44dbae59ce908b
 EBUILD spirv-headers-1.5.4.2_pre20210526.ebuild 514 BLAKE2B 411e68b89f8ca47e4d7b28c863cc933df12034186ef6c811b65522aec05655be4d87bb20b9648cf51a31933447a7a22844325b4da7ff3b3cec37371ea28845aa SHA512 2595b8d59279ad0eb28beb55c4946c1848a7ab86fb8fff6e17a9ac085918a7f9f3c226729c5af86b19c860f6b7d2e65dabb754601df9e92073d88858435d871e
-EBUILD spirv-headers-20210817.ebuild 520 BLAKE2B 113a986d9b15fb5d3f5fb0357736a570fb5403a43514236a8094c1d632b4111b9d3bbf4bea703306c83b2542d98d7a2c41703368f60d74a2bc123851c48247f2 SHA512 4aa5bc2b62deca9958ba2a4072d026a8d166b403e81ecaffae7d1d42c8756e3dfe79a10236d0d1aa0f64fbdb7afc42065b2827ceb9583aea89a146b116928490
+EBUILD spirv-headers-20210817.ebuild 518 BLAKE2B b714ae88a33ca13025df3e58aa429f196556a2a1cd55c15451c446a7c7b4e569e69891d8a446887f2db130036d35ea0728aedf36d3170387a78aa4d6ddc59531 SHA512 d982489bb73c5ef865d00157d1f017df8063ab5514f6dbe002490c78d466dbae188b7077de68ff1ba49c4c7cb72a1b6d87721fe2ab912acee6b189b750b1860c
 EBUILD spirv-headers-99999999.ebuild 600 BLAKE2B 729bb67b02b0daed93cb0313be74c44443921d28f64cafce463efef0e6e7c50a0113dd770bbea8c07c5bbb606389e2f721909c3928a152a6c7f90cfde0b9f367 SHA512 2fe9de8cd13eb45914844fa56829c0e165a05ad721b5cae1db2bbc676a7f1e7d6ae76d7dbf9e226b21754db962750da4211ef31788d0b50524c7f7c82bd6e785
 MISC metadata.xml 431 BLAKE2B c29407612814c966f4134687e901ffff31be3990b771b3584f6517640098ba2cdf131ae84bcdc3da8398d77d1d51e3d6fe0180c564c0e8272406d246a5661578 SHA512 599da456349756e1ec66a1b36d9c05322c5aff088dc4741239a647550ba816333a2dab0e05049215e6d4b08222e06f3aa5a1f76697c7a15eda31b571afa3299a
diff --git a/dev-util/spirv-headers/spirv-headers-20210817.ebuild b/dev-util/spirv-headers/spirv-headers-20210817.ebuild
index 17e0b0e120f9..922bff4d2c43 100644
--- a/dev-util/spirv-headers/spirv-headers-20210817.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-20210817.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index d7d6f0567f05..433863b54482 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-tools-2021.1.tar.gz 2613619 BLAKE2B ab5816e3407ba827f5db69cb391b0e4820661aa7367edfc5a9a41cb9fee98a7e814f765d99548cdab1a11869f79710e6243f2c97ec3ee4f6a919990dc24e63dd SHA512 74be4ecb3f6926cebdbfdc2351e3d3e0db18a8a312ce12882442d4e33737f9ccfb0ec6e1f5cd6bb5604525467605c080a8494b4aef6dd797dc805e12bc10226f
 DIST spirv-tools-20210825.tar.gz 2852443 BLAKE2B 87c24d6c5506097cf24b3008450e54a652c1e9d0ad1dd61499b65cc93e4783db2f86b3138ef2c8f33b8b242fc55dfa279d135d347bd21dd8977773ae302ae430 SHA512 d99cb85527810413e6df386342a5d0de201defe401fd175f0cd15604dcba0f8c157b63b4d49be64b5161b6a97c0a6ae16fe82080368ec6eb64cd71300d056bea
 EBUILD spirv-tools-2021.1.ebuild 1254 BLAKE2B f59d178590ac5c0985abb3698c6a2b7618e6f199fbc5018cac01b2e9f63b73ed87e6f1d05bd5bbfaf6edc929e9ab119e46bfae51573b621c7a7f6a694634b9bc SHA512 6a47a37de6a9b741e37c279f8cd910486b1978ab3e94bb89013d7d30b648e511e90559d1798d95b8a9d1816c18509668e5182125b8e7f790c02a53c99c4f434d
-EBUILD spirv-tools-20210825.ebuild 1249 BLAKE2B 0ed3b9118c7ee8068f67d50db3400ab1cc0a953d7720e049f40b50cbcd6aba39af44b6c13afe876cc1847bb15f20a88e4461e8ab2f7606f3f81a29739c0199f3 SHA512 794f2c7a03e71fada2ebdc627a2a75fc7121c5719b2794d9402e44d60453adf429b721b038156c7449d778fd268945c4a914e3e83aa0bcb7ec3684ec47ba3f85
+EBUILD spirv-tools-20210825.ebuild 1247 BLAKE2B cdbbdb116752e61e848273ff41e40fe650dec9488bce72956efe67e0c4154f06e825a1ab9614ef62645e8547a9eaee24bbab8f0d6fbdbe3e90be4b3822fbc222 SHA512 e37e252fc8f08f8fe99653fac92b2fdd0942985a60aa182a784ecbc787c4b2f31357ce3dad5e6d3bb0e810c2c1db7720be1b71c8e5cfae97aea486810e770def
 EBUILD spirv-tools-99999999.ebuild 1249 BLAKE2B fff6ed718fed7223911810ad47847230aa3f77c08925893e63e04cd55d4c3486b4e653d26e638a44bce7d9cdce178dff9a01e8b5d99777b245eac9b8563453b3 SHA512 0081fdbc259e420597b3efcd1985cc4e30a963bbc08e49701fb1b7218b092d2af373d510cc484a2e8a1de8e9032f91d0d49272e09f9a5645042bebd9cf278dd1
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-20210825.ebuild b/dev-util/spirv-tools/spirv-tools-20210825.ebuild
index e4f15743b655..6a16265502a1 100644
--- a/dev-util/spirv-tools/spirv-tools-20210825.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-20210825.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="1fbed83c8aab8517d821fcb4164c08567951938f"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index f1bbb8add83e..2b292d0184ec 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -2,8 +2,10 @@ DIST stripe-mock-0.110.0.tar.gz 604856 BLAKE2B ce8b83ce4787d56752ce47f919c049a32
 DIST stripe-mock-0.111.0.tar.gz 604494 BLAKE2B c9aad7c4b939a49c6a947cc3a2b2506b0c2b7e2c0e1f8841f92b7d53e1138a4e6333eaecf6f2a984861df6fb67800acd8d29b3774b8970e5e482f58fed4e9c53 SHA512 1b01136bb52543052bd66b1c7112181dc0834d5e17ff0590fd2dfad8fdc593eb21967e7ecc3ecac8ae7882e44410e752ddd203b9a87b34d6f4c1fea1cd3ebbb2
 DIST stripe-mock-0.112.0.tar.gz 627738 BLAKE2B 7ce44762596de04edda1e544a6bc77c36f68dabbebb280881d9e992b3f08054c9a3dc6805fc6060cabed5c9fcf185ccdf89835c123c9145cd2dccbd57fdf4461 SHA512 8d78712e99c95ab07514406f850d4255ff69bcca804b030a23ec9cb6a19408ade26836a2b4be6262868bc57ad68542112816edf3c6508c01a9bcbc4202922a27
 DIST stripe-mock-0.113.0.tar.gz 628049 BLAKE2B 5886bc5884bac74502014e1ad59bcc16f1c58f373142c9aca9129b7c8c70556bcfda23576f2c70d71fd9a99bed00f0f95a36e26e95cef58aebf9a37a21e42bbd SHA512 1a3687685a5c48de89946a4949ee4da367585b5adecf6e9d002493f8ab23b1eb8e38e87ec0b60d6157ddcbd8601ef5c1fef5d279a98e80eb34e0bd529f798185
+DIST stripe-mock-0.114.0.tar.gz 631280 BLAKE2B 6b5fc4b160363eaacda7d8fcc590c9812c05d8fa3bd305e52fd70aa54205620fa46bd7ae00044ad618ad03dc36bb318be27b311eeb9a5c77534dedc93a9d67c0 SHA512 e1df4318d34e5213eecb36b43ccfce327cbdf75bd9f786e8c5ff3cc793ebf3ecb376e5c24b41966d76874c1df80b543707ea2a4a857baf70a32fb7dac7d06066
 EBUILD stripe-mock-0.110.0.ebuild 582 BLAKE2B 3e5f302fe8efdfa19c81b51aa1f733c8695650a2ab7982ac737f67bf0005c4d94ecbe47c59c41ee81377d9e02671119e19e084ff37be10a555ea031d1951f6f8 SHA512 25771845d4987ba1fd2e4f49ec69825c59a36d0ad967ef258b149de7f53edc7ef7cd3198095b2684e7364e0f46d8a62beb653e6b088f14184ee5a6efed72d53c
 EBUILD stripe-mock-0.111.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 EBUILD stripe-mock-0.112.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 EBUILD stripe-mock-0.113.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
+EBUILD stripe-mock-0.114.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 MISC metadata.xml 643 BLAKE2B 6a45b4c6f7e3372850e8947db71b028a32f6fc63d202b912a0fed600dd7f426984828af2f80dbfbdafb69a15a3b58b82c2b738b424727b28704aefb43f43e361 SHA512 3a1d0724f14ca0885c6dde06b9c0fed1dcf7a9dcbfb32de75682cee9ad2b29fc94f9544319a2fe5d5fe3c25afb01e0f6492616e13e3d01640af7defd0ba9c098
diff --git a/dev-util/stripe-mock/stripe-mock-0.114.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.114.0.ebuild
new file mode 100644
index 000000000000..05a7220e34b0
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.114.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_SRC="github.com/stripe/stripe-mock"
+EGO_PN=${EGO_SRC}/...
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT ISC BSD-2"
+SLOT="0"
+
+src_install() {
+	golang-build_src_install
+	dobin bin/stripe-mock
+	rm -rf "${D}$(get_golibdir_gopath)" || die
+}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index a57508ca862b..15ce4ccae5ac 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -3,5 +3,6 @@ AUX systemtap-4.4-configure.ac-non-posix-test.patch 9435 BLAKE2B df56bc874cc14af
 DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
 DIST systemtap-4.5.tar.gz 5549909 BLAKE2B 3c180a49c81070cb374ae23f95f1e90cc3cf2550170363793f46584b201c2284b2ee639f395d73ed6c5b44160825b3cf128bd360b81bc243e71c98e71d779f48 SHA512 8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3
 EBUILD systemtap-4.4.ebuild 2885 BLAKE2B 04f70fad16bf1f3fce92e19101301695d458fd3aee80df40527eed5eda260fe0a294c282ae9d8406143d2aafd031bdb3b9d387efda674c760ba250b29d6a9639 SHA512 ba502e7d961c53ce0c2f3a1de9c1fe4791e38fb3fc8769dc22c5e98b3a7403b465c5ad53edbe642b6b7df519064ab0a437a2201edddd22a0888900eafcc1b2cc
+EBUILD systemtap-4.5-r1.ebuild 2849 BLAKE2B fafb9f95e3270127739de311674244504d82a75952e160482fe26fcc05cd7d9e5cfec0ec52df965c76accfa48d594159c35b2301dc98cba0965544cb24a866c1 SHA512 7c68266ff9a12d39b284f68fd71d2f62a591339a663ecf4395f67b7480b893d5d4358f658f5bb76016df2f631b460113781e647b7dfd8d5eca81f15adb2b4efa
 EBUILD systemtap-4.5.ebuild 2821 BLAKE2B ea81c5de36484c89c145fa275c8bf4a63642562dda782f6ca334ed7b1e44752d6e3b9e2d6034022aae6a4a7c25248183b5f6fd875f552bcd2a717ea7ec2d5ea9 SHA512 a8a1f562da5a596d9f38cfa7e4bcba3ec1030d732ce1c47506e17043055ea2b196e2a5b0adf99b2d27e39c65593534b5397dc701db3da6f0620037815934bb0b
 MISC metadata.xml 303 BLAKE2B 5db95d500a08d656d0221a474d297c8357712f19334f45db347e36f14a10365d65777e0d24c68f75d4855b3ee1778dca1ecf4a05b19d2dd3975acf25a12b4523 SHA512 27261bc875c881495a9b0e1fffc811dff40b763a9e6453ca47143cb8d7d867682becd7266f8d559ad8c32bb5d7de9698341055d483f3e6a68b107895aa174b77
diff --git a/dev-util/systemtap/systemtap-4.5-r1.ebuild b/dev-util/systemtap/systemtap-4.5-r1.ebuild
new file mode 100644
index 000000000000..b11a0b1830c0
--- /dev/null
+++ b/dev-util/systemtap/systemtap-4.5-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit autotools linux-info 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 ~riscv ~s390 ~sparc ~x86"
+IUSE="libvirt selinux sqlite +ssl test zeroconf"
+
+CDEPEND="
+	${PYTHON_DEPS}
+
+	>=dev-libs/elfutils-0.142
+	dev-libs/json-c:=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+
+	libvirt? ( >=app-emulation/libvirt-1.0.2 )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="
+	${CDEPEND}
+	app-arch/cpio
+	app-text/xmlto
+	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	>=sys-devel/gettext-0.18.2
+
+	libvirt? ( dev-libs/libxml2 )
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/stapdev
+	acct-group/stapsys
+	acct-group/stapusr
+"
+BDEPEND="test? ( dev-util/dejagnu )"
+
+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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+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 \
+		stapbpf/Makefile.am \
+		stapdyn/Makefile.am \
+		staprun/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() {
+	local myeconfargs=(
+		--disable-docs
+		--disable-grapher
+		--disable-refdocs
+		--disable-server
+		--enable-pie
+		--with-python3
+		--without-java
+		--without-openssl
+		--without-python2-probes
+		--without-rpm
+		$(use_enable libvirt virt)
+		$(use_enable sqlite)
+		$(use_with zeroconf avahi)
+		$(use_with ssl nss)
+		$(use_with selinux)
+	)
+	PYTHON3="${PYTHON}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+}
diff --git a/dev-util/uglifyjs/Manifest b/dev-util/uglifyjs/Manifest
index 47176de6f660..ada145895991 100644
--- a/dev-util/uglifyjs/Manifest
+++ b/dev-util/uglifyjs/Manifest
@@ -1,3 +1,3 @@
-DIST uglifyjs-3.14.2.tar.gz 485825 BLAKE2B f90845d832334d39e51ac011d4b92fbc1501586265aceb0a20522ee628903608503225e2ff1ad11be391068363dd68bbbd4de7aa5b88d2464cfb07b84c19f3ed SHA512 fa3c668e28043e0155f583bfe64375b92c1f796eaa1d9ae88c0f54d6799d95b9d8f25e9e0da79a8ac923f3dd2d408de4f70dfba39ad2b1156bbb99fcc536f6c9
-EBUILD uglifyjs-3.14.2.ebuild 776 BLAKE2B d1ab3cca46fcd56f33af01636cb74dfc6d08323982a1a1443a7e3af6692d70a5ad9be4cb1506c935da5d250431707ee6ebeec6b3bea9820811cdf9abba3b312e SHA512 9e16abbd07e58895790de78149b18675e79bbd04d3ab6ad295f7e41a08336d5c396739ff7d9318f8fb58804267814c0aead92694f667ff0210339bd5f13a6f4a
+DIST uglifyjs-3.14.3.tar.gz 487667 BLAKE2B 7a94cbdb4a9a9ec97f69fcf64d4db310cf44cabbc3dc342e842aa638576f823316fcc521682e136958d75f943c080891bf951771b281c8ba75e7964b6c1e8e15 SHA512 2a95437141eb3311b7ac282d610865f63dc67b9c862cea6103267f289a6ff06d1b25ffb6ab608b379d8f1db3b1f0b8634daae32c5debf197aebdae894a19e282
+EBUILD uglifyjs-3.14.3.ebuild 776 BLAKE2B d1ab3cca46fcd56f33af01636cb74dfc6d08323982a1a1443a7e3af6692d70a5ad9be4cb1506c935da5d250431707ee6ebeec6b3bea9820811cdf9abba3b312e SHA512 9e16abbd07e58895790de78149b18675e79bbd04d3ab6ad295f7e41a08336d5c396739ff7d9318f8fb58804267814c0aead92694f667ff0210339bd5f13a6f4a
 MISC metadata.xml 328 BLAKE2B 74d4d808f158dcb49e996da74b67d65fe12956d7486b91941b03f3bb237d7d13387ac629b9689ebce8bd0580b0ce24d359a788911134fef6f006546c5365f2d8 SHA512 3db3efc0f0f5f0f3c7d453d4edae27d0ddfc62aa7cb778684d58460cfd55187fdd90c06bfb2629fb0d84874ff378dbccbc7ef182a10e35fd4b85991c5777a213
diff --git a/dev-util/uglifyjs/uglifyjs-3.14.2.ebuild b/dev-util/uglifyjs/uglifyjs-3.14.3.ebuild
index 66d57eae5391..66d57eae5391 100644
--- a/dev-util/uglifyjs/uglifyjs-3.14.2.ebuild
+++ b/dev-util/uglifyjs/uglifyjs-3.14.3.ebuild
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 7dee258cdab1..41384950a89c 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,6 @@
 DIST vulkan-headers-1.2.182.tar.gz 1162517 BLAKE2B 0dd396dde2cea94529b99a079cb082d01b4223cd1a63a4bff6405f882b95d896080d62ebfe34365ee104de8530ceaaba6f889443a813926838c82db9938d5ee0 SHA512 045091ad94d335fb4743fb033ca581a5c128b23633d61dc403bddfef8f88b6ae86afff628b2f2f333ee5edfb0f6f68f060e2402d27d5ab53eaed850a16de8782
 DIST vulkan-headers-1.2.189.tar.gz 1191160 BLAKE2B cd322dfd4ad9010cf4a7d84e8bd450fee48008f43aebed69253d42e786d446d1afa2fc32915d7021b8f75fe6a70400ca57e06a20b075aad78a524f811b3ba1fe SHA512 883a3d69c48bea307681791c6e9d5efa4f956c5beba70d3cac87826bade633cbc98feeaa34607a4754c460cb262e0d6a7b20ecae5c3fccb765181d04402daa13
 EBUILD vulkan-headers-1.2.182.ebuild 611 BLAKE2B a0dc00cde81752730cd13704bd71f06943f2a523306bb250ec4043c2cbbb7fccf9a9ab4e90ca7bb6811852f9b866940a7722e623dea0d36abff1d7001d8ffe40 SHA512 e08e859280da3384fc8248b255333b8e781e4a6d57c3cf8952b37f905bc78b5ca8df25bae6d79f39ca52bf21f1e11786bd2b60d0d70cb7a6b93eb66cb49e0b7c
-EBUILD vulkan-headers-1.2.189.ebuild 617 BLAKE2B de17fc55658dff792497262a77db71dbc9a360c6a35497522a7681452bf52398f90435bf6738477f09fa4cc1fcf96c3785ed6b222d9d7a5bb4ff257778dc63eb SHA512 9396dd22eee89217748990fcd336163561244de835947edc5ab6028b63ab16666c9ce28fb737563d572891de036bf3b435b68f6a89191bd2f97b12575af1b80e
+EBUILD vulkan-headers-1.2.189.ebuild 615 BLAKE2B 820f25c3900be3c11d5507c97d3ea9c9fc537822c53e2253ce8598981e60b27701cce67444c96703f7db14a359a7eeb242619174c230efbcb19ada4776839072 SHA512 ebee5b68e944b54790f1303441e8ba6ba65cb9231f574138a4ef6bda084f3684cb09493864a869a099fb4e75a1678b9aa790ad0b442853215c55d746a41e9f58
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 432 BLAKE2B 04c6e302b541f48dd20c84c7da9e82cad1b53d8040e796034992e8e110e3a815acc76e3067d12ce12fe2d7501d797b1e0340231d7f8216c4bf7576a053f5ffb7 SHA512 89ef7a8b4de02a0726aacaabc87904bd4f5484567d21ec6dcfa15dc7f84a3a3915a3202febf4f779fdc54762b3731cd0384235a7908c46b1adf3cbc38effa5f4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild
index 9eea670b13dc..a9d5e5115981 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 0a019a3ec6d7..87768ca9d9f2 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -2,6 +2,7 @@ DIST vulkan-tools-1.2.182.tar.gz 847991 BLAKE2B 5ab9d73383338bcc3c54487f0f433466
 DIST vulkan-tools-1.2.189.tar.gz 849041 BLAKE2B ae38aaca9789276bcb93c5c297c9113fcced4cd3417f0619c0e1fb539df5891e725a77785fbeca0c8957644af7245ff9f0a3981cf5f8726f4f231e39f05ddfbb SHA512 3ac4f79a6ba18690026d1933b7f3c45769f9759e25d19508bc34d431454dc548e1f738ae3d804db2864a97de3b8628f167bc00dcad4059eaeb1714e4fdd3507a
 EBUILD vulkan-tools-1.2.182-r1.ebuild 1960 BLAKE2B 58cc40ddc91151c04eccf4fb10a341e10105f20d195fd5c6d988dcabb22c0352ceeaa0807d443af45fbc4e365286059df8e1ad033657194f389a50afebc826aa SHA512 7fa32f411fbe29e6a999c5c591b21c4388d5400c76e1e7a59494f703c68f7af9f38065b6a9d6260685377e6ddedba8695871daa6b431c388c2e6b4e085c6eca6
 EBUILD vulkan-tools-1.2.182.ebuild 1860 BLAKE2B 3e3f89a5c3f26601333dc91a3532638d08bb15023f2cf487dd075f300245fbbe109b7b84f4046af3972132504d41a8f8bcb82c03bc8c24f9ad0c738d456beab7 SHA512 ad5a23b0a5e4375d80f0d5f912daceff89992c563ba29858f8ddd9b5b3a34a5c3570a80d57617493662b76aa0033027849b0908f463ac88aed55715c91860c9e
+EBUILD vulkan-tools-1.2.189-r1.ebuild 1946 BLAKE2B 4415d72ebb75d99ed7a9058be037387dcd00b4865b4a15aed337c7aaad6f1c0eeae8c4b4dd180386e8f8ca60d60954ed1b594b8b02fa809bba8daf71f1201ee1 SHA512 345f5e6ef33a0002fa9272bc81e5084e0d263eedef349cbd1d042a3c20ffa178bbf6c93ec9baca286898b6c0d614cf649f1045a97357ebe23c1c64c9f0c44ea1
 EBUILD vulkan-tools-1.2.189.ebuild 1960 BLAKE2B 58cc40ddc91151c04eccf4fb10a341e10105f20d195fd5c6d988dcabb22c0352ceeaa0807d443af45fbc4e365286059df8e1ad033657194f389a50afebc826aa SHA512 7fa32f411fbe29e6a999c5c591b21c4388d5400c76e1e7a59494f703c68f7af9f38065b6a9d6260685377e6ddedba8695871daa6b431c388c2e6b4e085c6eca6
-EBUILD vulkan-tools-9999.ebuild 1960 BLAKE2B 58cc40ddc91151c04eccf4fb10a341e10105f20d195fd5c6d988dcabb22c0352ceeaa0807d443af45fbc4e365286059df8e1ad033657194f389a50afebc826aa SHA512 7fa32f411fbe29e6a999c5c591b21c4388d5400c76e1e7a59494f703c68f7af9f38065b6a9d6260685377e6ddedba8695871daa6b431c388c2e6b4e085c6eca6
+EBUILD vulkan-tools-9999.ebuild 1947 BLAKE2B 9c39acf596d5cb4a98560f1ca28a0f577f03987e15ba37ce8d3bffef742282abfab7569c20a814eb8fe448e7448d05cd9fb951d8f7615b93e9a4c0c2b70580cd SHA512 ecf6d88130aff53aa336450f337092c4a6cf117cf71fe6ab47e39cc00e39df8de40d340531ca27c06a17e7920afd9c0dcaff54dfdf6eda8818031b5e5d528f8e
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild
new file mode 100644
index 000000000000..75e74596704a
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{8,9} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland +X"
+
+# Cube demo only supports one window system at a time
+REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
+
+BDEPEND="${PYTHON_DEPS}
+	>=dev-util/cmake-3.10.2
+	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/vulkan-headers-${PV}
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+
+	use cube && mycmakeargs+=(
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
+		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 82f33ec2490c..038bf033579c 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -4,8 +4,7 @@
 EAPI=7
 
 MY_PN=Vulkan-Tools
-CMAKE_ECLASS="cmake-utils"
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{8,9} )
 inherit cmake-multilib python-any-r1
 
@@ -58,12 +57,10 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
 multilib_src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
 		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_VULKANINFO=ON
 		-DBUILD_CUBE=$(usex cube)
@@ -78,9 +75,9 @@ multilib_src_configure() {
 		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 multilib_src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/dev-util/woke/Manifest b/dev-util/woke/Manifest
index 9d975de2f6b0..75d730874c78 100644
--- a/dev-util/woke/Manifest
+++ b/dev-util/woke/Manifest
@@ -18,6 +18,11 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.74.0.mod 799 BLAKE2B b9cf83579a32d0109d952f
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.78.0.mod 836 BLAKE2B a7c8abe165d93aff4607f158f66af5c6bba37fd06f42c89da797276a9dc3358b782b5d23da4c1c4706e9429b1e1e55583511695239fb552556af4c998a94b287 SHA512 8e02d438dcf1ef35271817b3ecde8a0bb29d95f08b9299463cc9eb82ee40c2669181f850e5b7c9cfbaee640a711952828772dcb47277c91064b5d30b9276da69
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.79.0.mod 734 BLAKE2B 0f3ff37abbf9359ae68c780de7406253cca023e201fa7bac86901abd52312429c5e94dce0b361dc5773f738b2155ca5dbb4273742da1f6599a30d60c432c1094 SHA512 2da8ed0a65a4825e939e8a35733d9cd828f102c531e322f233fb65d441ab566421f259f1e562743f982518f27334b4e1bffb6a22f8f7b4a3097df904f1e4aa03
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.81.0.mod 734 BLAKE2B e3ac7f5f2081a672878f5c017da4816147aa1d076dd1f24b9dd2a5ae07390323c15890f34d66a6089625da6a831545fb3c01a0a02a05c06a95a0799848172788 SHA512 0f20f17224815d31006304ee27cd0c79e25f3d83e962e1fff3e61483126b950dc21ecb7494dc585410b2ab7fa72f5c40c14d577ad85b50702d5b07758b2225a5
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.83.0.mod 717 BLAKE2B c7769274eab79772fa41793f0a6ab7560823e0bf101dfa0e5e583d6f59c3a7acaa74b7b4fcbacb5d4c9eab1472fc77fe31e6826d9c6e96e87ef27d9303466eff SHA512 1ff1b33b078484f834924b6c10c2d840749411314f56afbffc07f0ad4f97fc1b603aaac9293ff44e08600e56adbcf68398837eb5480b7b7b247de0ef4d1a30f1
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.84.0.mod 717 BLAKE2B dc70c95cb4bb9be1d8c2c8937092f5a457a056292c598e0e943e54d4fe69abc8a6609e239fc2e683eff3f6130f687cb51fed52f1ec90dbd045c2b2c0b9e46439 SHA512 247f8edc7a3e66b3538aa26da1ef94dc78d808704e9913dfee2082106d6e3cd2eb79c980cdbf3be86f33c07ebc393a515e64397d61f75d3f41952643df97c964
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.87.0.mod 717 BLAKE2B cea2816408c856fdad48e0456a41f5935c7e6a87f2ebaa21d820f74b843732887e672add29d3e9229cd047fedbbf9fdc00ef191ca3e2a3385985d836002c673a SHA512 0737cb897a6b6019851ddd08d18ab406f7dea69a0b8d30b0067315e45f4955a092e7ba58a76fbdfa7186fd9afc79e2f0a7ccf842307d1a262eba03980ed4fbec
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.90.0.mod 717 BLAKE2B eb7841827d8d5df498be184fb9a0fa0675caf2cf319580a2091e50b78da5642c7a7f457ee2a951da549831949d821648b7c6184b44eed15d830f79cb0e635205 SHA512 850490616112a8b1280d86e55803641614285cf11083c6328f4939dd22f84713d81c52b082c7fe4742c8785583fbddcf8c9b7d7b2a5e0713ba78e46250dc4768
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.93.3.mod 475 BLAKE2B e4026fa0b4d9e58eb3e3b51ed52b7679886a0005a7706ac12e3a1a43a2294cc9797d7294425164219aa8054f9270193512c31b86faa18755d6642539e99db651 SHA512 db1ed639b6414cf8a0c7c0d365b70d47574208177cee3f3b11a91870ca56eb989958f6ad8fd607b1491862b777745accb8cbeb6425cf454e9eeb1ee643aa88ae
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.3.0.mod 555 BLAKE2B 6707e248be1fa35970275388888eb7692f976a8fca6ddc7cf02e355f8d44264c7eef6d093d90c115670b7a3b495658b79e622c47d1c90b95684b8d32547d7342 SHA512 2df2dbf07037f027100f8beba6416c00fc115fcde2dce19ea4c0fe4a036e8f66f7ae278e9765d0fc80149a330e6dd90eee8e9a0c93aecfe16da65d02320aabd1
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.4.0.mod 631 BLAKE2B f7d342f7b6a9e0cc3249d9133a5408e9738957c57cedb13a64bd54d638cf85a17902bade3b452660b5e8b6aa6dbd76e0e93f0b0e4f5711856916879049f28e13 SHA512 3de4d1cf52d35112353c8d7e76df9915e92ba8addcbcf4c72e6d24c677bb642ff0b1011fca4e17dd9d364a03443710f452effb51965d95fd1571358b9aed7039
@@ -27,6 +32,7 @@ DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.8.0.mod 639 BLAKE2B dfcb82794bc8
 DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
 DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.1.0.mod 566 BLAKE2B 93ded2035caa89bff7ac5a432c713751fa04791c513b9464c409524157c62d0ad19929a65126785a1d167c499fbca2289da6e6657ab182bf38234a4d2f380d72 SHA512 e7056a89df84a1027e2dcb4e15c6e89e0279d4a8bf5a45dad7778587bbd06f5f359c7addde5a5a62e0cb454032cc3ae0fc443477bf2adc3422cb0c38009f4e52
 DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod 568 BLAKE2B d3d62f2d5c018c4ea3c829f7485e5a1239e2d810f79306af4d08ac32acda4d33e8e90c66c63540c4c95231f5fa116634758858dbf4af2a953a17b0db2b5c1cc9 SHA512 adb3d294ec1e9476bed820afa92aea5cabf77e7996d83bd1f03dff8447dfb13dd18ab4f091ad6ee209128151dcbfedb4967f99ccf7e10f5286e90b2ad56441d6
+DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.6.0.mod 358 BLAKE2B 8bfe4ecba24082089dca44337e39c11fd04219cf92e842402f8ef93daef4a4962fc5c2191d2cf9f5d8fcdafbf9796647e73d8f0c3a008092ebc4690d934d7dfa SHA512 1d6d6aa5b4672237e9d29ca57f9451705e18d0138e3115630a97f797e415abdd698e52c9ffcb1b80c1b5411cb78373b8788379808b6e46ba56b25f157a8860f2
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.1.0.mod 755 BLAKE2B 2a2aa8bcee45060e8a277379fabf5ce73a2c0a0abea8802c1bf152e31522b565b969ace4a49367048672908e55142c18b3c4ad60c7a468866ddf3316c722699a SHA512 2b2720ffcf11b02b3e12e794132f0d25e5e0afa08e4d617f9d4147d8bafbb6f00c8aa4c5776e039eba4ff5c8add0b4e73c8c928f4b155c5c386f09a4e06b765c
 DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.2.0.mod 858 BLAKE2B 7efdc0f9b152a5f49c07fb611f1807548f81f18f3a63b54d7f6d49a2f27c40941dc2c266e2abe0cddc60844ccb237bfbfd8afa3daa3f13c3a7ee34093e1a437d SHA512 de93e34151997c18f5d0211702ffbc19cfa1bbcd77fa6d194747e1094ffdefe7014a197f3a7c28fe99ae7677dce76e049566caeaba8a067bd4507dddeafc4f6a
@@ -39,15 +45,18 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335e
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2Fantihax%2Foptional%2F@v%2Fv1.0.0.mod 44 BLAKE2B 9ee187c88e6e4eba0b58dc16701725ff50dfc3af729ff9b58c3dcd200854af59d50689ffc51caafbe6af5685d5796331fc69dcb4a1813f6124c4e6f1a0bb5725 SHA512 e594fe55205c9dd96af55f58d011e5ef916c66eb057f7c0cb73fda0388133b6b476bce423969f85c1b95eb87ed9ed48bce7570fdbd131e0ad5e7ac6010514c58
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
 DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.4.mod 289 BLAKE2B c02564b45f86901f99c0813a0481d40db18804821e588e3a897e75558decb143327a3cd15d2244bd2c539d87a04ffcf1c55d8a1d78406bf50fcd38840fa41c4b SHA512 3d1227255f5e454682ed28d971b4ffbe35f80c127e0049d05d3ad24bc02fe97d257942180c6ca5b646ced2028805a94c0e2d62183bd311cdd2770da1ecbe19ec
 DIST github.com%2Fcaitlinelfring%2Fgo-env-default%2F@v%2Fv1.0.0.mod 101 BLAKE2B 89a888fff8ca8257ff0f2ac1804a8a7578637165f9141b57a6d17965a95f4d16a9e8d97b81bcd49a2a696c2dd1316bd3d0c9360f0e544835d5f73a8c4256e953 SHA512 16d4af5ab28b6d851749c7edceeaa60deb397bc9fdd629763f8fb1c05c02ad29d5e3ce255c67afba48b4538245a8986a92960c5edfbb7fae3c8dc90ec381e8ea
 DIST github.com%2Fcaitlinelfring%2Fgo-env-default%2F@v%2Fv1.0.0.zip 6262 BLAKE2B e5dd9fc80cb59aa4348dd2b742084b0eab33aa2f0cd8fff404a6463d74dcffd997f2dc4a97ef971ac3009869ad4e84832b9aa672d51104c7f515d764ccacf1d0 SHA512 6b707dd472d78a426bce1fb7bd77ef4f5bd5be0e65a2a8e2eec779f6184ffeb2703fa32373c6cdf38c67a7de5eacc0157563b1ffe1186bc62bcddd5323c7b4ae
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
 DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
 DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
@@ -55,6 +64,7 @@ DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200629203442-efcf912fb354.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20201120205902-5459f2c99403.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
+DIST github.com%2Fcncf%2Fxds%2Fgo%2F@v%2Fv0.0.0-20210312221358-fbca930ec8ed.mod 169 BLAKE2B f8ad79343477a3ec93894b14455df80a67e35f5ce14950b0e41005535bb11147be95bf362ceabb251864a64297a5d6a8a594648928be0e8aac87052f19e9f91d SHA512 cd8c47886f01235398b4c2538ccb516754e2bae6e9a88e0fa2bd80232f974c5f8cd79249f459c9788fcb7b0c83ced5064f1d8916869e71a15377df20077f52a6
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.3.2.mod 91 BLAKE2B 75d03e4a6fc970743c11a4a9d52dedc93f72b3dd3052c72cdd660af9df42b014f48ecd65961248e3b20f3e258d1ea36e058879a7039ea58441902ec5f339e382 SHA512 722430decd4f1022e8b035bcc7c1ed295db21a3c64f9dbdf409bd0442356664d378d4af37b7de828c02453014a5a9ddefb3397cbbbc8481c14179ecba9499a5a
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
@@ -68,12 +78,18 @@ DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.7.mod 543 BLAKE2B c757618d90ca032a7a1dba4ea988603324c82b3c8df0248caae59c5d33d601def8c5f6238acd40166aae227759bffe4ba9ef746ffb045da14416441e22f894bb SHA512 90f3298da3bac3bed1dcc040304c84939efe3757cfa4ea0d4367a459b3328f26da343a7aeb8d9b9185ac9e324e5cc6287243b51102edac6089b50209226b5018
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20201210154907-fd9021fe5dad.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210217033140-668b12f5399d.mod 543 BLAKE2B 35a7d739e1bc24c321c5732b27fcfc0bd4ef872610759ae867d08f2dea85e55b3f515698fc48299902703b7a8cff9658f30f855a6b472d4f4945f38101ee42d8 SHA512 b52cfc5fde9300a89cb4e59585c549582fbe75c33ca19fe06d1d8797216fdccee4f35a30fb794f37a16ac0a5d54dee0ce53fd938073b42b73cd96203b3819c61
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.9-0.20210512163311-63b5d3c536b0.mod 581 BLAKE2B bed1b19ca816a806f1cd354de32c7bcf3280cad3afef7569dee60d0963e56a9ac42e3a88e5167df3652d41efc40c96cd88a9a8fa725eabbebe43796365eb6b5f SHA512 2e31005feb4c2a96fa527af45aa2093da2ef746edbd9fd37a7f788820c023d2de132fe3f56e76422d1be856216870f2c07f5c01046d968f2e61281d53e1942b4
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.12.0.mod 126 BLAKE2B 3ad1240496ce1f7c94c224a1eca571a3671851bdfebb40b243cb4aec90e329c820788c6080083e138240b9aa0a6e980701e12349058a1fd7e9c972faf7085fd6 SHA512 d7e895c4a2e515a0d20f8839b4f6d52f3aa3d000b97cecc99fbeeb5080e53c260ebc3aba0ca6ea180a2f5c88d5ae303fb94a257cb55aa9430773f6f5b4048d87
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.12.0.zip 12823 BLAKE2B e96e2f6181cc92fd6f7006bd19b89d68d57abf2d8ea35cb0e58a670cbdb03b9aba6ab916289254f5cdc41b641d7e1d6d37ce239f0399e94dbeeb6db0685f8aaf SHA512 d78e12fe8706e0eabf04a57212a013768d7b82f7eb45b675f424d0c92cf0a741cd42a423a4538cfb04d03242ac873cc41f0f0c9d01a3b5cc2c31c9dcffe6c132
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.13.0.mod 126 BLAKE2B 994134e6d9b2ced5dccc884460b1e474a906c1fc27accd9481f0ae664d225eb57423f0820499b95157726a39dd69831aba944c443dafced0318af10cea46e53e SHA512 657d9220217da47372f647fee297258a13495d7c10bd75d0645a21e81c41443b7a71f8162178181396129983cb695241056f052412fc2d5c4fefb214a2a82587
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.13.0.zip 12921 BLAKE2B 9f4ddf0c3d4020892065746228c41e260abe78fb17f6ed87e664e8fd3e883f0851db52697eca0e6e52fa02d36509dca0092b516b5084a0cbb499e5f87a8e48b0 SHA512 64a2b414704a06e4b181984ea287a10db68e1a3af0df276da3fb8241ce7a2f5ec501dd1b8a0cb8ae093419378a6ef3b84b4ef197be66ba620ed296e9e99e68e6
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod 106 BLAKE2B 4876f70d70d2d8703d7b6abea5457e093043912d6a672bf7794a892d1c17b159ed2b92dee05ba1625a1b7cd6c8d66d6dc715bfc1d7c0f1c47965ae8e30506bb2 SHA512 ea3a26ed1f6df26a7e2aa64ea9d5d4a4c3005163cd8adc05028cf25d56d01d115bcda38b7af992242013c2610f26a184ce43dd1826309c95fa008fa9c8c387d9
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip 42349 BLAKE2B f2c476034a47330b5424159be4a323bded799ca489163c8d485e95f17ce519d6c4d771a35eaed83e831acbe20c1d9ec5b782469ce20aa224ab03de459228fe59 SHA512 8df5f490e26760bcfbfee216b5479321d060d4e48911c98e4d3375a6f84bd161b5d80769fb0326b3122534ff726e8a987bdce365464cdd042ab4cb5366d674aa
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.5.1.mod 122 BLAKE2B 2781f3c4d85e47658984fbddc3d79541cac0214262df2f67d8af9a6e4cc6efae71d7e31370e9ac3b6d5664142bdb824eab6048e296d26fe06af46939201713b6 SHA512 d4cb8393c16d38aad722df74b8c2292a85bb3aac4bc061676b896b537a21a93889a447cecdbc0f989c04e3cc91a2fe5fb35207e77f7ffbb129669b8377e6c5af
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.5.1.zip 43496 BLAKE2B b84f818f78c1ff6c05c73ef5c12fe4735e736724556b2520a5970fb4996275e0d23d6f36e858b9d06ca20bc105af6ba82cf33f08bf4489f6e6aefaad755e9b49 SHA512 a7a1f26b534df90ba3e7251c92eaa33168fbb0bd81d97b483995eb0c09f08de488f62bf1ef824a998de1a18789775f7b99486c7ab16483bb02d2f71512373c4c
 DIST github.com%2Fget-woke%2Ffastwalk%2F@v%2Fv1.0.0.mod 36 BLAKE2B 1436e275fa54c47fd7b75aeb47b2c8b4fd5e9dccf8339e35a9a0d8bb185e25b7692333a6082f56c8588a45482e807ffd30d44b55e0e202a4f442827e3b80b801 SHA512 51c4c3bcc0ec42fa7c415df8e642d24963c6b92efa9e5cd908ec760864e32652e6da2cefcb80f0be9b4bd6ea3fe082d485eb7d3e517ae99de1efd31ec43da9c2
 DIST github.com%2Fget-woke%2Ffastwalk%2F@v%2Fv1.0.0.zip 7298 BLAKE2B 735f19b40d65e40b2af61ed86752e6ec310202d85157c3a44871bd7c6da091ad5fdd112c60eff4ae74aa4d7854a9eace39139fc4c1c90c8264de5e652765f32e SHA512 2a3e5f8b3cb62b58a6fc00d4f48e9a37311a80d037c96a5bb7def8504b1fea2e47f767497d69293ab7f7ab8301e0787b7c5477b79494cd8fcb03210efbe19ca6
 DIST github.com%2Fget-woke%2Fgo-gitignore%2F@v%2Fv1.1.2.mod 93 BLAKE2B 827e2e360ba93ac30a2029c872355609802a413cd6ea8e6c23631ddc05a6b263843a8c8b9dfb898b8c6b78094ca585dbe6be8e44520295bdb014c11ce428b56a SHA512 6ede55158a4198c501e85a20f48791fa0767ff22aa0c3c6cf30d37fe5dfcaba2373e030eb5a46dd0579adc8f2893af656bc12b4dc6d498dc5d34d255aa7f778a
@@ -96,6 +112,7 @@ DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.3.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.5.0.mod 132 BLAKE2B f3b71704fc425084aaee253539f0748260138ee1fb493a98c2d0acc7c4c0b3533efd5d13e4ec578d0ac070f7d6fe01447f6270bc420cdb78cf3dc854d38ce5d8 SHA512 8529555c2751bec1c55edb40c210cd6afeb4b5f9f0cc38f99911c9da7afd6363a42bf225c742116707cd22aec2fc217802ce1c8d52e11185a80cdf398e8c4941
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.6.0.mod 104 BLAKE2B dd86cc7833414ad225f1dd2a51af2e5a1dd9511bebc712dce749d1452c52d2806a7de626eaf0a2c8e2f8a1796d1d394ebddfedac37f40159d37343c5a2709b2a SHA512 c1cbaa009d32793f323862b87efcd1e32324616df8df19abc7103633a215962df0f9038d1b52f7a715cdecd2da3b48a98e30618dc58532a1654934158ed160b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
@@ -113,6 +130,7 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.0.mod 129 BLAKE2B 15d140a0b2b22d6c9886ee9e517f923fda26ee8179755702a8eebf1ae8cf75be48e8d28a1df1bf875a7bfd499075d83a541c9716601856abe0e7c850a3ec68fd SHA512 467a3f6fb4c941cd55d8d4b2d6a2015966c60a8614691539c88c4bf0da2f8022055be8561cddd0e60b118f74f010be5998dd128b7b136f14edd2674e5650db2a
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.1.mod 124 BLAKE2B 4f470777c8d8816c52e0fb82b2ef37d4e9879c46fa93e8e4fc87c46b85c36ee6b4b1ffea22db22af2946c0fd3a12affa9df706f13f2367b14bb1a72c737ddb66 SHA512 6b46c8a019e49c6ed2307e7bf633d4fa04627938bcdffec22da42f722aeceb35de8655b04f69eb651fbc662ac5554b54b393340bec3ef4cdd01be2d7f6d07eab
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.5.2.mod 192 BLAKE2B 08ac45ddd213c260f4b9d33fec4ba9758ce949c699e2d8d6c7b31bc0fbd7498618cd5144a6ccc3e1b852e9f1a6b7d00191ada7d464dd5784d132506c9a8639ce SHA512 44c996ad31bf02aec42bef934d7cd65379ae5eca4d1069dab8c478be169f9479cbd55f8f72bd9567e51535d31c9f65cd1d56bbefb8b745f96cad0f5953f8c420
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.3.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
@@ -126,10 +144,12 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351f
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.3.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.4.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
 DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.1.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
+DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.2.1.mod 325 BLAKE2B 1fc1dac97ee3aec3b241e5b53ed78c8ec01d33b391e3cba3e21e2e12bd2a7e65e9a61f6bf7a62bcef43e39d4832982d1591efe915ce6ee56724eb9e9f34a158c SHA512 06c412e77ce3fec3f136d9992f5187ffc6ace7a80dead0dbc0c97f289a66a65afb3fd6f43e9de8686d757e2aacdf783f231c676dc6e017ee26ddd731bbd39598
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20191218002539-d4f498aebedc.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
@@ -141,21 +161,30 @@ DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201023163331-3e6fc7fc9c4c.mod 3
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20201203190320-1bf35d6f28c2.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210122040257-d980be63207e.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210226084205-cbba55b83ad5.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210601050228-01bbb1931b22.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210609004039-a478d1d731e9.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20210720184732-4bb14d4b1be1.mod 368 BLAKE2B 36e94a1887fd321a44ca393462c174dca588b3a52b971f8450e38bfc198aeeb0bad73174dda9cc1cc09f436f666cf3ade14d9c61e1b9e26dabb1daba65400f47 SHA512 b58244ed085a9d3f6f938143b568a9a7cb8ef9bd0e05421ea903791fbfcd21fecf6c4c315603aeede054108c85090f02fb16909a90d2b74ea23e481c50bd2e81
 DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.1.0.mod 257 BLAKE2B f5862e4f778d483d5966f52f2ca2a24175a82d3ab0c5e71973c1ccb646fb8a30f5865d4b7fd3c050ef532edaa20ecece24749a99fe353f4ad3c90ae12ae14373 SHA512 40630bbc128c7d42dc4e5b904a56eb39c42e2e51678a4b08c7786d439c5119c18ad70d3d3354f501b205096df1b0eb31a1a10c185f5b4f76cd9ec2c72cbaf962
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.16.0.mod 588 BLAKE2B b3d6657ba787034ed2a14fdb98a7dee43e3d9dbcf253558c588f9dc550b58a294db9022d548d48717ece007f20f52f5004ccec0fe92415120f9110ccad5c9288 SHA512 6d314f14132c60d5dc614c81746fa3492dc821c77f2c0cfa90dccb3dddd5dac671682cd842d9ec4b0d03aefe1da92e5bc2275e9bfa2bbce60e8bcb8ea6bdb173
 DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod 449 BLAKE2B 1fbabe18b977c8e6283312fc1f8d8b35514104080a4880afd4445b92fa20af4db49ef3f7fe1da703d4237e6bd78902e64fcc7e9d4db85e84153c2bdbc6a6366b SHA512 a6d33e281b580e5a3461edadbf4e5ebe6aa74a8a929b9f0e96582592b24c85eea1ab202457f88f648018cf5991d267811132ec77255ab4886b6ccf958487d5eb
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.10.1.mod 424 BLAKE2B a97dc13569a2e6e3ebd7ab7fcf4b25639ad1bc5a4730a60d92a1b62f0fb724c7e37c13a11853d58259e774eca79b23312a1eb96a5cecf9585aa30b37d6192e39 SHA512 9648377e7283fa2b01451de9fecf34c9dced0d735f63fb84c45d2fbeb2984bb4435452772c661b2ff73abb69b108b0d46dbdca660dd4d09b7958567fa2560b85
 DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.8.0.mod 583 BLAKE2B aa460be92439a8b32f89f5907afb1f0577392b3efa2a209bd76f686bcc5d0b3942aa5ee838a4c72784590df953a43ea099baf42bab9cf3ee1cb64bbb7e83572f SHA512 0704e691b5cedbdc8fd8628e4d8d1780f6045948df8a16c6c4ebe26cbc2694343bdc9bbe9650510d002ff22e66d1411e38860401d1559dda11286ebf6d0ba864
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
 DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
@@ -167,8 +196,11 @@ DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19fcac3ee740e1b4898414cf09a2813bdb6922705cdcad5913d7fe4682d11219ef10d8bd3921fcf93c7d568daadd33b8e7c307a55eea6ac0d54ca SHA512 19403c36137b6ec9247fab3a9255dc98ad9dc46ba03ad3788e11298f8a310756b24dbfd3a0d9893ad93dc111dd228c421f96daae09e2058438c3c7c58386a71b
 DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
 DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
 DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20200824232613-28f6c0f3b639.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
@@ -183,19 +215,33 @@ DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f123
 DIST github.com%2Fkr%2Ffs%2F@v%2Fv0.1.0.mod 26 BLAKE2B cb393cd37dc2b7c07fc316b588fac0f245ee33a37ff3d4ca0df67ce952976463df9a79d600a37d5cbd3f596c0135c2c0330aba871cc941cea13325eb24e6e56d SHA512 c151e8d0c5002b25d399fe4a7420e5735cca46dc6f3bd18837f110f5a72659406a3b92d7f870898c97f58b6f42364d4c97e9457491a0534ce456ec46d15b1697
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.5.mod 49 BLAKE2B 8b2bef1b80fd800e2e85a5d1e9ce4758dd3f23f58e1fe842bb31d6003794d571877f0f00f24eaf71e108ade573694b03456f06d326343816b2f12193d8c6c602 SHA512 c1b6e77c86f654480988e8a2c7f80b30739ce7d784a57e0d1b26b8fe41fce8c1d26dbeed5d23f3ad9a6aeb8953c07889ce3458ce837d92652aa5c825a318d4d4
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.5.zip 39629 BLAKE2B 35f0b15ac328b7c0be9d4409d947d3c0441f414c388e9da82a3e0fca807056c60feacf52d1d16dfceea1129c3b9cbcc475adaac2b650219cf11aaf612afd2583 SHA512 cbe51edd014a5a1a32daf08830c0be67e6e5a860c12852215bb256867ce2abbbd7d8d6387244e29662b5738e3e9962a7bfb5984f840c35297b56945b71dd785f
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.11.mod 160 BLAKE2B 63be9d239ea8c5ad48c5bdefaf634f1ef2e3913f9c1f1eb0c48ccf9185a2c14c1030d1542048acd9c7c42399ebb752a8c943e70ed7b11d199ed9067b6e906480 SHA512 f2fa86449f7da9a73f3f8781e6b3dc6ad6e7d491cb37854be0dfb5c3ee086c36f509646e6fa383b4f00c3cb96c535e581016b2a43aedbfd9fe5861bada2f7ce0
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.11.zip 13999 BLAKE2B 95316c7c0aa7b5f79b15f1cb6c155b84b46c821fca0c2cb3bb4f29641df8ee687271f3565f82450b3089b89676a0624d5326158114254b486dfa10af43f8f3a5 SHA512 3fb2653e0986ebdc1243a024305aa9bbb9ecb2b8ff49362be1c93ad31995d9ca3a320a61c73df58b4195e750296e817a9126bb4f9c8a637421c6fc8a888660f7
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+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.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.9.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod 104 BLAKE2B ee5067e0e89fe2d374ea852dac828c094db84c3a3d2d8a991abeaf40385431015577eeb6b11a66033e8da599e808f9385a84843fd8f87dea487bd3bc9ba233da SHA512 f144089cc85271c7d91b9a6faf169018bb12177dd770db0092dfd0b4c71846e5cc6dea385c0158a974cfe86971e5642858a6d633c64d3b598f1ab254fd47db28
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
 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.14.mod 104 BLAKE2B e859512911c1621e5ba3e46249c5b9b5e4b0bae854bb3a18d7e39d6da27c93e133d43851d5e6bf2ede44fdee31801b19fe274b55a1f37b1291bf27262e2f2385 SHA512 23b01eb4023ff5018437ff98b55ada053eba49feab2777eed36d033f426c5456b143f3defbc3131dad1251205f3ffb3553e3c10bd98de80f0a462e8450d6d56c
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.zip 8919 BLAKE2B fc84f4f16176d14f177f029cae5ecf0221a8f0ce716c499e8b5d49c8e1523673a2fbb600a769ac26be98b591b3cbc3730d447c412b2acd3eff7f878526c271a4 SHA512 c6401cf5af80ea2495cb63800ff39fb9490f212f3aae0ac1d86b3d37ce6734eb35aea00b35bd26532feab77ef80322e765925f302d77f664dd57163f67a8374e
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod 371 BLAKE2B 3ff3ff24a8fa567c715a8698c5a636f3eb2b1bf95263dc71a57d506a8fdf9e25cd741b8d0564ba95c04c696ba536ba44149da16572e13c1b5134c24dd0edddec SHA512 5a25ee9f24cf52fccb76de4ca0d1ee7bf309044e6700d48273bc1ceba948831320a51a7013584f60496df642284a4a282b2ed44e7d6290e96927927a220619d6
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
@@ -206,27 +252,36 @@ DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c0
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.1.zip 32972 BLAKE2B ead9d8ce8dcd35159742d9a8ccfa06acf36a4f993a36b45dbbb9fd99bcc28be32401ff7ae30b545337cdb6a5a15c4765c61f4d129eec96e4646c132ec85507fe SHA512 d846320bf53383a66d0e1604075a25ffacea41fe12452ab2dc5a9b16365b6cb5595ac4cb53e8e8047a9d7cf86af79b997ed8573c125afbf59b06be8f28d6a13b
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.2.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.4.2.zip 33442 BLAKE2B 04fee65c62822445d961bd15ee75bc322c060f344204f8f8fcbe1ef27717f17009bd63b0028035422cf0119a9d95dda0b534d813106beaea50ca136ba1eee411 SHA512 b925689def9d801c6c84304bc1a26a21d4ca6b81747db07cbdf5ca98af685350ccb1f16d31820a5731a4195a662bbbfc34f5c25cfbc5f1522be23f9b7b7d0528
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.mod 45 BLAKE2B 0a144164f01fb7455ab76875415874dc845b22f9cba88105b7453e5c4c07c21f00a3ce83b8802f333bd775fdce8bc8e998ad41f6fc65a34e92750fef0a7689c7 SHA512 fdeaa2c0dbeb52934d9b48cf468c923f89058e3a454cfa153c9392ab908e3868d501d7bc2b923f33ad5949df6fd9ef07e1336b2dd98f9efa70b1ca4a23918ce0
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.3.zip 126646 BLAKE2B 78a77568425e63a661b1ebe4bd565f8af0ceb68af0783088860d1e1e93f496b565e357a55c5860b12e41ff693e7e195fdbde2e98974043dd62f12f6e92a58586 SHA512 3878b23bc00b19a5463ce8416043e899167fc4c501a2d499c3d3947745cb4996c91e709dc2d670a16f8060c077a32212f158fc01afc36ca8530b80cfde6e659d
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.4.mod 45 BLAKE2B 0a144164f01fb7455ab76875415874dc845b22f9cba88105b7453e5c4c07c21f00a3ce83b8802f333bd775fdce8bc8e998ad41f6fc65a34e92750fef0a7689c7 SHA512 fdeaa2c0dbeb52934d9b48cf468c923f89058e3a454cfa153c9392ab908e3868d501d7bc2b923f33ad5949df6fd9ef07e1336b2dd98f9efa70b1ca4a23918ce0
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.9.4.zip 126838 BLAKE2B dfff7927b27ac3ff68629a9d84e3c90ebbf97f9b80a4772c94e546dbcbf20653ecc17fb04f0620dcfde7f538a9ba2540b963038ab2d50050633815dc6da6ef2b SHA512 f378e7416a037fc2f803472f510c8f7b283d77692b58aa07937cd89cf6adbd2155b5417725397a644009661c23f61c9bc635e475a17a34c5ca9561efa0d612a6
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Fsftp%2F@v%2Fv1.10.1.mod 196 BLAKE2B ad2d0b1c9f2c509812872f3e24d86ad3a1b193e624092b8225cf1f3bdfcb28e634ce330934bd742617b3d141ccda41de177231cc7501fea2b18a6e798e27aa77 SHA512 0fb15e3a1ab36a6d413110e7d6e7e441c9d7943f4d7bab935b2ce53feeb7e560d63960f1a9ce340d6b3f3e7fc400824354945a12628c65de1ce2d81856b119f2
 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%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod 136 BLAKE2B 3708d63176898e5b9b06ad69d2ca1b4bc3bc62c5dabc6df3d77f476ea9b588f27efc18ce5f098b50ac0fdd7c71b36f76175e2cc3cee878c3f4815303b17071e8 SHA512 9138e434a2810bd96269cda05a0cb03bc7e6f28949f6d6379468567e40938846c85f581b4bc3549a53605dd9436e25662f27f216a60a4bdd816b038d6af570c0
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod 25 BLAKE2B 23b4d575cda8259ac3498731524edc19e21e56ca2881d58ab40adad9469eb97d94036eaecd4fa5e78558e852f4c8f4242f830c962843d14779fbef470f3f8f2b SHA512 18a8e8a8b69974b2112578bd8995f31235bcfe49c218b2d0affd6fd5d6b7938687d9f5405d4a228a2ee2960de7960496319a92a26e8b29f6076983c0d07ee66c
+DIST github.com%2Frs%2Fxid%2F@v%2Fv1.3.0.mod 34 BLAKE2B 191c36f7e2328b0192de2eabff29eaa04575c74260f00171ec29e97ce46dddb7e6fdc32bd50ab5904f4c35f535be2a9af45a1613c4f1ee77c07435eca44118ee SHA512 d47bf7f1012d6b846425ee3b7ba44c64cb51d80e258e4c39df4365a3730e5c55f8836e484d7d77777160c35ad4431ee48f8a4d042b638d5c7eef86de6ad4b943
 DIST github.com%2Frs%2Fzerolog%2F@v%2Fv1.23.0.mod 176 BLAKE2B 81c58ea2d707e9ca68bdc1741b2ccad703affdc2a8c34be4874268366659c9da5b2c2f21218c1d02a1c3418a95ed176cc9bbab9ea3583d37b7630edb0a4f0b79 SHA512 40eb7008ebd095279bfcc3579a0361d4ce6e62f5275c1dc5fd5e704c08fcb726763fe2458c9a69a6128afe2d2cb9af006fe3d8ac1530c536c894c296afe543fa
 DIST github.com%2Frs%2Fzerolog%2F@v%2Fv1.23.0.zip 189837 BLAKE2B e43195c8d709a335c0136f024a85548bcc6db66769418bcfcce35a48dd62faeeb070e54c2dc06aa5d40520b5fb40687f099e27216c540f2c7faea8749f6d75f3 SHA512 7b375f8a22811046b2fb87d4c3f339ef0b56e21247bb788946c77d59dbe435ee98ef3e23f39005a3192c768f3244239ec903f4d982695b7c1b9058b24943adf8
+DIST github.com%2Frs%2Fzerolog%2F@v%2Fv1.25.0.mod 176 BLAKE2B 403e2301bda42bb5f01a651e141e52023fc33513a965632fc8b5ea7110059c350150feac2d179678794757036afb3eb95b4614e54b6a84b81fc4655cbeeaa5fa SHA512 cdee4cca0190067eea7ba19012d0c88149b60d5155a56487249bd831de9dc02455cde6058c0e7c4cc780671575133dbd8d5a0bc83cf5f999d121390255599ce2
+DIST github.com%2Frs%2Fzerolog%2F@v%2Fv1.25.0.zip 191437 BLAKE2B 3d4fd2db61e3bfe3a9d495b0f183356707d0a76b1953aaf5b07b4fd74bc3ffb5163007827d8e8d88568417b7dcb017df0e075f48cdb7ba7db68347243b8a1090 SHA512 cfa7c179db786673691c7653f036cce422e78c16d601e5a32a44f5e7969bf3bd2fab894ef8f68e91a269f95e100a3765cc04d74f22c1029800455f7dd8f795f1
 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
 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fsagikazarmark%2Fcrypt%2F@v%2Fv0.1.0.mod 1974 BLAKE2B a2a7ea23c62be1a63a69051098ea8a3dc54336b5c8717dd816601c10398ac351abc9d882d55a26ca482dd7875d4c5aa8aeddaef99205242ed96a1fd2b25d6bc5 SHA512 96b6de4408e9a42cf28da6a084a4c11563fec9e6eb06f3755c05faf07b7e82814ee64c60325b210429ed49a0ae1e3cb553853d828fed29f9f8718fc867afe188
 DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
@@ -234,10 +289,13 @@ DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0c
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.mod 163 BLAKE2B 78976e3b857b07f201d0e0d65209cab8ed73cc9aa10f2977646b655d541e9a6a3dbf1d40e037ef0dd36c0c6f6813cf807e7211afc3683b9bc95f3b3e4bf5e6fb SHA512 1f0348cb522ec6a39f5667339dbdad2a16521eab1d7cf710e6b939c8156c928d7ed1da3c4cf1d976f6c8b9e41e74a43ef1328407119fd55d8fcbc0d91eb1dd7b
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.6.0.zip 88927 BLAKE2B 2ca68ce31cadf36091026bf56b454440a78d46efb0babf98972f771804272666baab6228a0a8b45f8d1ce266ebdf30a12f6c88f2777f73a397886381c16dd8cc SHA512 fbc261addef367881288523c9b4738673b64b65fd2240700740e0f0a476437e2aa917243a9b49bfc29e79d279c6584f888b2735782bd598e90d1e7696f43983a
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip 12750 BLAKE2B 65fce8e1c7f8d6553e3b003b02a2ab3a7b1eccd7dae3db0423b8ba9d5579721d6d84d0227e321f8d7b557db71648ed2e4a3b810ef867f34ce25f02f29b4209f0 SHA512 bc4f20343133aad94ea020cbb5f2c74c5b983603f3638ee84093a31b4cb94e3725f3e0f01252e6546f86d1e47c317e171e0229681116b8d4aeac67221af40636
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.4.1.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.4.1.zip 15383 BLAKE2B 3a288a6541be7e34774cf990cc8727e1b5b7a1320467c0369e7117437d92b429c1c8e054623e10d55023149c11d661c6031ff7820c366c607083467d5703afe4 SHA512 2b79c43aabd65436b7b3bf9e5e53fca5b3185297ff09f43effafeed932344b3d72ab4e011da6fba95755025596753c5e39f0e65e010211543d3b9342a5f7e5db
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.mod 225 BLAKE2B 2c2a5d0ec6a0d5f489c8db922997c0fb8e1db1919ecef727647089c1f08c26302d01e1cd566bf478bd54a9a43b9026cd117899bca284d47880c23066a9c698e5 SHA512 57506dce411c15e601f271d54faeed055cda401acdbe201becc0284ea6ed0727be4a80d8db3d6891acdfe4e68bad3c6f8ed5062f2f4c24419c539f3845668842
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.2.1.zip 207095 BLAKE2B 9a0827a65b97a60c049d71cdb8bd2ab8feafd96495496394034870bdf917ccfcae929df714147b7bfd1c2f29d9f138970a32e4f5e2f86bb7976198fcbafa6a66 SHA512 84acc0c56cf68b4d08cfdf890e13a9cc073f07345d918c4e7f320465569f7211ed5874d6243c3637f321ecb9dbb3ae26117930c55ac113b174480017a419b0d2
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.1.0.mod 188 BLAKE2B 26b2922f8d9ebbb77872bc280b6a40ce569be69e78a0734cf7f75def7709fd86183506274ff8b9e5853cb0dc29043ce315acdda631102497a8178cd749fb0c03 SHA512 a5da49fe5d41b33c03cd1af18affc92ca2572f0c735da70c55f06d668ff33ae4a231fcb6cfa2e85ab4b04ef4c7808d895739d0121ae874c43b01edad791f2735
@@ -246,6 +304,8 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.8.1.mod 587 BLAKE2B fd6d02a8e0423f09282eb521c154f78afa81c016c1843157b2a0261fb3d933146453a9cb8f4e081034249d6850494f325ad7cddba2060f52c018a857a2d0ba18 SHA512 2a7f416c42aff6a33e20374acb339c0b1f3f0e08aeffad2d56b5c5527d37f6e048ac5b5e833ab5404d748632fa50b014dabc227aeaa8758a244d37cb2d41b68a
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.8.1.zip 100533 BLAKE2B a6941b44d21400f9620c429315aca42213cc16c05739b23985c94462c13be1cdf2c325d61d950f97f98759b2faf01366265eb4d80f2c8336efba41ed614a19b0 SHA512 4612109794335aaeab056a96c2aa3b437921c12c1ac68c7e36652a927b25a181b1ab33fc6dadf0b6b985b4b466f75e54786219ff1dbc459d3f7620d4e349e9c7
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.9.0.mod 537 BLAKE2B 6b8e3d143bad2e146bf69f230eb523006384d952cdf86770516d7b3e970126ac6d864b5d6d45ae36e0b158a4b2f971f7f1b3f476582f829b7ea530c50102761c SHA512 90d8c45d43968b6b3e2ffef5b4eca44a0bb4875cd91ee75a86704728a16f8e0c789e9e58a768c2438f20fcab9e47df8987df8e876e5d16e5451c5dd0e49c64b4
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.9.0.zip 110399 BLAKE2B 4bf6b37ea6df670037364998b37a3a67e53ee880588be980ea7d5a4569fbaa1ca8e00e40a2fbcc879f9b161b86e14bbbc383b43db5f747ca7a8d9d0a9e9eaf8e SHA512 059e02d2f8b00c25a3289cafcdcfc488cda81e63d6ecda1969c1114b44ae37392fc70ca2137379b7f33cefa96e8350470fe729fe48905d1592fdb0cd9bfde45f
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
@@ -271,6 +331,7 @@ DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225
 DIST go.opencensus.io%2F@v%2Fv0.22.4.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST go.opencensus.io%2F@v%2Fv0.22.5.mod 478 BLAKE2B aa63f336c10d04557c0f24301afc55f32d5d9062c70a03307bf7b5b7626e7f2125be07c7b6900cec97e1af9429d4930bac4d67179d87575e90acaf68d7fc3ffe SHA512 e94311fef653435875bf2c670a9c19e0e1fa2d6761b9323115504d2acb154596818d5ec9d4f65c662e607f4089cbbb6be0cfef0bb41631260ff8474c759c1323
 DIST go.opencensus.io%2F@v%2Fv0.23.0.mod 300 BLAKE2B 768900ce7738c5e1de5c550f1dadf600bae434c89eec337e532e50542487226c79bd113e2b8223c63c241be631ebf5b177441b1b583317425f850a0efc6a02bb SHA512 67849dda4a765e79351214a3641bf601dcdb404f83fd48cde5c6b4fd7249868567424b9f70e0bdf041f6e50f6fcb82239600be8f62253835e4c7c8a17c8d8871
+DIST go.opentelemetry.io%2Fproto%2Fotlp%2F@v%2Fv0.7.0.mod 211 BLAKE2B 108e3a16472a1401b8ec1b18180c109e034394988b06050b6dd7e918d578917d1b6d139296b39046e09a9f6e251ea665a2cabb749b4b342cb301e6caa2cf0498 SHA512 4348e909c754b1ca8cabbafa293377cbb8f2b4f4d67ec412f6bcae4171d7d0212851d90631c1354e8b04b7955eb0a8077e5a86fbf8ed38d179e9ffb2e1ef16ae
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.7.0.mod 131 BLAKE2B 0abc8845d865fa3a1e96e938a9df81733f6d658b39592df46f26eb3292431b0db554eb5db00671f12471cc3c0e454bdf227215c0f9adb182493b5c146a12e3ee SHA512 ac727a2635d02ba4d12c9af7a9ca2d27c0f1bbdb2f2ef797a2852cf569d33cced35be8ce3e95e2ff3b13a0085b723622656ddb8731c055719fbf62cf10caa4df
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.6.0.mod 113 BLAKE2B 9c82de4ac4a30a4f5ef4881d70b75dc7433664ee90632c6d4dcd1594f3c08082aada1cea4740d38b79ea7753abe47cbba9a173051577c2be869a45ac1e90902a SHA512 850531fa2e156bb78b5a66f4afe89148f048e90ad6753308f4d36aa886f5bd179d2dd5ca67c99cb98976ced5aa6b14e4e463bb27f0d002b8a0e1814fc5316873
 DIST go.uber.org%2Fzap%2F@v%2Fv1.17.0.mod 257 BLAKE2B b03dc3f61ab15720e3e89d8725be6a3a500f9aeba17419403df4bff7ae52b60abafb43af2ef785479017f625c6a3170913ca975fac64c36c65c0476b519540b5 SHA512 9677119c715a41ff061ea5caef85c35b23f79648aa09015e7427ded423c7ed73c0ba7da24d8fb586ea038499bf42ff211e5a328102573b67122ab3a74bfd9ebe
@@ -279,8 +340,10 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 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-20210817164053-32db794688a5.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
@@ -330,6 +393,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -352,6 +416,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210119194325-5f4716e94777.mod 179 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210316092652-d523dce5a7f4.mod 179 BLAKE2B cbbf790357e705f6b365164e871ec1a61f38f08d3657730186e53b1e3a3d802cc0af8032be7f59252707c6d19dcdeb6f8b9ec3d4e7af74c1511bae31da54046b SHA512 22eca632a9bff1e24cdbbd1060a6c8a1aaf3bf7e06aa96b40f1848877cab00b8687309b9466f703664c4988264fb5a62ee99bc216038bf1096bc21fa27ef988b
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod 179 BLAKE2B d4f0ad22973a6e0a06b186e217dedbea3abb1800b259c56a29da9075c36808160620b42b0a485127f713760b24b4d9d6d9a61119c5739927340436bac307f5c4 SHA512 f48731641ffad3b90daf0a8bb79fdfc607c076961dbda1c51e71eab787dca0681e5984ffce048bd655ceb56052fa64426b30b32e6ee32957c92418a16d1c9f06
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210503060351-7fd8e65b6420.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
@@ -364,6 +429,10 @@ DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210218202405-ba52d332ba99.mod 167 B
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210220000619-9bb904979d93.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210313182246-cd4f82c27b84.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210402161424-2e8d93401602.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210514164344-f6687ab2804c.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210628180205-a41e5a781914.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210805134026-6f1e6394065a.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210819190943-2bc19b11175f.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
@@ -379,6 +448,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -386,13 +456,18 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -416,8 +491,18 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210315160823-c6e025ad8005.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210320140829-1e4c9ba3b0c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210403161142-5e06dd20ab57.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210423082822-04245dca01da.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.zip 1634371 BLAKE2B b13afd43d8734f143af16046780b9225a874157e0562068c8c3198dd23f7ff4b3e14f6654b578bc7520dd3c299411ca2d77999a8ab8459a765d05e74d03e81db SHA512 b7c4ff1752cb582263b837048e28b52fa219db5f7316739692d4c2d20bb2a9b8ad3645e92b3b1a72cba0817e4587ae04465dd351bb17a719bc92e193cb29cc76
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210514084401-e8d321eab015.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603125802-9665404d3644.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210616094352-59db8d763f22.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210806184541-e5e7981a1069.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210823070655-63515b42dcdf.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.zip 1655907 BLAKE2B 317486eaf6a714d7d74f563e20bbe3f0581c7331e3c8e492cb075476bdd57f9ae4a75c49834cc6912f7d9ed6a54c540a78f6e2556245afc05f6480019c7abc17 SHA512 dcd3d13b504c351483c49f93884b3e8635cb0377a51cd14fbd3efe8b55f3983e401ee746bbdb7e6904e472beb09343d9d1d1d9667f2cc515e991c8f5c3bf14cf
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -427,6 +512,8 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.5.zip 8609319 BLAKE2B a4459cdb830dd5de499cab9b0a37afa88f0cee1b3733a9d765a6693eea89fa5f7b2aafd9f5b27405c9bd38f27f715ef311845e52d3dedbcbf2ba020a04334898 SHA512 f40c677e92a896b7158f0b3ddb786e670a954fff7d981be3e0d3bc6d789d4f069174273050a0cedb8e2438d780e6950e027d84a2e2d64b7936e61edc613acd36
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.zip 8610726 BLAKE2B 78870544de29f5cd9216befa8822c2387654c3987e09994dccf55d210ad7c517edb93bddcc68bd981f2c083a4ec5e012d558b0164901e2d74f6f447e75edfadf SHA512 494d58f2bc02819ec24d8e55f668a06694568e63bc4b41064a7e44aefcb2778c74983fc9126b50277845da8e6739e83fc1334aed989981e8e53b869878803d17
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
@@ -444,6 +531,7 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191112195655-aa38f8e97acc.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
@@ -480,8 +568,13 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20201208233053-a543418bbed2.mod 270 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210105154028-b0ab187a4818.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20210106214847-113979e3529a.mod 270 BLAKE2B e62694003f3e6a15a1494d429bb8d7388cbdeac1d09d28cb20244ca09eeb72b706a2c244d9cf77d7b3ff2b15a193fe35f411e9f5c34ff46a9c42abf813178730 SHA512 749bf78130d1fe8da6c022ea7f5fa65e66cd010cd4ea8278bcfdef116acc52d4d632e46a4a3070ddb7d775ef23b39e78724dbbab36e635ced32058174cbcd052
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod 323 BLAKE2B 703b8f1e36b74c6bea0f942558045ef2333c658e31a3b4c2b7924c8e436c31a7d596b60587027f7605f65f8fb20597e0a7e7628f0ec2eeb423f3519870d8e0a2 SHA512 13d4c5dc1bb206cae17c38b6e387386573b402a3679054c12a53acf384e15d5d77ebbb77ad374993b1bba547faf34f4189fe5d77b80d57f0831dac1ee54a98c0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.2.zip 3441487 BLAKE2B c91d9d98cb01c8562aa2a33931de3ca86d51d815a1514a6e55533854ada4d520f22c8a08c69b9ece3714156c787c46fb9ceba156f99f4b8bbc08d685ed2621d6 SHA512 0ee51d19f7a03af6f79771598ba4201f54b9035f38086829e9e9ea837156bb6e42b900d9f75151ace7e522b6439b21e0a86fe2c70f3d24f37bcf5a70a084cee7
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.3.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.4.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.5.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.5.zip 3513755 BLAKE2B 2537e470673cbca85684cb2896fe567db4b16cfd2d9b94570fdfd9a56d20eca550a7b22d8290d89a84281c02077790528d351e99c1f5dff223d867ab0e951f06 SHA512 3cedcd8d219cedd2f55e462cff9e235e3650f92d5a6dac4a44b9920a1431899a73ef41e2f07370c27d909000ce21c9a20a8b29d732471b59e4cb6777565081b8
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
@@ -505,6 +598,12 @@ DIST google.golang.org%2Fapi%2F@v%2Fv0.40.0.mod 582 BLAKE2B ce5d0b2f3965440e4ea0
 DIST google.golang.org%2Fapi%2F@v%2Fv0.41.0.mod 554 BLAKE2B 5a047b5fc1095d1f7968701852d42e33545b9d32d0f384f2425c317f2f69c1f5110ff6c91ca2878449f2993c112f0fe98269aaff33cfabc1d56b0e73089ed1ac SHA512 8663309700a5c7b090ed954ce89f8d06999a3e6d943e1bd2b87c77cb75788272a0057718db9e145a10329c4bf2cb97ac00f7ef0d1b52355f54847b596c26710e
 DIST google.golang.org%2Fapi%2F@v%2Fv0.43.0.mod 554 BLAKE2B 1762b991f8e9106a131452afda7303a8483cdd0dfc6551a97f4fbeb8e6588d4adc03b35972902eb6c86e2bd759d917b3de3e4354bd4460d6fccf8c83e31b7726 SHA512 d5a9b88edc13a0ae616c249beca3a712f5db2c643ef13c771f22e64b81548a32b46aa19fd87507bb27b385a9525423f586157bf9efd111d29677d38f02c85908
 DIST google.golang.org%2Fapi%2F@v%2Fv0.44.0.mod 554 BLAKE2B e24bf1ef81efd6b5cdec071848307b10a9c8a40c0600260d38dd19b37b8ec920afdc26e640537d39c873c4efddfd0f0dbf06bc2b2a155c38fdc0348a489eb371 SHA512 b650e19e3c0fbdda5dd6a4264170c6d9473ab26bce271d50dbf5f2ca9f1fca38430b524750e5f68a0deab08db664fe70fd4e6355b1f30dad994c27887304b9b9
+DIST google.golang.org%2Fapi%2F@v%2Fv0.47.0.mod 661 BLAKE2B db842ff2a2911217bea521a84017983a98a9cf6b95b804da3abab14a8dc5237e722d7e80a0b1e196998de65b86e64fd34ea363bbfcc50ebfbc950b8c5e537e55 SHA512 9b7bd454c604432874fe9647a1768157bd384537992fe62bbc7a72e6feff614a4d33a7fbf89af1961ec71258115498980dabbbb040e7faebd9ef26a8802e8e31
+DIST google.golang.org%2Fapi%2F@v%2Fv0.48.0.mod 661 BLAKE2B 107ccb932948c454c8634c03a423ddfe3333c607fd82252be8d47d2081f27bf6235cdf6c2723ee799bab6dc2c480066739ed57782536335b419ccee8761467d3 SHA512 72192b22a77ca7c06873e9238461da5f9457a9901d7a269d1bccdf9749c818f24d2db7f007398fb2a0b197fec77ec186d8cebbcb8124ca24dac749248277a685
+DIST google.golang.org%2Fapi%2F@v%2Fv0.50.0.mod 661 BLAKE2B c62f77a80985e6b15ad816ddeed32c59d14d3b8af53f2d37adbeb6598b1456093cdad54e94995746c93d8a53e5f0db4b76ab4645a85a7ae537af7a69de7ef96e SHA512 5c80d3ccc15286448411e9f23ddcc6e4856a8e68f1328d391d63aa8dcc33f5a09a03760553d153696aa02f31d488c3d456446267f2602aa4a685bd5d053c7a63
+DIST google.golang.org%2Fapi%2F@v%2Fv0.51.0.mod 661 BLAKE2B bc685b26549735893ac54d14aa5e352458bd580cb1193ef6bf993272020fe55fd18b6626be5a09afbd6b0743332c8adcc7a030b20fbc1e30a8d88692db601c17 SHA512 14ebb886191515248093ef28ef10aac43451837ef920a1a2a81f3cbf208ec716b15fc4d3afbb820fe2e9a132e697d3b54d201a5d9673b8f4520144b66ca003b7
+DIST google.golang.org%2Fapi%2F@v%2Fv0.54.0.mod 661 BLAKE2B 137f95ebe57d08a2a989be71ad8248e137a13262c15b132e7de77d128e1cb94d59b32081f0f6e8e5c72de0d48baec8a2404517be9fca0123bd67cb34da999eeb SHA512 a1090037d91b9a617bdac90efda46b90a92ad4ac562588232efa89d65a5682462ebaf3f8f340c38e09e5e742d6cee8891239ece5b8c255119bfcba26171fc53a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.56.0.mod 661 BLAKE2B b789ac2c45898063b409a9804d980dd6b65d055fc39c0cd0424b8a6a195bbf73fd01e03d3ba66bcbbabbec71a2524d2d61d3685752937a66f9c6b79ed91a7f5a SHA512 f53b4510cbc07c8fd04e075b7a57ea34fe014955bc6b3b74fb1db8bec0760fdbb9e1af1a910bccecce1f4a7a34f9f3c6163ed4b921ace85da2ee3d0f45f9351f
 DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
 DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
 DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
@@ -555,7 +654,18 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210303154014-9728d6b83eeb.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210310155132-4ce2db91004e.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210319143718-93e7006c17a6.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210402141018-6c239bbf2bb1.mod 408 BLAKE2B ffa3c2000ed843b4274bfd1c06aedf4c5a9aa1fa9abbe06f96c2c09fb1ea8bc18e451fc226097659f5da5e603a67d00aee7d31d7bb7db22614de0c99950ff73a SHA512 c6d892fa8ab198a921437b1b017a9108e516f1d91a79b3fe0c39b674d19aa74385c30ae9456fdd1565c6c6308ce1b811d7b49db45e3fdedf1286aed38c1c48b4
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210513213006-bf773b8c8384.mod 408 BLAKE2B 60b36881020cdd512e1981a98fffb1f83de54dbf69a6d55719e86995ac322d80c6c35f5b84d7b7b2346804350a50b023d23ea7dcde89d45feded023a90a0461c SHA512 8d6f7f28525e6ee67df587c2e013821259261f6dbf0a477dd26d0147aebca87ad0ad65fb662a37042252d2e82714f9c9e487164b74e67ad25a92e232ed9e5bee
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210602131652-f16073e35f0c.mod 278 BLAKE2B bc29676533b5813b8383ab995cd9c117cfa3712c1a7091b504a3feb60614b704fd031692dabd7a479fef427efc584b697b74346fdea2fd6df6d09cca8efecf9e SHA512 dbc012381b6e5c891ca583f791ec02094b4d1c43f0c22d1d4a992497d5f2503fcc78fb8f119c891a474156dd8fcde92acc27e75f40cc026cd37913aa83298fc5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210604141403-392c879c8b08.mod 278 BLAKE2B bc29676533b5813b8383ab995cd9c117cfa3712c1a7091b504a3feb60614b704fd031692dabd7a479fef427efc584b697b74346fdea2fd6df6d09cca8efecf9e SHA512 dbc012381b6e5c891ca583f791ec02094b4d1c43f0c22d1d4a992497d5f2503fcc78fb8f119c891a474156dd8fcde92acc27e75f40cc026cd37913aa83298fc5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210608205507-b6d2f5bf0d7d.mod 278 BLAKE2B bc29676533b5813b8383ab995cd9c117cfa3712c1a7091b504a3feb60614b704fd031692dabd7a479fef427efc584b697b74346fdea2fd6df6d09cca8efecf9e SHA512 dbc012381b6e5c891ca583f791ec02094b4d1c43f0c22d1d4a992497d5f2503fcc78fb8f119c891a474156dd8fcde92acc27e75f40cc026cd37913aa83298fc5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210624195500-8bfb893ecb84.mod 278 BLAKE2B 8d7378817a9a30017f545c303dde5a26e3bb74df85568be806090a68b66e31c13cf04a8eb9be81836e715930fce89eca1cb972584f862931ba642ca3236d0db5 SHA512 0d1d8e04e6cff226b2472667f21fd7c72b21cf3cddd59dd8980219e2150b2662e10ce565b349093c1318849ff84e8178eb2f8782d26809cb5d5012aba1e90c44
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210713002101-d411969a0d9a.mod 278 BLAKE2B 29eb15e23dcef673bca153c172832e5a2647f7ec1c6b6aa775ac6594211829e831137ae7e4435c3ca0a500fdcb18e6c3533351c911dda0cccfb07d2b99ffdcc7 SHA512 69c25e94a0e174296abe276b1e02abd2b0b14e3f3a36c646d63dbeaa375c1936c0857ab6615b4eaaa90aa503eb6d00101dc0e57cf5498ff73271ce5d13da9226
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210716133855-ce7ef5c701ea.mod 278 BLAKE2B 29eb15e23dcef673bca153c172832e5a2647f7ec1c6b6aa775ac6594211829e831137ae7e4435c3ca0a500fdcb18e6c3533351c911dda0cccfb07d2b99ffdcc7 SHA512 69c25e94a0e174296abe276b1e02abd2b0b14e3f3a36c646d63dbeaa375c1936c0857ab6615b4eaaa90aa503eb6d00101dc0e57cf5498ff73271ce5d13da9226
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210728212813-7823e685a01f.mod 278 BLAKE2B 76ce09b65424014b839bb387613f1259dcfb0b62f2832f02a1f36f86f3a07ebd0766913cb72512b4de6df13626378c0bc5b5010219d160988358d7b0fc4bcccc SHA512 dc854a5bc0656a51500f50d050eb129a94cabb7ea627314ae8eed44084af17ef712785074a74bef2f11b5f0ff98311dea246d6a0f646afeb1b9e00d25929c2b3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210805201207-89edb61ffb67.mod 278 BLAKE2B 76ce09b65424014b839bb387613f1259dcfb0b62f2832f02a1f36f86f3a07ebd0766913cb72512b4de6df13626378c0bc5b5010219d160988358d7b0fc4bcccc SHA512 dc854a5bc0656a51500f50d050eb129a94cabb7ea627314ae8eed44084af17ef712785074a74bef2f11b5f0ff98311dea246d6a0f646afeb1b9e00d25929c2b3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210813162853-db860fec028c.mod 278 BLAKE2B d62dbc3a756b1a1ab753b8a1f63e406ee6f2dfaca7df4fd582941acb625778b298460931b0496023f3912e3863b7b974a86622fd30b29e6095735af940cd4ac5 SHA512 0fb947ff6a7caf91b32c186a14d2f19ee906f83c9ba5de3209525a3829eb5ef75f0097961ee9e11dc9cb151238e7baf16fb1450c97a53764ef57653f9cba8a75
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210821163610-241b8fcbd6c8.mod 278 BLAKE2B c536c2a37cb43bde4d32407cad4b8ed577eead6cc35697a8dcb986869924d234aaaa0a2e60098bfa109abaaf7bc03a6e86ef708cb96f04f8cadd16c1fa6f7987 SHA512 4aa8d342e58f401b4b3005add3ddd4df50758ff346a09728be67830ad4ebb3db90edb12bf81cbb819b343a4de4b5290148e462bf07ef392cf94538b0477e734f
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210828152312-66f60bf46e71.mod 278 BLAKE2B c536c2a37cb43bde4d32407cad4b8ed577eead6cc35697a8dcb986869924d234aaaa0a2e60098bfa109abaaf7bc03a6e86ef708cb96f04f8cadd16c1fa6f7987 SHA512 4aa8d342e58f401b4b3005add3ddd4df50758ff346a09728be67830ad4ebb3db90edb12bf81cbb819b343a4de4b5290148e462bf07ef392cf94538b0477e734f
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
@@ -575,7 +685,13 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.34.0.mod 578 BLAKE2B 620224161970d1fb647
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.35.0.mod 608 BLAKE2B 01e491f455fd8b3faf2dabdc8ba3e343c67461f3c58621a9c63575940474e3b4346e4eb1c8f260e78f3ca7cfecddf54f7656f590665d3596e6af1391974b284f SHA512 33faa853ccdf8c52a82c9c44e4b5f2dae76e5cc2c1e8227036f8f5fe7f1b496066fa72a379714491c6d2ac14e0ea8fe5419dc0a1626f9e60933b897903377b45
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.36.0.mod 608 BLAKE2B 01e491f455fd8b3faf2dabdc8ba3e343c67461f3c58621a9c63575940474e3b4346e4eb1c8f260e78f3ca7cfecddf54f7656f590665d3596e6af1391974b284f SHA512 33faa853ccdf8c52a82c9c44e4b5f2dae76e5cc2c1e8227036f8f5fe7f1b496066fa72a379714491c6d2ac14e0ea8fe5419dc0a1626f9e60933b897903377b45
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.36.1.mod 608 BLAKE2B 01e491f455fd8b3faf2dabdc8ba3e343c67461f3c58621a9c63575940474e3b4346e4eb1c8f260e78f3ca7cfecddf54f7656f590665d3596e6af1391974b284f SHA512 33faa853ccdf8c52a82c9c44e4b5f2dae76e5cc2c1e8227036f8f5fe7f1b496066fa72a379714491c6d2ac14e0ea8fe5419dc0a1626f9e60933b897903377b45
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.37.0.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.37.1.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.38.0.mod 608 BLAKE2B 7de276dcb3541de0e9509c95860d13991855aa3f9193d32fe540fd41b28db88e3787c767073a6be9c294b6ece11742d80d13a98cbc1a57c48fe81d1bb7c45004 SHA512 bf2d4e70b656e1345aee9029d35a922424bdbdd05edb45fd8f0267af3a17da53d1d1ff005d58b99d721883e7371b2d2ea99fb67bda9ae880f5ea12a32d8f2078
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.39.0.mod 608 BLAKE2B e0fd588267fddeda3a91af18ec7eac08e8c83020e287f2737e93daa843ee2f87971c2385ecd531527316b5b0c63dc53021aca6f0f30e34a4d65ace222fb00739 SHA512 6eb0f8d38caeac4bd92806466132208239fee81c4af1c1f6200a3e9074a70b8ebe76ac8c2d9992e61ac9e86a5309a5333b37ce004a22305491d7d513ccf94d2e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.39.1.mod 608 BLAKE2B e0fd588267fddeda3a91af18ec7eac08e8c83020e287f2737e93daa843ee2f87971c2385ecd531527316b5b0c63dc53021aca6f0f30e34a4d65ace222fb00739 SHA512 6eb0f8d38caeac4bd92806466132208239fee81c4af1c1f6200a3e9074a70b8ebe76ac8c2d9992e61ac9e86a5309a5333b37ce004a22305491d7d513ccf94d2e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.40.0.mod 642 BLAKE2B 71e24b8446f8230b4763b0123b77f3b770e3989e00ffd680999016ad9dde0286f79bba7aba82b35e7d43a0683f8d74e74198876b648e75bc6b5e9d322ca05331 SHA512 718a4678722359c59fb9aff2b44d00d62524a5931220eb2fb7ea32a36aa443fdeb882ce157e5a99e2a7b1817dfc97c5e3f619559e6b723a3aba1274c4b75d28d
+DIST google.golang.org%2Fgrpc%2Fcmd%2Fprotoc-gen-go-grpc%2F@v%2Fv1.1.0.mod 105 BLAKE2B 1fd1c6f20bdc1fb0a8a89ff7a9dd787d9c69a81f87249f44edefefb5bd1293a513ec4f7111be0df03044b54e42426b0b1083a24c76e50fa96f76aa393334e78b SHA512 e5e455ab72efe80c6d130c4631162f2d42690edff30064c0314700c8ce9d3c77b14554ff1b398aebb940e6501bef102af78a32e05b424b3b381625ca7d5e7cd0
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
@@ -588,12 +704,17 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.27.1.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip 66745 BLAKE2B acf0c83323e5e7a7444b615ca7bbdfd4c43bc9a5985532fec2cf80679fc49bf23cfa8579468fff501a1ada101b3ce84fd24223408e05a85408235990fffa20ff SHA512 b812663ce5f6668da2265890b0ec9fd0531bb128a69fc6cf3546ca9acda71b4db2d8be782f18d81665b060d0418ce6f92bfb69f6dcb89b18b0d5492df4505cb3
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.63.2.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.63.2.zip 66834 BLAKE2B 2f0a3a73dd4b878f360555313248ad5f8e4fd3c677a566e613f47078264390ae538c55e4ea36b10b7eb1de26cc54609957da554ceb143b691e449923abf2ad97 SHA512 955a765d1784ae819e7fd55ea667e2313fa736840deaf9823b99eaa3e9b1a451d6b9e5d2356d3567f57e0b1661d949bf04c2c0dd4a6fb78898dc80237b063cdb
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
@@ -614,6 +735,8 @@ DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b20
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 DIST woke-0.14.0.tar.gz 85897 BLAKE2B 7731a8d88574f33aaa3021cbd71cbc84db7b9f2c13eddd4301c7cc1f512a2282a4e8376f98ad3c824a21afa6635b4e178a5bf2c5be203563aeff71e12a95b390 SHA512 ae6501816f0fc2cb615bb950e657d89d83b46829dd3bb2c4c594fd9870757b11bbec4fb9b5c5da386f4845b8686e3f3cee041ea53234301280c0fbeacdb5cfe2
 DIST woke-0.15.0.tar.gz 86130 BLAKE2B 1954ea8dcfdc5ca035a78f7fa97b7a03a4c7b11e1741fc2457d529e04a27f565f9f2b6b16be45608bf60d7342afb9a0f8cd631d67d24f81e6b24be5b132099e9 SHA512 796b18887a5a82b0de2ab6dba353c12bb252650a325c1033d62bf7103356d9da744a6064fad2e0472ee6a1851f491a486b935a8d030d96711459c1ad912a75c1
+DIST woke-0.16.1.tar.gz 90086 BLAKE2B 08991bb8507f6b5431d54e97d8ce517372bfea8ba4f3765af2b9cb26f4b5f05d888ab296c531b5c21332042958635c8a2de1f17a8b5d256242341a228cfaa20c SHA512 d9ae29d4b8925086b2b72e54b9271bc6a8f0215e77fb415a3c3da7f2f51d170c1a833dc7d08786318cfc6b31103c1a60c71f96ed585902a40fdabbac188f8bc7
 EBUILD woke-0.14.0.ebuild 33620 BLAKE2B fe619ac9b5f4927ce12a51c5f82f320c0182184c98f08db0004a9c57ba2598302a1a3660a7f85e31577a9b306fa3890fe72ca4c07a98fefea6b0e392b0dcba3d SHA512 695c39ba2a07c50c789d9c22958950f487122bccf0418f1d1750cb2720830ff79e3619f1d70294364866cac889a8fdd8b9f2d27ae4cbdcd3c55a56e2d052e2cd
-EBUILD woke-0.15.0.ebuild 33621 BLAKE2B c5ac50a1f7cf7fdb8d9d4185724408b7930c13b15dace5dc069dea197641c319559ed0eeca68f747550041bb6399a99e1d5c0f5ac00e30906768ad3a38a8ea98 SHA512 b3c61afec222eb0f942ae80239826bbbc8a8d634dd1c9e9ea99f3283734993a7acbe3aaf55080e651af78c302b57e43ab3482bb9682ed4fc57cae06bbdc46c2a
+EBUILD woke-0.15.0.ebuild 33620 BLAKE2B fe619ac9b5f4927ce12a51c5f82f320c0182184c98f08db0004a9c57ba2598302a1a3660a7f85e31577a9b306fa3890fe72ca4c07a98fefea6b0e392b0dcba3d SHA512 695c39ba2a07c50c789d9c22958950f487122bccf0418f1d1750cb2720830ff79e3619f1d70294364866cac889a8fdd8b9f2d27ae4cbdcd3c55a56e2d052e2cd
+EBUILD woke-0.16.1.ebuild 38769 BLAKE2B a8ca46383d50c3354916cc9025dee717bee10d01cd014b582000ab4c1ebef8a6219834d746635a431c43224964b380e142fddf49c26250fb45a19932a86fa5e3 SHA512 d1ed7d90c600433d00f2b52cc8179fb9ec45ec94b8bca2d33a9be1401193e21958a6710def28dc7e44d7cb87c3b890b5d4242d6a551c0a891bfd629159cceb1a
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-util/woke/woke-0.15.0.ebuild b/dev-util/woke/woke-0.15.0.ebuild
index d4c53f4202eb..e9b1ee947c12 100644
--- a/dev-util/woke/woke-0.15.0.ebuild
+++ b/dev-util/woke/woke-0.15.0.ebuild
@@ -629,7 +629,7 @@ SRC_URI="https://github.com/get-woke/woke/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_compile() {
 	go build .
diff --git a/dev-util/woke/woke-0.16.1.ebuild b/dev-util/woke/woke-0.16.1.ebuild
new file mode 100644
index 000000000000..5be803661e0b
--- /dev/null
+++ b/dev-util/woke/woke-0.16.1.ebuild
@@ -0,0 +1,739 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="check source code for non-inclusive language"
+HOMEPAGE="https://getwoke.tech/"
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go v0.72.0/go.mod"
+	"cloud.google.com/go v0.74.0/go.mod"
+	"cloud.google.com/go v0.78.0/go.mod"
+	"cloud.google.com/go v0.79.0/go.mod"
+	"cloud.google.com/go v0.81.0/go.mod"
+	"cloud.google.com/go v0.83.0/go.mod"
+	"cloud.google.com/go v0.84.0/go.mod"
+	"cloud.google.com/go v0.87.0/go.mod"
+	"cloud.google.com/go v0.90.0/go.mod"
+	"cloud.google.com/go v0.93.3/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/firestore v1.1.0/go.mod"
+	"cloud.google.com/go/firestore v1.6.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/antihax/optional v1.0.0/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bketelsen/crypt v0.0.4/go.mod"
+	"github.com/caitlinelfring/go-env-default v1.0.0"
+	"github.com/caitlinelfring/go-env-default v1.0.0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod"
+	"github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.3.2/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/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/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.7/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fatih/color v1.13.0"
+	"github.com/fatih/color v1.13.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/fsnotify/fsnotify v1.5.1"
+	"github.com/fsnotify/fsnotify v1.5.1/go.mod"
+	"github.com/get-woke/fastwalk v1.0.0"
+	"github.com/get-woke/fastwalk v1.0.0/go.mod"
+	"github.com/get-woke/go-gitignore v1.1.2"
+	"github.com/get-woke/go-gitignore v1.1.2/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.4/go.mod"
+	"github.com/gogo/protobuf v1.3.2/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/mock v1.5.0/go.mod"
+	"github.com/golang/mock v1.6.0/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.4.3/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.1/go.mod"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/golang/snappy v0.0.3/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.3/go.mod"
+	"github.com/google/go-cmp v0.5.4/go.mod"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-cmp v0.5.6/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/martian/v3 v3.1.0/go.mod"
+	"github.com/google/martian/v3 v3.2.1/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod"
+	"github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod"
+	"github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod"
+	"github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod"
+	"github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod"
+	"github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod"
+	"github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.1.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+	"github.com/hashicorp/consul/api v1.1.0/go.mod"
+	"github.com/hashicorp/consul/api v1.10.1/go.mod"
+	"github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+	"github.com/hashicorp/consul/sdk v0.8.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.1/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/memberlist v0.2.2/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/hashicorp/serf v0.9.5/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/json-iterator/go v1.1.11/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/kisielk/errcheck v1.5.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/kr/fs v0.1.0/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/magiconair/properties v1.8.5"
+	"github.com/magiconair/properties v1.8.5/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-colorable v0.1.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.11"
+	"github.com/mattn/go-colorable v0.1.11/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/go.mod"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-isatty v0.0.14"
+	"github.com/mattn/go-isatty v0.0.14/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/miekg/dns v1.1.26/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/cli v1.1.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.1/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.2"
+	"github.com/mitchellh/mapstructure v1.4.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pelletier/go-toml v1.9.3/go.mod"
+	"github.com/pelletier/go-toml v1.9.4"
+	"github.com/pelletier/go-toml v1.9.4/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pkg/sftp v1.10.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.3/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rs/xid v1.3.0/go.mod"
+	"github.com/rs/zerolog v1.25.0"
+	"github.com/rs/zerolog v1.25.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/sagikazarmark/crypt v0.1.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.6.0"
+	"github.com/spf13/afero v1.6.0/go.mod"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cast v1.4.1"
+	"github.com/spf13/cast v1.4.1/go.mod"
+	"github.com/spf13/cobra v1.2.1"
+	"github.com/spf13/cobra v1.2.1/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.8.1/go.mod"
+	"github.com/spf13/viper v1.9.0"
+	"github.com/spf13/viper v1.9.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/subosito/gotenv v1.2.0"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark v1.3.5/go.mod"
+	"go.etcd.io/etcd/api/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod"
+	"go.etcd.io/etcd/client/v2 v2.305.0/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"go.opencensus.io v0.22.5/go.mod"
+	"go.opencensus.io v0.23.0/go.mod"
+	"go.opentelemetry.io/proto/otlp v0.7.0/go.mod"
+	"go.uber.org/atomic v1.7.0/go.mod"
+	"go.uber.org/multierr v1.6.0/go.mod"
+	"go.uber.org/zap v1.17.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
+	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod"
+	"golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/mod v0.4.0/go.mod"
+	"golang.org/x/mod v0.4.1/go.mod"
+	"golang.org/x/mod v0.4.2/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod"
+	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
+	"golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/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/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
+	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/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-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
+	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod"
+	"golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod"
+	"golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod"
+	"golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod"
+	"golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod"
+	"golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
+	"golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod"
+	"golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod"
+	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
+	"golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod"
+	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
+	"golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod"
+	"golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod"
+	"golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6"
+	"golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.4/go.mod"
+	"golang.org/x/text v0.3.5/go.mod"
+	"golang.org/x/text v0.3.6"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+	"golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod"
+	"golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod"
+	"golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod"
+	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
+	"golang.org/x/tools v0.1.0/go.mod"
+	"golang.org/x/tools v0.1.1/go.mod"
+	"golang.org/x/tools v0.1.2/go.mod"
+	"golang.org/x/tools v0.1.3/go.mod"
+	"golang.org/x/tools v0.1.4/go.mod"
+	"golang.org/x/tools v0.1.5"
+	"golang.org/x/tools v0.1.5/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/api v0.35.0/go.mod"
+	"google.golang.org/api v0.36.0/go.mod"
+	"google.golang.org/api v0.40.0/go.mod"
+	"google.golang.org/api v0.41.0/go.mod"
+	"google.golang.org/api v0.43.0/go.mod"
+	"google.golang.org/api v0.44.0/go.mod"
+	"google.golang.org/api v0.47.0/go.mod"
+	"google.golang.org/api v0.48.0/go.mod"
+	"google.golang.org/api v0.50.0/go.mod"
+	"google.golang.org/api v0.51.0/go.mod"
+	"google.golang.org/api v0.54.0/go.mod"
+	"google.golang.org/api v0.56.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/appengine v1.6.7/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod"
+	"google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod"
+	"google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod"
+	"google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod"
+	"google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod"
+	"google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod"
+	"google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod"
+	"google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod"
+	"google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod"
+	"google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod"
+	"google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod"
+	"google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod"
+	"google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod"
+	"google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod"
+	"google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod"
+	"google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod"
+	"google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/grpc v1.31.1/go.mod"
+	"google.golang.org/grpc v1.33.1/go.mod"
+	"google.golang.org/grpc v1.33.2/go.mod"
+	"google.golang.org/grpc v1.34.0/go.mod"
+	"google.golang.org/grpc v1.35.0/go.mod"
+	"google.golang.org/grpc v1.36.0/go.mod"
+	"google.golang.org/grpc v1.36.1/go.mod"
+	"google.golang.org/grpc v1.37.0/go.mod"
+	"google.golang.org/grpc v1.37.1/go.mod"
+	"google.golang.org/grpc v1.38.0/go.mod"
+	"google.golang.org/grpc v1.39.0/go.mod"
+	"google.golang.org/grpc v1.39.1/go.mod"
+	"google.golang.org/grpc v1.40.0/go.mod"
+	"google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"google.golang.org/protobuf v1.27.1/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/ini.v1 v1.62.0/go.mod"
+	"gopkg.in/ini.v1 v1.63.2"
+	"gopkg.in/ini.v1 v1.63.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.4.0"
+	"gopkg.in/yaml.v2 v2.4.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/get-woke/woke/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	go build .
+}
+
+src_install() {
+	dobin woke
+	dodoc README.md example.yaml
+}