gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /dev-util
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
260 files changed, 4296 insertions, 6503 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index dafff41dd23e..bce17d410ead 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 3308d1674a74..7b251dd1192e 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,9 +1,7 @@
-DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
-DIST patch-5.14.14.xz 528644 BLAKE2B 3917c340eb1cd814b7fd40420e32baa84c6a062a7c52ab75301cfce8e59acf055f3c9ff38f4ae1590837f245607e294277001f0a0b53ee44b0056b83f98bc68f SHA512 258fa67ee6e6d13b4e92d361898313b4e2f3d9d0be883e5c5a0c436e51cf8bcb3eb5acb46272bb5df2bbf8390b81152e8244b1d6faf7299314589b90c95eebba
-DIST patch-5.15.12.xz 620100 BLAKE2B 8ac09e5cff7465641818e24e846a014bc936e2e2f61b7d1973319d5665d45acd6be24d28430173b5646e80cf67351044165b949575baf76ccdfb46ae34fc1468 SHA512 0e2dbfa675f00ddcb72369d1aed76470ed37a0968856e00d620bdc4bc7891a1646b4f9dcf864a57c26a5b9ab6afec43c8a62ad5c7e0549aaf0e8bae2852a752b
+DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST patch-5.15.8.xz 537596 BLAKE2B 0f431804d406c4bbb09c44826fe1018b0bca94018337b73387d44ff3e25e6b90e2ec10cf9935847786e4dac6e1523e8e7daeaedb4f854d20a155bd13b29a0c72 SHA512 ef6d0841033fecba7c4aa25f5249a1e532a0d95f4b7e7048357ff00277d9abc11897f92d05d4a2cb90372da9cec8aa6664ce1058f71a6cae6bc647649787667d
-EBUILD bpftool-5.14.14.ebuild 2825 BLAKE2B ddddd1db68cd7ebce4872227c8896ef0f81a85b46230c7e4ef83e08cc3a004f46df67815812a2f80d8ec56e65e0bb794b56fc32f8c5ee70ed8d9ed52add95aae SHA512 b67729b68efd059799b8dcc8146bfdb6ea8e92482fcc2f960d7e3bcf7a2002409f1423f13ef2c18b31bacdf86a7c5eee322d563540dfa03752a0ccbb7458c9f9
-EBUILD bpftool-5.15.12.ebuild 2831 BLAKE2B de315e53f165a2008a74021dbf4ccfeab5a59121e1044dd5b11d3df29c086c38ce32a40ab7d1fb2aa16ed7c1cbf4208a7ca1252fef3eb48716cd0b74d6c64684 SHA512 87b2a927a3b3b2738f0a2f126af9d83bbd68b7200c4b36b987e898d65c3508018636413cfb113715065514b7ccf251a0b8903597249ce8ed116c4ae881a3880e
-EBUILD bpftool-5.15.8.ebuild 2826 BLAKE2B 75caba7a4cb73dba40a6e3c08751327e97f32f618d7240b694434371ba63722626565fcf9fe6ffe0961929e1f6736bf80cda3c196c3aa6160404521ea20628fa SHA512 5c02dcd3f55e406955fbbdb4199ff89572665a1c09f443217e415e0a0b19df8865d7a75342ce3305e93254066f4f49670ad34b879aacd1d68a36fcd0db696829
+DIST patch-5.16.2.xz 20432 BLAKE2B 9c9f697e4dd0a78a94ac0bd361ec69683c6904d9af02da55c3001394e6a6efcc1fccd5d44747fff6ea47271b7655bd7866d161a90196cecaddde1c630ef5c425 SHA512 50d3c386e391603fbfe86780bbfa69c3a7caa83a7eea6c239af133dde3a7aa4746f4a3f1483589018d5ac27caa7ee69d869f8f64f4b5121ddab52224f5302222
+EBUILD bpftool-5.15.8.ebuild 2830 BLAKE2B db113b1e8e9b42204215e0d0a6b1ff21b7ca929401f4e63b33e1fc0da8baa837be38349171ff19c2f7460b63062b72423e0524df6180c118ff10e1b110d90bac SHA512 139015d99cf70a7bcf9558f316a214e4c8cb0b9c162c6936df785702b94f02ee5abfccb64e5f6beebef4badebe6182045917cb3fb45a4edf0ccee108c00f7385
+EBUILD bpftool-5.16.2.ebuild 2831 BLAKE2B de315e53f165a2008a74021dbf4ccfeab5a59121e1044dd5b11d3df29c086c38ce32a40ab7d1fb2aa16ed7c1cbf4208a7ca1252fef3eb48716cd0b74d6c64684 SHA512 87b2a927a3b3b2738f0a2f126af9d83bbd68b7200c4b36b987e898d65c3508018636413cfb113715065514b7ccf251a0b8903597249ce8ed116c4ae881a3880e
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.14.14.ebuild b/dev-util/bpftool/bpftool-5.14.14.ebuild
deleted file mode 100644
index 96d2e40cb699..000000000000
--- a/dev-util/bpftool/bpftool-5.14.14.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit estack linux-info optfeature python-any-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
-HOMEPAGE="https://kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-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}"
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="caps"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	sys-libs/zlib:=
-	virtual/libelf:=
-	caps? ( sys-libs/libcap:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-	${LINUX_PATCH+dev-util/patchutils}
-	${PYTHON_DEPS}
-	dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-	local paths=(
-		tools/bpf kernel/bpf
-		tools/{arch,build,include,lib,perf,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
-
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-}
-
-bpftool_make() {
-	local arch=$(tc-arch-kernel)
-	tc-export AR CC LD
-
-	emake V=1 VF=1 \
-		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
-		EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \
-		prefix="${EPREFIX}"/usr \
-		feature-libcap="$(usex caps 1 0)" \
-		"$@"
-}
-
-src_compile() {
-	bpftool_make
-	bpftool_make -C Documentation
-}
-
-src_install() {
-	bpftool_make DESTDIR="${D}" install
-	bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
-}
-
-pkg_postinst() {
-	optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
-}
diff --git a/dev-util/bpftool/bpftool-5.15.8.ebuild b/dev-util/bpftool/bpftool-5.15.8.ebuild
index e3fa3487cfe7..6e1462d1df87 100644
--- a/dev-util/bpftool/bpftool-5.15.8.ebuild
+++ b/dev-util/bpftool/bpftool-5.15.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="caps"
 
 RDEPEND="
diff --git a/dev-util/bpftool/bpftool-5.15.12.ebuild b/dev-util/bpftool/bpftool-5.16.2.ebuild
index d4a6b8926868..d4a6b8926868 100644
--- a/dev-util/bpftool/bpftool-5.15.12.ebuild
+++ b/dev-util/bpftool/bpftool-5.16.2.ebuild
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index f5b0f3a1e205..8db7db670c73 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -9,5 +9,5 @@ DIST bpftrace-0.14.1.tar.gz 991481 BLAKE2B 832f213760eb86804d63df782ff1923f6355b
 EBUILD bpftrace-0.14.0-r2.ebuild 1800 BLAKE2B 595833564e6d29016a523502877ab550a65d8749f6afd4a090ee10fb0c06470488c00ea8379b8f84cdce994651e2b323402c7b1663a2113db90b4b1a101c3c5d SHA512 37f6b42c84c82107b51b035d94e7ff704587c6241e05e872ed98cf6ad4a17acab24f66265339dc57e905a82b868acc4182f4a245cecdb52a5871d4db53757574
 EBUILD bpftrace-0.14.0-r3.ebuild 1714 BLAKE2B 920871a51ced4378659f415e3f08ed29a3b2aaee9613977b0efa090d86429c1a464c71fa7a9d5ec73a134f38a9086c9af8519ca88c60c008233796ca3e4af9e6 SHA512 b667cdbb36ffdace520ed8c29c384ea50c71679f1e798f1e5921a59307ef2c3202789bd8fcc988d0c1776ab88feebc869de6d9f60a071721e9a3fc3b56d1dead
 EBUILD bpftrace-0.14.0-r4.ebuild 1897 BLAKE2B 9e895fff1c210b84f2b25ece52f155b80373ad798777ca4737612e4c1c7eb275206baccce366faa68f6ec65ec732d81e7008542b485ede9a303213c3cdede8f4 SHA512 377ed0d43308a1a7d785537bbd4975c64ecb0bf133491d9133c5d76b50ea5f5db7e0f341e0e3142ac0949dd67f40453d6b59c7bfa2028634ef4380b67463355a
-EBUILD bpftrace-0.14.1.ebuild 1897 BLAKE2B 64e23a87fd0c2b7e55d2d909ab1d45b80dc59ec10b1e056799dc016824312874bdea7f52dfcb0a19efb33bb5d78e628fa7a6fffd19a5fc164313d947ef3b49b9 SHA512 2d650c65d67af11dc76f554f56b7ba374b295ccd4c738181f04496866b86ac7c83d3b9a18d92a9d823dd7e5a390547220cde3a0f5e1188cbf9a2f80af5f65d26
+EBUILD bpftrace-0.14.1.ebuild 1904 BLAKE2B 1ee8a2235c547e6f513070baafc7bd2063934dcbe3e77612f14b42e92a14f31aacf89b26d927a776f840acb225cd3fddf24532230740799a022de6fa7b6f492b SHA512 e6a6dbaeff403928f9f4e90b1875bccb4c894c9e418159a01c613698b090a41a38463fd3046e171fd660e0ce526d9dcc1f53b8b3251a0ce020f32781cdc44e45
 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.14.1.ebuild b/dev-util/bpftrace/bpftrace-0.14.1.ebuild
index 81645fe66617..91157b21ad7e 100644
--- a/dev-util/bpftrace/bpftrace-0.14.1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.14.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="fuzzing test"
 # lots of fixing needed
 RESTRICT="test"
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index 301905eb3210..a06533bc7452 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,19 +1,3 @@
-DIST buildbot-badges-2.10.0.tar.gz 3989 BLAKE2B d158aaab8b61146bd02470619ffcb7eb1809c8a6370ad8546119590faf9e9408dff76ba0457cce432a2bd709e36437ecc973eff38bf0a69cde45abf19c49fd21 SHA512 f0179ed0cec4611022affdefbee67ea59545cb3325cf96d532a6825171cc46cc7ea062512681ab0e93d34ae96988e41a4ec5bb91629a02e094c40fa3a37cfcc7
-DIST buildbot-badges-2.10.1.tar.gz 3980 BLAKE2B 5c538bfd75102ed0bfe6d1a282882e31cb8790dd13270193db902d5ee660888909c2b9b4267fd7533eac0161263a26fb3c8e3b6593e4491a59f00d78c6bfcf5c SHA512 1a3bd3ee99288f11304cf9ecc1a202a98bc8b4b668cb7b361fc327aeb805796a1425d417d53938ee430873704dfc9b395ced7084ef68b59c720b75d8e57c1bfb
-DIST buildbot-badges-2.8.2.tar.gz 3982 BLAKE2B d2320979c3c8530089ddad3c9c57e9f77576da8979b5834ab7f4e6766c5d210c822e7ab582103e897591db0efc63139dc7cb9f9d834bf81ae199dd25929c6b49 SHA512 e2f6ca0178428db90812633c9af47e8f5c40220f506e62745a150a5572a95f99d3a4115621c29b8188b4b5d48aa3b0bac1862b6c5793cd87a4971798a5aae28a
-DIST buildbot-badges-2.8.4.tar.gz 3983 BLAKE2B 24d77c179a2f3287f80b46b66abcc42897016f1094a0b5cfa36dc691be1e7d3c3c709f2c7f13c789bfcecb50d59788e5c8d660f45414855831f31892d34b63af SHA512 bfd11c0dedcf4586e73eff3cc158953d2d3eb8f75c7d900354381e962b5215ca52d2e14c5f20d558c3ae6068a680a4af17967ee7dd7d677a2ba8af2d9cf4e725
-DIST buildbot-badges-3.0.2.tar.gz 3978 BLAKE2B bbf02c2ba3b0d9ef7c133b9dc8ba674896f2397b9a3da60f61718b439a32393127fe4111514937bf09de3a27a6af1601c6373d3e24c648bee9168cf95a77fa78 SHA512 575ab0fac2c1d2d9e0dc349e216b9a562138a239a71ec276a3d9e136933608f59f9d9ae16a507d3fecca2fa377690175cb2d79ef34138a8ca64b07b4166ee685
-DIST buildbot-badges-3.1.0.tar.gz 3978 BLAKE2B e79bd6fdd9b545ff4bb5391bc209f92933cf823c28e855e6d7deded96243192f4cb68e4195a56b72eeb0a44925392aa9859fe840e7d0ab503328c3229b847d66 SHA512 8f5c5eeb544d546306906bfe7b6f4a280fc4aa30240dafd284fb8e7147b3a4ca04b842924b6b099918dc94619113668d2fdd79429a526e4080c3f03ee2dff9dc
-DIST buildbot-badges-3.1.1.tar.gz 3979 BLAKE2B 28dd0716f08803945a1e217ba2a35fe9eec0e2f7dcae93fa8d8815f4c72458114cda9e4234a35834ff0723a05aab2321dd516c46d2d3f2c05b5761ad3d783075 SHA512 0c364928cbcc34f7d269197cf0ed9b503393bc0ae6bc325627b6431eebc499fb64a99a1076f2934898a41567045350db55751c7376427dc9d06fd528909b7495
-DIST buildbot-badges-3.2.0.tar.gz 3978 BLAKE2B 775b6896338fd88ecf382982b4ad9f154391b770b797539d1633adc930de85ee864b0265e5751c5bf8ad20f0aa251823da0ef1eff5e7a87de62f3aaffbe4ac28 SHA512 60231d178bc35054301751f5089f91118f4767093da740bc757b6eebe4ec3c6fe9265c1984f641480a81d9eba9b71d9bf1ae5ef3fe11f3d0bff2f3a4ca4010c2
-DIST buildbot-badges-3.3.0.tar.gz 3981 BLAKE2B b79243e4d408115e445ccc9acabfdd41cb44c3fc0df66148a943efc1fe7b9b82bc23477863e18fc041e1631d5db5d63768a0d1464ce3f4102c79462067466791 SHA512 67c1c17c987a273ada1ac593cfe1242ef4861759f13a01ccfd2d1d62a6513497085773f0e6e685d0950f9a23f988789b3f273882ac647c7ba67099f49c1188bf
-EBUILD buildbot-badges-2.10.0.ebuild 932 BLAKE2B 5509e576aacd9ae50f0aa10fa1014ef2b1a9027e4803a74b0bc13f79d434572f1766a1dcacd8d1dd2873db125730dc93e06edf979bc13cc17fceccd8173b2990 SHA512 07cf146080f4f2d2888980db10c73a324a1cbbf5b1d7632b8a707ca79d2875d4f341b3365b74c9c80211661dc899fd14bea8ebe389303226343bc347a12d2f82
-EBUILD buildbot-badges-2.10.1.ebuild 932 BLAKE2B 5509e576aacd9ae50f0aa10fa1014ef2b1a9027e4803a74b0bc13f79d434572f1766a1dcacd8d1dd2873db125730dc93e06edf979bc13cc17fceccd8173b2990 SHA512 07cf146080f4f2d2888980db10c73a324a1cbbf5b1d7632b8a707ca79d2875d4f341b3365b74c9c80211661dc899fd14bea8ebe389303226343bc347a12d2f82
-EBUILD buildbot-badges-2.8.2.ebuild 932 BLAKE2B 5509e576aacd9ae50f0aa10fa1014ef2b1a9027e4803a74b0bc13f79d434572f1766a1dcacd8d1dd2873db125730dc93e06edf979bc13cc17fceccd8173b2990 SHA512 07cf146080f4f2d2888980db10c73a324a1cbbf5b1d7632b8a707ca79d2875d4f341b3365b74c9c80211661dc899fd14bea8ebe389303226343bc347a12d2f82
-EBUILD buildbot-badges-2.8.4.ebuild 932 BLAKE2B 5509e576aacd9ae50f0aa10fa1014ef2b1a9027e4803a74b0bc13f79d434572f1766a1dcacd8d1dd2873db125730dc93e06edf979bc13cc17fceccd8173b2990 SHA512 07cf146080f4f2d2888980db10c73a324a1cbbf5b1d7632b8a707ca79d2875d4f341b3365b74c9c80211661dc899fd14bea8ebe389303226343bc347a12d2f82
-EBUILD buildbot-badges-3.0.2.ebuild 934 BLAKE2B 54f4a3d652d94fed650b66d3073893dfd30f66bd852d6c7d93f1fee653de35700c31ff5d309f1e5e4a4606890326e80496ab22937ffae62e87cbf6c266d4b6cd SHA512 31861241bbe8ce2be65f6dfbbea46919b2729a0c2d98aeb6d2491f47ab1ff06209ebe03c54cbcb5d7470a8de124c411a2dea58193b932c66e87309fd268adb0d
-EBUILD buildbot-badges-3.1.0.ebuild 934 BLAKE2B 54f4a3d652d94fed650b66d3073893dfd30f66bd852d6c7d93f1fee653de35700c31ff5d309f1e5e4a4606890326e80496ab22937ffae62e87cbf6c266d4b6cd SHA512 31861241bbe8ce2be65f6dfbbea46919b2729a0c2d98aeb6d2491f47ab1ff06209ebe03c54cbcb5d7470a8de124c411a2dea58193b932c66e87309fd268adb0d
-EBUILD buildbot-badges-3.1.1.ebuild 958 BLAKE2B 9cb60bc5386566a96317347fd40e4c976ea434f38124f2bc557a6a1976e8c139daca82e1603e8a5c759cc35d1481e7ee1d0b4cfe5edcb113ec8a432821b06f2a SHA512 85a90e0551dae6286e03ed903fff1305218dd5549d73479106d4e4a8e81e0f7833781eefad5b88202e226b16ff19e1c7883c688e6de9f854c23506e53f66e45d
-EBUILD buildbot-badges-3.2.0.ebuild 958 BLAKE2B 9cb60bc5386566a96317347fd40e4c976ea434f38124f2bc557a6a1976e8c139daca82e1603e8a5c759cc35d1481e7ee1d0b4cfe5edcb113ec8a432821b06f2a SHA512 85a90e0551dae6286e03ed903fff1305218dd5549d73479106d4e4a8e81e0f7833781eefad5b88202e226b16ff19e1c7883c688e6de9f854c23506e53f66e45d
-EBUILD buildbot-badges-3.3.0.ebuild 958 BLAKE2B 9cb60bc5386566a96317347fd40e4c976ea434f38124f2bc557a6a1976e8c139daca82e1603e8a5c759cc35d1481e7ee1d0b4cfe5edcb113ec8a432821b06f2a SHA512 85a90e0551dae6286e03ed903fff1305218dd5549d73479106d4e4a8e81e0f7833781eefad5b88202e226b16ff19e1c7883c688e6de9f854c23506e53f66e45d
+DIST buildbot-badges-3.4.0.tar.gz 3966 BLAKE2B cb94a63dec1e16bb52f5f84174d204137e7da582d3a62effa2d298fbc5f1c25541a8a96d8366efac650488b3810b37eadf9e650db277d6d04c33c1ff9cab32b1 SHA512 3b440b9d36f4e5d310886fd4b0e11607574d312093ce8c9654f07650c2ccf90b27c078c950fb7008f9d834d1cf4f15813c113b85c2d0d1181fac370f7a3472f6
+EBUILD buildbot-badges-3.4.0.ebuild 890 BLAKE2B 502c1085bbf7a0642b099aab6691abd0078cee816083d228a493591cd6811dc44f887ec389e24f0a4246a916c8f2f634b59f44e8a3c662ed429dc02c30b4bc9c SHA512 76d8af39ad96ca345dea0ffbb16d8477723c12cd29ea98ffa3f156698d1033fa14046c0939eceb2023bd9ad8c7bbdd7ab230e2387473ce161a162bb0fe2230e4
 MISC metadata.xml 762 BLAKE2B bad3590966f17a1a4f25b1b382be72f6e2a1ce77c5a0a806fb878b9d20d9c30dec6ea493a530e0aedaefe2dcc964fe7397e752f38a00f9feb2c8ee372d541c9a SHA512 f3936f9cedb5c400740e691833ee030996e61f0f9e6e7661adc5ace37f415c2d456092137a5d14cf792089387177499a36be0bdd53188676b699a829bfc21c24
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.10.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.10.0.ebuild
deleted file mode 100644
index 3c84db65cc63..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-2.10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.10.1.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.10.1.ebuild
deleted file mode 100644
index 3c84db65cc63..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-2.10.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild
deleted file mode 100644
index 3c84db65cc63..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild
deleted file mode 100644
index 3c84db65cc63..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.0.2.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.0.2.ebuild
deleted file mode 100644
index b6fb8a505bb3..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-3.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.1.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.1.0.ebuild
deleted file mode 100644
index b6fb8a505bb3..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-3.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.2.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.2.0.ebuild
deleted file mode 100644
index cc918015f8bd..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-3.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.3.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.3.0.ebuild
deleted file mode 100644
index cc918015f8bd..000000000000
--- a/dev-util/buildbot-badges/buildbot-badges-3.3.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/klein[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.1.1.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
index cc918015f8bd..2e659e00cb17 100644
--- a/dev-util/buildbot-badges/buildbot-badges-3.1.1.ebuild
+++ b/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
@@ -1,31 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+EAPI=8
 
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-grid-view/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
 
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
+BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
 	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
 	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
@@ -34,5 +30,3 @@ DEPEND="${RDEPEND}
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	dev-python/klein[${PYTHON_USEDEP}]
 "
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index cfdb126a19cd..496bff0cd175 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,19 +1,3 @@
-DIST buildbot-console-view-2.10.0.tar.gz 18720 BLAKE2B 00ae39bbd4ec9ee13dea161e4ee853fc65ed61c5aef11ece5766c2ca17db292fedf8c636726c5616c7e2f76edbe6c0c9e2cd442da3d52311857c13947dc6f9b1 SHA512 cb1899179e14df9076224d33d8a0364cde4c74825c5ba1c281dabb1cdab976c7eb4fcb8a1e73274a3198d36b8e24a85e4736dde1ae8f42244e4001a340536785
-DIST buildbot-console-view-2.10.1.tar.gz 18737 BLAKE2B 4423f37a63de3d708ab05d7a1e91a8731d79edf36821ab8e3646447b03d382903bc553dff5396b6d50d5f89e35f85cd67b543fceb47da64a95be72481dcd2332 SHA512 7cef67ebdc49760df0861f5af6cbdf33ba179063647655dda562a06047d7a246c1e56c501dbc5a8b57f3cb3b0a552bc9a56cd2376b913288ccc52b8fa7f5a756
-DIST buildbot-console-view-2.8.2.tar.gz 17575 BLAKE2B e036429dd40fdfdadd65a10d4f6fc025b00d9a61153aecd4f31e0c6c133ba1e546b1c810254ec1fb83913cd4434db223c3cd782481ef5785ec48162a2f111682 SHA512 dbec358933865aa79ad86754ef454d89fa369fc64f3df54eb079c0f1ebadb027131d4bd7ac14dd29a16d34aa416e21f90cbecc873944a7ab8ef7da637e20c999
-DIST buildbot-console-view-2.8.4.tar.gz 18531 BLAKE2B 8d997e34eefea4be6bbbb33902b992a4864b601ef689cedbd7051667e5cab1ee45b13e2d5ad888af4a805ab1a60f0bc79439580583b3c3e233d321b52b28e0d9 SHA512 ccaa8b9ab18bd6e6609ab017ce4f2d447f99310b3448584decb8a572c573426bf84e6b86837f68b715863c66de013a8cad546e35dbbfb051c1c8d32a3825fe7f
-DIST buildbot-console-view-3.0.2.tar.gz 18724 BLAKE2B bc8a75ba284547c5d9c71094f0780242198be14d0e86da2ee837c3437e8e4c76212d4c8ebafb9e6042a8fc8a35530e6fa0df95890ab6fe592d295de2b74df1ba SHA512 15e80c4036c5451a1a48d2d7254118586c4a97ea49d06d04a1237f1c82bdf8b3c044235c7b1cfa46cf892168e94becd48cd4d376479abd8212dbfc0662b7cecc
-DIST buildbot-console-view-3.1.0.tar.gz 18730 BLAKE2B 61703292ddff90e096cd70a5f1001d0e521884f1e89936ca0f11c917867224ac60d61fe96a6f24a51cdfd4b40bb052443a839a51a8849cb76bb93b938a0272c9 SHA512 88b568ec2a7457b074e7448671991e907d52bcf5b1298d37f6b567b9e5ffc98b82ee1f0d9aed3a5841904d482476502f88aca31b93e505b5ea8db56d8b8f882f
-DIST buildbot-console-view-3.1.1.tar.gz 18731 BLAKE2B 266e08a04f5c6e618c101d5c7fcfaf08b7ad389346bce94f5e6e2a9cc3eb65906228c0ad12503a0ef1beb330b2f16ff3a532ac9861443018b7a5eb4c85488d64 SHA512 6287643f320a06bd56b8826fbca665a5a2d5bc0914c0dfd7b01fe273ce3220fd89a0267ed4bed979393b87d5a48fa53df579acc4df965be12f87eab43584eae5
-DIST buildbot-console-view-3.2.0.tar.gz 18732 BLAKE2B e9629d9aac9534c5948732dd94a0cda9da77c391bb0748e06c6d8ef04540e6a09af709db2f0096c74d3b942e02733938913be2cdcf121812526ac299f59b2573 SHA512 478e2273660e8af1d0f2ec61d5197819ae71db23e1319ef7f7d3aaa99ab2023c954dd917bcb4eed3b92da5a13b174cf31e28408dc6cc64bd2284a87dcb0cecc2
-DIST buildbot-console-view-3.3.0.tar.gz 18739 BLAKE2B f2e32336eaa7b7e98395a850310508f0bd69eb1e26830fa5692e61b864d48c348a3c7385f3f7eeaadb80c54077bfef4216ea161fb97484aa9657200ccc53b5be SHA512 3b2c64205bd46b01cb9e86d3e13d809c777ba433cf052d82ef7aa0951f0e47f1a08435ba34fd9e21c902ec3b67fa7ce2ce256f21f79d23a2e97f2fbe6315f920
-EBUILD buildbot-console-view-2.10.0.ebuild 754 BLAKE2B f71597e5773596c44118bdbc9ee55a8bd47824e4d9bab6ff4bbf43ba43929dfd10cdf99671e8da77aadacb14a00f44f95e3735b1185fd91c1d86e2f239bdfd67 SHA512 308aaf9ce98a994d5b600e7e1409ff3a28cb7a2b7bc44295a71c448513327ae52f95db7e2932c1a4b2620d778320c247b0848ab1cb0b58393f55b2b0c5541c31
-EBUILD buildbot-console-view-2.10.1.ebuild 754 BLAKE2B f71597e5773596c44118bdbc9ee55a8bd47824e4d9bab6ff4bbf43ba43929dfd10cdf99671e8da77aadacb14a00f44f95e3735b1185fd91c1d86e2f239bdfd67 SHA512 308aaf9ce98a994d5b600e7e1409ff3a28cb7a2b7bc44295a71c448513327ae52f95db7e2932c1a4b2620d778320c247b0848ab1cb0b58393f55b2b0c5541c31
-EBUILD buildbot-console-view-2.8.2.ebuild 754 BLAKE2B f71597e5773596c44118bdbc9ee55a8bd47824e4d9bab6ff4bbf43ba43929dfd10cdf99671e8da77aadacb14a00f44f95e3735b1185fd91c1d86e2f239bdfd67 SHA512 308aaf9ce98a994d5b600e7e1409ff3a28cb7a2b7bc44295a71c448513327ae52f95db7e2932c1a4b2620d778320c247b0848ab1cb0b58393f55b2b0c5541c31
-EBUILD buildbot-console-view-2.8.4.ebuild 754 BLAKE2B f71597e5773596c44118bdbc9ee55a8bd47824e4d9bab6ff4bbf43ba43929dfd10cdf99671e8da77aadacb14a00f44f95e3735b1185fd91c1d86e2f239bdfd67 SHA512 308aaf9ce98a994d5b600e7e1409ff3a28cb7a2b7bc44295a71c448513327ae52f95db7e2932c1a4b2620d778320c247b0848ab1cb0b58393f55b2b0c5541c31
-EBUILD buildbot-console-view-3.0.2.ebuild 756 BLAKE2B 57506a4e0cf10d6a0de9037b78ec0b7fcfc57496d246b2428003addf674f64ed8973b86c2bc48c912c71fd182d8b0c243dcf31948350657ac8101e7eefa3809f SHA512 c8a869cf3be7c4a08c943e18138cfcd6233b44c85c36710431633ee164d651e370e4e54b56f9d09b3a02cf73ef476745532908ace0aa56895412174f9ed56d75
-EBUILD buildbot-console-view-3.1.0.ebuild 756 BLAKE2B 57506a4e0cf10d6a0de9037b78ec0b7fcfc57496d246b2428003addf674f64ed8973b86c2bc48c912c71fd182d8b0c243dcf31948350657ac8101e7eefa3809f SHA512 c8a869cf3be7c4a08c943e18138cfcd6233b44c85c36710431633ee164d651e370e4e54b56f9d09b3a02cf73ef476745532908ace0aa56895412174f9ed56d75
-EBUILD buildbot-console-view-3.1.1.ebuild 787 BLAKE2B d308c38ac6df0187f5fe3f7fe1175c757a031f31b32e26e4cc90ab9b26f67214daf68981a4efcaa57fed2e27b63ae1aaf3deee9fa5d9c997a57dd75ffc4efaab SHA512 06836c617f5510d2f49732561b46784dcbc8dd62455504a1470cd71738d522095bd53bbc993cfbaa2f8ca705775dd7ca7e54a9da52682abda57c894f01440716
-EBUILD buildbot-console-view-3.2.0.ebuild 787 BLAKE2B d308c38ac6df0187f5fe3f7fe1175c757a031f31b32e26e4cc90ab9b26f67214daf68981a4efcaa57fed2e27b63ae1aaf3deee9fa5d9c997a57dd75ffc4efaab SHA512 06836c617f5510d2f49732561b46784dcbc8dd62455504a1470cd71738d522095bd53bbc993cfbaa2f8ca705775dd7ca7e54a9da52682abda57c894f01440716
-EBUILD buildbot-console-view-3.3.0.ebuild 787 BLAKE2B d308c38ac6df0187f5fe3f7fe1175c757a031f31b32e26e4cc90ab9b26f67214daf68981a4efcaa57fed2e27b63ae1aaf3deee9fa5d9c997a57dd75ffc4efaab SHA512 06836c617f5510d2f49732561b46784dcbc8dd62455504a1470cd71738d522095bd53bbc993cfbaa2f8ca705775dd7ca7e54a9da52682abda57c894f01440716
+DIST buildbot-console-view-3.4.0.tar.gz 18732 BLAKE2B caeb78d4d3cc616edafccc5f78c1104469f77ead6ec31e7b9a741e43cb8d7140f8c44b57449bd6d97e35912787cbbeee5617bdf90ce7a15ebd023721160edc06 SHA512 072a4ca8d5677e68d2893684d68d4742d7a5546e128ae99bbec0385772a5df6c885bb62b855484543a42c95471aa828f8f3375770fc079997e5183cf3eda9db8
+EBUILD buildbot-console-view-3.4.0.ebuild 681 BLAKE2B e1fc60dc75bad46714812d758d5c8c17563f096acc832e9b5f344dd1fd58ed662a6c3026322722c730d93443e85b6d97d79ae92fabbea2d14423f00b9939c18e SHA512 e0c1d7942c33b9734fb8a6a7dc0c8feceb29e1f4900f05c786226c21349a9b883551dd20f44e3c63253f37f3d65b12b173aef12648b3d83ace897c180965e98e
 MISC metadata.xml 661 BLAKE2B 00812636b1e2bf2b7d604a540ed1982e891894f38d8fa256bd954a693f6ff4b203c9a6cf8a2d4b67288b489a362a661b072de042dd3f62cf3d596ef14049e35c SHA512 1f905f5810e7a216e73e942fe2cb42302010fdb19078f20ee95a20555e2b2f0e13e29b3cf326d0a546bfc78e4d610d402199acbb915fc0b57ff55be3c402ec2b
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.10.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.10.0.ebuild
deleted file mode 100644
index 5acf3519acd0..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-2.10.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.10.1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.10.1.ebuild
deleted file mode 100644
index 5acf3519acd0..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-2.10.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild
deleted file mode 100644
index 5acf3519acd0..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild
deleted file mode 100644
index 5acf3519acd0..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.0.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.0.2.ebuild
deleted file mode 100644
index e19be940f47d..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.1.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.1.0.ebuild
deleted file mode 100644
index e19be940f47d..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.2.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.2.0.ebuild
deleted file mode 100644
index 251b0b05b8c9..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.3.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.3.0.ebuild
deleted file mode 100644
index 251b0b05b8c9..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.3.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.1.1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
index 251b0b05b8c9..16cdd7ff13ac 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.1.1.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
@@ -1,37 +1,28 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+EAPI=8
 
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-DESCRIPTION="Buildbot console-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
-
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-console-view/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
 
-IUSE=""
-
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
 	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
 "
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 66e34056dfa0..8311cb518764 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,19 +1,3 @@
-DIST buildbot-grid-view-2.10.0.tar.gz 13685 BLAKE2B 56c871b24c48ce6723e8fba803f82b1c751b7a3ca61b8d7ec8adc50aa87f9d64d04ff6551b0a99535c04cbaf9b18763cf6469eadbd115d2f20c060cb97a3a27c SHA512 4e5099922e3e08f18a77aede09b25ee60ee629c7c94d76149164d3e1e4ea1cdb0bd1cb6689bad060c55f55f9a3527d3f49e9a99b963479e39c076e62c5ade085
-DIST buildbot-grid-view-2.10.1.tar.gz 13697 BLAKE2B 1fa5f213fff4190773328c946b8e4aac0c5118fb2ee7d7ebcca41656abda98e89b4061f959d3378d1f05fd0c0f4f14e9b37980e204818b99b0b6a4b48ac56fc3 SHA512 14c60642c5fc9924d1670c9faa27288c58763c06a7eea580851e0853b25e272f371fedd8016cba9c5e04c51206781359c08e99664fcc6e9006191deb3bcf862f
-DIST buildbot-grid-view-2.8.2.tar.gz 13373 BLAKE2B 0a7a73011655e9a57574575943a3560c395ca4358c0f2169def8413a60f8381644512a227b54f016b23e6dcd18641d1ea7a3295f6c0a983c6f3caa9ab1dda60d SHA512 9b136d96f5a38f0d28f6c37db6269e039eca0cff5bbc7d75d43346566ba2e9f7924e453098f4777792429a7a9bbbb5e02c34a9b81e131d40dc3e339f4dd377f1
-DIST buildbot-grid-view-2.8.4.tar.gz 13510 BLAKE2B 97816ae90c06cbc3ac63920da4dd2e1152750181a5c23c59d3f227f46131228140e676328aa80741626ff071679dd8c9385f3895ce92d27ce6d0264afe299872 SHA512 dfeb454f9d9162e30e0ea8555a0978ecfad2266e1a9412e0633924ad44ae404144ae4a51b58fdca31fa54b67fe53bab57cac1f54926fee346decf90623f91f89
-DIST buildbot-grid-view-3.0.2.tar.gz 13687 BLAKE2B a3f04cfab7c5716a7fbeb05c407883c93907b5aad5ecb19a92348da8f171b196699e6cd014a41867e74b29ec9c31fb389ea9e9fc319650618dcd2425fbc4da5f SHA512 84aafca38dd6d1dc3057f81c7ea865c7fafbbc048db99f867b0d97038c732492041987d143342e8b15f7a2bc0c7a1559d8865549903cac1c7a45026ca9142c7b
-DIST buildbot-grid-view-3.1.0.tar.gz 13693 BLAKE2B 40eecd2a18e754d4e035e591d17d081f77c1d7b39405f2c405b8a4e578d5effaf7a754346a8c6248e5ca1a761d9eb772189b0886c8b25c311501040825efbe53 SHA512 dc1b68b7ba3708d8a0e2a0b11ee2a685b643ed786ae535bf7be3c6d3fd6a1262ee4795fd3ef11edfce06a6444fd0b0c77ec3bfc71b6b7e305e677ba370690d2e
-DIST buildbot-grid-view-3.1.1.tar.gz 13698 BLAKE2B bedae358e0b52e8928b829c1e77175df878ab798a8e56e344015cc15b67cec27aecbd6533682f89e9108a41c11069046825e225eb8e1ffd8944f0c709f376bd5 SHA512 385843472394d9106c77e4c986d263318cfc727a8c0766258530c656b6f454b989541a4afeb388f0ce4bd46976d66d01975463d6bbd4e5f1da67fa0e7c71cbff
-DIST buildbot-grid-view-3.2.0.tar.gz 13701 BLAKE2B fe593e78707a00449b13a035af98ca3b03aa39cb27bba10004bfa1ad56076cdf5f6fc3e7b54e45f20f33c259cd1ae29653cfd85aa3a91ddb41094aa51c7e0ff3 SHA512 120bc359922b3400dabba95fdd9017f69d3c8e5b4bc09cb2a86a64a9058daf1d86dcc4b7b241b9f5c3a9544f6fce39f34020e7ca602efbb80b9d3dbc6a557eae
-DIST buildbot-grid-view-3.3.0.tar.gz 13708 BLAKE2B bcde041a2a6d1e3d3a91e1919e618ad86d29033bfedb93aa0913fefef722d4b1fc7d8b7beff07d1cb9be72ec265dbca9288fe66803ca83ad94208f3df84ba31c SHA512 ce6e5fbe6b4874631f3de9964a0acae55c6c4fab408bd4c420c829701a6d5503d7bee92bac8db54c630bdc0164c45288503480e1073865420996951a9c6f0d06
-EBUILD buildbot-grid-view-2.10.0.ebuild 755 BLAKE2B 1989783068d2ccc933a41bbcd3b867b182aa04467ca8e699ed276d9031e503f67491e4201b0302ce735dd57119736f3354a5090b623523732b81f55e52854130 SHA512 5d84d10766c4c123cdcb6217ec73f76f0546a0e7b2da6bf54893c46ac1cc55f8be9e9bafde1bba76d2064f35e8c2379484cce6028e5336f09ce5393163e3f6d8
-EBUILD buildbot-grid-view-2.10.1.ebuild 755 BLAKE2B 1989783068d2ccc933a41bbcd3b867b182aa04467ca8e699ed276d9031e503f67491e4201b0302ce735dd57119736f3354a5090b623523732b81f55e52854130 SHA512 5d84d10766c4c123cdcb6217ec73f76f0546a0e7b2da6bf54893c46ac1cc55f8be9e9bafde1bba76d2064f35e8c2379484cce6028e5336f09ce5393163e3f6d8
-EBUILD buildbot-grid-view-2.8.2.ebuild 755 BLAKE2B 1989783068d2ccc933a41bbcd3b867b182aa04467ca8e699ed276d9031e503f67491e4201b0302ce735dd57119736f3354a5090b623523732b81f55e52854130 SHA512 5d84d10766c4c123cdcb6217ec73f76f0546a0e7b2da6bf54893c46ac1cc55f8be9e9bafde1bba76d2064f35e8c2379484cce6028e5336f09ce5393163e3f6d8
-EBUILD buildbot-grid-view-2.8.4.ebuild 755 BLAKE2B 1989783068d2ccc933a41bbcd3b867b182aa04467ca8e699ed276d9031e503f67491e4201b0302ce735dd57119736f3354a5090b623523732b81f55e52854130 SHA512 5d84d10766c4c123cdcb6217ec73f76f0546a0e7b2da6bf54893c46ac1cc55f8be9e9bafde1bba76d2064f35e8c2379484cce6028e5336f09ce5393163e3f6d8
-EBUILD buildbot-grid-view-3.0.2.ebuild 757 BLAKE2B d4d34887dafabf862937e6077393ece2b7b1fddd3d340dc2c7422cf342f04b058a9ca20af6ff8a973456637a2a7e39154430769b614021da119dfee2ae0a9345 SHA512 3188a0ef7d4a563c2174f5fad98a486d428ba357d1914b8dccc9316e4106f0ef2eeb2a7c1b4a92457aa367776d94e25e368fc10d9558f19876933c79f8644840
-EBUILD buildbot-grid-view-3.1.0.ebuild 757 BLAKE2B d4d34887dafabf862937e6077393ece2b7b1fddd3d340dc2c7422cf342f04b058a9ca20af6ff8a973456637a2a7e39154430769b614021da119dfee2ae0a9345 SHA512 3188a0ef7d4a563c2174f5fad98a486d428ba357d1914b8dccc9316e4106f0ef2eeb2a7c1b4a92457aa367776d94e25e368fc10d9558f19876933c79f8644840
-EBUILD buildbot-grid-view-3.1.1.ebuild 788 BLAKE2B 1683c99a80b58bbe8102826e75d4ef5009a1ca18167907039cf4b50348c912f18a343215e6fe9625c4b19234a1da1003618ca012c30ac63d866cbbfecc25822d SHA512 bdbdcfd0c1a0587adcd2b87f9ce35444425c3fb2788cee0808635f7a623775879b6392dcfe1b5569377a4ce5da6c241fc9a0d930b402e84f2605d277d662b55a
-EBUILD buildbot-grid-view-3.2.0.ebuild 788 BLAKE2B 1683c99a80b58bbe8102826e75d4ef5009a1ca18167907039cf4b50348c912f18a343215e6fe9625c4b19234a1da1003618ca012c30ac63d866cbbfecc25822d SHA512 bdbdcfd0c1a0587adcd2b87f9ce35444425c3fb2788cee0808635f7a623775879b6392dcfe1b5569377a4ce5da6c241fc9a0d930b402e84f2605d277d662b55a
-EBUILD buildbot-grid-view-3.3.0.ebuild 788 BLAKE2B 1683c99a80b58bbe8102826e75d4ef5009a1ca18167907039cf4b50348c912f18a343215e6fe9625c4b19234a1da1003618ca012c30ac63d866cbbfecc25822d SHA512 bdbdcfd0c1a0587adcd2b87f9ce35444425c3fb2788cee0808635f7a623775879b6392dcfe1b5569377a4ce5da6c241fc9a0d930b402e84f2605d277d662b55a
+DIST buildbot-grid-view-3.4.0.tar.gz 13698 BLAKE2B bc819f87db76ec217dd91cf1f43d2ad18e1aa27c661f37db893946b22e87a3de752f67fe04df8a10499e0659b618e24c3a15de18dd3f3e93523cdf4234d6907f SHA512 69369694e993365644416ea8223b546e147930dac41c74d000e8b1419e6b889158999cdf5cfb7079c3456a9135071f2d1983472faaed82ad410e7cd873c8c77f
+EBUILD buildbot-grid-view-3.4.0.ebuild 661 BLAKE2B 715aabd15ed71710a389f7b6b9d7adff4d49c9dfaec94eadf15090c8966e86450d24efb10154e66d11bb029316a475bbd51383c2e65a18d3969d4ecc0c1f0d8f SHA512 9f06a1814d6f2455f43e5317b9d84892ff9ddffcf3bb0fef1831fb4514479008dc91a92adf0beb814c8f62e94a8b78f9567840be02da828ff2b36d787dc28a8a
 MISC metadata.xml 640 BLAKE2B 22ccf767dae88664f3da52b44a6cc1d7abe93e282db0bccd6fc7bcd20bad2719b3cbc0ae75a7a72baf6a542908e7155026d7fdf1fa6976b165129110e348e11a SHA512 d6c7605dc32e3fc40690a45b8bfc70fd73e82e07ddcd49d94503254c25f5d532fc21ce79b94a37fc0a1fd023f5632065c35e946f0d48bc802c051f04a5dcaf81
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.0.ebuild
deleted file mode 100644
index dc85143f6ac4..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.1.ebuild
deleted file mode 100644
index dc85143f6ac4..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild
deleted file mode 100644
index dc85143f6ac4..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild
deleted file mode 100644
index dc85143f6ac4..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.0.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.0.2.ebuild
deleted file mode 100644
index 2045f7adbb1d..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.1.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.1.0.ebuild
deleted file mode 100644
index 2045f7adbb1d..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.2.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.2.0.ebuild
deleted file mode 100644
index 1f6d73786b21..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.3.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.3.0.ebuild
deleted file mode 100644
index 1f6d73786b21..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.3.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.1.1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
index 1f6d73786b21..30d360342720 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.1.1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
@@ -1,37 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+EAPI=8
 
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-DESCRIPTION="BuildBot grid view web interface"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
-
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-grid-view/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
 
-IUSE=""
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
+BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
 	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
 "
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index d4c7df1a93fa..87a025acf934 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,19 +1,3 @@
-DIST buildbot-pkg-2.10.0.tar.gz 4777 BLAKE2B 59f37eb1765b47d3b912b98e9d1483bb6360ec06aa35bb015018c17ebdb4e44143367e926c09c218b6c93500069238dc18e2e07b3902e15ac1fbb0d78425e558 SHA512 0f4ffa6a3d1b0a14a80c17ba573d51e6a719a6172f8ff528c19088ba2fba9ddef6ec6d82d42c280f7eda2f4260df3e5f0bbe273978fc253f4776346d3f207080
-DIST buildbot-pkg-2.10.1.tar.gz 4777 BLAKE2B 5c0244146176e45cb30431c6716bf8fbc327b939ed7b997ef1a33d86d25eab1b3106293498b5c12fa07412c590503981ebef8d0bb140ba9535469ff187caea51 SHA512 b65d139696cbab7df9f52894c5571ecbfa715b3b593ee25f5174d4b2dbb864e5d62265ab8c611ca7a439e761735e20fa03273bf2ddfbfb71b6c01e00bbb21036
-DIST buildbot-pkg-2.8.2.tar.gz 4736 BLAKE2B afbd5213b51240845f8becfcc727dc3280aa1510dd62305a5e029099da4f8e7cbbf749365baba568a2205354205e97dbdbff78a1740e464164e0c2bbc3148194 SHA512 611b5600df181adfbbe203947c36ad64a99c10c6c63c0f4e65ffd2ae4551f2d879559007b59302434cd1a2ae915a2a7125afb90f6c896110ebf514212434a2a7
-DIST buildbot-pkg-2.8.4.tar.gz 4772 BLAKE2B 08e1bdf7db8a4b1f007b12475937638575afa3e16511c28f24dab59fda88d83b03420b84d4e674aaf8e2e7962e80291f759fc7083424d3d96df2643946e8d2d5 SHA512 c5ca0c36315807bb458e16f4bdc015659b32e0c6047a067d5717251e6054249aa8a162873aa196b4fb6367c68a9a99ec3a698e861a5c70de1f81e90601b3467f
-DIST buildbot-pkg-3.0.2.tar.gz 4780 BLAKE2B 4cf0fad6413b3fbfab2637a08f9bee90228183a493e71102ff518fe18a2790b386c592891f6dfb51c6f43121945f55c1ed66994ad6ce2ae28d9b7f6045e99c24 SHA512 6c09ff3a78b53d4f93e331f9691f1200abda12b912cd0fed99e3b2ba900ee0d07805ee9d16f9337c0e187a74d511d1c23cebc5a286cf3c05520c22e730191996
-DIST buildbot-pkg-3.1.0.tar.gz 4782 BLAKE2B 9107134a56eb27c3714ef5c66a610c44b21ae8080690f30147e6e9e0f592da08cc4e171eb588ea26d48aec269c8c73939ae19081133dc52aa8e4b3d3f9e1903e SHA512 8300031b01bf8d3d9e9508bbc101cfa48e516cfd4a797a04f93692a69b06e26cbe37ab4d712fa458e1aa39e1bb34567816fb5604258bf4e10c3359392aa3df6f
-DIST buildbot-pkg-3.1.1.tar.gz 4784 BLAKE2B 47f19dc7872d5dbf45e53fd259e864d138a8a990801a4c87b3dc0b378477b4e424fbf2cdd6963dd92e3e33446770e72f23f9ea738796bbe1b0588b2a40c34974 SHA512 6f8309f62cd1fe2c7f61be58a79590eb28a53265819dbb28b229d122ecb3fc6513d9f47edd420add6e72aabf03784f7c9837f80ff9ae74f2474f72ce60aa876a
-DIST buildbot-pkg-3.2.0.tar.gz 4777 BLAKE2B 0a20f1b16c5354a9f5f0ac6e2f91443af3c5754161324ca9b8c941ab3920e16e7bd31c8a4b7a655bb466f02718a22924e8a21e75efb505375daa01740cf0c2eb SHA512 e795e3198f61abbf6f7ec8eae3c98dc7bb054af2a0885a5529467e73c97d82d30ecb9a8c0b9daa2bac8b5fac72de63dc4dcd2a5e77df6006e50eef21c6f5f9fb
-DIST buildbot-pkg-3.3.0.tar.gz 4778 BLAKE2B 14bd3d7bd985e63a587313c26f35ada0fcb1fb25d0d1ff89f12714e8a6d29781e53c83b42bf4a0614d4543a7c24dbf4375cfa1600d95f050497523a84d42c177 SHA512 73b6d61c27336450e8a9df1094c8afbb7653b33517f6a55e35a1ef62125b969f8ddf0a94ad11c7da15489fca2e6a7ad853093a946945c511140e61f3341ad2c0
-EBUILD buildbot-pkg-2.10.0.ebuild 695 BLAKE2B 174b80418cad0777ea006d43e2e7793fd85acfa3d43f771d55c8399a7682274a82c1dfe40d329b38b1552bd65ae981903ada5f42644508c9b2bd807a0324b5d4 SHA512 0d746dffdfa2e23268fbfba6017f3bd740efa679ff81f62493ec42646a4d2163f68eb9293ec14d0d5f73580130036072f54d683007a380682bd227e513950cb7
-EBUILD buildbot-pkg-2.10.1.ebuild 695 BLAKE2B 174b80418cad0777ea006d43e2e7793fd85acfa3d43f771d55c8399a7682274a82c1dfe40d329b38b1552bd65ae981903ada5f42644508c9b2bd807a0324b5d4 SHA512 0d746dffdfa2e23268fbfba6017f3bd740efa679ff81f62493ec42646a4d2163f68eb9293ec14d0d5f73580130036072f54d683007a380682bd227e513950cb7
-EBUILD buildbot-pkg-2.8.2.ebuild 695 BLAKE2B e1512c55e95cec782aa3a33ca22c39b20d986d82f286cb059e2ea8ec84443adf5b0a3946ea19f3ddd59277ebeda4995bbb5173784109cb8065f0a35742a70d6d SHA512 6024f1cb7afe282e4fbf24b8e6a108ad75d8ace8098c68cc0d889c6ed3b1836be958694a45ccd468b261d49aa6646d02a11359864a3506a54a54dc3df6684409
-EBUILD buildbot-pkg-2.8.4.ebuild 695 BLAKE2B e1512c55e95cec782aa3a33ca22c39b20d986d82f286cb059e2ea8ec84443adf5b0a3946ea19f3ddd59277ebeda4995bbb5173784109cb8065f0a35742a70d6d SHA512 6024f1cb7afe282e4fbf24b8e6a108ad75d8ace8098c68cc0d889c6ed3b1836be958694a45ccd468b261d49aa6646d02a11359864a3506a54a54dc3df6684409
-EBUILD buildbot-pkg-3.0.2.ebuild 697 BLAKE2B 813fc9a172557ca5ceeee78f561689aff1f44d866e01c290014bec04e2bf23ccbc87739404fb7af39bbf0b5d340bf9204393ee42082131da3144e88df52daad0 SHA512 74f1970004573262179781246c180c283285e0f435dbc328ca589f83ce02ff0335de31eb106f109c0cc76a35f063d6bad8522051d84826c69d7376d6b1b53866
-EBUILD buildbot-pkg-3.1.0.ebuild 704 BLAKE2B ee91295ed2e9684c4345e7b062f76640781720f8e524e8242389d9a0f6383d3c4e50a9c1141f60c53b5f6df85a644903bc881efa70f8e722d607203378cf4b23 SHA512 732bfed55bd0ddc04871b3f05efc03d90b38204ca526408b3fdde6941480499e009dfc14d345624018976f179111dc087f4704a3e28c87b49297ef9714e32c49
-EBUILD buildbot-pkg-3.1.1.ebuild 728 BLAKE2B 54ee9f1fd832d61b1a08fae145bdbd2bf52a34064d30667b0070afdec0ad1e6387eff9efb4ef465db30792d17abd26b3974c2f757dd923b10e5db26ef90aa945 SHA512 f3bd6a350d47a5652c177d368b5355e27d2df8337f3522ad90cfc1a1d78b89c771f830d9c1af1030543fa860863b69e3e9118096929e85b271f71c090b8c72b5
-EBUILD buildbot-pkg-3.2.0.ebuild 885 BLAKE2B 5177d834cc5bdf18e5113eeaac5169d992270056721b486f9b85447ec76c997b5cd3a91d7242f9566fe002c031e4037f5022db167ae0415dcc6d632de3f9a7f7 SHA512 667f1aa136f37b9dca9cd42fdd5a6e2ac9d62a5864f81b2e58a4d788c596e2cbe37bcc8954135afe318595db58eba16d70aaead16c6200f85c849a2161d3d9bf
-EBUILD buildbot-pkg-3.3.0.ebuild 885 BLAKE2B 5177d834cc5bdf18e5113eeaac5169d992270056721b486f9b85447ec76c997b5cd3a91d7242f9566fe002c031e4037f5022db167ae0415dcc6d632de3f9a7f7 SHA512 667f1aa136f37b9dca9cd42fdd5a6e2ac9d62a5864f81b2e58a4d788c596e2cbe37bcc8954135afe318595db58eba16d70aaead16c6200f85c849a2161d3d9bf
+DIST buildbot-pkg-3.4.0.tar.gz 4809 BLAKE2B 6d3e549e7b44b5ad95bb7520ef8765828da587e3940a9f352ede63346b3303127313fe4b71338ff65ef9ab2c0ac6258793bd9ef664153a0b45b0b6d7d2d92943 SHA512 ca1ef22fb6113bfe0106360ba1eacb167a8335ba15f94a0635bc4d00f999818704f8cfebd7889b6b3df5e1ca7ab79b96f4656e481d6b1f25f5fb7404af0d7ff6
+EBUILD buildbot-pkg-3.4.0.ebuild 865 BLAKE2B af117f9a781c2e33048ffc2e6242a65a2e23f6c2d214920090173cb9b9d48b212e9bf29a936f99ed58fcccc58b50de0ed4704cd61a0cc237e41d63427f7d5b8e SHA512 a764c0bbad7469e5ad447f1f226eff89a475b6cd06e94dd1e6ed29e315e597554e32a1ca262af4c75c27b7a5c9da9d3038f30442a9640cb527b3ed99220380f8
 MISC metadata.xml 1199 BLAKE2B 1eb102f71e83b2d11adff2f92f08614715428508b83042358d054babd4cd7f5bb63ef0e289fd9e60360111dccbd734422215b6f8a9811198f62c30cb82612566 SHA512 545c227af17fe4492aff85837e948769001d281dc40cbfdb5a74663dc5fde6989df632aab9a6f5cda644fd20f385d36469ec38b930bb42bfb61483c1c5e46faa
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.10.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.10.0.ebuild
deleted file mode 100644
index 0a556b7409a9..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-2.10.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.10.1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.10.1.ebuild
deleted file mode 100644
index 0a556b7409a9..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-2.10.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.8.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.8.2.ebuild
deleted file mode 100644
index 4c3d68526605..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-2.8.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.8.4.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.8.4.ebuild
deleted file mode 100644
index 4c3d68526605..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-2.8.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.0.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.0.2.ebuild
deleted file mode 100644
index c83932c89272..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.1.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.1.0.ebuild
deleted file mode 100644
index f4a2fe382f7b..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild
deleted file mode 100644
index e78e9ab33131..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	sed -e "s:version=buildbot_pkg.getVersion(\".\"),:version=\"${MY_PV}\",:" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.3.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.3.0.ebuild
deleted file mode 100644
index e78e9ab33131..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-# No real integration tests for this pkg.
-# all tests are related to making releases and final checks for distribution
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	sed -e "s:version=buildbot_pkg.getVersion(\".\"),:version=\"${MY_PV}\",:" \
-		-i setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.1.1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
index 03b7f005df6e..e7729822e3ed 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.1.1.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
@@ -1,27 +1,33 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+EAPI=8
 
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot common www build tools for packaging releases"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-pkg/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
 
 # No real integration tests for this pkg.
 # all tests are related to making releases and final checks for distribution
+RESTRICT="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-S=${WORKDIR}/${MY_P}
+src_prepare() {
+	sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 5d4864ec62b9..2fe66d2881fd 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,19 +1,3 @@
-DIST buildbot-waterfall-view-2.10.0.tar.gz 191695 BLAKE2B 910cff873d4b3ecbfd37ebb9035f4ac967ef55f64a0840467ff49176220b7982c71596aede3553b88345ad66586903cc08ad5856070fb7ee547369ed01e09c6c SHA512 e671cc1582f4944bad8b5f56daf04a0aeffe2ee55437f22f4ff0d20c4a82887e3635f79b3a3fa09295495293d34a1fd43b695c790796ee683f0febdf9b56a260
-DIST buildbot-waterfall-view-2.10.1.tar.gz 191700 BLAKE2B b48460fd8df381b909c7a8bccaf8a2efaec169d5539f127b1ae6e0e5d8a89866ce09c19cae07dafdd9050f605ea70ae42acfb959777a0df6722a3fe016c526a5 SHA512 fed605f06acb906adf45251e7e037d0409ab081521f942948577fd8a2dec577c3e66ed94c21e7ed3fa53b51504d6967aa5c2e4793cfa8d4bf3fe952b7592e0e7
-DIST buildbot-waterfall-view-2.8.2.tar.gz 190551 BLAKE2B 9db81d1cf17357a57c34eb8f3b1e4412635c4804708d3d99646a68293af52594952884f96f7d528c6a87302c3563a8d4f4411ed410da2fe1043b4439d4113d73 SHA512 e252874745a623c1ec8fefcfb10c742a783ec677f172d20ef8165687ec5981f4df09092096f7922381e886f4ea7ba4c795997ad8ff8fd58fd6aa40d8bc057b00
-DIST buildbot-waterfall-view-2.8.4.tar.gz 191026 BLAKE2B f81dea767bf881182eeb6eb750cdcf4bc289ac92097b9b8e13a5b5a237873aa4ea16f48625e56de2dc69fe849e5602d96a3d7991cdeb427dae169de5740f0bcb SHA512 c15b7bd23193742b50deaceb1810f8dbeedb77768f0d8a3d0a7bf72c89d914b963aa2141475464f9f3701881da6abed49e730ccb39d824a755ad9c567590dd7f
-DIST buildbot-waterfall-view-3.0.2.tar.gz 192453 BLAKE2B 9c0dad3e4399863175293f60c8430ba3f5702aec3feca60e1589edd39afa212ee7d638c285032ec945a4fd277fb67b649408c6ec37f00551111051b850e7e35e SHA512 7b1f43568a9f72f56771c93c52b1dd149a90c8e75f4437dbbf725a04c6a79705b109291430e4818ce2bf140b22e46fccc6a4e334ac29b003a325aded89f530da
-DIST buildbot-waterfall-view-3.1.0.tar.gz 192451 BLAKE2B 13d0e0d39097b77a666e93856e86dfb4059588167cee357e1cbd97aedc9e2bbb4119cdc861e51a410f3da1ae5d6ecb2617f87dfb5c62aa9f3bc25f2050167247 SHA512 78179240a988125842a2397e3536d607840e3533f4570df79fa2da27a828cd2f6ca36f3bd65d6c1197bb663f13fa0492a683373fb7a0d7d70443c581dd3f3d76
-DIST buildbot-waterfall-view-3.1.1.tar.gz 192456 BLAKE2B 557d21bff08d0a90c992ffabbc2daaab4bfa93cab5c043ecf2afb894f4e6e5b45941a5fb5f21b3c7b20e46d127b1f9f388c3e0b10735ff3d6dffe958df682d05 SHA512 78059732219e2fdd3c25243f9d6f309506d2cab30686770268769344805da51a967e6b869d5baec30c9d6cde59a7d3a8348a20e5dca502268eaa9cb0530122b0
-DIST buildbot-waterfall-view-3.2.0.tar.gz 192453 BLAKE2B 6f30860ccf0574b422f60ef0d7ef8d562fa7ad65e0242357cbef75f1a02d50f345ff16c69f5990665a8cbedb8ad1af9add94d41e6ffdedbdd3e2208bf3c5cebc SHA512 e18d3f4dd92f24045da9a8daad4804c546d88588d5705d09d3bcdb3f88395ff0d7748b79dc83b3efd9242df581a47a0ec4b26dc039e8cb0f126e4487edbbcf94
-DIST buildbot-waterfall-view-3.3.0.tar.gz 192446 BLAKE2B a383537e788096326331aaf1bad5cedb5e2ef3f06d3af6c915443e6493552d39d24e78fc6a5c3fbf2a52f794ad2096ee27e44525328a154229dc4935bf0bd803 SHA512 9de38247aad595ac9ac017eec04602160b5e74eff7eb061651e683b6cd8afb20aca57a78c8a5445ae78bffa9ce0398f9abdc3cf046dd152788324d2f3e52ed12
-EBUILD buildbot-waterfall-view-2.10.0.ebuild 735 BLAKE2B f2fc2527ae1a16338cf1079f287e1d2c56d8395cb9bc1cbae3e8e613b0980e8030cb3b3119896ffeeb9d4b20a7fcbb2cfde6179312f830fe703422a5bd20749b SHA512 47be5f449203fb09588d5d23137282d5f8422a087cdffd7f655bc060f38c727fb58dd9777d169cddc88c44ec54bf815b10a3ba7e1e88d7dba93d0c6787d949d4
-EBUILD buildbot-waterfall-view-2.10.1.ebuild 735 BLAKE2B f2fc2527ae1a16338cf1079f287e1d2c56d8395cb9bc1cbae3e8e613b0980e8030cb3b3119896ffeeb9d4b20a7fcbb2cfde6179312f830fe703422a5bd20749b SHA512 47be5f449203fb09588d5d23137282d5f8422a087cdffd7f655bc060f38c727fb58dd9777d169cddc88c44ec54bf815b10a3ba7e1e88d7dba93d0c6787d949d4
-EBUILD buildbot-waterfall-view-2.8.2.ebuild 735 BLAKE2B f2fc2527ae1a16338cf1079f287e1d2c56d8395cb9bc1cbae3e8e613b0980e8030cb3b3119896ffeeb9d4b20a7fcbb2cfde6179312f830fe703422a5bd20749b SHA512 47be5f449203fb09588d5d23137282d5f8422a087cdffd7f655bc060f38c727fb58dd9777d169cddc88c44ec54bf815b10a3ba7e1e88d7dba93d0c6787d949d4
-EBUILD buildbot-waterfall-view-2.8.4.ebuild 735 BLAKE2B f2fc2527ae1a16338cf1079f287e1d2c56d8395cb9bc1cbae3e8e613b0980e8030cb3b3119896ffeeb9d4b20a7fcbb2cfde6179312f830fe703422a5bd20749b SHA512 47be5f449203fb09588d5d23137282d5f8422a087cdffd7f655bc060f38c727fb58dd9777d169cddc88c44ec54bf815b10a3ba7e1e88d7dba93d0c6787d949d4
-EBUILD buildbot-waterfall-view-3.0.2.ebuild 736 BLAKE2B a5768070df4ca42b065a0d1e2f2be9020ae7a62fb009241628dc6ffbb79b1548552baf8e722cda4fe44a0e253adeac701fcf541f95dc9f83ecc1a67a5b014d81 SHA512 d0798f7b0e40078fc4dfe2a26051441c02a0f668758d27b3448a1469ae83884e6ea8165d87aa22cdc053e477f42f844f2d40677a70deb294d20830e7ee039314
-EBUILD buildbot-waterfall-view-3.1.0.ebuild 737 BLAKE2B a0bdcf3470289ecd339bc6d2d21c68614c65b02e87104086be25e69f7e83fdc1227dda28f131d9ed1662cbf8dab06359f6936a8de444ef5c7662b75912a8fcec SHA512 5ebe30b1c6ee9454e8bddb4ba7b5ab1d5a6ceafd22823e2afa691840587d5902097b791b3caa1eb51cf776470557f078da2de990ff7cbfe5b8a8791445602ba6
-EBUILD buildbot-waterfall-view-3.1.1.ebuild 767 BLAKE2B 1d1a696a3077bec43492de0059d208966c42ca4b59bf079d743d9187548b7ea1cbf56bf3aa73b1e3efb2f52db09158b75d7cc45d29c5cec2e78436fd2af776b8 SHA512 14574d4d4ea9aec214457b8b85238a77ba8bbe749a7314e724d0c1d7117f0f4f82e24c279a7553d36bcb946fd263bc22328cfedefa1c6f6ba41c59c4487bc8f1
-EBUILD buildbot-waterfall-view-3.2.0.ebuild 767 BLAKE2B 1d1a696a3077bec43492de0059d208966c42ca4b59bf079d743d9187548b7ea1cbf56bf3aa73b1e3efb2f52db09158b75d7cc45d29c5cec2e78436fd2af776b8 SHA512 14574d4d4ea9aec214457b8b85238a77ba8bbe749a7314e724d0c1d7117f0f4f82e24c279a7553d36bcb946fd263bc22328cfedefa1c6f6ba41c59c4487bc8f1
-EBUILD buildbot-waterfall-view-3.3.0.ebuild 767 BLAKE2B 1d1a696a3077bec43492de0059d208966c42ca4b59bf079d743d9187548b7ea1cbf56bf3aa73b1e3efb2f52db09158b75d7cc45d29c5cec2e78436fd2af776b8 SHA512 14574d4d4ea9aec214457b8b85238a77ba8bbe749a7314e724d0c1d7117f0f4f82e24c279a7553d36bcb946fd263bc22328cfedefa1c6f6ba41c59c4487bc8f1
+DIST buildbot-waterfall-view-3.4.0.tar.gz 192456 BLAKE2B 7375e22b86b4dfe2cde88d4190accea50bf49c9615358ec55b341e6720551b4605015938ed15bfac6bf80805a32457081389bd150d762e90132af4f18295cfe5 SHA512 a9a381e8b520919f71011083face8760f864f5bbe5080446c64c0a63c38d787e486cddd20c3548b01d78534a206221ed2bec85bb78681fe3dceaef2bc1f172d9
+EBUILD buildbot-waterfall-view-3.4.0.ebuild 720 BLAKE2B 6f7279284751779e87eba970c0c9db7b80ace5cdd3e4c48295d892b1ae11e94c24186ca08509844ab9bafad055b930ea522884e98f548857bc137ceb46fcda87 SHA512 38ee4c08fd8afb4a617ead7fcad909f46480104ad38a236e4a92084f776d315fc5de7556cf49945cbea68a62db5a478c225c51cfdbbeffc2e39fbe549e41f254
 MISC metadata.xml 681 BLAKE2B f74bd19772210f0ffbc45a54aa06a05c97c11bcc18a76ca621e4761d36f690bd0d1ce926b744e3b6c0dc83fd3bd709a2bbc7dc53c63c0364cd0e82bafaf0620f SHA512 37b2205043cbbfdf019b0a827494d28693e3e0537cad6fca6a1e46cccd3a6779f5b9244f2b9523953ae07238e8b8c90da00cf5061f8e6d54895c06c447137fb4
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.0.ebuild
deleted file mode 100644
index af5526243055..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-	KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.1.ebuild
deleted file mode 100644
index af5526243055..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-	KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild
deleted file mode 100644
index af5526243055..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-	KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild
deleted file mode 100644
index af5526243055..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-	KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.0.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.0.2.ebuild
deleted file mode 100644
index 774a2c6376a3..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.1.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.1.0.ebuild
deleted file mode 100644
index ac163ac19287..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-	KEYWORDS="~amd64"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.2.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.2.0.ebuild
deleted file mode 100644
index c2a121241d3d..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.2.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.3.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.3.0.ebuild
deleted file mode 100644
index c2a121241d3d..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-RDEPEND="
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.1.1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
index c2a121241d3d..14ad3bd03c9b 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.1.1.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
@@ -1,34 +1,29 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+EAPI=8
 
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-DESCRIPTION="Buildbot waterfall-view plugin"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
-
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-waterfall-view/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
 
-IUSE=""
-
 RDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
 	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
 "
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 4b6f728f02ee..03a1dd651525 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,23 +1,7 @@
 AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7d8b6cb23cfeee84bcff31b99a6bf2e81bbc467db340a774a43be6a2f7fc3c03068df09dd6164fc9e8050d SHA512 4a1b6d78b51067b5d3efb8de18d91995efb820bf9486c6ad6acd5bf726e39c3a7746cc9fb90b5a07eda8a40b09988490972b11707026d951184660a21fddccc1
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
-DIST buildbot-worker-2.10.0.tar.gz 107279 BLAKE2B 415b950b81862ac4c08ca00217e27351152b74c19e0395451e6cb965a039ccc8d16d3a63534053c15783cb904c279e8c80354f8b33d956cd3c45c5d5c1f5c1f4 SHA512 94b96abdad97d306998b995409f5220c967b0f7a2e33d1310fc99723bb3d54aa055e0ae2e6b771cd53340b132eb95515c266f08bf08e10bede29e2a93fe72b0a
-DIST buildbot-worker-2.10.1.tar.gz 107656 BLAKE2B 8b94ecacc18f1e1f2e58d64f223f77af31454a3b199de9ee4c5a174b2cb645a970614674f5917415c4ab6d1ee0180ff99fbf4f121339eb05fcd80b363bfad3c0 SHA512 93f684c36e7c07c90e24a666084734df33d30376436b50db74ae8bd3b3a5e306799d15bd03d93b02f723bdf878adbfe17bbc59fd9f49f43431aea90612113ed7
-DIST buildbot-worker-2.8.2.tar.gz 101707 BLAKE2B 451dff979c6934bf6dd4e1579abbe18e9cf43551c906bd516c788a6a5f6170650a5468927bec0a8d4ab242e5886247406b2e098e1908a8d9b5777744982c7be6 SHA512 0628825ac023a66cd249dc6b42ff2f3ad3b5c0cb97561fd332ce4775abaa5368a8b7b636115259ab4aa842c811178c9b641ef4453b06167315eb81117ffef815
-DIST buildbot-worker-2.8.4.tar.gz 101175 BLAKE2B 23077305d26ab282eaa4c633ebee7ca7c502285862604ecafe25d6b666ce802729c5478d676e6834bf9a2e27ccf48e1ad0e69449e55532aa81b0dcd3c6780011 SHA512 16ad9a0e5e9c875f90383fc90c359ee843e0b82a7878f87f2ac9e7091d8d907707c69210876f25b4fdf7148bcaafab10d10a8a0a8865c73808db707320757107
-DIST buildbot-worker-3.0.2.tar.gz 96923 BLAKE2B 720d265381c0dc4f876ba1c87df893d8adbb153fef8dd78f6d84b24cbf43d7637fb2f58fd4e312724e9fab3318c2ba6fb6bd7a881989790edc1e9aa02095543d SHA512 d970568bdec9d201699350383dfbcf9e915a75d2cc5f69c0af9db009ce1bf5dbed83302bcc6c7e34fdcc2aa739675a7bd14fda686900b05a32ae83cca6a2da10
-DIST buildbot-worker-3.1.0.tar.gz 97938 BLAKE2B a886656ad099a849731307ce5db4eea0990b46bbae3aef8f931cbbfbaac0c8ac69d81fde1c1f6791a489e6dd1abe8b09f90615c658a31d8fb8cf3a0eb0cb6cb1 SHA512 eca2a32c67822adc0dd258ba991205525024ee1543e218337835393ad9bd948d5f48dd4348976c64eb4c6812a16a7e951f4114ef81982a49a0d80da485567f98
-DIST buildbot-worker-3.1.1.tar.gz 98239 BLAKE2B e73abcdd0fb067da0e77bf8382f8d4d54c0db63e3cf04d003599dc68dfe5c742758ba2c3e39368413a45e8c5beb913a4cf5571e229c3ce5084066790702fb4e8 SHA512 9bf969aadf0f2ccea726365b1e250ebd0c0d0146b4fb1b49ae675e0db555a0b50a87ceb455c25f987b75605d72ab50306f5af9247978fe93270d2c97b8ed04dd
-DIST buildbot-worker-3.2.0.tar.gz 99401 BLAKE2B e50ee76f667aab2a07647df3bd1dfd2016827bc5bf96be5f2f6e90158790c3b908f0c5b88fead59bf9977dc15adbe275c7ba81829c56fde3c1c318084633624f SHA512 c7822c16761052f2b45b809de3d3ff910f40679d885213541aa87f54a3490e9a092152f9cbb8c4ab25d1e5b2c9597e87b202f0db62c79f35e8fec2cfcc797653
-DIST buildbot-worker-3.3.0.tar.gz 99996 BLAKE2B 4e2bbe6467fc58a9f8c597939cdcfd4538712445580ab7f2c0e1ce3415cc1f8c60ce2b3cba4c16f341d8c19e1b99a91e799c7d3ff2343af0fffa0a1740960588 SHA512 e75a7a91a5b2c418dae65abdd1dde2b840a840e5b9cc1a218007a9e33e1cd58288bc708ec43ecfd9ec74a257809a59f65923ec8dc8aee1ef28cfaf82314964e3
-EBUILD buildbot-worker-2.10.0.ebuild 4612 BLAKE2B d6025654e4e330d8a58ef67050aa6eea06e2f6f6ddd528a8f1b945a8efb1ba23c767bcf7a52e46a928c56fe97071d883e410ff1b330567677c7887776d4c4a64 SHA512 45813c1392eb44f9245c4528ef97bccc91bf89a991a9df861537721fefbb7f3464dce8f073dcf7c5483fec02ad6ff85aaef1eaeacfc4bed07fad0947941ab2b6
-EBUILD buildbot-worker-2.10.1.ebuild 4612 BLAKE2B d6025654e4e330d8a58ef67050aa6eea06e2f6f6ddd528a8f1b945a8efb1ba23c767bcf7a52e46a928c56fe97071d883e410ff1b330567677c7887776d4c4a64 SHA512 45813c1392eb44f9245c4528ef97bccc91bf89a991a9df861537721fefbb7f3464dce8f073dcf7c5483fec02ad6ff85aaef1eaeacfc4bed07fad0947941ab2b6
-EBUILD buildbot-worker-2.8.2.ebuild 4612 BLAKE2B b24029d46d49eb188f8955a8a31b5bb59c68f10d78ac778f5fc739080825d59539ff81c0d1e1bcaccaeafe345e60474098db52509431fe10e616c33eeca85e73 SHA512 a21d78d2a7ee910efd8da093b092aa0e9386a433f2abd8832932e9c6c2c2a3e31524ee6a9bd0bb64a6bfa1174ee529b9bf361a1961a46250ed12b42c29f7bccf
-EBUILD buildbot-worker-2.8.4.ebuild 4612 BLAKE2B b24029d46d49eb188f8955a8a31b5bb59c68f10d78ac778f5fc739080825d59539ff81c0d1e1bcaccaeafe345e60474098db52509431fe10e616c33eeca85e73 SHA512 a21d78d2a7ee910efd8da093b092aa0e9386a433f2abd8832932e9c6c2c2a3e31524ee6a9bd0bb64a6bfa1174ee529b9bf361a1961a46250ed12b42c29f7bccf
-EBUILD buildbot-worker-3.0.2.ebuild 4614 BLAKE2B 46c5d74b0654c0cdf7e3d589bed5c3459f469e3b5e4ecfb0ea327aa209d1dd7313453cd273179c26fe44a7cb65a7b2cb53be41ac0905d48cc25c50b8895ec15f SHA512 3ca66e435c59c1e56e69e9c1e9c969885d95640c173c002abcb313bfaad715793d0497396981b3083e3a5cbaf15e2583eb879106ff9e304d1b990d75006bed83
-EBUILD buildbot-worker-3.1.0.ebuild 4621 BLAKE2B 68e47ab3e16a63124b1b9c9dbfe1c68befc387e861bac3fb3e7937a3c97b623841526807d3b68b1bdcc6575de454b281603cd582ae7675e237aa6c446b859175 SHA512 7fe155aaab0f7020044d0f4617ec2e7419d5cb7fa99c3e0cbfe360b0053f4d2347f2c1cd724b77e320e4a10608866b381f1e55fbac52a64d27a96400f0ebac70
-EBUILD buildbot-worker-3.1.1.ebuild 4645 BLAKE2B fdf1dcbe3d5925c5d65ca7c82ac549146915407f312b34c437211da55ac7ff92688d33387c20c3f8c6911885b2c7eb83358c9e2f81a30072f73e490c4522877d SHA512 29f3834f42a7d1589d6ac91d1385c37e826b5ef28c8eace06c6ca84c456f6c9a7b1735c168a384b110c901846042a87355198cb3aa2706510219b1dfacdf7a91
-EBUILD buildbot-worker-3.2.0.ebuild 4645 BLAKE2B fdf1dcbe3d5925c5d65ca7c82ac549146915407f312b34c437211da55ac7ff92688d33387c20c3f8c6911885b2c7eb83358c9e2f81a30072f73e490c4522877d SHA512 29f3834f42a7d1589d6ac91d1385c37e826b5ef28c8eace06c6ca84c456f6c9a7b1735c168a384b110c901846042a87355198cb3aa2706510219b1dfacdf7a91
-EBUILD buildbot-worker-3.3.0.ebuild 4645 BLAKE2B fdf1dcbe3d5925c5d65ca7c82ac549146915407f312b34c437211da55ac7ff92688d33387c20c3f8c6911885b2c7eb83358c9e2f81a30072f73e490c4522877d SHA512 29f3834f42a7d1589d6ac91d1385c37e826b5ef28c8eace06c6ca84c456f6c9a7b1735c168a384b110c901846042a87355198cb3aa2706510219b1dfacdf7a91
-EBUILD buildbot-worker-9999.ebuild 4619 BLAKE2B 50d4fa32c36c1517aede27e2ca335414d260a4a58eafc4069c1ee777194f6c70da5de8f7dafe310001ed16924c49749d5bfdbc8496b866b0c38d46f38f5d6f8b SHA512 ca127a2b3153241355ef8f5a903c72f771018e59ade8e74f4f1e241a8adf4cdd01cfeb5379f2a294b5fabb600b26cd0fee75fd99e747d7927e09689338ad07fb
+DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
+EBUILD buildbot-worker-3.4.0.ebuild 4605 BLAKE2B 6d2b9250d7d6cd3aaf5ec7e8bb149d4a4b09d84d8659835963fb13aae6ce1acf0b4aeb472a76744f537ede691405464d1dc1169800f3834627cbc13fad883d15 SHA512 c10445f630cbd86ca6f6b8ac87ee6ab0294e9f3982bdfa80ea58a2ea089630fd7f2eec30625c2f53d77f29ccc556da0167a890c44b4ca30b9b68919a2d00c613
+EBUILD buildbot-worker-9999.ebuild 4514 BLAKE2B 2f6fea082878f4ee08eb5d488237a83f2962fa16cdc46bb40e917ea4c906dab5fe3c33879356f3c5cd6fc7d563f22d543194451f59921853462bfe119bf2b9d5 SHA512 0a0ab5c9eb9eeff2ad181b726bce42820f4a5ec40cec51e28cf3c20d2d6aea298d241de7a9608c914289fc0362315938a93d393186f4af1f351543e8b252affd
 MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild
deleted file mode 100644
index 06d672daee8f..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild
+++ /dev/null
@@ -1,126 +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} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild
deleted file mode 100644
index 06d672daee8f..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-2.10.1.ebuild
+++ /dev/null
@@ -1,126 +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} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
deleted file mode 100644
index bd9c309e10b7..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-2.8.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
deleted file mode 100644
index bd9c309e10b7..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-2.8.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.0.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.0.2.ebuild
deleted file mode 100644
index 6f105d83f93e..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.0.2.ebuild
+++ /dev/null
@@ -1,126 +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} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.1.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.1.0.ebuild
deleted file mode 100644
index 6ccf06830ba8..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.1.0.ebuild
+++ /dev/null
@@ -1,126 +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} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.2.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.2.0.ebuild
deleted file mode 100644
index e66c92ea2278..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.2.0.ebuild
+++ /dev/null
@@ -1,126 +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} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.3.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.3.0.ebuild
deleted file mode 100644
index e66c92ea2278..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.3.0.ebuild
+++ /dev/null
@@ -1,126 +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} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
-}
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/buildbot-worker.1
-
-	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
-	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
-
-	dodir /var/lib/buildbot_worker
-	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
-		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
-		ewarn "    rc-update add buildbot_worker.myinstance default"
-		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildbot_worker@myinstance.service"
-		ewarn "    systemctl enable buildbot_worker.target"
-		ewarn "    systemctl start buildbot_worker.target"
-	fi
-}
-
-pkg_config() {
-	local buildworker_path="/var/lib/buildbot_worker"
-	local log_path="/var/log/buildbot_worker"
-
-	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildworker_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	if [[ ! -d "${instance_path}" ]]; then
-		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
-	fi
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
-	einfo "To change the default settings edit the buildbot.tac file in this directory."
-}
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.1.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
index e66c92ea2278..69a126362a82 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.1.1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 inherit readme.gentoo-r1 distutils-r1
 
-DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
 MY_V="${PV/_p/.post}"
 MY_P="${PN}-${MY_V}"
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-worker/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -28,27 +28,25 @@ RDEPEND="
 	dev-python/future[${PYTHON_USEDEP}]
 	!<dev-util/buildbot-1.0.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
+		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
 	)
 "
 
-S="${WORKDIR}/${MY_P}"
+DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+to support starting buildbot_worker through Gentoo's init system. To use this,
+execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+Set up your build worker following the documentation, make sure the
+resulting directories are owned by the \"buildbot\" user and point
+\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
+The scripts can	run as a different user if desired."
 
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
+python_test() {
+	"${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
 }
 
-distutils_enable_tests setup.py
-
 python_install_all() {
 	distutils-r1_python_install_all
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 605f3460526d..18ee776e0e52 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -1,26 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} )
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit git-r3
-inherit readme.gentoo-r1 distutils-r1
+inherit readme.gentoo-r1 git-r3 distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
-
-MY_V="${PV/_p/.post}"
-MY_P="${PN}-${MY_V}"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-worker/"
+S="${S}/worker"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -30,27 +24,25 @@ RDEPEND="
 	dev-python/future[${PYTHON_USEDEP}]
 	!<dev-util/buildbot-1.0.0
 "
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
+		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
 	)
 "
 
-S="${S}/worker"
+DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+to support starting buildbot_worker through Gentoo's init system. To use this,
+execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+Set up your build worker following the documentation, make sure the
+resulting directories are owned by the \"buildbot\" user and point
+\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
+The scripts can	run as a different user if desired."
 
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
-		to support starting buildbot_worker through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		Set up your build worker following the documentation, make sure the
-		resulting directories are owned by the \"buildbot\" user and point
-		\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
-		The scripts can	run as a different user if desired."
+python_test() {
+	"${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
 }
 
-distutils_enable_tests setup.py
-
 python_install_all() {
 	distutils-r1_python_install_all
 
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index f4aa5bf37e69..c8e6aa0d05ac 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,19 +1,3 @@
-DIST buildbot-wsgi-dashboards-2.10.0.tar.gz 5582 BLAKE2B 84b8ba49d967e40ab5cee28cac49d58ef97f794b07dff2eba5b27ddd712a4c34ae50d0b948f345fafe23549d1ab5d19aa0a5d799b6fb3eceb66591e70061cadd SHA512 15388a7acdacd22e8aa99e13f2a3bef75f097e64767751b246cdc5a72e19270928d61325217224cdb196eafffde0cda1dcc6a33d69cca5ef05f0d8b9836ccf72
-DIST buildbot-wsgi-dashboards-2.10.1.tar.gz 5590 BLAKE2B 3a138b7f150370d8ca63c0830985a4d0a85f0de45d33fe64e729c5e2df733468fe031fa54d6c794917eba91f53b87d7a479af30893e73c283d0fb208355fc90a SHA512 2b4ee561f7a4e10ecc26449035b4a49734caf46fc1207ac78a50cf34e7a52e928be548c6ea66f2ab2f7b1a53395b59cebdaa3a73308a780b4bdda8fad2b6e68e
-DIST buildbot-wsgi-dashboards-2.8.2.tar.gz 5566 BLAKE2B 487b816862366acae9e55c39cb440a21c8e5c438299c43e2d6fad049ff946ece5ab647390955fbbad403ad1d7c0a2707a7612129442dc398cc7210d831aa49ef SHA512 2b75a61331aa457b3f168e1955b8905f95d11008ab6bee611ac92488f988cb0cf73fbf92321e594ac0a6e5ae03b82dfa05daab5a0647ae636a96922c0f4e8eff
-DIST buildbot-wsgi-dashboards-2.8.4.tar.gz 5588 BLAKE2B 3298edaebe2f9eb5e31f8298598e892d64d653648843e3c107710d4df3a24977bd3e77db06f7edecdf8d85bbbdeedfc66a75c6f3eef93ec8374d0df1973790dc SHA512 656f0626c8cad2c21d64ebc3eb4d6e1ac24a10909afc28819e54046be8e843a7383f3648a00a908cfddd9543767e1c3293825170d7c6c64c40a61bdcd55245bd
-DIST buildbot-wsgi-dashboards-3.0.2.tar.gz 5581 BLAKE2B a122d97fe5837319a1185e944db963f215da2390861f87a1d00d9e22b29776e259495ece4ba0c0248483d4715d4cc5aca5011fefb50fe1268a58c64c9bc0733f SHA512 881d874b31a59c44448ec90784db9778424fe53eed19d75cd588e359f50bf59eea209226bb3bc95c94174a54b1d42166f66c0642ea550adfe4e9b9f7f44013f9
-DIST buildbot-wsgi-dashboards-3.1.0.tar.gz 5581 BLAKE2B 0ab769016aac877dbd2a802d87cb8a2de4e0019a810b1a448ee261cae9f0e9efc4a6ff4a7ff4c28c348d82639c8c4eee9f53a87340fa53c2971d8f4e977b4708 SHA512 40c9e328262c42c3c36bf85022a534cabc568a47280d82921ef6b5badaefdc94082984e3c5acede26fb62f27a38783ec03257d7500cdb7241c10fac7bd45971c
-DIST buildbot-wsgi-dashboards-3.1.1.tar.gz 5583 BLAKE2B ba0462e70e29cc1e6cfcc6a461373bdc56c03dc0510e7498310e722e0a5c494311f6da081f1ccccd2641657a7025885211802ce38b13326bde2f0b2f403ee198 SHA512 3a4a4621ae2ecca9313d2c6c4c33566b3e2e58c0259caaf135935362139eb4c1536669251138408c76c136ffe4a93ba9cbca7fa08b7b07e46472b2606b24ab06
-DIST buildbot-wsgi-dashboards-3.2.0.tar.gz 5582 BLAKE2B ad52295e4c334377372e0db03fdd0d6b929fe0c19184b02feb6ba6e296a11477e8334a1e23d3a8c720462064916fefc45f78e729e59bd3a789779711365df038 SHA512 9deba0ba64f5c57da5e4688538757ae287b9505d2e98dce0ba2e7a16fac80bceff666eadf9116739c3af5481749e1568c2b07c367ca33f7ac548cdc719535c75
-DIST buildbot-wsgi-dashboards-3.3.0.tar.gz 5591 BLAKE2B 90ef8554d41a4a58f0ac320d688a95145a53bf7c56bed9a164940912d3d944f8e04668ef96aeeb862c6627d97b7a90e648a878710d8bf68a5c2dd4bc24436100 SHA512 bd791710f5788ff44be784549535c3043babea3c672c8e26f4563d1e5c5f217eff87b142ffbea3d94a6764cd2e5b422f48158cd70dfd8c1225ae299304903861
-EBUILD buildbot-wsgi-dashboards-2.10.0.ebuild 781 BLAKE2B 6b874832a4d6482388b7a9f7cb68cbb545cc37115c4718112bb2b2a592dcc13f1f7f13095b1f01bce7769e36b8dc9b99907664718e39b83c606887cb95363c26 SHA512 3c2a97a561b10b78b2420f72440af47109cb48b276fc8d08b3905defa168075bf2b46a01fcdd2d14953de96c80452791ac7b1851b02aa2a88f9bc5f0cd2acc92
-EBUILD buildbot-wsgi-dashboards-2.10.1.ebuild 781 BLAKE2B 6b874832a4d6482388b7a9f7cb68cbb545cc37115c4718112bb2b2a592dcc13f1f7f13095b1f01bce7769e36b8dc9b99907664718e39b83c606887cb95363c26 SHA512 3c2a97a561b10b78b2420f72440af47109cb48b276fc8d08b3905defa168075bf2b46a01fcdd2d14953de96c80452791ac7b1851b02aa2a88f9bc5f0cd2acc92
-EBUILD buildbot-wsgi-dashboards-2.8.2.ebuild 781 BLAKE2B 6b874832a4d6482388b7a9f7cb68cbb545cc37115c4718112bb2b2a592dcc13f1f7f13095b1f01bce7769e36b8dc9b99907664718e39b83c606887cb95363c26 SHA512 3c2a97a561b10b78b2420f72440af47109cb48b276fc8d08b3905defa168075bf2b46a01fcdd2d14953de96c80452791ac7b1851b02aa2a88f9bc5f0cd2acc92
-EBUILD buildbot-wsgi-dashboards-2.8.4.ebuild 781 BLAKE2B 6b874832a4d6482388b7a9f7cb68cbb545cc37115c4718112bb2b2a592dcc13f1f7f13095b1f01bce7769e36b8dc9b99907664718e39b83c606887cb95363c26 SHA512 3c2a97a561b10b78b2420f72440af47109cb48b276fc8d08b3905defa168075bf2b46a01fcdd2d14953de96c80452791ac7b1851b02aa2a88f9bc5f0cd2acc92
-EBUILD buildbot-wsgi-dashboards-3.0.2.ebuild 783 BLAKE2B 42ad468c1645908157e799379c7c0d1f2f9787f7d3ba90a3c5b329025f1978495c409b72b9c306d0c5c3952cf1ac3a31cc302ac6346f14657092381b39c3a58b SHA512 42ad77aaee82f5cd4a650268abd767c885798c3768b2b3e1100539dd629b5c593beacf900b673f6bf68c7f30f670049a40cdda283e1183daece1cb559fa6bc15
-EBUILD buildbot-wsgi-dashboards-3.1.0.ebuild 783 BLAKE2B 42ad468c1645908157e799379c7c0d1f2f9787f7d3ba90a3c5b329025f1978495c409b72b9c306d0c5c3952cf1ac3a31cc302ac6346f14657092381b39c3a58b SHA512 42ad77aaee82f5cd4a650268abd767c885798c3768b2b3e1100539dd629b5c593beacf900b673f6bf68c7f30f670049a40cdda283e1183daece1cb559fa6bc15
-EBUILD buildbot-wsgi-dashboards-3.1.1.ebuild 814 BLAKE2B 1367c3c0a6d26e775af41d9780f4993c7ed17d1925706454317aac9a1415d99bebe37ce18db30f69edfde0903e240ecaff7bb50df9ea3b97711a3494caf89b63 SHA512 cdb505d84e4cf1ce7977f7905d0347b671a954a92d55e96b92ddd1e792461b4536ede16dde6245c548a5387326a98e0d52b3bdd939ba91a521dc27159d016805
-EBUILD buildbot-wsgi-dashboards-3.2.0.ebuild 814 BLAKE2B 1367c3c0a6d26e775af41d9780f4993c7ed17d1925706454317aac9a1415d99bebe37ce18db30f69edfde0903e240ecaff7bb50df9ea3b97711a3494caf89b63 SHA512 cdb505d84e4cf1ce7977f7905d0347b671a954a92d55e96b92ddd1e792461b4536ede16dde6245c548a5387326a98e0d52b3bdd939ba91a521dc27159d016805
-EBUILD buildbot-wsgi-dashboards-3.3.0.ebuild 814 BLAKE2B 1367c3c0a6d26e775af41d9780f4993c7ed17d1925706454317aac9a1415d99bebe37ce18db30f69edfde0903e240ecaff7bb50df9ea3b97711a3494caf89b63 SHA512 cdb505d84e4cf1ce7977f7905d0347b671a954a92d55e96b92ddd1e792461b4536ede16dde6245c548a5387326a98e0d52b3bdd939ba91a521dc27159d016805
+DIST buildbot-wsgi-dashboards-3.4.0.tar.gz 5583 BLAKE2B 0eed4a375330d58bd6caf95f8cdc2ebfaebc9c123450461d4e0f938745bb1b6afe0e9786bd886c6e6cb6a522da2b645bf1ad3237b2049f86bc1bca83829b15a1 SHA512 56411bb34a1f40d02a814e8d33dcd3c6de65627728c3bb9cad776c43c48707e648ccdbb4a58cbfb8ed080c219fc37252304c88ab363eb6deb6057b2debde1071
+EBUILD buildbot-wsgi-dashboards-3.4.0.ebuild 705 BLAKE2B ac9589b9f5520ac553f445345ad06dfb0011f454c2d509f3dd46b2ea1748590ce0d8bec2981480be683196d205de3cda5b3d14b57029d236aa82dd193935298e SHA512 c31207b81b8a3d0aa98edddc70ca62033789be6210a1557c03cbe743b7713edf97e277f17a879c6054b73b737885e49a9efc2714101ef14cd47087407352d4e3
 MISC metadata.xml 680 BLAKE2B b3fea763f6f493b0fb8be5e0408f80b295a5d205c5d01443e3a47965a5c982dbcc8e1f806978b0d8939e31ffeaa425590f9be8d5b563f0c064d700b1f33343be SHA512 01aeda23d466d40dc4c2bf7668595795fb6f743930c168549f259fd2a6e0f3491044079ef039096d030dec48ebb2bf3977bb5084264381675984cf43e063e083
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.0.ebuild
deleted file mode 100644
index f7e634d74bd6..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.1.ebuild
deleted file mode 100644
index f7e634d74bd6..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild
deleted file mode 100644
index f7e634d74bd6..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild
deleted file mode 100644
index f7e634d74bd6..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.0.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.0.2.ebuild
deleted file mode 100644
index 627e51c3cdc1..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.1.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.1.0.ebuild
deleted file mode 100644
index 627e51c3cdc1..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.2.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.2.0.ebuild
deleted file mode 100644
index 4ddd7898f765..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.3.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.3.0.ebuild
deleted file mode 100644
index 4ddd7898f765..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.3.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
-	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.1.1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
index 4ddd7898f765..89d8f635b8a7 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.1.1.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
@@ -1,32 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+EAPI=8
 
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
-
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-wsgi-dashboards/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
 
-RDEPEND=""
-
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+BDEPEND="
 	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
 	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
 "
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 5997f553ef54..53474f49c9c3 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,19 +1,3 @@
-DIST buildbot-www-2.10.0.tar.gz 3179700 BLAKE2B e9a8324c483896ee6f27468ce4658495277bc4e8e7b920bfc371440378d537473db1053373b8294e89519932eab486fb036743c8d069604c4646bb95c0680d41 SHA512 3ca30f65eb191451a718f102344c2230026cc252fa2a8a780cab20be309f1191567f5816c4f894e2e3b6c462f70b5bb8d22c96c9bb372818d4673a11e42c69ec
-DIST buildbot-www-2.10.1.tar.gz 3180266 BLAKE2B ccc5beb12a8bd3684cbd90767794f70848023600ec0851df06c1e4dd356e5774a10fabe31721eeac9c67514ecbb44d22a8983d552975e654f332ab0deb8b3bdc SHA512 c1bc1f3c9154c7d96d7d3f25f6ce89fffd1f98b4fccf8f9499d230cd81d3f67f25e4a01dca04723a838065368d1256933fce26fa252f136285f6d617f68e6f7b
-DIST buildbot-www-2.8.2.tar.gz 3172352 BLAKE2B 8ead9e9eb046bf773bd70d312ae612dced839b263b02d300f600d066fcf21ef98a7884fef36c494bdc8eb26129d5bf7897c319256f0fe6ef8e1515dc8507a26e SHA512 22d0ccb3e5b3badeb5a59db18dd7b0b925fe84936c1be1773437e899122df95bc9b0a4205a0c87182cf6be4ca4275ab20cb86a4da6098c9d9c73927cb9b3c784
-DIST buildbot-www-2.8.4.tar.gz 3170166 BLAKE2B d3d5c8a6b4b963cffaa75035e2f4a076af27c9f816a8e80b346bdeade55f01c7c8403612b8e6d12036261dabe6ab4f05ddb7ffce4e7369565d361fe7b062f691 SHA512 8b698b8b99b3f9b51df0ce230c3d6e5dea8d1c1278cb7372edd170844ec46f7fe213be20db628da244cd38daaa53b1e2fcbffd3ab3980eee35ccc6a9824c7ae5
-DIST buildbot-www-3.0.2.tar.gz 3180864 BLAKE2B 772f23daf19ea964e4e65bb890e25bd90623e1eef8cb2845352e4e65884668d913aec98e292fb28121f1d87571430224eb5c70aca326f4c106d7125fbdc10570 SHA512 9be7271dbae3b62ee6fcb10441faaa9cab952b9db989275a62b7ca9d4c5dc342ec1decf33c267c0d2d8e095ab32f4493055cda1880f73818d26a98fab674a108
-DIST buildbot-www-3.1.0.tar.gz 3180991 BLAKE2B d2ebe82e97cb92c97c43059555c276602dc128164bed2ecf7014ad81b7b2375568dcbc3d35be2e98c737be8e7c2774d77f0361625d96db3da311fc5da7aa5ee8 SHA512 db1be3054bc3b6112f1f4ebe846f02a1da096ffbf29bfe1b99d254a759a67d64849e3c1e3df7edbada200e791d62904a2e2c66e7e0f8273feb3dedd463efc69a
-DIST buildbot-www-3.1.1.tar.gz 3180995 BLAKE2B 16c6e0966d64cc6631df8b4980bb20617707ebd3fca279cc6aa614e83bf0c3537e992f120670c00992dce854304ddf421143e96565e05482bd3d231f15fbe2c6 SHA512 89a1f88958fc509e33d6d5f2e8f0690ff87069eff60296926b3cf7021a060fc3918a990e54e5750922d6152b9d1e9257a973df16630332be9fd10a3643520354
-DIST buildbot-www-3.2.0.tar.gz 3182436 BLAKE2B b9ba9f0982527e5ed20e0657526292f5f9eb2ca875b6aa1944cfff6eacda2c49de6f311437d5752ab00b2391515b6d9b0caa8165cb1755b89d96489f9a0d9df0 SHA512 9cc6566cb8dd13a1031bcebcc3797cc3ced2d9fe18303a9a436854db6382ffac850ed01ad44d6bd462ed1b59264c72b06b7bb790e75f25e8e6b384ae694793b3
-DIST buildbot-www-3.3.0.tar.gz 3182454 BLAKE2B 107e5563c74a647592966c22c1d3502fd72c6907efefa91de8875d4821a44f8b29a4b9c5c551a9c82980cc038fa98ce7026fd209b229ea2697515d808dcb76dc SHA512 9d332a0f70815cf7e9d3a6897f2733bd33b6938fe49cb1a879023235d159d7cd4e3faa0fca74e16a64cebe1248929a43aff0000e805011f506c4febf10b03f90
-EBUILD buildbot-www-2.10.0.ebuild 682 BLAKE2B feb3866b4142bfa022b281ad93c399209573821058f330c4843987312a24349f0e5262cc2309c8207630d00413ec0dac33b410f0e45b7b5671ad1926fcfc6d42 SHA512 b0c51f461074396aaebd115aa245f784d1d625272c1c92bd966eacc99e84da2a127330d5901d44cb823d4c54496dfdcb1d3fd914a61ab5417b1029db3c901095
-EBUILD buildbot-www-2.10.1.ebuild 682 BLAKE2B feb3866b4142bfa022b281ad93c399209573821058f330c4843987312a24349f0e5262cc2309c8207630d00413ec0dac33b410f0e45b7b5671ad1926fcfc6d42 SHA512 b0c51f461074396aaebd115aa245f784d1d625272c1c92bd966eacc99e84da2a127330d5901d44cb823d4c54496dfdcb1d3fd914a61ab5417b1029db3c901095
-EBUILD buildbot-www-2.8.2.ebuild 682 BLAKE2B feb3866b4142bfa022b281ad93c399209573821058f330c4843987312a24349f0e5262cc2309c8207630d00413ec0dac33b410f0e45b7b5671ad1926fcfc6d42 SHA512 b0c51f461074396aaebd115aa245f784d1d625272c1c92bd966eacc99e84da2a127330d5901d44cb823d4c54496dfdcb1d3fd914a61ab5417b1029db3c901095
-EBUILD buildbot-www-2.8.4.ebuild 682 BLAKE2B feb3866b4142bfa022b281ad93c399209573821058f330c4843987312a24349f0e5262cc2309c8207630d00413ec0dac33b410f0e45b7b5671ad1926fcfc6d42 SHA512 b0c51f461074396aaebd115aa245f784d1d625272c1c92bd966eacc99e84da2a127330d5901d44cb823d4c54496dfdcb1d3fd914a61ab5417b1029db3c901095
-EBUILD buildbot-www-3.0.2.ebuild 684 BLAKE2B e25d10cafebfa5a400fe0cd6e43d1eb59b8474e7803664baef8d2ff54bcc273972a071103aca59bab5342460d0f8a94b327248e8096bfbe45f5a656f104e3d5b SHA512 5f439bb964bf37b2eeb2349242666f406c812e19a5ab27a7b0a3c4e9f364a05dc1bd44b3439bc1f046ffc467ce2102a819935ae1cb1ee670e8f9eebff5f93cfc
-EBUILD buildbot-www-3.1.0.ebuild 691 BLAKE2B 3457c22fce9587109a5c09fdaddac97c51cd1da4d39a5b22fd03ec0d23ab79acd42b3162db8884d8a4c76db44342c12d6aaa94d53228f5e53bd872d7d7bdbccc SHA512 0969a0cc74dcaac65f4de261eee3ff263b5cbb928d1ceae62043b0670e0f3c0189c4fe6e23973a07b5f040cff7f7e18498d75fb06ca38c241b188b11a832784b
-EBUILD buildbot-www-3.1.1.ebuild 715 BLAKE2B 635afb0978e2718f60f723c5588b7461ea1a47104b5c196dc723692f49d3daa32a3f2e86901a12c632e09a2b2b664845adc371f127c67286e1805230aa7d902a SHA512 5e173073f7b68b342ebbe6a7214d3ad601c23a5fbb57668408bf2943cd3fa632b796d4263075eab5222ad4cc6f3accfdfc4242c707539c89c8f6ba5ab623b034
-EBUILD buildbot-www-3.2.0.ebuild 715 BLAKE2B 635afb0978e2718f60f723c5588b7461ea1a47104b5c196dc723692f49d3daa32a3f2e86901a12c632e09a2b2b664845adc371f127c67286e1805230aa7d902a SHA512 5e173073f7b68b342ebbe6a7214d3ad601c23a5fbb57668408bf2943cd3fa632b796d4263075eab5222ad4cc6f3accfdfc4242c707539c89c8f6ba5ab623b034
-EBUILD buildbot-www-3.3.0.ebuild 715 BLAKE2B 635afb0978e2718f60f723c5588b7461ea1a47104b5c196dc723692f49d3daa32a3f2e86901a12c632e09a2b2b664845adc371f127c67286e1805230aa7d902a SHA512 5e173073f7b68b342ebbe6a7214d3ad601c23a5fbb57668408bf2943cd3fa632b796d4263075eab5222ad4cc6f3accfdfc4242c707539c89c8f6ba5ab623b034
+DIST buildbot-www-3.4.0.tar.gz 3182445 BLAKE2B 350606158ae68aba1b82c43d202e6140f433905e9913c7f4fcd3f4ebd328f7b70940f0a4e76a4a1f89731f6364dd285f08052bd1d96badac4e69cd1e16643d4e SHA512 7be83f35b6042accae77db1133d54282d0d27ce15a9b34220cc015255935d7463c1a327ee289740325bbb73d6a6a162f384da2b3cc731719e7f99a911faf86cd
+EBUILD buildbot-www-3.4.0.ebuild 676 BLAKE2B 1a7c4395990ab584a8cd9143740bd033efab07107ec76db5b543bb792d59fcf7f3c2f35c7ebf5fdbd1985e9dd4011259296b475d92eb0a2c741f20bdfb7d40fc SHA512 b53d1e066a5c375464687c70324203ced5bbc85991b91604d73935df37122f75b08b6035371a7ae6195ac77a74febdb4306056bb0369dc6598e83a1a5ac4aec1
 MISC metadata.xml 667 BLAKE2B 10cb0032009c616e55be86ca788abf9b643890605d456b71636b40b0b9591136270a2d30227d3b06854ddce18a7697a3326233cf6da0e1386af4f8102d8d53bc SHA512 d024b9e5148003c7d0d20c82d25bd376006d4c2d8bdd8d58c865f6f35a252333618ec3964a5af1baf63ba9ac7fd5b49fca4c65438066512a016804ef85032256
diff --git a/dev-util/buildbot-www/buildbot-www-2.10.0.ebuild b/dev-util/buildbot-www/buildbot-www-2.10.0.ebuild
deleted file mode 100644
index 5c89813242d4..000000000000
--- a/dev-util/buildbot-www/buildbot-www-2.10.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-DEPEND="
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/buildbot-www-2.10.1.ebuild b/dev-util/buildbot-www/buildbot-www-2.10.1.ebuild
deleted file mode 100644
index 5c89813242d4..000000000000
--- a/dev-util/buildbot-www/buildbot-www-2.10.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-DEPEND="
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild b/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild
deleted file mode 100644
index 5c89813242d4..000000000000
--- a/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-DEPEND="
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild b/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild
deleted file mode 100644
index 5c89813242d4..000000000000
--- a/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-DEPEND="
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.0.2.ebuild b/dev-util/buildbot-www/buildbot-www-3.0.2.ebuild
deleted file mode 100644
index 70027ef7887a..000000000000
--- a/dev-util/buildbot-www/buildbot-www-3.0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-DEPEND="
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.1.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.1.0.ebuild
deleted file mode 100644
index 811dad5066d6..000000000000
--- a/dev-util/buildbot-www/buildbot-www-3.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64"
-
-DEPEND="
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.2.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.2.0.ebuild
deleted file mode 100644
index 34eaab6d6621..000000000000
--- a/dev-util/buildbot-www/buildbot-www-3.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.3.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.3.0.ebuild
deleted file mode 100644
index 34eaab6d6621..000000000000
--- a/dev-util/buildbot-www/buildbot-www-3.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-
-inherit distutils-r1
-
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/buildbot-www-3.1.1.ebuild b/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
index 34eaab6d6621..ea0de6d3f79a 100644
--- a/dev-util/buildbot-www/buildbot-www-3.1.1.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
@@ -1,29 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+EAPI=8
 
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
-DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
-
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-www/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-
 KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
 
-DEPEND="
-	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
+RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 2d26bef36bd8..58b50851ee89 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -4,24 +4,7 @@ AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df252
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
 AUX pypugjs-2.8.0.patch 3633 BLAKE2B de243262e4631e7ce3b3208d4f3acc7c7857375c4e938809d18ed65c1dcd2aa8abbdf0339fe278a329bc734220a21cf85f772b81e0284d42cf3c66599902a0e1 SHA512 c847026d0658d61ac617b7471a09fc0ae4f70fdf82bd1c79d460c0dfc9beb060081073b260aed2cdb5f2092746146dbe12787589f311bce6857a2769ccfa1e13
-DIST buildbot-2.10.0.tar.gz 2270072 BLAKE2B 467c774bb50076e16731edeced969366b3960a8032da2ebed56baf2c7de8affa730482878e45aca1523ff4b7e16b6bd913bb83e3cded274faeb75148f2b6fb8f SHA512 086864dd67b883a11ba565ae3e6530c1f396e35fcb8d4346f751c05de684bc3bfd7e709a428781be79e7e6a2e0eda1eefcd7140efd529d85ed336acfb398b262
-DIST buildbot-2.10.1.tar.gz 2271357 BLAKE2B 8320f12137b938b1a795857c2cc1e7427a19ebbb8fcd84f22142d2a37e92cf8211aa67afe42ec9f53ea2da3db621ababddb95794bdf5a0795de231a58f256cbb SHA512 6dd0bfb0d4747f3953cfbf73de6079f6fe5a75f4d7d072161f4de1209549df7732e216c859f7df69d6155e2df7c09c1667453973607ce3c8d0524c0433832873
-DIST buildbot-2.8.0-fakedb.tar.xz 16204 BLAKE2B 741676e2c9117b1ab174ce49747bdfcd07766ad3e471e308398dff476f167fd231b7772c2f02002cbafb27e2ef535242d84d5aa84f4bc8942d4d216b2d5bf1f6 SHA512 c2b00d8621b3a1e521f6c17e902ae331b606dda3d319187895f26629dbdaf50caefc5d49fb150fb780e682ae431515c7ded4950d62448e8a73b8efba821c0fa1
-DIST buildbot-2.8.2.tar.gz 3181035 BLAKE2B 40a3e424cc03c982549f25993a4abd2fe04bdc089ad22288af4d25724972f9f3541ef32549d2761c808845df44a972b00cf631adfc564bf4852c4b6b6ab14404 SHA512 7d7f15becc7fc1803ae4e9f1906d547c89dfe1efaa51e8fda0674a3d9b060bafbaae4cb671ec844750313247edb73f17c9014c545bce58070df0ca322a0fd9a2
-DIST buildbot-2.8.4.tar.gz 3134447 BLAKE2B 67052a060c9951e584a5e94f36b92262b9a1956c22efbce7ac17d83f93edde3d9443b00a7bc3afc5918006d68cc023ea0ae913e7bbf0e7cede0d9345992f83ae SHA512 45a6e6116ab5fec18b9b3a6d54886bcf86d3a821a79fd151f9311c8c3646c61051a194250395e203f02b9aa0161e12a9ca54b623897c74eee6133df752f1742c
-DIST buildbot-3.0.2.tar.gz 2221373 BLAKE2B 7f7e08375f0eb6eb0187dc734f0eefda5bc24c9bdce543cc6d094d67a211e909bff93d3a956b57cb14e800c52b7f05a2f823173becac37bd0a52790dfe158e1a SHA512 137ac6fdb7e1b67542c0a5b1d5c4736ebf9b6b7ffd5a2c18795eeec3a132abcad972252baabbf585efc3ed4bb14e61d8552c4d21ceff9c71823cca42613c6f5b
-DIST buildbot-3.1.0.tar.gz 2229027 BLAKE2B 27eaed470f18c4fe8cae1730ca92918352518263a5cc7c3affea070dc3c9890e88db81e2f0d70b1071da89a4df7fd34091ac9dd08b8d6933e568365859640c4e SHA512 2eb08af4c59b5268fb9d5dd3e5c6c4889542c39b7034aee7bb6151d4e24ce99a9c0a83ec303ca4110a55e8f7daa562ddc0debee83499984a3d9fa0fad965740c
-DIST buildbot-3.1.1.tar.gz 2229124 BLAKE2B c384b897a5f8816b7d6a52070cb1cce7e9b70d41a5837990af3474d3063a4906600f82c1bc6e6c48d826ac1f95dc36dcc15ebca10c9249615d25f547e0216dad SHA512 4f4194fab83bb80cff15366fb6461624b75c5a2d0e473ac9cb6a8abb372ccd7ee9208a944f198d874e8cd1a87358239ba3e8314d54ef35a641ff83510c48de37
-DIST buildbot-3.2.0.tar.gz 2245261 BLAKE2B ccb1dc5e6a6bf5c9e06a7b05cc1baa605b09cf65ad4f9beff2a40e9f52a3065363960a990c288ed181cc5cc5cf5af1ce06dd4df561ddfe9819165ebe32760887 SHA512 5730126786880eb48da140cbbaaac2df95e6d04d22268fb305c1a228969bd096cd18959779f6101af73c41fecb07a7c1e2bb276271bede53989323a46fb06962
-DIST buildbot-3.3.0.tar.gz 2255464 BLAKE2B 9b4cfdd948bdf4b183dc45973f26b41ec5b390740c92f3b29c460c8fba4f35b71eaf848b026b21e1ba1e213b18d6d91e3736b69aa8c3e6dbb847b04b644e2c54 SHA512 da0d26257964df40a470b00e2cd0f3f2230d3224bf8ae7c2b896fc8ec739e5d3ce7988ab07f6c66dcb13b0d4b6916e839f53a025cac637ccd4bcd3f442e12b1d
-EBUILD buildbot-2.10.0.ebuild 7097 BLAKE2B ec93bddfc15ff763693dfc1602e4e6687fd28b00aa2e69bce95ea37a7efeedc828958d55c2995e5b7f522909bc4894bf06f6133e14a108fcb1ca8823f304a7a1 SHA512 39e7cb03d27b32432d45637d3a976c49f4fc01f5ed8e2c104329acf52b2763bc3f5cba9dd86317f031b0bee654a80bd3b3a52a0b7407ce6e394821f2ff4d9a1b
-EBUILD buildbot-2.10.1.ebuild 7097 BLAKE2B ec93bddfc15ff763693dfc1602e4e6687fd28b00aa2e69bce95ea37a7efeedc828958d55c2995e5b7f522909bc4894bf06f6133e14a108fcb1ca8823f304a7a1 SHA512 39e7cb03d27b32432d45637d3a976c49f4fc01f5ed8e2c104329acf52b2763bc3f5cba9dd86317f031b0bee654a80bd3b3a52a0b7407ce6e394821f2ff4d9a1b
-EBUILD buildbot-2.8.2-r1.ebuild 7162 BLAKE2B d01e229b6927cd16b5b852db5758146e4a284e21a915459c140c023da215e5ab40da1cfb9a7f78baaa0d0c792cdd0bfd9caae5ccab408c6ca5caf70218a3bef5 SHA512 767eab00ef736e04bde1ca898b3f21224b89bc756175d1ca769bd947872fa90c204258d4a9dae4ec69bfd623e74533107c1ab14232940471e4901983039b6f37
-EBUILD buildbot-2.8.4.ebuild 7225 BLAKE2B 2b549d7cb6e8e7d90356fc9d648a0dd466f04909944beeeda8aed4a4a2c8df13d87fa2e316d791bbc614893948b906c96c4e5b06ff1bd715aa0bc11a308473d9 SHA512 551fe27d6b28ea82842b314be4182d9ec608551e87095db9ef4de4522a7499f2fe97ed1d626c718ef20e8c8cad6609b4a9de74e6c176ad14e0f9ef703ff7d037
-EBUILD buildbot-3.0.2.ebuild 7184 BLAKE2B 8b980199ed250d0675e3d99b93bc685466090841702af32277275e5a816d124d41636a6cb3ee319e8dd03c641f2880233b7bc9bb438b6f72b2008c99eb9c98a0 SHA512 6de57aec13afb5b5174851f25098b49d21a935244bde5960c2fc45c215fbacbc31816f485cec5fca6f2734241fe5eb5500effa8f06d0263d5a1428ac30a03e12
-EBUILD buildbot-3.1.0.ebuild 7229 BLAKE2B 4bb723ce898a5718529a171fa2391223b57b6713e0b20a44bd852f45aeac959367f4013d2bd59563a5b3d639f8ac8bbd57ecc4f4643cbbaf9953eba986fe0aff SHA512 d72650d98d9690d5012681eb78437030963987791d891eeaf80b444c5cde34148771d023d342fde63178f9cfc594bff1af3721911b7b6f1db518dd945857de57
-EBUILD buildbot-3.1.1.ebuild 7229 BLAKE2B 4bb723ce898a5718529a171fa2391223b57b6713e0b20a44bd852f45aeac959367f4013d2bd59563a5b3d639f8ac8bbd57ecc4f4643cbbaf9953eba986fe0aff SHA512 d72650d98d9690d5012681eb78437030963987791d891eeaf80b444c5cde34148771d023d342fde63178f9cfc594bff1af3721911b7b6f1db518dd945857de57
-EBUILD buildbot-3.2.0.ebuild 7158 BLAKE2B bd352fecf2ab837715d553304a48484a770b5e252d94159ab22cd29e402a55b73edaa1b18a14b3cb0ff8a8bcffbe086af2d07df29079e824cbb3b1bf2ff90ac5 SHA512 bb6127a7b9cd8e8aa5c49bed56fa5df61eee7ee7b524472deabb50083e89983a3decb8514b7917569b48398830fbc974a3468af4b14d058c3bef20f5357e985f
-EBUILD buildbot-3.3.0.ebuild 7158 BLAKE2B 462b19f4a31e79bc73ff6ba0c45be5a11be812d18afcf8f8d060a5309ba35c495e503dc1b42d59d9c8455854d7d2fd0af642d148b3deb7e8e1828a170f4b0990 SHA512 de6948f6f7596b633c61b1dc5fe3330566f2f09491ad291bfc18b4870a695ab4b4e01d1ef036e24d78d0efd7c560a285af5061adb707ab366f021bc911e3e974
-EBUILD buildbot-9999.ebuild 7179 BLAKE2B b82966f31a9783597485fc92271a916762bb2bbcf2af5a5c1bfbf48e321b90d2e10b1a4e4575086454b194083f59402eb73bf859cf2ce3e641dfecfa29ea157a SHA512 e979841f2dd909452ec11cf6723d74728a2fcb8bf9b87bd2aeef3381674930dde15e23454622069fd482e65c6f7933a5087333ec3c2072195034621d053be8ad
+DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
+EBUILD buildbot-3.4.0.ebuild 6527 BLAKE2B b5a47812e5fc3d1f10faaf389ba5dbb0729f930cfe386ed1420e17d35e482ac51030060296f028119a28b33a5779f9b0aade4afcc9dfc2afb7721193eae48b4a SHA512 dc342f1e033d5019f6b41fb40d92c07c648346e03a13e4efe3a1a11257b184990ab7e4cfcc0eb294b2864707e4c79bf0df699cd11046e4b3cbcd57af8c1d1c7f
+EBUILD buildbot-9999.ebuild 6432 BLAKE2B 815bc338ec0f9ff949d32ca02201c59b446bde86bfa9b8c9272b785425a53f4dbba30dc16204d20175b9b45f643bcbcb590a86b9457ad063cc4a10cf1d8e5729 SHA512 b46f1955b7a36d981f0cf4fe62925b3aaa93051b0e264c0f5acbb7fe9efb65ef68927f0510273dacad167db22b6ecc5ce6a21a387bc34a666cc47bdc8c16844d
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
diff --git a/dev-util/buildbot/buildbot-2.10.0.ebuild b/dev-util/buildbot/buildbot-2.10.0.ebuild
deleted file mode 100644
index c7c1f74b4a1c..000000000000
--- a/dev-util/buildbot/buildbot-2.10.0.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-
-IUSE="crypt doc docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests setup.py
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# missing files, so skip building
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null || die
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		HTML_DOCS=( docs/_build/html/ )
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-2.10.1.ebuild b/dev-util/buildbot/buildbot-2.10.1.ebuild
deleted file mode 100644
index c7c1f74b4a1c..000000000000
--- a/dev-util/buildbot/buildbot-2.10.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-
-IUSE="crypt doc docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests setup.py
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# missing files, so skip building
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null || die
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		HTML_DOCS=( docs/_build/html/ )
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-2.8.2-r1.ebuild b/dev-util/buildbot/buildbot-2.8.2-r1.ebuild
deleted file mode 100644
index b0700a3d10e5..000000000000
--- a/dev-util/buildbot/buildbot-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-
-IUSE="crypt doc docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-		"${FILESDIR}/pypugjs-2.8.0.patch"
-)
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null || die
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		HTML_DOCS=( docs/_build/html/ )
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-2.8.4.ebuild b/dev-util/buildbot/buildbot-2.8.4.ebuild
deleted file mode 100644
index e9d0a330e1ec..000000000000
--- a/dev-util/buildbot/buildbot-2.8.4.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-
-IUSE="crypt doc docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests setup.py
-
-PATCHES=(
-		"${FILESDIR}/pypugjs-2.8.0.patch"
-)
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# missing files, so skip building
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null || die
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		HTML_DOCS=( docs/_build/html/ )
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-3.0.2.ebuild b/dev-util/buildbot/buildbot-3.0.2.ebuild
deleted file mode 100644
index 36fb6b16cb7b..000000000000
--- a/dev-util/buildbot/buildbot-3.0.2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-
-IUSE="crypt doc docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/ldap3[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests setup.py
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# missing files, so skip building
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null || die
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		HTML_DOCS=( docs/_build/html/ )
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-3.1.0.ebuild b/dev-util/buildbot/buildbot-3.1.0.ebuild
deleted file mode 100644
index 01cb4bce9603..000000000000
--- a/dev-util/buildbot/buildbot-3.1.0.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE="crypt doc docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/unidiff[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/ldap3[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests setup.py
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# missing files, so skip building
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null || die
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		HTML_DOCS=( docs/_build/html/ )
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-3.1.1.ebuild b/dev-util/buildbot/buildbot-3.1.1.ebuild
deleted file mode 100644
index 01cb4bce9603..000000000000
--- a/dev-util/buildbot/buildbot-3.1.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE="crypt doc docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/unidiff[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/ldap3[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests setup.py
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# missing files, so skip building
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null || die
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		HTML_DOCS=( docs/_build/html/ )
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-3.2.0.ebuild b/dev-util/buildbot/buildbot-3.2.0.ebuild
deleted file mode 100644
index dfef67930503..000000000000
--- a/dev-util/buildbot/buildbot-3.2.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
-
-IUSE="crypt doc docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/unidiff[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/ldap3[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-distutils_enable_tests setup.py
-
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	# missing files, so skip building
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null || die
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		HTML_DOCS=( docs/_build/html/ )
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	local log_path="/var/log/buildmaster"
-
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	local instance_log_path="${log_path}/${instance_name}"
-
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-3.3.0.ebuild b/dev-util/buildbot/buildbot-3.4.0.ebuild
index 1a848207da31..b06b7fb40d3f 100644
--- a/dev-util/buildbot/buildbot-3.3.0.ebuild
+++ b/dev-util/buildbot/buildbot-3.4.0.ebuild
@@ -1,48 +1,47 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+EAPI=8
 
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
 inherit readme.gentoo-r1 systemd distutils-r1
 
 MY_PV="${PV/_p/.post}"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
 
-IUSE="crypt doc docker examples irc test"
+IUSE="crypt docker examples irc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
 	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
+	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
 	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
 	dev-python/pyjwt[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/unidiff[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
 	)
 	irc? (
 		dev-python/txrequests[${PYTHON_USEDEP}]
@@ -52,55 +51,38 @@ RDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 	)
 "
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
+BDEPEND="
 	test? (
-		dev-python/ldap3[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
+		${RDEPEND}
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
 		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
 		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+		dev-python/ldap3[${PYTHON_USEDEP}]
 		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
 		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
 		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
 	)"
 
-S=${WORKDIR}/${MY_P}
+DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+to support starting buildbot through Gentoo's init system. To use this,
+execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+The scripts can	run as a different user if desired."
 
-distutils_enable_tests setup.py
+src_prepare() {
+	# disable all warnings as errors
+	sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die
 
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
+	distutils-r1_src_prepare
 }
 
-src_compile() {
-	distutils-r1_src_compile
-
-	# missing files, so skip building
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null || die
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null || die
-	fi
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
 }
 
 src_install() {
@@ -108,13 +90,8 @@ src_install() {
 
 	doman docs/buildbot.1
 
-	if use doc; then
-		HTML_DOCS=( docs/_build/html/ )
-	fi
-
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
+		dodoc -r docs/examples
 	fi
 
 	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index dcf36e3727e7..0f755c2b1c80 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -1,50 +1,42 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7,8,9} )
+EAPI=8
 
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit git-r3
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
+inherit readme.gentoo-r1 git-r3 systemd distutils-r1
 
 DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot/"
+S="${S}/master"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-
-IUSE="crypt doc docker examples irc test"
+IUSE="crypt docker examples irc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
 	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
 	dev-python/pyjwt[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/unidiff[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
 	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
 	)
 	irc? (
 		dev-python/txrequests[${PYTHON_USEDEP}]
@@ -54,54 +46,38 @@ RDEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 	)
 "
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
+BDEPEND="
 	test? (
-		dev-python/ldap3[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
+		${RDEPEND}
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
 		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
 		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		dev-util/buildbot-pkg[${PYTHON_USEDEP}]
-		dev-util/buildbot-worker[${PYTHON_USEDEP}]
-		dev-util/buildbot-www[${PYTHON_USEDEP}]
+		dev-python/ldap3[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
 	)"
 
-S=${S}/master
+DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+to support starting buildbot through Gentoo's init system. To use this,
+execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+The scripts can	run as a different user if desired."
 
-distutils_enable_tests setup.py
+src_prepare() {
+	# disable all warnings as errors
+	sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die
 
-pkg_setup() {
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
+	distutils-r1_src_prepare
 }
 
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null || die
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null || die
-	fi
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
 }
 
 src_install() {
@@ -109,14 +85,8 @@ src_install() {
 
 	doman docs/buildbot.1
 
-	if use doc; then
-		HTML_DOCS=( docs/_build/html/ )
-		# TODO: install man pages
-	fi
-
 	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r docs/examples
+		dodoc -r docs/examples
 	fi
 
 	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 0494586f9c2c..2cc2674b2923 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,6 @@
 DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
-DIST catalyst-3.0.20.tar.bz2 620395 BLAKE2B 24e1e1def627bccebea4da7b4c0f787d1b7e06cc3a830847896d71e997d859ecc2131a85d328f2d58226bbf2d459ca349d50b1af68b95bb06bfe8e1843f4c4aa SHA512 f2f2b0003a70b7843006155edca0971508d19199dfe803b85477d2f2fd0365304b9e65531cc19bfb06b83fa98dac11960b72001e899bed0f9b55c0f6881a853e
+DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c
 EBUILD catalyst-3.0.18.ebuild 1921 BLAKE2B e6816716661490d98271f79ae6f78a48394df34f6ba1e3a0ee504d0fbd218861b135ca7b82136c2ebe4ce5b29efc9c0a2527fc5d362342ffc49159588fa65084 SHA512 05ed3e0a88ac4f70a71efa372b9ffb28b4b6fe51299aecbcabb386176ecccfbdc35de12341bc4f93a08e3768d04315824460c4e776a6b1e4e717876c68b62ffe
-EBUILD catalyst-3.0.20.ebuild 1918 BLAKE2B 6ea62e94157d650de3a91e8ab1d2b7d32e85d5289826dd23508a166f6c65aaf13515f2b2901b8ae4ccb6a8287897e9f6072c40b104a320a5a4b0a3557b6bbd57 SHA512 8782d03208dcf3b278e7a377aece147b745b7bb67ce634db807f7c4ce871c85c17a90d7fac35ef0762ea46e69b2136dfe7d695161bf8c59499a398cff5c57cb1
-EBUILD catalyst-9999.ebuild 2274 BLAKE2B 07e21a527e4b5724991af355fb60038e70e4f06977b9b9b0efc009a90aef7a9edfb4b8fb300c51189392b98df876c25f1390915ee12537a7635eab30899437b5 SHA512 d90235cc0e6257121f2734dfe3924294b4a8feff2a77618e1212373e538d8b234b9f7418c0830df579bb2b5f9a512b4cd353f80d5171d494fad8260ef7c2200c
+EBUILD catalyst-3.0.21.ebuild 1925 BLAKE2B 3e2b9596933c4deda234a6891f3f0852e6d98d30dfe5ac4c096d1036662b16a78ec92a6ab401aa51db5300e3a02c513f0c9e1a03aaf9eaae9049c31df9e5d5d5 SHA512 368fb12323423ce2aa85d329a9cbcbb616966e6185af1693d0eb42ff5eb6c72412415b083cb2599565a5342fbbf9e2016992b875c619c01cc60ccaefd5b9e7a8
+EBUILD catalyst-9999.ebuild 2276 BLAKE2B c9c69540cb30c045e86318b58b94cc103cca96b5decb7a9bfce1a375d30d92a15cfb3b6292aa38f23de7031dbd3f9202261080ed522a214044821c1e438e802f SHA512 8c065eb89b69bbf42a8a716ca8062d4b5968a29dad635ba01b2403bc92cc77c383726e9993dcf58bcdd0efb2ac7ada5c7a6e7f0c13e292f42263a605763cb35b
 MISC metadata.xml 513 BLAKE2B 22190e4d7fa9f6ff81681614aad1ae622462418be7fbdb6ecb11bf14f884b6520592a8125a5896ff27de788824a98a0005853ad54ed8fcb39daddec570924551 SHA512 a47a00346b514a42add12c5d0d83d712e1cd28e1737ba4c3a1ebc710ad4a0cab365c969e2da5e78f675a5a5ecdeef8925fae53a80ca8d22df6cf74d89efdf1c4
diff --git a/dev-util/catalyst/catalyst-3.0.20.ebuild b/dev-util/catalyst/catalyst-3.0.21.ebuild
index 8bf7848b4cc1..282eccf985ea 100644
--- a/dev-util/catalyst/catalyst-3.0.20.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.21.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == *9999* ]]; then
 	SRC_ECLASS="git-r3"
@@ -9,10 +9,10 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	# KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 ${SRC_ECLASS}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 96c71919d029..494d05142502 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 linux-info optfeature ${SRC_ECLASS}
@@ -31,7 +31,7 @@ DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 	dev-python/fasteners[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/tomli[${PYTHON_USEDEP}]
 	sys-apps/util-linux[python,${PYTHON_USEDEP}]
 "
 RDEPEND="
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index 3d6da66631cb..4dfcba609a3e 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,6 +1,4 @@
-DIST ccls-0.20201219.tar.gz 160445 BLAKE2B 8d3f536ec13673e7251f09de992f24d88066787442940e3e0913ee201111e97c0d145d8a57b4fcdfeaa886fd5bf5e5be621ef54e307cd08cca8e516103a9c573 SHA512 fba8cc1ec50e55939b2deb167d9d32e946ccab4b322766191a787719b47a39e887afad26b7364dfb40c4a4f2522964af76fc7f51a5d84c10d2b0125f07a19c5e
 DIST ccls-0.20210330.tar.gz 160487 BLAKE2B f87539a5e726a8742552d811d741c379d62c146bed835c7fa8d32ab5eb1f609513f80051faf07bbb8e346f176c02ab3e54b3446d5e28dae744468f2209a9d037 SHA512 dd78c040c2a51d6b47f8dd2d8bdc0661111f26b9233ffeb41216254b1b0ad0f634190784e6b8c2d7b36475c13020356342d83a9f80047d7da75ce21ca8885b16
-EBUILD ccls-0.20201219.ebuild 750 BLAKE2B b3389e27c7e55d4e29d71a363f1de355bde157d9e45d2c38cfc840ad9c5a3e5dfed6f463ffa52232957b2747297a8324b2440ec05fade52bd8e02f2438f925b7 SHA512 dfcfec985ed57785ae78c73828885e1077c3e2bf8c2033fee15b5ed94d1336970cf4be16799d5e2719cf7c7e02a70ebd85290c9fdd489852c57a947214740775
 EBUILD ccls-0.20210330.ebuild 750 BLAKE2B b3389e27c7e55d4e29d71a363f1de355bde157d9e45d2c38cfc840ad9c5a3e5dfed6f463ffa52232957b2747297a8324b2440ec05fade52bd8e02f2438f925b7 SHA512 dfcfec985ed57785ae78c73828885e1077c3e2bf8c2033fee15b5ed94d1336970cf4be16799d5e2719cf7c7e02a70ebd85290c9fdd489852c57a947214740775
 EBUILD ccls-9999.ebuild 750 BLAKE2B b3389e27c7e55d4e29d71a363f1de355bde157d9e45d2c38cfc840ad9c5a3e5dfed6f463ffa52232957b2747297a8324b2440ec05fade52bd8e02f2438f925b7 SHA512 dfcfec985ed57785ae78c73828885e1077c3e2bf8c2033fee15b5ed94d1336970cf4be16799d5e2719cf7c7e02a70ebd85290c9fdd489852c57a947214740775
 MISC metadata.xml 324 BLAKE2B 83e4ab413a926db1ddf998ec8e5566a9a58fc2b3472b9d137356ebf3c08d4ca888a5252baeb0e10f298e31eca4bb4ea1a9b67c752590807be3ce27f8b3742327 SHA512 00dfaff2972f7ea5df02c207b8211475acafcbba5bef4c5ce3ceb09924db2bb3f009e155aab43866903e7442008d058261f07464f43f9295a4d1be6ed0cfec02
diff --git a/dev-util/ccls/ccls-0.20201219.ebuild b/dev-util/ccls/ccls-0.20201219.ebuild
deleted file mode 100644
index 377cc36c8068..000000000000
--- a/dev-util/ccls/ccls-0.20201219.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit cmake ${GIT_ECLASS}
-
-DESCRIPTION="C/C++/ObjC language server"
-HOMEPAGE="https://github.com/MaskRay/ccls"
-
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-libs/rapidjson
-	sys-devel/clang:=
-	sys-devel/llvm:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCCLS_VERSION=${PV}
-		-DUSE_SYSTEM_RAPIDJSON=ON
-		-DCLANG_LINK_CLANG_DYLIB=1
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index e02ac1bfa524..9708d75d6dd9 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,7 +1,10 @@
 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-0.8.0-ar.patch 469 BLAKE2B e0633baffddab3d298f1a5ef7bb6c39138a01f639d58121fc4d52fc2b5aa1244fb6ebb848fb301f71f8bd5a2ab629c7fd0771e3bc73bc999c12e0f4b5dc48164 SHA512 e0c60ea8f3c5e89071e38f5b3b42c54a6f1cb39715c0b77fd72c6c7453da1ff16c2edced39a788b905400f635ed4a74e9b531b3e72879fa3c62b949bb1e1147d
+AUX cgdb-9999-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
+DIST cgdb-0.8.0.tar.gz 328281 BLAKE2B 60e577dd5f8363b91da33136a9ffd911581e9cea4cdc1d0fcd338e0a761a26921e6edf6298c619b8d0eb1486449843457b2c5370a395a8c49fed5382a60e63a2 SHA512 e2b653db472de2014402dae6d13953ab811526a47ad5d7a05e34cfba09f44d6fea6b19304b9205ff0e2ac9549ffa5818f4282d7c03293b6c0ca9d563f9ae89e1
 EBUILD cgdb-0.7.1.ebuild 1541 BLAKE2B 9ec609c8cd1a8f9b5c89e3ccb160119a5bfc3f31171f056aea03060789cf1813df45702c727600049d76324c548f9f292dc41423b2539b9a3391db9c4264a287 SHA512 647bef5ac18b1f0ba19bbf4e3b2148f760c564cd7f74e4a66721c2417ce46a1605331e29f19615fbc1e843419e8955b42da70494f2c78a770162466c5b072ce0
-EBUILD cgdb-9999.ebuild 1398 BLAKE2B 3e153439307e809ab81f30c9c1d4c4b6f8a1d92cd8a2f2026891b9257a5f4e00e157f342a845a5d2425b658f6633d69393a2ef99856209da343242f1a25b3d74 SHA512 fce4d64f769b1c4d55859514bee9a9f77b05f5e97a2a372baf9ad9f3dcf3ea83ba88340c6aeb4aac996fa66e8535a901a7544852fdd2314bcf60319e619d71dd
-MISC metadata.xml 371 BLAKE2B 374f6b79292f6bcb5e4fb612d7c72e888be0f32d1ef10cda456b168dbd6ae0f6297ba9d508b86c01c1ba2bc979e9466be9dbce776451ba368a9c558cd50ace88 SHA512 139e032fe97e70d530940ef728124a177647c6012263adcf25afba829c5cfbfe9b2bc2cf0a230ea1b93d1628976b3620650d7aefd16a1bb23646b081db2541db
+EBUILD cgdb-0.8.0.ebuild 1475 BLAKE2B acdb9fb5b71f846519346a6492707c961d6f28ff3699f6410c460d1314cec77f64dbd063866060f4d3934f6e980a77b2aea2dbaa740422a83222a2e1d8b1cef0 SHA512 8e7546a49e732727c88aadb3672aea19d75ff41ab2afcd891c821619ab07802178b0e94f7e916e3a5147c95869f2eb538aa1d4dd74c2c8e8b46b28e80d2d610d
+EBUILD cgdb-9999.ebuild 1475 BLAKE2B acdb9fb5b71f846519346a6492707c961d6f28ff3699f6410c460d1314cec77f64dbd063866060f4d3934f6e980a77b2aea2dbaa740422a83222a2e1d8b1cef0 SHA512 8e7546a49e732727c88aadb3672aea19d75ff41ab2afcd891c821619ab07802178b0e94f7e916e3a5147c95869f2eb538aa1d4dd74c2c8e8b46b28e80d2d610d
+MISC metadata.xml 291 BLAKE2B 10d0b1b36ae41f63a8dac8cae9860c08141b6bddad3672fa8f6649cdc50e545ee2c8f1ebd800b4026dd32dfa5e8545380a68765d5539617d971229e90535407b SHA512 b7dcb0521d63080ce670d3195bd56fe54af7d3fa3d2f0f2eaee2f1ee93a14106facffb67f1e82ff49768c90133ceaf7dc57df089b86a98f67007df1089471d77
diff --git a/dev-util/cgdb/cgdb-0.8.0.ebuild b/dev-util/cgdb/cgdb-0.8.0.ebuild
new file mode 100644
index 000000000000..416db639d484
--- /dev/null
+++ b/dev-util/cgdb/cgdb-0.8.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/cgdb/cgdb.git"
+else
+	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A curses front-end for GDB, the GNU debugger"
+HOMEPAGE="https://cgdb.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+# Tests are broken, need additional research to figure out the cause
+# Bug: https://bugs.gentoo.org/831899
+RESTRICT="test"
+
+DEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+
+BDEPEND="
+	test? (
+		dev-util/dejagnu
+		app-misc/dtach
+	)"
+
+RDEPEND="
+	${DEPEND}
+	sys-devel/gdb"
+
+DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ar.patch
+)
+
+src_prepare() {
+	default
+	AT_M4DIR="config" eautoreconf
+}
+
+multilib_src_test() {
+	# Tests need an interactive shell, #654986
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index 75f88b51bff1..416db639d484 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 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"
 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"
@@ -15,16 +15,17 @@ inherit autotools multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
 HOMEPAGE="https://cgdb.github.io/"
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
-RESTRICT="!test? ( test )"
+# Tests are broken, need additional research to figure out the cause
+# Bug: https://bugs.gentoo.org/831899
+RESTRICT="test"
 
 DEPEND="
-	sys-libs/ncurses:=
+	sys-libs/ncurses:0=
 	sys-libs/readline:0="
-RDEPEND="${DEPEND}
-	sys-devel/gdb"
 
 BDEPEND="
 	test? (
@@ -32,11 +33,14 @@ BDEPEND="
 		app-misc/dtach
 	)"
 
+RDEPEND="
+	${DEPEND}
+	sys-devel/gdb"
+
 DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 
 PATCHES=(
-	# Bug: #724256
-	"${FILESDIR}/${P}-respect-AR.patch"
+	"${FILESDIR}"/${P}-ar.patch
 )
 
 src_prepare() {
diff --git a/dev-util/cgdb/files/cgdb-0.8.0-ar.patch b/dev-util/cgdb/files/cgdb-0.8.0-ar.patch
new file mode 100644
index 000000000000..128c32ec238c
--- /dev/null
+++ b/dev-util/cgdb/files/cgdb-0.8.0-ar.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/724256
+Patch taken from https://github.com/cgdb/cgdb/pull/142
+--- 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/cgdb/files/cgdb-9999-respect-AR.patch b/dev-util/cgdb/files/cgdb-9999-ar.patch
index ed5f200b3260..ed5f200b3260 100644
--- a/dev-util/cgdb/files/cgdb-9999-respect-AR.patch
+++ b/dev-util/cgdb/files/cgdb-9999-ar.patch
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index 8b25c5b76d4d..6dfc01c9d272 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jsmolic@gentoo.org</email>
-		<name>Jakov Smolić</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">cgdb/cgdb</remote-id>
 		<remote-id type="sourceforge">cgdb</remote-id>
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index aa07473e1594..c035a7cdfbda 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,10 +1,8 @@
 AUX clazy-1.10-gcc-build.patch 1571 BLAKE2B a6409a491fc142690fe34d15415a4bd0aa90052cfc900d45fa81fc679497cff979d4c9e63319f315a97f3395fad8f39b1aaea30bbff994ab7e0c6af4f8545be0 SHA512 1ecfa3d9899f685996933f3f1d476537e942f37cb4f28d46c87bb5c14575d403407beac4a091966225e00d495a9d5aaedaea88e313fdad1396e14e5adaf0c59d
 AUX clazy-1.10-llvm-earlier-than-12.patch 692 BLAKE2B 40b2920f7017031f99603cbeb5f823445309dbf3bd774cb59c70ef15f556f15835f49143ed884be36620adf61511075ce338c9517fcca8ad16af0a66815999d9 SHA512 56e5d9b44ab9661d4a1bf2e550f12a683d119bf6f784287f64971a76d50009a5fa85950f86307887428a8a929da05ea067b1c15a0fd9dd271e0a8655cc0c2a32
 AUX clazy-1.10-use-c++17.patch 1159 BLAKE2B e7ec20f4c879d13046499f308c732e966a9c75ae23ffd6657a61b8472974aadee947f5ac0ce4a246589d2c2e4f22f63db8ebb90b31df28cdc66b75e347df8661 SHA512 67d3ab6a87217e8ca5da68789d06b771cda6ccae8fd69d36ca60f6b68edfeb87078ed169844a10943340789e5452a470f3040d854f38a3ad003f7e688835977d
-AUX clazy-1.9-llvm12.patch 3056 BLAKE2B 7c090b17a3a598075fdcaec04df4efc0fb6c2a8d496cc8a9bc3b345eb8bc8f59c6aa4a8d7036c6c6717c5da05d5acd22544a86e0c711cb5f94e3433ffd871351 SHA512 42775ac235092241419315e4282dd7cd5953b55db0b58826ce50ae4a4520833e6575a17d6ace9ea559240bc29d033ad1b16af1f5fb5aed7f751a03e07650e7a5
-AUX clazy-1.9-llvm13.patch 1098 BLAKE2B 6933e7f9e159e4e4d10bcacf67a7f384ca1782d84606e2cde85e4f2bc5007f25e1fef96129de366c9be013ef2f602f7e34a4388576b404c0a913625de99992bf SHA512 a8d4c59236b9329ad1a0db4fc3a21eebc16faa19888c21f6fdf53a3d242dfc955f0902ba95e38f1f0666524d926611b353925e4519e60cca7d6e5d69a3f107f4
 DIST clazy-1.10.tar.xz 398920 BLAKE2B 1cdc160de21363c7dc9c93ea7e780412a4971b18e97c7ec6e06f1c7450c56e0fbbdb7592d6b92ae53e4c161f6d9abca205984f83b68646f04ea11d63e3c45fa6 SHA512 59dd8c6903bcc239dfc356804cab265597a771de3858a6add4877149e0e7875b3c9ddae9aeec889c9102fb9ec6b0125bb8a786344e47872b01ba87425ba021eb
-DIST clazy-1.9.tar.xz 394856 BLAKE2B 641ca46a31475cf7bd03ba921e390cb2712362dc97b960a519e05c47049927f805d3ef6f1c756b96d3483e8f4b75e2dc41a2419a462ed2e45cbd08c88c07f933 SHA512 2e8bec44a027366263de23c50d14192e310fd38fa2b369afb21413da9cb78da9882b2153daf1784c4c9076cc62e2867b5211c75ff9a1eabcb583e405f20f5912
-EBUILD clazy-1.10-r2.ebuild 1302 BLAKE2B 0df22a8367cfd50acd840237d26b0b1716515bbf02e6bf7cb267cfc86192e1603dde0ed000dc30f0d4d96f27467280a013669207780cad37759810247800af15 SHA512 df2f27b443ecf45387d3ec350a66f2f5e2f4ba4606bbe9cc121cbbbdacf9d34c10d116127c6a6d7661c8699cd4286311a1a01da4f3105db45631d09327bfde1f
-EBUILD clazy-1.9.ebuild 1048 BLAKE2B 19aab05c1a0ea51e60164834cd1d18c22537a35224258d5e37bee821b384efa90bbfe98b38362ebed62c667c8ec3e0947cd1ea5ebb2517f1d8ca4f621a135859 SHA512 5a1adc300ca1fd975e07b97b4fb5bce068c2b99afbbdb5701df327060bea1f2afbb77d00bb2ba5d9be795c84641ee235ab076c1a83f1075ad0ecddce260705dd
+DIST clazy-1.11.tar.xz 404088 BLAKE2B 1a69fe07ef81a0efe3c9db9129083247d60943592967f705d62d3859039cec250673eecc06184f70d134cbab85708d957b0a085beff8b3e46325a69547e005b7 SHA512 6a7c162392dd30aea29669275cea814d6daccf7931b8cdb20997f9bbff5619832d5461a6d0f854ecbc4726e52b6937c4f9cb8651087ffe73676c04239a38ca2b
+EBUILD clazy-1.10-r2.ebuild 1301 BLAKE2B 6e66f772f4f98db3fc824b18da18c69b28a593a251909cb8f200ca92b6708be851172b7ab3e8aabb582c3b7e5b03b3fc0de22859cc7c56fba83c7ca898e85ea4 SHA512 03124499d436fb114c1f751889d9a97bcf0287e7221b01e0cfdb8dde3e8caa9d07dbea4018e0418fa05fbf8915ee6d21e5936e7f192db91c2de2144cdf94b109
+EBUILD clazy-1.11.ebuild 1172 BLAKE2B 341d0d12e7712aebf2e45e2dd9ee4f3665adf8a007f2c0a959536d264def2cedabe0adf05eae47c08c4a5cf0fa490a9f028effa35fc747a07755955112542df6 SHA512 55d68604268ec8d1471b5319c5405e0d7c257e53ef117a4c857a8a7a1951862620c63e2b43010fc4aceff61d5bc54cb2567bdbadaddb77f7b3b7edcfd0eda390
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/clazy/clazy-1.10-r2.ebuild b/dev-util/clazy/clazy-1.10-r2.ebuild
index bcb85e9d4148..077cb9c6224d 100644
--- a/dev-util/clazy/clazy-1.10-r2.ebuild
+++ b/dev-util/clazy/clazy-1.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/clazy/clazy-1.11.ebuild b/dev-util/clazy/clazy-1.11.ebuild
new file mode 100644
index 000000000000..b69ab9ff5253
--- /dev/null
+++ b/dev-util/clazy/clazy-1.11.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=13
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit cmake llvm python-any-r1
+
+DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
+HOMEPAGE="https://apps.kde.org/clazy"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):="
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}" && has_version "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+
+	llvm_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	export LLVM_ROOT="$(get_llvm_prefix -d ${LLVM_MAX_SLOT})"
+
+	cmake_src_configure
+}
+
+src_test() {
+	# Run tests against built copy, not installed
+	# bug #811723
+	PATH="${BUILD_DIR}/bin:${PATH}" LD_LIBRARY_PATH="${BUILD_DIR}/lib" cmake_src_test
+}
diff --git a/dev-util/clazy/clazy-1.9.ebuild b/dev-util/clazy/clazy-1.9.ebuild
deleted file mode 100644
index 781b51040559..000000000000
--- a/dev-util/clazy/clazy-1.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://apps.kde.org/en/clazy"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=sys-devel/clang-5.0:=
-	>=sys-devel/llvm-5.0:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-llvm{12,13}.patch ) # bug 786525
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	# this package requires both llvm and clang of the same version.
-	# clang pulls in the equivalent llvm version, but not vice versa.
-	# so, we must find llvm based on the installed clang version.
-	# bug #681568
-	local clang_version=$(best_version "sys-devel/clang")
-	export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-	cmake_src_configure
-}
diff --git a/dev-util/clazy/files/clazy-1.9-llvm12.patch b/dev-util/clazy/files/clazy-1.9-llvm12.patch
deleted file mode 100644
index 3862f40ad981..000000000000
--- a/dev-util/clazy/files/clazy-1.9-llvm12.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2592a6e3393ebc75e16c91e606ad2015a16295c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20Sch=C3=A4rf?= <c.schaerf@t-online.de>
-Date: Sat, 23 Jan 2021 15:34:10 +0100
-Subject: [PATCH] Fix build with Clang 12
-
-Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6b7bb31e7ef059a3d238de138849839fbbd and https://github.com/llvm/llvm-project/commit/d758f79e5d381bd4f5122193a9538d89c907c812
----
- src/SourceCompatibilityHelpers.h | 26 ++++++++++++++++++++++++++
- src/SuppressionManager.cpp       |  5 ++---
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
-index 4db141ab..1737d5a5 100644
---- a/src/SourceCompatibilityHelpers.h
-+++ b/src/SourceCompatibilityHelpers.h
-@@ -29,6 +29,7 @@
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/SourceManager.h>
- #include <clang/Frontend/FrontendDiagnostic.h>
-+#include <clang/Lex/Lexer.h>
- #include <clang/Tooling/Core/Diagnostic.h>
- 
- #if defined(CLAZY_USES_BOOST_REGEX)
-@@ -103,6 +104,31 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
- #endif
- }
- 
-+inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
-+{
-+#if LLVM_VERSION_MAJOR >= 12
-+    auto buffer = sm.getBufferOrNone(id);
-+    *invalid = !buffer.hasValue();
-+    return buffer;
-+#else
-+    return sm.getBuffer(id, invalid);
-+#endif
-+}
-+
-+#if LLVM_VERSION_MAJOR >= 12
-+inline clang::Lexer getLexer(clang::FileID id, llvm::Optional<llvm::MemoryBufferRef> inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile.getValue(), sm, lo);
-+}
-+#else
-+inline clang::Lexer getLexer(clang::FileID id, const llvm::MemoryBuffer *inputFile,
-+                             const clang::SourceManager &sm, const clang::LangOptions &lo)
-+{
-+    return clang::Lexer(id, inputFile, sm, lo);
-+}
-+#endif
-+
- }
- 
- #endif
-diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp
-index 9d774ea6..9881388d 100644
---- a/src/SuppressionManager.cpp
-+++ b/src/SuppressionManager.cpp
-@@ -24,7 +24,6 @@
- #include "clazy_stl.h"
- 
- #include <clang/Basic/SourceManager.h>
--#include <clang/Lex/Lexer.h>
- #include <clang/Basic/SourceLocation.h>
- #include <clang/Basic/TokenKinds.h>
- #include <clang/Lex/Token.h>
-@@ -84,7 +83,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-     Suppressions &suppressions = (*it).second;
- 
-     bool invalid = false;
--    auto buffer = sm.getBuffer(id, &invalid);
-+    auto buffer = clazy::getBuffer(sm, id, &invalid);
-     if (invalid) {
-         llvm::errs() << "SuppressionManager::parseFile: Invalid buffer ";
-         if (buffer)
-@@ -92,7 +91,7 @@ void SuppressionManager::parseFile(FileID id, const SourceManager &sm, const cla
-         return;
-     }
- 
--    Lexer lexer(id, buffer, sm, lo);
-+    auto lexer = clazy::getLexer(id, buffer, sm, lo);
-     lexer.SetCommentRetentionState(true);
- 
-     Token token;
--- 
-GitLab
-
diff --git a/dev-util/clazy/files/clazy-1.9-llvm13.patch b/dev-util/clazy/files/clazy-1.9-llvm13.patch
deleted file mode 100644
index 9bbac8f7624d..000000000000
--- a/dev-util/clazy/files/clazy-1.9-llvm13.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0bf4e428c76270f4534a0a8df3cf6912157f22ab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjoern@hazardy.de>
-Date: Sat, 17 Apr 2021 20:57:10 +0200
-Subject: [PATCH] Fix build with LLVM 13
-
----
- src/ClazyStandaloneMain.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/ClazyStandaloneMain.cpp b/src/ClazyStandaloneMain.cpp
-index 41c4fcf9..7b4cf5d3 100644
---- a/src/ClazyStandaloneMain.cpp
-+++ b/src/ClazyStandaloneMain.cpp
-@@ -158,7 +158,13 @@ llvm::IntrusiveRefCntPtr<vfs::FileSystem> getVfsFromFile(const std::string &over
- 
- int main(int argc, const char **argv)
- {
--    CommonOptionsParser optionsParser(argc, argv, s_clazyCategory, cl::ZeroOrMore);
-+    auto expectedParser = CommonOptionsParser::create(argc, argv, s_clazyCategory, cl::ZeroOrMore);
-+    if (!expectedParser) {
-+       llvm::errs() << expectedParser.takeError();
-+       return 1;
-+    }
-+
-+    auto &optionsParser = expectedParser.get();
-     // llvm::errs() << optionsParser.getSourcePathList().size() << "\n";
- 
-     if (s_supportedChecks.getValue()) {
--- 
-GitLab
-
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 3502ec9e3c9f..82fd300aaa27 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST CLion-2021.3.tar.gz 741453727 BLAKE2B 0bcc79df3180256732523df6acf34f7eecbd08f87427f41796ebef342d71d4a0643770fd8e08c25dbd7e96360e72806f7fe1b57a199cc7fd53ad34cb85ff1d74 SHA512 d4b9f8b8cf8f218c45a568498630216f55540b2094ec7fe2a36f04478ff713c34dc7431da3824da44c61ae999b475a4ae7d4c7c9c7e02d0ca0ab6520ecf8cedb
-EBUILD clion-2021.3.ebuild 2729 BLAKE2B 22f31e2c8f729e91906c7172b2b75c1e377ad5a45bb22791cfc98328a9ebe99005008fccae1fb3346c23f672edba7dd1483aeb0d94945c17143f7499e75bba47 SHA512 4b3800178d3fcf97be336e1ccf6fc93f3a59f153a17d3c30fbbf2ef30d850df1512989c42b45cbab3ee0feddb8d58147ca56e8259b7e494078a4cfafaf09863a
+DIST CLion-2021.3.2.tar.gz 747081798 BLAKE2B 68be520b06e2d59d3a240b03e8e64cdd0a96e96022fc72fd531813fe0d417055b58d36a6a5a0360e3121cbb111ccdecf96b25778e2368fb21b92f404013a4604 SHA512 6c965c745588e49fcb3c2ecadcca38817884bd3f830d6b5f1042a6edff5687419fc2375bb41063c808c894588c371d2a860a75ceed86a187eec7fd9fce380678
+EBUILD clion-2021.3.2.ebuild 2849 BLAKE2B 51a2f0ef88dd87c161b08db57b09ddf2f43d942f0af65ac4d0ffa984e73f6bab989a1f1920c3ef6ced2a2a712883380c16799ce38c3d3cfba2201932b2925d0f SHA512 1cdde32c528042a43cfeffb0a0ac297e6b3614ec19afe7c8e78f25b6b3cc8c666cdab1a587e18cace829a67461fdef4e1b496e5e0fbfdc026da63a33f0f521e8
 MISC metadata.xml 402 BLAKE2B a74ce91089fa83dc91f1878f17b0e2adc483fdfdd987eb2dd4b184b2a98b8f1d995ab5d2c4dca2d7f25d3a8e1dfec711625e980feb5a0422fe5635c5816ef4fe SHA512 6d425358265cac8deb12c18632cfe520d82a733e4caab71eeb89b6d6643eddbfa27df03fcd8111477a77efea136aca1093c84024c89b85dc66ce1b92633709c6
diff --git a/dev-util/clion/clion-2021.3.ebuild b/dev-util/clion/clion-2021.3.2.ebuild
index daf59355c8c4..93132025c95b 100644
--- a/dev-util/clion/clion-2021.3.ebuild
+++ b/dev-util/clion/clion-2021.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,6 +30,7 @@ RDEPEND="
 	dev-libs/nspr
 	dev-libs/nss
 	dev-util/cmake
+	dev-util/ninja
 	media-libs/alsa-lib
 	media-libs/freetype:2
 	media-libs/mesa
@@ -58,14 +59,15 @@ src_prepare() {
 	default
 
 	local remove_me=(
-		bin/gdb/linux
-		bin/lldb/linux
 		bin/cmake
+		bin/lldb/linux
+		bin/gdb/linux
 		license/CMake*
 		lib/pty4j-native/linux/aarch64
 		lib/pty4j-native/linux/arm
 		lib/pty4j-native/linux/mips64el
 		lib/pty4j-native/linux/ppc64le
+		plugins/remote-dev-server/selfcontained
 	)
 
 	use amd64 || remove_me+=( lib/pty4j-native/linux/x86_64)
@@ -86,7 +88,7 @@ src_install() {
 
 	insinto "${dir}"
 	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,clang/linux/{clangd,clang-tidy,clazy-standalone}}
+	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier,inspect.sh,ltedit.sh,repair,clang/linux/{clangd,clang-tidy,clazy-standalone,llvm-symbolizer},ninja/linux/ninja}
 
 	if [[ -d jbr ]]; then
 		fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest
index 1548ed0f8229..6f1303499c2c 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,3 +1,5 @@
+AUX clippy-8.1-big-endian.patch 1677 BLAKE2B b47262fe1d6edb94005982ba854980acc47f21fccbd5969965fa2604cbf866748598a842b71a786a24e07ec39d0fc70652206d3b6d0464c435a06da40fff207b SHA512 c7849814b6b979fee63a2c52d364798f0a8fd4069d14a561881ee7db1c1213d6b1ad726f67a0d68df103e28f18b80aad1071427773b47d9916b3ca0247393c05
 DIST clippy-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
+EBUILD clippy-8.1-r1.ebuild 858 BLAKE2B 645d0a6365a5fa85273ea900908b60532ac56584e296fdb3d41a5f23a4dd4987781d1d8c446cf25a3b8f7116a600275229a88582403313092f3b5bb96a33b491 SHA512 00704b7a6c16a91dfe04581e00375af6de696606ca09c81fb0871fe8e1b08a5f3db8c663837884b9da688a845eab7f1c1e34aadf81f6552132d4b8c283354820
 EBUILD clippy-8.1.ebuild 806 BLAKE2B 3a12042685e907d89c81a1115036b37279915e728b73c48b171684fd07380730295b8606da97b0525fa9ce73215477dddfc531ba39061acf48dd7ab8cfc2ba66 SHA512 133b754ba54cc5b160fc8c53d989770cf23fe31b4e5e7c828305a69c8ce7207e5627df8a8b6865356ae2c3699da0137270a2a6a44fdecde826a44253c38d2f0e
 MISC metadata.xml 326 BLAKE2B b909c2525951476b2905e143974e734364023b9ac622f01ddae1e16427359ea47af02af11a3bb6ac5c51ef519c9c66995c8cba31d9ca41f1e48f33106a0678b3 SHA512 ee570ffd0054e2c132d637b41921bb25f3172fdfb0bcbc5d2214eaa3bb95c109ca58a5e6cd7ebd386de497ef3e20cf3696243dcc5e82fc4cfae25bba51be4db9
diff --git a/dev-util/clippy/clippy-8.1-r1.ebuild b/dev-util/clippy/clippy-8.1-r1.ebuild
new file mode 100644
index 000000000000..bb8ff2d0c5d5
--- /dev/null
+++ b/dev-util/clippy/clippy-8.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020-2022 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"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-big-endian.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-clippy-only
+}
+
+src_install() {
+	dobin lib/clippy
+}
diff --git a/dev-util/clippy/files/clippy-8.1-big-endian.patch b/dev-util/clippy/files/clippy-8.1-big-endian.patch
new file mode 100644
index 000000000000..fa715cf23858
--- /dev/null
+++ b/dev-util/clippy/files/clippy-8.1-big-endian.patch
@@ -0,0 +1,57 @@
+https://github.com/FRRouting/frr/commit/cfc45e911e21820bc8b703b37e947a6a7e5d798a.patch
+https://github.com/FRRouting/frr/issues/10051
+
+From: David Lamparter <equinox@opensourcerouting.org>
+Date: Tue, 18 Jan 2022 09:50:25 +0100
+Subject: [PATCH] lib/clippy: don't endian-convert twice
+
+elf_getdata_rawchunk() already endian-converts; doing it again is, uh,
+counterproductive.
+
+Fixes: #10051
+Reported-by: Lucian Cristian <lucian.cristian@gmail.com>
+Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
+--- a/lib/elf_py.c
++++ b/lib/elf_py.c
+@@ -1071,26 +1071,25 @@ static void elffile_add_dynreloc(struct elffile *w, Elf_Data *reldata,
+ 			 * always be a pointer...
+ 			 */
+ 			if (elffile_virt2file(w, rel->r_offset, &offs)) {
+-				Elf_Data *ptr, *conv;
+-				GElf_Addr tmp;
+-				Elf_Data mem = {
+-					.d_buf = (void *)&tmp,
+-					.d_type = ELF_T_ADDR,
+-					.d_version = EV_CURRENT,
+-					.d_size = sizeof(tmp),
+-					.d_off = 0,
+-					.d_align = 0,
+-				};
++				Elf_Data *ptr;
+ 
++				/* NB: this endian-converts! */
+ 				ptr = elf_getdata_rawchunk(w->elf, offs,
+ 							   w->elfclass / 8,
+ 							   ELF_T_ADDR);
+ 
+-				conv = gelf_xlatetom(w->elf, &mem, ptr,
+-						     w->mmap[EI_DATA]);
+-				if (conv) {
+-					memcpy(&rel_offs, conv->d_buf,
+-					       conv->d_size);
++				if (ptr) {
++					char *dst = (char *)&rel_offs;
++
++					/* sigh.  it endian-converts.  but
++					 * doesn't size-convert.
++					 */
++					if (BYTE_ORDER == BIG_ENDIAN &&
++					    ptr->d_size < sizeof(rel_offs))
++						dst += sizeof(rel_offs) -
++						       ptr->d_size;
++
++					memcpy(dst, ptr->d_buf, ptr->d_size);
+ 
+ 					relw->relative = false;
+ 					relw->rela->r_addend = rel_offs;
+
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 99e77a47662b..c548c837fc36 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -11,7 +11,9 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
 DIST cmake-3.21.4.tar.gz 9630991 BLAKE2B ca6b6c50d984cc6713f3e88e1a6438c360d80c34927e60a20cc006ba47df2b91a290f1578d556f58d2d40711848a9b9caf36f65a043df892b81c1d48e3edb0d8 SHA512 0262a666f6da106576c26215580c40b54497bcdac400e847e1799716c31c71068293e719416338132a7da6122826c08ff50ac23dfed2711ab42631e96303f544
 DIST cmake-3.22.1.tar.gz 9778031 BLAKE2B 8c91e9e666ece94e0cfb5868ad257b1de824206b6f5420a5f516f684e4fd655e634918c59955f41a3f27b604b76946d86ab51cf975de7052c067a9dc4f952400 SHA512 b1e900fe573cd1cc76d26386f2298d7722737c9ff67930ee108994972b4561ef69caeb537177c9b95b7f17b755e20e034825d3807ea0d2dd4c391310b03adc11
+DIST cmake-3.22.2.tar.gz 9779456 BLAKE2B 5f1c76344fe2d6fba012b0d745dc990ec1ed4bf32c99beac1e538f4b83c1d695aee757d2780e635b67c0a185935a6a70b344a733259e3a91d01c4b83e94e2730 SHA512 86e95f9ce773bcc7513a1c3901561a1b09d06830936b8b1d44e075fe3bac55cfa636eccdedfa94a9939f5e12eb965224559fac30a17c64314ee023acb2a3e53f
 EBUILD cmake-3.20.5.ebuild 7034 BLAKE2B ec62fb9ae6b4cf3b2e28142a571c217bfed6d9c1489d5d7ced9250690df058ca3ff5dda3b3a59800b770c7afea56b200b309a2bb8eb7763da2fdfc6a45794407 SHA512 1155e55439ff5f46d78e447a74a7f7a5600e8a4eb123f233861675462caeeffbdc1cfa38ea44d5ecb1a77f3db302017c750399f645d78e37adbe9649e8b21978
 EBUILD cmake-3.21.4.ebuild 7034 BLAKE2B ec62fb9ae6b4cf3b2e28142a571c217bfed6d9c1489d5d7ced9250690df058ca3ff5dda3b3a59800b770c7afea56b200b309a2bb8eb7763da2fdfc6a45794407 SHA512 1155e55439ff5f46d78e447a74a7f7a5600e8a4eb123f233861675462caeeffbdc1cfa38ea44d5ecb1a77f3db302017c750399f645d78e37adbe9649e8b21978
 EBUILD cmake-3.22.1.ebuild 7042 BLAKE2B 351fa7dcc56444e75a914a17cdecc1c1f910a00bcf809969449ecffadf1b2800a196f228e9307f6422c8ffed248541fa2b573cf4af6a658546ff949bb71a4b0c SHA512 e72af310d008431e2e7356d37996cc7afa4b6680bfb283a8a1a025abcfcaa818a53bc2406c5659c12d4d6cdf2d0ae45b3c107a874a07be6314e8f947a2cf9937
+EBUILD cmake-3.22.2.ebuild 7042 BLAKE2B e929548b0164e536d35e61acc5dd0c4e5e0ba28b79a44e77255fc5a135c5564fd7e919c8d749b932dcd680f8f2d905837d33b1fc3773d71e683c51368bd19198 SHA512 c406f462862f8d657394c1583e9a5e3a482cc8fae003ee04ec9ff6054b63566fe35de12059f6be736e335cb1ec4214024f566107771d1d9dc727d22526b52ef8
 MISC metadata.xml 338 BLAKE2B c3ace8da183f0d5e1a12d79d1b77a58fc2fb5700c045ebc899f4aad3854c418169fd4eea525cc91dffef54e4d7a3244d4c74f76285aa8975a469c49b46b79762 SHA512 fd24e8861001d9baf86816ffd22e919f92c3a7635690d7257fdcb20f4115921c304d6bc9fd34deda27b89b5e173b0a80c30ec985c066f2a343594d4dc022bcab
diff --git a/dev-util/cmake/cmake-3.22.2.ebuild b/dev-util/cmake/cmake-3.22.2.ebuild
new file mode 100644
index 000000000000..52eda2fe8185
--- /dev/null
+++ b/dev-util/cmake/cmake-3.22.2.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 7fddcf0249fb..5d440a5576a5 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -3,5 +3,5 @@ DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1
 DIST cookiecutter-1.7.3.tar.gz 253444 BLAKE2B 92ae74768c909ab8e2ae97ad87921ae0cbf24c417ab6985ac10eacd913981ee7756843e2588936174d3c04ecfa7a62077a6d4a323fdfa6d1872f3c84d943cbcb SHA512 a7dd7993ba40a084a719d553afbb8035f26976f38a3e8ee373c8074db64eac6bd7b711eca8cedbfd1050fc057a0b45409af4d59ff3bde57b344317dbee56f10b
 EBUILD cookiecutter-1.7.2-r1.ebuild 1301 BLAKE2B 49b746a2ea6120a7dd3cb451fefcc9db8a6240ad1604876c435a8bf9dbae4a72b12995584132b46465a25c01a7a2d8f7fde98e123f71e0971bb06754830aed59 SHA512 5716f7cf06d42e181695680e7a09779d9f1876f02f8fee0e0bb116f6d255bfde5c2bd7e1efd591d2ae8d27c579c2f875b32bb0fbf8599117925e8ff446aa2dee
 EBUILD cookiecutter-1.7.2.ebuild 1288 BLAKE2B 0b17d7cbc3ba94efed52318ffaf68e65f643e28bcbb232c963b9e7be48bfcde474f2c5c569d07964e374a56456376ff6435b6894aedb40f87d18d633d0ba8ba2 SHA512 1a331f871659bebfc8999556fb49d4098b1929404ed845fd4368db1f5b9c6652fe094071aca6dfcbe03fbf17f8ec318ba329ec3352788691b62134bcbf1086b1
-EBUILD cookiecutter-1.7.3.ebuild 1256 BLAKE2B 22d1054eed5f8f4e215a8267f47ff5cac2930c6f2a4daeb1aaa11772c14d7786033ed260634291302e304d13d335b490e03d141c32e6d212b61c9a55d821aa61 SHA512 badb2a112429300aa4a2a1478ab0cdfae028465a42176cee412bf23dbb365c9fa8de13c00772f0ad82f6f6690d8ad0fe98e3df0fb5f90feba411e4d075d36a04
+EBUILD cookiecutter-1.7.3.ebuild 1263 BLAKE2B a6ad9d143075c65cbde93a10882fbabd547e8c8e904161b5712d4c2fc76e3f1173ac1fdd629dcfe19b1e302684ca1e15efa0567bb8ba6f06798189514d463bd6 SHA512 850a02f099857f89ee7575e623deaceee1865dc902e2544a9b3a689691673717b488e840cc6c3c889a2c5d6c15a0e72a20b9e9ebb707d3730ffdeb30d26954be
 MISC metadata.xml 449 BLAKE2B a0e82c0c0ef3700ca8deb860a6200ecb3c6e3cb48aa7e58851bb968919e7f29aead9ed05e5763f843b5add955219c5fbda69153aae58e179c0c4c051781cf486 SHA512 e533e02124fbaceb8ca527eba23cef06dfbdf7d055195bd9089c62bb0ccd0be5174511440f1b238b378680c5529b9fa3d604335514d461ec3199a25ee78f7f7c
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
index 88fe924e6df3..910b54392313 100644
--- a/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/cookiecutter/cookiecutter/archive/${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 71a3fdcd2fc3..2c8ad0b0dc25 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -1,9 +1,11 @@
 AUX 50cscope-gentoo.el 1442 BLAKE2B 73a5542b5ac18dd6ffb34169764cae590cb009c3d04816cb09361d24ea16c3e2fdb2355cca2301e932108fbb333ff433783b75bb379ecf4ec8996f8e162f422a SHA512 63bb70766d69a85f78c43204e3539bcabaf5765f19703f6f8ad1dcc2bc076c1c20623a3120eeeaff89842fac9f17d5b3f17820780eab9844716cbcd6a138d384
 AUX cscope-15.6-darwin.patch 288 BLAKE2B 3426d3f3dcdd67764b8f3ee63bbf1ea6c457231cc61099e854ded076f66034ab400c0f49db7ba5eeb43ee7cd3e1d5d9c0ba488b282f050ffe532da9910324688 SHA512 24c3a876c34786c8ff2b51256c05da5c8334cc8befb3db40faba8af8f34abbec78062f1baf8e0dc0adf9f37731b10310e61cd46c08a6e78baa767234e483e7d5
 AUX cscope-15.7a-ocs-sysdir.patch 582 BLAKE2B f9144657cb8d584f4d504481b986f68322d1a08b408e4f623db0ed3e22474895f4f8464e297a90e635a3dd3e71cb06f79b092a82ab8876d0ed308b71fa0d2812 SHA512 aa296d8839da73b6838c450dfabc9782940a2f9c9cfba2f738993c777c1d4096688d79205ccec58dbf931b2faf45a4c3850ddbd894c7b7e616d18a0014cacfdb
+AUX cscope-15.8a-pkgconfig.patch 910 BLAKE2B cdfefcf050af281a930a037b3b9339b316f6eb886f901b84fefeb881a471c8226d9bdc1b8ec7ae2740b2c6a157c471401901a6dca18ee4c1cb4cdc205460b760 SHA512 83bbfe58b682bb95cd0234b5f85528e75074271bb45a24573ba7da6053976d5753aa4019aff11593fb9bdd3a35afff648d21f8463f21945ce1542ddc2a1a4a29
+AUX cscope-15.9-pkgconfig.patch 833 BLAKE2B 4f8869517758d4b8725d772c7b4252c4f7aec57b3d63ab36c3fd4a6df08c6374773b016901a0418327b76c04f9fce131b58845c074073e1bcdc3f319261c74a3 SHA512 98002268e01be238a4f918bd95d9f69957477e9bbd0bd7cd0be204efc421fec8daf2aac86cfad9310c7bbd1f6ef0b6234e11e6e9d5490787ae2011160080f731
 DIST cscope-15.8a.tar.gz 601232 BLAKE2B 8c67311059a055af775ba3d42942a557b54c0214751d8756e6a5c19a7a271824004e72c533614015ddcb0ffa4c768f99eb736d441dc8467c5be4824cebf5c15e SHA512 bedba69820eca86420f6c975d1f267de67a457b182a3fe49720a2ae5ea48759c5b5b8db06ed5ffd85173ddf4a0f12ca722e87200dea4a2da7d43c8c711b00318
 DIST cscope-15.9.tar.gz 613948 BLAKE2B 66c0c85d0db810e8cd5a286925eeb1026fa4a9e9c3a5a9decd1412188fca43f831949c231acca428b5eeb476662b7ce9f81defcda81759c18027655535b855be SHA512 f3b95da5eb5c036cd39215785990c7cce7ce7b8eda4b18e60792e70d01ffb63809ce32ace310a9aefd88e6761c1609039ccfab0e8e49f81730bc1630babbcb80
 EBUILD cscope-15.8a-r1.ebuild 1378 BLAKE2B 52001e76ecec742a627e766a0779870e912551ed5cbbe5085351e446a57b589d8164d81cf00b1512ab29598de4b548f9da28c367adbad7657800fecc4074955d SHA512 74ef447b77d1b3422845e5dd24ee284523b5bcd6105e33fea68516c70de430d65b2c5c1416391861b21edd4c82b7998437efcaadec633b0889497b67b503bf64
-EBUILD cscope-15.8a-r2.ebuild 1565 BLAKE2B ad179fbd8eea5ea5e067e0b870afa8c00d882810fcada68fb11eca1d45251ff7d1d246754cd846752e1a1200ef0650c60aa020056d820ed2be036d2afed23786 SHA512 51f7ff71a723a09da1f3adb00bec317bb2de86758db9e73af2fdfd198fa86a4b0753a1f588a7d8d3be669407ba30b2142c90ccd64cfc8a3c867c1a7364a35312
-EBUILD cscope-15.9.ebuild 1535 BLAKE2B 5b116bec23f14e3136087153645a1e8495ea5d6327f5904fbb22c5043f96483f00ef8ba0b5f2a19312754bafa47d0e344e3a811ec3b34c457f383f78e6b7ca7c SHA512 77ede04b6d970c314776f2738581073953caa2b58bf0e111358ba55a3ef9e9b70440f306ca3b4dddcb08fd21ca2875bbea5eb0a5f334d3829545e7b6f23b81a6
+EBUILD cscope-15.8a-r2.ebuild 1615 BLAKE2B 03df0e896206ae8f50c2e10c1c55632790abe3c4dd3d3456343cd4b0b7fe14fb4388139a910e1696463695ece9c9227586319fbeff30b9cbf712229d9ae222f7 SHA512 bc73bfc6175f45c11251f3064e6b3b9e0e9a53a8f02052a4ad9c41c8a1c9c3dea04ee3054b8e3e386bc48383a4317ffdafcf1eb9d45b22a6c830e4c35ba4de3f
+EBUILD cscope-15.9.ebuild 1584 BLAKE2B 119f7307f3020f305508eb2444e2b587781c644cef495d24a4c400d7d33b20abdc6ddb8282084e4d38b62a4bc9a889a39dcec2e1274ae2e6ac9eed400b3c56a7 SHA512 2228768e1529627f77238d431e2d779fcb7acd01ef1d1c19b86a512c2e81ebc2768fd5c28d6676e8e30f3163bd8791c54e9f7ece2f8659430d343828e8b324fb
 MISC metadata.xml 1087 BLAKE2B 2e4779a4e1d063adc26a16774898a6cca08788ddfbfa036d29ae751e547a74cbf3252645e2b6444c59ed106f6088acb0bb5490dde7e7f5b55c74b3c9f941ea1c SHA512 6db0a7194cf116f4f1a1b34de222729dd0521dfb21486ead4885b068e52c3191091bf98e52b31b2e9d4d564560cec9a184d8d7c2387262afcf8442d66507c60b
diff --git a/dev-util/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild
index b2707fe35459..95facd63cb4f 100644
--- a/dev-util/cscope/cscope-15.8a-r2.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r2.ebuild
@@ -26,6 +26,7 @@ SITEFILE="50${PN}-gentoo.el"
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
 	eapply "${FILESDIR}/${PN}-15.6-darwin.patch"
+	eapply "${FILESDIR}/${PN}-15.8a-pkgconfig.patch"
 	eapply_user
 	mv configure.{in,ac} || die
 	eautoreconf		  # prevent maintainer mode later on
diff --git a/dev-util/cscope/cscope-15.9.ebuild b/dev-util/cscope/cscope-15.9.ebuild
index 1cad13f52943..cdee9e4703fd 100644
--- a/dev-util/cscope/cscope-15.9.ebuild
+++ b/dev-util/cscope/cscope-15.9.ebuild
@@ -25,6 +25,7 @@ SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
+	eapply "${FILESDIR}/${PN}-15.9-pkgconfig.patch"
 	eapply_user
 	mv configure.{in,ac} || die
 	eautoreconf		  # prevent maintainer mode later on
diff --git a/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch b/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch
new file mode 100644
index 000000000000..665b7169761e
--- /dev/null
+++ b/dev-util/cscope/files/cscope-15.8a-pkgconfig.patch
@@ -0,0 +1,28 @@
+--- a/configure.in
++++ b/configure.in
+@@ -22,6 +22,7 @@ if test "x$LEX" = "xlex" ; then AC_DEFINE(USING_LEX, 1,
+    [Define this if the scanner is run through lex, not flex])
+ fi
+ AC_PROG_YACC
++PKG_PROG_PKG_CONFIG
+ 
+ dnl === BEGIN CURSES CHECK
+ dnl Curses detection: Munged from Midnight Commander's configure.in
+@@ -363,7 +364,7 @@ dnl Check for a GNOME installation
+ AC_DEFUN([AC_CHECK_GNOME],[
+ 	has_gnome=false
+ 	AC_CHECK_PROG(gnome1, gnome-config, true)	
+-	AC_CHECK_PROG(gnome2, pkg-config, true)
++	AC_CHECK_PROG(gnome2, $PKG_CONFIG, true)
+ 
+ 	if test x$gnome1 = xtrue; then
+ 	  has_gnome=true
+@@ -373,7 +374,7 @@ AC_DEFUN([AC_CHECK_GNOME],[
+ 	  has_gnome=true
+ 	fi
+ 	
+-	AM_CONDITIONAL(USING_GNOME2, pkg-config --exists gtk+-2.0)
++	AM_CONDITIONAL(USING_GNOME2, $PKG_CONFIG --exists gtk+-2.0)
+ 	AM_CONDITIONAL(HAS_GNOME, test "$has_gnome" = true)
+ 	AM_CONDITIONAL(GNOME_LINUX, test "$host_os" = Linux)
+ ])
diff --git a/dev-util/cscope/files/cscope-15.9-pkgconfig.patch b/dev-util/cscope/files/cscope-15.9-pkgconfig.patch
new file mode 100644
index 000000000000..c031633a6559
--- /dev/null
+++ b/dev-util/cscope/files/cscope-15.9-pkgconfig.patch
@@ -0,0 +1,28 @@
+--- a/configure.in
++++ b/configure.in
+@@ -18,6 +18,7 @@ if test "x$LEX" = "xlex" ; then AC_DEFINE(USING_LEX, 1,
+    [Define this if the scanner is run through lex, not flex])
+ fi
+ AC_PROG_YACC
++PKG_PROG_PKG_CONFIG
+ 
+ AC_SYS_LARGEFILE
+ 
+@@ -361,7 +362,7 @@ dnl Check for a GNOME installation
+ AC_DEFUN([AC_CHECK_GNOME],[
+ 	has_gnome=false
+ 	AC_CHECK_PROG(gnome1, gnome-config, true)	
+-	AC_CHECK_PROG(gnome2, pkg-config, true)
++	AC_CHECK_PROG(gnome2, $PKG_CONFIG, true)
+ 
+ 	if test x$gnome1 = xtrue; then
+ 	  has_gnome=true
+@@ -371,7 +372,7 @@ AC_DEFUN([AC_CHECK_GNOME],[
+ 	  has_gnome=true
+ 	fi
+ 	
+-	AM_CONDITIONAL(USING_GNOME2, pkg-config --exists gtk+-2.0)
++	AM_CONDITIONAL(USING_GNOME2, $PKG_CONFIG --exists gtk+-2.0)
+ 	AM_CONDITIONAL(HAS_GNOME, test "$has_gnome" = true)
+ 	AM_CONDITIONAL(GNOME_LINUX, test "$host_os" = Linux)
+ ])
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 71bd6b86427e..9bb5e96d6151 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,11 +1,13 @@
 DIST cucumber-core-10.0.0.tar.gz 47173 BLAKE2B 3ce81c4ae9de1dafe444fcae4b2609b786e34d8efdf16e02c05ceaf7f077c13289bea23f6fc22616cb8ce16598ffd3f07cbc51751b3151455d65ecf396ac0e92 SHA512 7ed559ae5e9071f1697da74aa067fcbc42858d51c9d470280c0695df0ab0836b069be2e1ae8948ff01a674ca45be7eb2ac63c37d666d40c7ac333a0a5315c65a
 DIST cucumber-core-10.0.1.tar.gz 47196 BLAKE2B d048c36e3d28871e603b2092062af1e9a754ce642c365c5f71696f450c2f8fbccd27e3d809980c96929f75a2afb11c216a3b1ce40a0b7f81dfff7495d46f531e SHA512 c7ff950f7fd81824822de0ec485c1890808126c36be4c25ed15048c35491e8891851cf7438ef806bb1456b68281853ac3a0b1f7a598414f794793db83530406b
 DIST cucumber-core-10.1.0.tar.gz 202704 BLAKE2B 22aebd78e27ee1f8062128007c42ae6bbcfcf63dfb3dc94618db6bf1803511a08305289105e33e78ebd48e881bd7e93721bf8b654e28c7309b381ae4aaba659b SHA512 6f3973ca69f13dd85b7ecca54064562b80812d5517ca0c64cacf18e0ca0c2ef47ca6f0182d3aacdb385bb16ffc9d98f065e30d9f1bc556554535c0d027dbc39b
+DIST cucumber-core-10.1.1.tar.gz 202764 BLAKE2B c5704ed4821d056aea7bf537c7193bb8965be5a6d0effad0f85f76c18e62acf7a2de981da05826fbd27c1e55122ba3ca9873729332a9840280d1638838af27c9 SHA512 c7c4de1c53a58b74e632019a9a69b3bac164da72ee3cef839d19c9548707c06ddac5e562013ca86992ca3d78ad96f23521ff69de83b3e9e614a336cc3d6ba9a6
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
 DIST cucumber-core-9.0.1.tar.gz 47009 BLAKE2B 2c78956643dfb08319732af24c08d5df811574891b582ba7ab51281c9a5299a3063c6c607af5cd9659aa0e160c0f3cab1d54b9cbd57d3dbf2768e97bb8f79e8e SHA512 0ac61797cda1d62d2b452d3d843be855f84b12fc9c435e8b5261700a981d94c9c88e36e309d8c2dc637ff195032768d363ffd9e7424c842d5b0ba98c3c678752
 EBUILD cucumber-core-10.0.0.ebuild 910 BLAKE2B 28832d630b2905fad9f86991b168d4f1908dcda685b8ec16c994eb318394aa7c91430ce5ce1e642327c608a193a51f142e26e59dcabaa85453b1c5501a6c5a10 SHA512 bdfcc8db9b12195dd030623d088501ce8cc6d878e6fd31d844ae8335d785901767cb87f6ae785dfa02ba373c7cb764240f8552d0a0044ccf373a5dced436c52b
 EBUILD cucumber-core-10.0.1.ebuild 936 BLAKE2B a5c0960ebc8c4dc7ba5145219723f9ab582c65a68389a6e2873264756bd046972339e5cc79af21df6555b849eaee9b84bb234385a93b46267d79c209fdfbedc7 SHA512 afd48389461d1733a621180f865fa60c1bb51ec876bbc9de23edfb2fa9d1347f9f9535587ac19a8defeaf19bac65993497fe85da0f9bce9824687aed19e50f8f
 EBUILD cucumber-core-10.1.0.ebuild 965 BLAKE2B 091a860c11ef6320a5346e87cbe89fbb97c90dae5c3ad8d54f5e8bc8ee603a3f1023e6314510e8fa201a4765b16566e8df96cf4b95a36e3ec63b4696021faae2 SHA512 9d4ccb4ffb7745dd9ef982a1ad30b6bc4ac5a5d94c3c76dc9602fd09de1816aa9a2e94568415b10d2fd6e86dd8805157025aeb8b0839201359bb3f758e5dcd9c
+EBUILD cucumber-core-10.1.1.ebuild 965 BLAKE2B 4104e8b2de2af6a85a6e4562ab2d72da8b597d073ffd14199c06101990872de15796e2d7c7bfc6486f2b4e4dceb227e0650b86a66d9a513d11a64dbb476b950d SHA512 607519a02f7807b5b47e580b085bcf9cb4caa15c9236d7ce172e9d9440f2c23ddb09ff36bec64734fca64196daf3f725661100b80a0751dcc8e81e8a503b8724
 EBUILD cucumber-core-3.2.1.ebuild 1036 BLAKE2B 5974f4b5f2e4b10fc89b934e92917e95f500c07334d2d25ff06000f7cb626ff5412446765dee220def380ba8c17beede6778feff8471d80a70af0ded394a5110 SHA512 0063cd60aff9789447e75df8af18e6c1f736505aa124489617811f57a1dbd96387ade525d3273da06987e5596e5ca917e75dc5ed5e28d3a3953da02ac077475f
 EBUILD cucumber-core-9.0.1.ebuild 1135 BLAKE2B d4fc3b08fcceee5282c01140c01c6649a050c19edf10c5b3784995770066581f8a473ea50c3c7c3288071857cfc4bf5ef8a735266aa1086ac5a63ca59915782a SHA512 3e667a53637d636223bead410d40f38e183b3f430278974551ee78e7b235b91fb92486245835419058d2aecb65d689f1f115f7da19f720b9c2f4a78371c1e2de
 MISC metadata.xml 305 BLAKE2B 4f83e60ccce4b19cc37b87fa6b75d2e574fbda010202d97396513fb1e96c436b3a8809b492a1ccd4434078ec12b979fbf72b2475b791d29066f25297ba285753 SHA512 554e5ec784181d190c211f88ddb39e1a7964fe27be8056e1e7352b85bc3450ed0e74483b80353a8704f5fdf358f3a7a646682740d1186bd5402f4fcb3316707d
diff --git a/dev-util/cucumber-core/cucumber-core-10.1.1.ebuild b/dev-util/cucumber-core/cucumber-core-10.1.1.ebuild
new file mode 100644
index 000000000000..9661227c5e17
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-10.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://cucumber.io/"
+SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-core-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/unindent-1.0
+	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-gherkin-22.0.0:22
+	>=dev-util/cucumber-messages-17.1.1:17
+	>=dev-util/cucumber-tag-expressions-4.0.2:4
+"
+
+all_ruby_prepare() {
+	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
+	rm -f spec/readme_spec.rb || die
+}
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 347e23d120b6..3a2282e8c4f5 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,3 +1,4 @@
+AUX d-feet-0.3.16-fix-meson-0.61.patch 911 BLAKE2B 21198e257461b1df602b1d7cdeddc3158d39967d8d3bd412ea36ac6cb1fd904d6419e5c40664958639e2be8b2cf08bef53fdd8fd458f6e4548d7b08f519874f1 SHA512 bcb3ddf35293c2f000bd857a20de403cb1903b787de078c1276bbdf8dc8b4285f8419a8ad6e031296e1428e098325d8471fcf8c19480818502d280dc9a591d16
 DIST d-feet-0.3.16.tar.xz 237888 BLAKE2B b4773b781c53feb11889b49746e714a42a15a85daeb16dcd5235609fb6105c0b1a3ebeeb4a08830de9067f1c193702b31fcbfc67190eb2f901907b96acfcadbc SHA512 ff4db968cbd679e2065c614d538187fe3c56118b44638771ec9f7472bdba4a798dc682565f520a8680a8001ea39ce88555b07cda172e60f88eb6bdf1e00b5a6d
-EBUILD d-feet-0.3.16.ebuild 1024 BLAKE2B 9551ddfec9528d64b83614e4c58dc30322b688ba4cd56af154c2d859e5982846255978d7d832b5569216d1c5798492287e98d7dee993912eb6173f32347d85db SHA512 de91c821a0838c576d80f9476fb58e678f32c8202b442c648f50386a07283083d9fa10a7a5971091e3b54b6587a9131225e8d747e3970fd32f64206190b77ebc
+EBUILD d-feet-0.3.16.ebuild 1086 BLAKE2B fef497f70c7a1395e9709ef912fa45513c9e40d13f65dc92607981a297d9cdd4db683e88c18387b05a90e8158247cac43322bbf1841395c1fb5f24d4866189a0 SHA512 74b98981961654e1efb9344d6ab0d0b5d4f739a1cc9f81d21cf9c78e88c66702ead13af665eadbbe9e267a562288dfe606c225b70b45850591faff6852876c0b
 MISC metadata.xml 252 BLAKE2B 1dee28ae6c6e69a9c06e2c6f7f309e1193633c7571f0fc645546b89aa018837d3222514caf1db9ac7d43a014377d6ba04620347c78aeba5b6aa020dc51a49690 SHA512 e8d972cad532f8afa0e4d67eb837160d7d436db8c8296a69e97d40e010a12ae11651147cd8f6b5e39c445992ee16008f52ea2eb6f8c032e340040d298abf979f
diff --git a/dev-util/d-feet/d-feet-0.3.16.ebuild b/dev-util/d-feet/d-feet-0.3.16.ebuild
index 7a9d65104598..346847660580 100644
--- a/dev-util/d-feet/d-feet-0.3.16.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,6 +37,10 @@ BDEPEND="
 	test? ( dev-python/pycodestyle )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.16-fix-meson-0.61.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use test tests)
diff --git a/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch b/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch
new file mode 100644
index 000000000000..064f94105882
--- /dev/null
+++ b/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/d-feet/-/merge_requests/32
+https://bugs.gentoo.org/831524
+
+From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:11:57 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:27:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+@@ -25,7 +24,6 @@ i18n.merge_file(
+ appdata = df_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+GitLab
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 45b66621aa5c..2f73cd74dc5e 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,10 +1,9 @@
 AUX 40.0-optional-introspection.patch 1163 BLAKE2B ce50a6bbb920610be1daa723383e1fd464aed84f3d01911e1f85b50adf1f44680518a15e896b351271a3c3ac5500c2fbe148392fe90191f0ed37162faacded88 SHA512 6f874452379b76ee0ef1b402a7bd706e3543cf10b9033e5c5c0d1e153ce8d845e75056d10b1f451fc4ffe2073a7157ab492416d9c76eed44e38d00d919ddbd57
+AUX 41.2-meson-0.61.patch 1775 BLAKE2B b169bd8ea9d84c074426219fcf9b2a37557490c1dc3a2e647016b6c46d2ecbc02000f9595da9375cf9a4b00d22c95ad831ef72fceb3192030bcefcdc073afe8c SHA512 50500f5ddaf5eafb1299f24d1b1dba4b0808c9a140f1d7c0748cc73d8da25e0a444bcd1a1293c331158a3f0f96af1ab9cb27c37498437f0bdbffb191d93777ac
 AUX 41.2-optional-introspection.patch 1196 BLAKE2B 85c451d943b23c0d0c26268b4a32ac177c9dba3b048446c0e3eb3c47fbe23e54602d3d5d5f3a72f76d8f8dc6382b4d9499a0b8c2b2d20bf9553334e205b12a27 SHA512 10aec862a82af083cadc4b182ac1e69566f4a3f9f4114fdefecf414b380a348c62edd4fefdf833300d2e2233454e17ee1092e228683f6fd30d02e2f9db3b6ef7
 AUX 41.2-webkitgtk40.patch 1174 BLAKE2B 9c93f1d8b214f8569f560de51d3e8f308e2ecb4dd00f8dc1e4daef5eef87a785289c1ab53b94de0e8e75493015fa13669c1a7b0cdfe7750617275fa13e830a47 SHA512 22b45421fe5e0e312cff0128f98fce32f76a15b5316ca8a4065db3a300dc0e12e04ac2a0a6c47e47ca7ff49c4a4e0c2e0a4accd10981f05eb6bf312860da0138
-DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefea2c85229092be57c98f96459c33ab0fdf847a7135fa1b329c76edea71f7da0342c6673a828efe26298d26bdf SHA512 b8dd5fbb12558845f7f5794dad56ef0ffc1dbd60d5a6a28029dc8acea241e8deb1b68cd0abe9d620a512931a1c5f6db12fc594cd4597758c8d4904fb64e6ade7
 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 1782 BLAKE2B fc580fb91d5b1e1733c05f948f6bb2e1f83da617d41d4e1bd1ad979228d290cae44b34de858532039c7573d8daa52ae2682d68fa69f0a6d515014e04d1adae8b SHA512 3d05ba5f0e9f1808139bf6a6ec3ab2f731e57fe65fe474904ae1abc81d07932021c47a0ccee67f2489a709772bfcfe0e7aa2e9d1d43992bda3c8f33e8a79531d
-EBUILD devhelp-41.2.ebuild 1950 BLAKE2B 707e82f453d1959713c344f411d4b81898b30e1abc403658f5345911acfc66d15f3014f7fbdc0f06f6627bfc2b7e2338859306258f823577d7adad6cc10e19e1 SHA512 b93484e9b1002c34a219af0ff774340a3d932cddfbf3dafcf3fef81c3f53c7a070ad82234a48294fa2c01f19b178b177986678d801f0dc8662840fbec135b61d
+EBUILD devhelp-41.2.ebuild 1989 BLAKE2B 8a64288acb6bc746158af8890ab7a9f3a0b436e1d74238312ff255cfb37d9f2d1e8ee51284bf571422d09f7dcfe1e07b328ab8988cfe88e952451a4f2594db85 SHA512 f84905e5724fb34965390e9003fd422aec3beb2a393cfc299dde8e25eede93509f99cdd4568a9395b267481ecbc7c1b08afd1e413b1941bd9920370742d81eed
 MISC metadata.xml 338 BLAKE2B 50e6d39aa8a020fad15ddf7fe529f56c440696730b7400135d5ce97694d15feb64a1bd02bb156b21faf7e6fb1772e10f5c90ddaf0cf62dd19bbe8cf8af8462fa SHA512 5a00a79928fadab11128ec6d73fa4f119c9a93b69ddc0ac4832d94a1d72b6e1eb1e5c128839281c4ec272b5fe6ec6608ef1b344d6a7f8b46ea59989bca5dc8a6
diff --git a/dev-util/devhelp/devhelp-40.0.ebuild b/dev-util/devhelp/devhelp-40.0.ebuild
deleted file mode 100644
index 6fd8e3d4278a..000000000000
--- a/dev-util/devhelp/devhelp-40.0.ebuild
+++ /dev/null
@@ -1,82 +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 gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="An API documentation browser for GNOME"
-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"
-IUSE="+gedit gtk-doc +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	>=dev-libs/glib-2.64:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=net-libs/webkit-gtk-2.24:4[introspection?]
-	>=gui-libs/amtk-5.0:5
-	gnome-base/gsettings-desktop-schemas
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-"
-# libxml2 required for glib-compile-resources
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	dev-util/itstool
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3
-	)
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/40.0-optional-introspection.patch
-)
-
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dflatpak_build=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-		-Dplugin_emacs=true
-		$(meson_use gedit plugin_gedit)
-		-Dplugin_vim=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/dev-util/devhelp/devhelp-41.2.ebuild b/dev-util/devhelp/devhelp-41.2.ebuild
index 0d4bb96937b5..7892dd7fcbf5 100644
--- a/dev-util/devhelp/devhelp-41.2.ebuild
+++ b/dev-util/devhelp/devhelp-41.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,6 +45,8 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PV}-optional-introspection.patch
 	"${FILESDIR}"/${PV}-webkitgtk40.patch
+
+	"${FILESDIR}"/${PV}-meson-0.61.patch
 )
 
 pkg_setup() {
diff --git a/dev-util/devhelp/files/41.2-meson-0.61.patch b/dev-util/devhelp/files/41.2-meson-0.61.patch
new file mode 100644
index 000000000000..dd75f802056a
--- /dev/null
+++ b/dev-util/devhelp/files/41.2-meson-0.61.patch
@@ -0,0 +1,52 @@
+https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/43.patch
+https://gitlab.gnome.org/GNOME/devhelp/-/merge_requests/42.patch
+https://bugs.gentoo.org/831928
+
+From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:02:20 +0800
+Subject: [PATCH] Remove incorrect arg for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments and
+explicitly rejects with error "ERROR: Function does not take
+positional arguments" since meson 0.60.0
+---
+ data/meson.build                 | 2 --
+ plugins/gedit-plugin/meson.build | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c6aeffb4..0bc531a2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', APPLICATION_ID)
+ appdata = APPLICATION_ID + '.appdata.xml'
+ appdata_file = I18N.merge_file(
+-  appdata,
+   input: configure_file(
+     input: 'org.gnome.Devhelp.appdata.xml.in.in',
+     output: APPLICATION_ID + '.appdata.xml.in',
+@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('application_id', APPLICATION_ID)
+ desktop = APPLICATION_ID + '.desktop'
+ desktop_file = I18N.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Devhelp.desktop.in.in',
+diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
+index 4f779886..877a01ff 100644
+--- a/plugins/gedit-plugin/meson.build
++++ b/plugins/gedit-plugin/meson.build
+@@ -7,7 +7,6 @@ install_data(
+ 
+ plugin_info_file = 'devhelp.plugin'
+ I18N.merge_file(
+-  plugin_info_file,
+   type: 'desktop',
+   input: plugin_info_file + '.desktop.in',
+   output: plugin_info_file,
+-- 
+GitLab
+
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 753c10f6b722..bdc4931cf627 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
-DIST dialog-1.3-20210621.tgz 563430 BLAKE2B 8ffb630ed67f303facd79ca72aaca89d32c55a2b504293105a72c596409828fffd3e5e5f603fb5bec7f8748358a03ddadc7f1cd6fb989d1b31af1fd8f1078d97 SHA512 bde13aaf215127d143aa0d37989e0bacb6bc23f007681aeff27683efa01a483106710ff756358e396c23e4c1f0355cd8a2b3bb362ae1c3a1a997e00835d53c2b
 DIST dialog-1.3-20211107.tgz 566509 BLAKE2B f2c045f60185c34eec18b878219fae10a5acca2dc8bec5d379de069c939a0079e1a95925f860944108c97c8ef4e32041966c423d8b294b2102311c9aa085301e SHA512 a6626092692ca61209f67caa7c5dec91f637e3ff002488a0e117ec80ce8fdf0ef50d3b11f67d84d8abb06145347a100de76223fb4b1f971a755c28de1be860ac
 DIST dialog-1.3-20211214.tgz 565608 BLAKE2B f069968abe258942f27e010f8d14eafd270c45ae467d5131b41b57c0cc5a145a410fdaeab5f7fa221aa7dbea440f8e268d130e0f1f7389a224374b0047228156 SHA512 b76e7e1fc333550a9cc351e37e7121e98f48b2a1f78e8c0c528e2126db16ae14c4c5da088bc611cb12020836e75dd2a1d875561fe5eec6589c104252d4aa7626
-EBUILD dialog-1.3.20210621-r1.ebuild 1280 BLAKE2B f3a52a7bb5ebfaa1b18be1d85c8d1f6dc970afed683cfa54c4c468e6c3abb9e741c97da1765d30a18c3a99537e3e3f1d05b263a7fc2a20c2870dd48418a1e616 SHA512 599039faed3b0a25e2c23382e4c837dc3a8c3ee5bd86921bc0be7046e0aa991d13cdbfbdcfb866784f583062447dd5a27a896af93255b42f5c11ca35bc5c1493
+DIST dialog-1.3-20220117.tgz 565530 BLAKE2B 6c77be870962151e37f87870e62d4a1e04adacf01ad4076fc38b3dc35c97ea03169f253d2672edbb9d4cf54aa6ae0ba3def199b84c866c6a0bd7299915abbd0c SHA512 c785dadb0bf7feeee6ac767a6752fb85e9d07ff3991c2f948deae05893ba3104590eda37e88adc0032ce89ede036f6215bb4acd1d85699f5cb9f5b4fc153e2ef
 EBUILD dialog-1.3.20211107.ebuild 1280 BLAKE2B f3a52a7bb5ebfaa1b18be1d85c8d1f6dc970afed683cfa54c4c468e6c3abb9e741c97da1765d30a18c3a99537e3e3f1d05b263a7fc2a20c2870dd48418a1e616 SHA512 599039faed3b0a25e2c23382e4c837dc3a8c3ee5bd86921bc0be7046e0aa991d13cdbfbdcfb866784f583062447dd5a27a896af93255b42f5c11ca35bc5c1493
 EBUILD dialog-1.3.20211214.ebuild 1288 BLAKE2B cac0fb5481a56a82bfc72811b63044cd0c79d2dfcdc0dfa2371e34af141076dfb4a06618229897924c6b8d971ead2ffb0634bb2385a3e24cd28c1420f5de67c6 SHA512 054319ff13d7bf219700d700456ed1b2120a6d2abaababd45ab481c68213db55d241cbd935c75ff7cb7677d0e46d9ec426839e651e65b463ee8ce5008eddadd5
+EBUILD dialog-1.3.20220117.ebuild 1288 BLAKE2B 08c69a4d51c9a90d9725b16738861b62fd355716b09c36d6fe80fa00c187281695b5e3d2748d0a6cb5c53f440ff35850d611686a77c3fb41204d83ede0bcaa74 SHA512 c1308aaa4f27fbe9d03d316fd4f65b557aaa557898bcb959859c89ad8932b8b8c0b6e2986370fc2f56bd372212a1b9744a20e3ed44a5d282f708c064db8bd40a
 MISC metadata.xml 461 BLAKE2B 82507f66df52f2e9c4f51c52fc346a517e4244b4902dac4d557b52c01fbcdc9547ec8b0b572870a2860f995932973fd2b97698fcf748fe4762f210e4b12b655c SHA512 b07779508297ef58d1fd0349700cb7c609a1d503ce99c4fc3bda84c5441dd52064116680459510adbc6e1b6d9173d53fccbd3d6c2130caeb1d822dca5082a334
diff --git a/dev-util/dialog/dialog-1.3.20210621-r1.ebuild b/dev-util/dialog/dialog-1.3.20220117.ebuild
index 0c54076343ab..2d0b6c41e870 100644
--- a/dev-util/dialog/dialog-1.3.20210621-r1.ebuild
+++ b/dev-util/dialog/dialog-1.3.20220117.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 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"
+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(+)?]"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 92542640750a..9412e942b67e 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,7 @@
 DIST diffoscope-197.tar.gz 2705041 BLAKE2B 1d66462d3f1cdbba177d24d194ce14ae51274c6b60139e56724213a6b4fc0b41e6a71f9f2e250ecc7d6330186bf774470b2153801b375ffb63e8390c425e1073 SHA512 d8411ad166738b29caa28abbc10f21e0906b7b19bd5ab644db36c04b1f9c5af9f4cbdb31eb850da7249380a6774bde355f0e815f4d3cdd0df76570df9df7fd0a
-DIST diffoscope-199.tar.gz 2705444 BLAKE2B c17752a504cef75d1a9d6f1c0dfdb896abd1ce7dfd5a2494022d4a7b9e098822db80b52e3cd0d4367e28bcc9ad6316746d10cd82df2ac7c24c19d74b3ea0de5d SHA512 e4caa9d5d8d7f1671acecf2f6240cd587bbfd4087eb6e69021303ec3e7bfde15fbd409139b7658eeed64d75f05b3768f1a585640fcfee6bae63ff7d27227e4d0
-DIST diffoscope-200.tar.gz 2705536 BLAKE2B c931430a7e8159f135446709866106e4646b087c30d9d3cdf82810e8ac9273075af80d67f19858b71656d73c078478f96083c6d784a7e1bf8af5d620765cde78 SHA512 74317603e8416e2decea4d6fae9c16a5a931986a6fb8660c518e1363f99cbb523d69316be6b19f0a6168622780f4642bd901f376c3d38cfd1a600d9ac1ce1fbb
+DIST diffoscope-201.tar.gz 2705733 BLAKE2B 97f74633bd990408af9ba33feb38243da22253b1f1c49a23d11cf6cc16197b3a4fdb371f01f310a2a5ee782ae89209c2f80b0956d48b0a5c5308dd6f50aba86f SHA512 a221d656a49b77f08eb884acc8bbabd1e4469ff2411d47532c0326743653b43e45a60e5fb39d841c1b835d896dbe9d08032f51f295f5399af878be18305acd52
+DIST diffoscope-202.tar.gz 2706185 BLAKE2B 11d77445d9cd4a8b2bba5f8a31a3b9e08862937af3ce3aea993603026483758d1742254629fb7541c751ab1c5213dff892b102bc625ead78fc56ce01e25aefd8 SHA512 f42ea35a492ef62740188986b25f629d4a0d62d1ee1e6d284c4251577170720ca731a7f11f387f64b68f82817f47019b3aaf236d0bb19f4c0a65d4048c5a0266
 EBUILD diffoscope-197.ebuild 3271 BLAKE2B ade3cf501f71ee523ed95a2f10f71753989edc12d8107320f389f6b05b4733c0dc7e6e886c19bd1682273f3cd5e115d770b8b06ae20e02bb096c14048bbe7a3b SHA512 cad1ff3dda20a61954833f6219ab695387cde56425009b2c781cab88950cb9f3752cbfa8e24914ad05fe3916d3b5299bb254c06cab8044d5d05abe30ac58fbe4
-EBUILD diffoscope-199.ebuild 3268 BLAKE2B 62547024451bbe8e19d6eefd8ad5ddb46a425223e51e7246c3e68f61558c33799b1ae2bb79b4c57fa6e689f96968f4d85ad63259364f0f22d113a9bd344d2ede SHA512 05c07ccfd94eb1315bf1aac9675eb352e6ed6dce9e09a91f8e67b6a1e9282ca90e331e8da7b97bfdf25168a4068b55775db3c2b88989dbefb5c1bab21bacf2f2
-EBUILD diffoscope-200.ebuild 3268 BLAKE2B 62547024451bbe8e19d6eefd8ad5ddb46a425223e51e7246c3e68f61558c33799b1ae2bb79b4c57fa6e689f96968f4d85ad63259364f0f22d113a9bd344d2ede SHA512 05c07ccfd94eb1315bf1aac9675eb352e6ed6dce9e09a91f8e67b6a1e9282ca90e331e8da7b97bfdf25168a4068b55775db3c2b88989dbefb5c1bab21bacf2f2
+EBUILD diffoscope-201.ebuild 3266 BLAKE2B 099a25b2748694ed73b9a17efc1bf149164c9df80b8cc832a6c269901b72d69ce4acc0665585d3c9e0fe8269954604420a08985a32a35dec0b99203fe5e198eb SHA512 678c442837ec264add7917231a763a339e951d672ff161bbabac6fe50ba938eb908d87fdec34e051001951d49d7fbe98e6d65421c05d819c2f232cab2e459eba
+EBUILD diffoscope-202.ebuild 3268 BLAKE2B 62547024451bbe8e19d6eefd8ad5ddb46a425223e51e7246c3e68f61558c33799b1ae2bb79b4c57fa6e689f96968f4d85ad63259364f0f22d113a9bd344d2ede SHA512 05c07ccfd94eb1315bf1aac9675eb352e6ed6dce9e09a91f8e67b6a1e9282ca90e331e8da7b97bfdf25168a4068b55775db3c2b88989dbefb5c1bab21bacf2f2
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-200.ebuild b/dev-util/diffoscope/diffoscope-201.ebuild
index ec72907f21dc..eb627b7b6c72 100644
--- a/dev-util/diffoscope/diffoscope-200.ebuild
+++ b/dev-util/diffoscope/diffoscope-201.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+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
diff --git a/dev-util/diffoscope/diffoscope-199.ebuild b/dev-util/diffoscope/diffoscope-202.ebuild
index ec72907f21dc..ec72907f21dc 100644
--- a/dev-util/diffoscope/diffoscope-199.ebuild
+++ b/dev-util/diffoscope/diffoscope-202.ebuild
diff --git a/dev-util/edi/Manifest b/dev-util/edi/Manifest
index 8fc2b29ae712..6529d5327232 100644
--- a/dev-util/edi/Manifest
+++ b/dev-util/edi/Manifest
@@ -1,3 +1,3 @@
 DIST edi-0.8.0.tar.gz 1076134 BLAKE2B b422493a1786f6dd2865adfdc88d756e7ced7681d8ccfbb6d0befcf04b035435134b168752d47dc25f86b1ee59c659a23b04b392787f8863f772e90a5f6f55fb SHA512 88d4ff3f5a4c56c3de7392024022a505907b6d6a16854254f227e457157fd7abd35eff1916842c77fcd6b81d42ec2fa15deceee632bf67d22ab272f8e755215c
-EBUILD edi-0.8.0-r1.ebuild 1334 BLAKE2B 0221ed226091ba13f7a89469274248aa8a3ee997eb485244258ed67645037cd50efc8f557183d05677178a3c817067824ea07566241add4974640e8a14ba7004 SHA512 f83cc9c36ae10e12cc9e1b63682334386c9ec4d11f9c7b7814132486058a5386147373628d55075379646d3ad5c64b59357a3373b14b97ad74894352b7e49ea2
+EBUILD edi-0.8.0-r1.ebuild 1351 BLAKE2B 0dc5846a8c0ddfc48d22522d599c2e51d761bc6bb3010db40b055aa1b4a8ca5fbfdedca73d0e03c13512f4ef3e29b1f85ad9d60c3ab4b34ad9f476cab135aa34 SHA512 7ba44bd9a47fb48b568e2d5c91008294e61e408324f5ef322b2ba3253426eea3b5a3871cf961bb850470cd1963468e5f69daca5b0c1cd07dcb90f18f55501e04
 MISC metadata.xml 484 BLAKE2B f8b79e0c6fdd8c6917988c8bdac916d7473592e791d7a7fbd652b6640aa033868c8c88ac46c11418e7f2e3e28c131540d408524935ccc8669d5d3d73cb6faa01 SHA512 f3b6508bb912230b29347cb14e91917b5716b464292f37b0b9ef78487c830090eaa90228251ec589ce497de68d20abc94d1fb73c55562e4606b6f083e7071d3b
diff --git a/dev-util/edi/edi-0.8.0-r1.ebuild b/dev-util/edi/edi-0.8.0-r1.ebuild
index 920db6c168b1..859c80b1b229 100644
--- a/dev-util/edi/edi-0.8.0-r1.ebuild
+++ b/dev-util/edi/edi-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,7 +24,8 @@ RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
 	)"
 DEPEND="${RDEPEND}
 	dev-libs/check"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="virtual/libintl
+	virtual/pkgconfig"
 
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 7af25c05fceb..91436a0fde71 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,9 +1,7 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
-DIST glib-2.68.4.tar.xz 4945212 BLAKE2B 2135e2bea778714494b9f3ef140f20639f95dd347c9025e5663ca8f493092cd2723aba6520bb4f85687491794353685eccacc4dd34339962e5cb717e6130c025 SHA512 be17d79b41d17fd2b144184d6e793180667b7d9ba299215ea6d4948b4c05f6d888b4868c48643e25935a34ee2f85ee1d03e53325151b7a61819437cbd3c84b10
-DIST glib-2.70.0.tar.xz 4796812 BLAKE2B de393961c8c2b98fadc1cc0a3647de4fb9d54193e000005c847468e48baa30abcc518d94e1aaa69e09414ee0218c5502f872e08818bcc404aa0c61f94fe2c156 SHA512 fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f
 DIST glib-2.70.2.tar.xz 4822356 BLAKE2B 63b1f4e05f26cd51c3345bb042e2175ebcdb22afa3fef85bccae530581a378070e6c7ea48eb957bcc73142ea228ddb70bdac2679ca2f81155a668560397aaa37 SHA512 872e3f06f87f21a32446b41aac7454fd6bf4d665c753121f6e9772cddebc592b79d88713fc6b8d510636af9f9c4528a9d508d8c4225c6dfeb928390120fb4809
-EBUILD gdbus-codegen-2.68.4.ebuild 2183 BLAKE2B f43f374f521311b92c6c22b18a498fda0f67376e4ccef0267051717e0475946175e5bdc0060bf27b6c3d88a6bd6ead6df1c249149dc8b3fd40c253766c56956b SHA512 79d0f7a65b858d35a0d35d269514df389a855be19054866b81d6caaef92ae848434770a72b74f896d87ba33b8cd765034c69a5fad9af64b7fae9b922ebf8b0ca
-EBUILD gdbus-codegen-2.70.0.ebuild 2191 BLAKE2B 7e930b02948aa484521a4d77b8e11fa307fedf74b0949d51bb07e26e1033ff53951f64ab1555ac7d31b8ff24ad4fe3066d69033bdcd94841bfa56d2222ee3f42 SHA512 023e2212b493defdad865c65ef3971ca7d9f60587950158ee261f2f289552614954a9b14ead1761c9bf33e0e45eed0f233ab670a7813b162e861bc70f15b44b9
-EBUILD gdbus-codegen-2.70.2.ebuild 2191 BLAKE2B 7e930b02948aa484521a4d77b8e11fa307fedf74b0949d51bb07e26e1033ff53951f64ab1555ac7d31b8ff24ad4fe3066d69033bdcd94841bfa56d2222ee3f42 SHA512 023e2212b493defdad865c65ef3971ca7d9f60587950158ee261f2f289552614954a9b14ead1761c9bf33e0e45eed0f233ab670a7813b162e861bc70f15b44b9
+DIST glib-2.70.3.tar.xz 4824700 BLAKE2B ba84333b3ad27c0092ebd8bfe31a522d30ef8b18e7483123da6e353bb572f8a58307e23758e93ac95eb781b4d5ff86f20d84eedc1ac6e72af85822f2891bcea0 SHA512 d0e58ea71575e30707b6eda0a5231bc9bd202bcd7a0293fed9e378252a9e430e219b82cd8a12eaab41bb0a0605bb9f3a1cdb8db6766cd42bac8ca9bd9885b80a
+EBUILD gdbus-codegen-2.70.2.ebuild 2183 BLAKE2B 5a25fb25dde1b297bd4c3413070dee2e7a3c51c763372d62c1c92e4aeb022e513c03dae4505a39d011fe10a0e254b90ecb17e56894d4936f0e9ae0aa36f2507f SHA512 fe3d58113918cf0d3d6665d0c243ac900fa54d411a12c8ea1b74e6af49b3055f92ab6142dab8aebeeb3f61aa20fdc176bf0f3b931ec7ac0aa8b9e37acfa1eb6e
+EBUILD gdbus-codegen-2.70.3.ebuild 2191 BLAKE2B 0064d0f01a14f641c9f63239512603d27e9b250724518830c3075e8c05f951e3d14a4f402a6555e3713646722c5e447939d0feab3787aa852753894aff631b96 SHA512 5b0df36169361fa447fd48510ce9a157b562889c8fce22b507203f8b8599b815ae2e4a2aa9bfb7a41cd554ac95fcd22baba8c0afcae9021f447cb4f78440f7cd
 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
deleted file mode 100644
index cbfb6ebcd040..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.68.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	local MAJOR_VERSION=$(ver_cut 1)
-	local MINOR_VERSION=$(ver_cut 2)
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
-		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.70.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.70.2.ebuild
index acef6bad7645..d953cc9ef5f4 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.70.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.70.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/gdbus-codegen/gdbus-codegen-2.70.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.70.3.ebuild
index acef6bad7645..672168a9fcce 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.70.0.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.70.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/gef/Manifest b/dev-util/gef/Manifest
new file mode 100644
index 000000000000..7014a1d3b411
--- /dev/null
+++ b/dev-util/gef/Manifest
@@ -0,0 +1,6 @@
+DIST gef-2021.10.tar.gz 170829 BLAKE2B 4d21fb68b2d9239dea912bb41790c7ffe83d9a7bb17cc6b3df67078b0147ff06676ff257c46567fb9a4fa76d5e12140f567f153337e83dbdd10cf0576cd08499 SHA512 30ccc728322651c3fc88f629165a96f593f079ddaa21d194e483804cdf4bcb235ed28cfaaa6fdd85c134b2314f32bd87e3dcf5decc45720f8e7b89ca9af2c379
+DIST gef-2022.01.tar.gz 211779 BLAKE2B 1cb501cc7e05b1f96bb1d3ea42c8970273aea717b927f90120dbc5d0b5d9d7e28a89d1b1eb8a969406dfcd4f06f23e703e3aaa27a5a294b0d454d41b82b7bd12 SHA512 4e89ab889933464711c7a990df7fe6a6c014b80e9f5ad5e77382c3938413d31d03838e2215225defae88008b2ca0e577edeb01189189ea5e37d07204375fb47b
+EBUILD gef-2021.10-r1.ebuild 1661 BLAKE2B 78c76fca05678d67ebda6d6f66b049f9556e6cb12e103c51dc78fa0510ce107e1c7c045bf7a5dad059c2d7b1977508370fe17e1116c127bdb431c9d27b5f03a8 SHA512 e5fdb32b56781916bc5c2d2176d9dfc04adf292515c959b06bd5967c57b4fedbe0a3a5ca340f1b711bbe90811774c36f92aa9fffdb59b95432a51ba172e64a56
+EBUILD gef-2022.01.ebuild 1661 BLAKE2B 83010f4388cb5093d4e2c8bba19520ea1d6427f38f2a0f1c77d1c87e152c9358fa9e5c4f841a8cc77f8a3653ecd6ba5a06f3ea36a24b81ef9857382a972671a1 SHA512 6123c66afd5deb56c6059ac3e40919518ddcbc7b80f214210b70192da8a0ab912b431c451e28838e42d673d19c5fe853b22643d1b5c3a04136a8a3f2a5c4b3d2
+EBUILD gef-9999.ebuild 1661 BLAKE2B 83010f4388cb5093d4e2c8bba19520ea1d6427f38f2a0f1c77d1c87e152c9358fa9e5c4f841a8cc77f8a3653ecd6ba5a06f3ea36a24b81ef9857382a972671a1 SHA512 6123c66afd5deb56c6059ac3e40919518ddcbc7b80f214210b70192da8a0ab912b431c451e28838e42d673d19c5fe853b22643d1b5c3a04136a8a3f2a5c4b3d2
+MISC metadata.xml 995 BLAKE2B f4c30ac2ea932c90b74800c44389169199cdc189e69584a3873c91b36086eb30b5d463a12a5b08cc45196aa57e939d00806e3d1e96fbb647c997ab891a312ea0 SHA512 b4e09578a7f5656688dced42d1f924ba928b59abcb8345fe143be11ae30b553cda26663c6771a99e44ffc9f72c187b871ee2d1c096bf49d37b1e0fd460653ad4
diff --git a/dev-util/gef/gef-2021.10-r1.ebuild b/dev-util/gef/gef-2021.10-r1.ebuild
new file mode 100644
index 000000000000..42103522b0c2
--- /dev/null
+++ b/dev-util/gef/gef-2021.10-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit python-single-r1 wrapper
+
+DESCRIPTION="A GDB Enhanced Features for exploit devs & reversers"
+HOMEPAGE="https://github.com/hugsy/gef"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hugsy/gef"
+else
+	SRC_URI="https://github.com/hugsy/gef/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+# Seem to hang right now?
+RESTRICT="!test? ( test ) test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ropper[${PYTHON_SINGLE_USEDEP}]
+	sys-devel/gdb[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/capstone[python,${PYTHON_USEDEP}]
+		dev-libs/keystone[python,${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+		dev-util/unicorn[python,${PYTHON_USEDEP}]
+	')"
+
+BDEPEND="doc? ( dev-python/mkdocs )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		')
+	)"
+
+src_prepare() {
+	default
+
+	sed -i -e '/pylint/d' requirements.txt || die
+}
+
+src_compile() {
+	# Tries to compile tests
+	:
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r *.py
+
+	python_optimize "${ED}"/usr/share/${PN}
+
+	make_wrapper "gdb-gef" \
+	"gdb -ex \"source ${EPREFIX}/usr/share/${PN}/gef.py\"" || die
+
+	if use doc; then
+		# TODO: docs.eclass?
+		mkdocs build -d html || die
+
+		rm "${WORKDIR}"/${P}/html/sitemap.xml.gz || die
+		dodoc -r html/
+	fi
+
+	dodoc README.md
+}
+
+pkg_postinst() {
+	einfo "\nUsage:"
+	einfo "    ~$ gdb-gef <program>\n"
+}
diff --git a/dev-util/gef/gef-2022.01.ebuild b/dev-util/gef/gef-2022.01.ebuild
new file mode 100644
index 000000000000..e29ca85b5b66
--- /dev/null
+++ b/dev-util/gef/gef-2022.01.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit python-single-r1 wrapper
+
+DESCRIPTION="A GDB Enhanced Features for exploit devs & reversers"
+HOMEPAGE="https://github.com/hugsy/gef"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hugsy/gef"
+else
+	SRC_URI="https://github.com/hugsy/gef/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+# Seem to hang right now?
+RESTRICT="!test? ( test ) test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ropper[${PYTHON_SINGLE_USEDEP}]
+	sys-devel/gdb[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/capstone[python,${PYTHON_USEDEP}]
+		dev-libs/keystone[python,${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+		dev-util/unicorn[python,${PYTHON_USEDEP}]
+	')"
+
+BDEPEND="doc? ( dev-python/mkdocs )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		')
+	)"
+
+src_prepare() {
+	default
+
+	sed -i -e '/pylint/d' requirements.txt || die
+}
+
+src_compile() {
+	# Tries to compile tests
+	:
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r *.py
+
+	python_optimize "${ED}"/usr/share/${PN}
+
+	make_wrapper "gdb-gef" \
+	"gdb -ex \"source ${EPREFIX}/usr/share/${PN}/gef.py\"" || die
+
+	if use doc; then
+		# TODO: docs.eclass?
+		mkdocs build -d html || die
+
+		rm "${WORKDIR}"/${P}/html/sitemap.xml.gz || die
+		dodoc -r html/
+	fi
+
+	dodoc README.md
+}
+
+pkg_postinst() {
+	einfo "\nUsage:"
+	einfo "    ~$ gdb-gef <program>\n"
+}
diff --git a/dev-util/gef/gef-9999.ebuild b/dev-util/gef/gef-9999.ebuild
new file mode 100644
index 000000000000..e29ca85b5b66
--- /dev/null
+++ b/dev-util/gef/gef-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit python-single-r1 wrapper
+
+DESCRIPTION="A GDB Enhanced Features for exploit devs & reversers"
+HOMEPAGE="https://github.com/hugsy/gef"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hugsy/gef"
+else
+	SRC_URI="https://github.com/hugsy/gef/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+# Seem to hang right now?
+RESTRICT="!test? ( test ) test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ropper[${PYTHON_SINGLE_USEDEP}]
+	sys-devel/gdb[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-libs/capstone[python,${PYTHON_USEDEP}]
+		dev-libs/keystone[python,${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+		dev-util/unicorn[python,${PYTHON_USEDEP}]
+	')"
+
+BDEPEND="doc? ( dev-python/mkdocs )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		')
+	)"
+
+src_prepare() {
+	default
+
+	sed -i -e '/pylint/d' requirements.txt || die
+}
+
+src_compile() {
+	# Tries to compile tests
+	:
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r *.py
+
+	python_optimize "${ED}"/usr/share/${PN}
+
+	make_wrapper "gdb-gef" \
+	"gdb -ex \"source ${EPREFIX}/usr/share/${PN}/gef.py\"" || die
+
+	if use doc; then
+		# TODO: docs.eclass?
+		mkdocs build -d html || die
+
+		rm "${WORKDIR}"/${P}/html/sitemap.xml.gz || die
+		dodoc -r html/
+	fi
+
+	dodoc README.md
+}
+
+pkg_postinst() {
+	einfo "\nUsage:"
+	einfo "    ~$ gdb-gef <program>\n"
+}
diff --git a/dev-util/gef/metadata.xml b/dev-util/gef/metadata.xml
new file mode 100644
index 000000000000..9ee6bdf0edc1
--- /dev/null
+++ b/dev-util/gef/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>mario.haustein@hrz.tu-chemnitz.de</email>
+		<name>Mario Haustein</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<longdescription>
+		GEF is a set of commands for x86/64, ARM, MIPS, PowerPC and SPARC to
+		assist exploit developers and reverse-engineers when using old school
+		GDB. It provides additional features to GDB using the Python API to
+		assist during the process of dynamic analysis and exploit development.
+		Application developers will also benefit from it, as GEF lifts a great
+		part of regular GDB obscurity, avoiding repeating traditional commands,
+		or bringing out the relevant information from the debugging runtime.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">hugsy/gef</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index 3ece62266c91..199143ab587b 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,7 +1,3 @@
-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 911 BLAKE2B 6346cb3177e913b847d940467f320b777fe6ca63b7741f0325212714f64823c1562c3393ed587d2cf7c68e335f69897ef90f7a7772257acd84900014bc8f2993 SHA512 5c7c21c7853fe8cd666d06dcc6d302aabd2b38189f9b3c1adc05333fb4a50c164daac06086e89b9cd447f5c5eac8df42b0059b9eaf360782cb8d3079faa9ec49
-EBUILD gi-docgen-2021.8.ebuild 918 BLAKE2B e8dc18e6a686aaa30ec8f99cc2bfbb5d6f378a9c1ae8b8931e13c0b4aa21597e7d42ae5e24adedeabb16ad82da350ebadef637d79d9ad2c4f2e2c64aaad0a808 SHA512 e355421843d82998fa2a9cb03ac061918ef535c97f68621cb1d33190e5f34a0c92e867e1f72289f6506e318caed43403244c046ca561c348b57f54eb81043dee
+EBUILD gi-docgen-2021.8.ebuild 915 BLAKE2B fc6be44c826ab948abe21ea69f13912494b70ad4e894e6195639b45ba63b218c28080a40634947f900dd7705162cac163b06a5eb0a467c117ee83813848ba583 SHA512 e2f4d19696e90797a8bc18753501e7f2f0b79103f5e52fa40c02c8a06ca8777047bb7bfd49e0f327ebab533af4f14bca2021d6fb7cbbae24de142d5e06a11907
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gi-docgen/gi-docgen-2021.6.ebuild b/dev-util/gi-docgen/gi-docgen-2021.6.ebuild
deleted file mode 100644
index f30962aacda9..000000000000
--- a/dev-util/gi-docgen/gi-docgen-2021.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{7..9} )
-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 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/gi-docgen/gi-docgen-2021.7.ebuild b/dev-util/gi-docgen/gi-docgen-2021.7.ebuild
deleted file mode 100644
index fd3c9a86bb6f..000000000000
--- a/dev-util/gi-docgen/gi-docgen-2021.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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/gi-docgen/gi-docgen-2021.8.ebuild b/dev-util/gi-docgen/gi-docgen-2021.8.ebuild
index cd9167886b84..34979ee84a1d 100644
--- a/dev-util/gi-docgen/gi-docgen-2021.8.ebuild
+++ b/dev-util/gi-docgen/gi-docgen-2021.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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/git-delta/Manifest b/dev-util/git-delta/Manifest
index ec4b87c3fbe7..b81e29f58d38 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -143,6 +143,6 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST xdg-2.4.0.crate 14035 BLAKE2B 9a2ce4737bbc4f36b007008fb6d66065bb2354c03df4feab127992d360f2e2d9a681c314f61b856b165b6515781917976bee415fba0b9e814695a046de467387 SHA512 d45b090c83bda578d89480f783e7238149203256d61aed46ae1657dc3de62551a618aa5a02e9d9867b39de82a8df527d37432b9b8c41afbbf0188f3644c4ad2d
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD git-delta-0.11.3.ebuild 3638 BLAKE2B b5f9024a73d351cd946907b4932e14c81ff9fe3f22ae6228a72d8e2687ac550d2e480cf7ef42b3d5e7244daa42c8ae5ce44a4933d5852a5f95a522db5c32426a SHA512 d0e8e7883cfcefd7fe7b2c66d83309ad620a5adf3b553846c2d9136652e77f17d947392d20190a49d79b3742cab2f34b297d30101e0226dff0f292022ee97a1c
+EBUILD git-delta-0.11.3.ebuild 3637 BLAKE2B 6b7c2111f9ed1d57c36398679947c7259fff90ac077d2c6a1879ec313742e5726dbf1c508c642aafb5df72c950fd0e04de63a5de66336dbc8196d0fa01bba05c SHA512 57d15f9ee8d1987710ce9e7414dda236ca046c5870c88cc5cedbc56bc845a013a571f6c404959cf5cdc46ac7187be6bd07a04649a1e60bf0ed3b5153df4dda85
 EBUILD git-delta-0.9.2.ebuild 3267 BLAKE2B 4901e4e31893d226fde729f5cdff902695a7b13d58d7c13b31992c18db28e4ae82f8ba97dbb5eb9ef3ac902c6ee09d61a5b141f1ee3c8684d5fd369e70001d3f SHA512 8fb549ec50c1b9f6707f61860602f2f37843d0ac34a85b928894d73b6d025d238b906aa49f5d04967fa212a75923984162626e8e7594e291faca23081deede65
 MISC metadata.xml 331 BLAKE2B 01b09c3e764fe24bd909a1e63b92e84a43a251f2487a0bddbe08f698eed443217a87f346e815e8f50948f3511e8036c8036d3c6e88195b6a6102e69fd169aee7 SHA512 cf4eb826415b89530fca726807669309f34cb2a04adc0b1a9352b10d9cec538beab5ebc79b1bbc5c69d9ae160856a5346cdca7315fd6be70de546e0abb89a020
diff --git a/dev-util/git-delta/git-delta-0.11.3.ebuild b/dev-util/git-delta/git-delta-0.11.3.ebuild
index 72415182f603..d5e1bdedd96c 100644
--- a/dev-util/git-delta/git-delta-0.11.3.ebuild
+++ b/dev-util/git-delta/git-delta-0.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -156,7 +156,7 @@ S="${WORKDIR}/${P/git-/}"
 
 LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions Boost-1.0 LGPL-3+ MIT Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index b961e7853138..f6f3fa1bfa77 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,4 +1,5 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
+AUX glade-3.38.2-meson-0.61.patch 1334 BLAKE2B 009af5a6617b59519eec3c4033d63f898ca71621628ef519da6d0ea68bc16e588f74b04d972c405c554a3f7f608e1704a1dd314a030b890c8b52e46ac0b7d8af SHA512 3248d5faf635a15303e8249637608b840b699208f1caae2d21e612caf3826a15de71456764ef98b801eb97fe3fe19e71fd868528a502d5540df4bb7ae75dbf11
 DIST glade-3.38.2.tar.xz 2709224 BLAKE2B 2bcd447b90d6e67abc44dd273f0f5d7fc1d6848ef0bd878481f2c10e8846828e63fbf9c9c96e5effe8126b4aec7eb05886606ca1dc5fb94943bc5d1d8d0ef4e2 SHA512 2df8c8363206905663cd3ac9196da44445425a888b64f1b3b3ac6cd41e14c4a82a5d2c299730ef0606c3970a04dd8f245bb5639218794eb67dcbd26fae17565e
-EBUILD glade-3.38.2.ebuild 1895 BLAKE2B 6b6567a45fa1bc8298613fb029d448a5e40f85920e7648b443a934e772e764cfb933332cba206483782690cedc3ff14c8a100c9895ea5fbbb5d97eddbbdd85e3 SHA512 f3c050c504d111678095de0f001c65a8116c7ca187c67a0e2f09d497a3c80540ff38c9c01cdda7f128c38d5eebcfcf6c76e7167186e358a892da3b163c232058
+EBUILD glade-3.38.2.ebuild 1975 BLAKE2B a92853e65b8f7edb25e6f78ef31e3094158b12fbbfb45f2b9655d638452ad6b4e62c83bf9cb7268d89a3f8946d78f62e7b4301dbcb30fd2b4851374cc67ee882 SHA512 f06fba20805b3b61968d27acbd9777771d2662e13de009bd363e37ea53f2d819881d648edfcbaa6699c3d145c473c893f3cfae09eb54c78240e0e92f0eb01031
 MISC metadata.xml 443 BLAKE2B 26f4701b1aaa6e751e838240b2c5d5f45b76b5dc2a5321a2f58384f9afa25ddd0409722cbe8865fb160272968babdc9145cbeb9ff3602697a7aaec3c9d5e6db6 SHA512 6a334008fb56ba68d64a0f1c064032b9677d8891bb0af7d6f9a02ee5408dfccb2e917f64ece43bc2e9b3ea740a29f2bae12b7fa14c07b7c6dca388d2e9725af8
diff --git a/dev-util/glade/files/glade-3.38.2-meson-0.61.patch b/dev-util/glade/files/glade-3.38.2-meson-0.61.patch
new file mode 100644
index 000000000000..72f9c0e509ba
--- /dev/null
+++ b/dev-util/glade/files/glade-3.38.2-meson-0.61.patch
@@ -0,0 +1,57 @@
+From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:18:09 -0500
+Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
+ argument
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 9f244566..bfbc514c 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', glade_version)
+ 
+ i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Glade.desktop.in.in',
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ appdata = glade_name + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Glade.appdata.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+GitLab
+
+
+From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:19:03 -0500
+Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index fc3cd4c3..d67e42c8 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -1,6 +1,5 @@
+ # please keep this list sorted alphabetically
+ #
+-da
+ bg
+ ca
+ cs
+-- 
+GitLab
+
diff --git a/dev-util/glade/glade-3.38.2.ebuild b/dev-util/glade/glade-3.38.2.ebuild
index b904db0e2b54..5844cf0a192c 100644
--- a/dev-util/glade/glade-3.38.2.ebuild
+++ b/dev-util/glade/glade-3.38.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,9 @@ PATCHES=(
 	# To avoid file collison with other slots, rename help module.
 	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
 	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
+
+	# https://bugs.gentoo.org/831453
+	"${FILESDIR}"/glade-3.38.2-meson-0.61.patch
 )
 
 pkg_setup() {
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 917607847c8c..a0a0e924a886 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,5 @@
-DIST glib-2.68.4.tar.xz 4945212 BLAKE2B 2135e2bea778714494b9f3ef140f20639f95dd347c9025e5663ca8f493092cd2723aba6520bb4f85687491794353685eccacc4dd34339962e5cb717e6130c025 SHA512 be17d79b41d17fd2b144184d6e793180667b7d9ba299215ea6d4948b4c05f6d888b4868c48643e25935a34ee2f85ee1d03e53325151b7a61819437cbd3c84b10
-DIST glib-2.70.0.tar.xz 4796812 BLAKE2B de393961c8c2b98fadc1cc0a3647de4fb9d54193e000005c847468e48baa30abcc518d94e1aaa69e09414ee0218c5502f872e08818bcc404aa0c61f94fe2c156 SHA512 fd3fcaebd34aebe0e63f9dc915b2df026a3f88a5c2254e9f17beea0a59ab0ac563976fca54eb57bd2f7af183c4ae76fb86f05951216bf4159d258b5e7b29696f
 DIST glib-2.70.2.tar.xz 4822356 BLAKE2B 63b1f4e05f26cd51c3345bb042e2175ebcdb22afa3fef85bccae530581a378070e6c7ea48eb957bcc73142ea228ddb70bdac2679ca2f81155a668560397aaa37 SHA512 872e3f06f87f21a32446b41aac7454fd6bf4d665c753121f6e9772cddebc592b79d88713fc6b8d510636af9f9c4528a9d508d8c4225c6dfeb928390120fb4809
-EBUILD glib-utils-2.68.4.ebuild 2325 BLAKE2B 18a9aa68cb4debe9b453c1fc27d80ec03b8ba6cd543795f65a05e03f10a9a6332d88f7a02aa2eba38e727c49b7a573a91bb3f21b93d3e8f25d8cb34e4071ef4d SHA512 5ed765e837315805aa81bf2eaed07c2551470d6c1b8f0255d6be3e188d960e31a5d9de6dd2b40257dade3299f1da2837244886d70b42001b3dfa03326f63faba
-EBUILD glib-utils-2.70.0.ebuild 2333 BLAKE2B 947e66dd635d26de20f2bb0c4e060d16266edf7e38019f636081c19d659b11a9b626859d8311b32b82726ea3d762d27bce24f9d073c757d80b7ee6bd2880a8e5 SHA512 f135dd2a58622314db75d94663c6515f2f25086484bdae9bd0055b1058cfed68f205358e84c86d966d521c669f7bbb48a41544238caa239ea283bc3c7f3c2f5e
-EBUILD glib-utils-2.70.2.ebuild 2333 BLAKE2B 947e66dd635d26de20f2bb0c4e060d16266edf7e38019f636081c19d659b11a9b626859d8311b32b82726ea3d762d27bce24f9d073c757d80b7ee6bd2880a8e5 SHA512 f135dd2a58622314db75d94663c6515f2f25086484bdae9bd0055b1058cfed68f205358e84c86d966d521c669f7bbb48a41544238caa239ea283bc3c7f3c2f5e
+DIST glib-2.70.3.tar.xz 4824700 BLAKE2B ba84333b3ad27c0092ebd8bfe31a522d30ef8b18e7483123da6e353bb572f8a58307e23758e93ac95eb781b4d5ff86f20d84eedc1ac6e72af85822f2891bcea0 SHA512 d0e58ea71575e30707b6eda0a5231bc9bd202bcd7a0293fed9e378252a9e430e219b82cd8a12eaab41bb0a0605bb9f3a1cdb8db6766cd42bac8ca9bd9885b80a
+EBUILD glib-utils-2.70.2.ebuild 2325 BLAKE2B 41a83426356b676395ad73eafbe3e8bb6642fd26c0258392763ff6a513d7871acced7aed6f99b4e68026b32cd565be11048f86f5f921071509cd17089218c49f SHA512 406a7c904e96055543a2025b808f675199f0f5a76fa511899ffee4dfc7fd6a8aea98e0a678825891e1f9879641b292fd784cc310368496917736d2991cd213e5
+EBUILD glib-utils-2.70.3.ebuild 2333 BLAKE2B 4355ec8d3face6b515901ae4d045c444258926622d716f3a4450b7bebd2bb05a68de349ece956318d3bed44b7124e99eda02b750dae4abba7e5705668042e9a5 SHA512 a0f23485fbba8965a3b437dcbf9b2b5d343d1fa57d3e932aa6687c15d62b8a477fa81e1e7d963d34e65c935e4db7860accca4ddfbc4c13b8b9647d47e65493f1
 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
deleted file mode 100644
index bd85373df4df..000000000000
--- a/dev-util/glib-utils/glib-utils-2.68.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-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"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.70.2.ebuild b/dev-util/glib-utils/glib-utils-2.70.2.ebuild
index 87fc5fc52d18..b3ccd00c17bd 100644
--- a/dev-util/glib-utils/glib-utils-2.70.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.70.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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/glib-utils/glib-utils-2.70.0.ebuild b/dev-util/glib-utils/glib-utils-2.70.3.ebuild
index 87fc5fc52d18..1872b62fdd4c 100644
--- a/dev-util/glib-utils/glib-utils-2.70.0.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.70.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
index 38df2b8b7d67..e68bf42a5730 100644
--- a/dev-util/gnome-devel-docs/Manifest
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-devel-docs-40.0.tar.xz 10756744 BLAKE2B 565a6340191f7f3f1d8e396bd0109d9d82792829dbdfc1d155115acfe6453b239e095e3c6f763a0b94119d173e1063ecc48296760cd9a39a3f29356de4faf6cf SHA512 c7068cfe712c94b01d0387bd66f64a295096223f0ee1c49cb06d0d4d2c1651da7df1f152164e289cafae5fa53963a9b4e2afd616d1995475a8b2c437fd8c2903
 DIST gnome-devel-docs-40.3.tar.xz 10790760 BLAKE2B 2d7804115ac03fc4c3f46127c2d80bffc8281616d158ea12006d5ba8123f3e52111049f5dc0e235ae2c7709bbdea592100b82630ed5153a44f44ede31da4283f SHA512 c80abbd6e8e06219e9bb4563ea7b42fc8edd03d51be1fa075d217f285e0eff8344bc411f26f7a68c338cf1ebcc1bc05ffc24c6b3dd7d6ad2bf98fa83e3b7ef20
-EBUILD gnome-devel-docs-40.0.ebuild 638 BLAKE2B 9e6642afa1276c9a03efad81d85d8ce8bd9d1c24dc88678783eba4f04bd5572abce1e7192bcfcca5e53bd755dba6a298d0b1f9357de73671b56b3a4f9b66a687 SHA512 ba8723fbb6ee8bef61fd7eca8ba17f83d69a520265de2b1fbdb0023964b9e01e7a9704b316bf9e9ccae981f1152fe852148436050223142b215d620c77e4ba9a
 EBUILD gnome-devel-docs-40.3.ebuild 638 BLAKE2B 9e6642afa1276c9a03efad81d85d8ce8bd9d1c24dc88678783eba4f04bd5572abce1e7192bcfcca5e53bd755dba6a298d0b1f9357de73671b56b3a4f9b66a687 SHA512 ba8723fbb6ee8bef61fd7eca8ba17f83d69a520265de2b1fbdb0023964b9e01e7a9704b316bf9e9ccae981f1152fe852148436050223142b215d620c77e4ba9a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-40.0.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-40.0.ebuild
deleted file mode 100644
index ea104314ef56..000000000000
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-40.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome2
-
-DESCRIPTION="Documentation for developing for the GNOME desktop environment"
-HOMEPAGE="https://developer.gnome.org/"
-
-LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-BDEPEND="
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
-	# Wants to build demo samples
-	gnome2_src_configure ac_cv_path_CC=""
-}
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 39eabcebf565..4cf5402cabac 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,6 +1,3 @@
-AUX gtk-builder-convert-2.24.32-python3.patch 2165 BLAKE2B 2c70d438614cfbe09f5742fb6f0f8519831612058de36bd4173d4f8968ca6f5f546b6c212f6c54a997d43406a0bc787f9b0a5eb117c93d137861e39896a3b066 SHA512 9b52db1bff0a9cbebfac2d2d737c8a75e3ef704993e1bcc2117289b6bc05f1bf797da4763f50b9e9f2f2e93734c8cb747b301191842fee915232614347e7b26d
-DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
-EBUILD gtk-builder-convert-2.24.32-r1.ebuild 1177 BLAKE2B 193385e720b3d39e167c55924c0fc7be8ce5dbd76d8797d1c0a673730e825675ee0764e2fa3ea95f8113e9b9ff37b77da9a236d931f131eb453e499740603523 SHA512 f953bc66ee55540f44ac45dc559fff5b985ba2ecf09e5b1f5e966cf9135af8b225098319ba94e908ce196719fb386d623a2b7abe206874d697c22749dbfeec9f
 EBUILD gtk-builder-convert-2.24.33.ebuild 961 BLAKE2B 863cae58352ba2f8b1a8fd76ee58c50a67d9f3eb1ec502c863705aed5f06d04f556686959028bbaabc6cea2f7b3edd14d6d9a73a15a0d788605c1f501ede32b3 SHA512 a6998849fd45e6fb372b03a28bc6cc26fdb43630cfe68d2a8ae895d983f8a56fff6e6134112b07078720bf9c2aa7a625c3a97bada221891b58921eb83a6a6221
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch b/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch
deleted file mode 100644
index 01dc3d0aaff2..000000000000
--- a/dev-util/gtk-builder-convert/files/gtk-builder-convert-2.24.32-python3.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://trac.macports.org/export/50710/trunk/dports/x11/gtk2/files/patch-gtk-builder-convert.diff
---- a/gtk/gtk-builder-convert	2009-04-27 14:02:41.000000000 +0300
-+++ b/gtk/gtk-builder-convert	2009-04-27 13:58:26.000000000 +0300
-@@ -258,7 +258,7 @@
-         for node in objects:
-             self._convert(node.getAttribute("class"), node)
-             if self._get_object(node.getAttribute('id')) is not None:
--		print "WARNING: duplicate id \"" + node.getAttribute('id') + "\""
-+                print("WARNING: duplicate id \"" + node.getAttribute('id') + "\"")
-             self.objects[node.getAttribute('id')] = node
- 
-         # Convert Gazpachos UI tag
-@@ -441,8 +441,8 @@
-             if signal_name in ['activate', 'toggled']:
-                 action.appendChild(signal)
-             else:
--                print 'Unhandled signal %s::%s' % (node.getAttribute('class'),
--                                                   signal_name)
-+                print('Unhandled signal %s::%s' % (node.getAttribute('class'),
-+                                                   signal_name))
- 
-         if not uimgr.childNodes:
-             child = self._dom.createElement('child')
-@@ -461,8 +461,8 @@
-         for accelerator in get_accelerator_nodes(node):
-             signal_name = accelerator.getAttribute('signal')
-             if signal_name != 'activate':
--                print 'Unhandled accelerator signal for %s::%s' % (
--                    node.getAttribute('class'), signal_name)
-+                print('Unhandled accelerator signal for %s::%s' % (
-+                    node.getAttribute('class'), signal_name))
-                 continue
-             accelerator.removeAttribute('signal')
-             child.appendChild(accelerator)
-@@ -711,7 +711,7 @@
-     return s.stdout.read()
- 
- def usage():
--    print __doc__
-+    print(__doc__)
- 
- def main(args):
-     try:
-@@ -745,10 +745,10 @@
- 
-     xml = _indent(conv.to_xml())
-     if output_filename == "-":
--        print xml
-+        print(xml)
-     else:
-         open(output_filename, 'w').write(xml)
--        print "Wrote", output_filename
-+        print("Wrote", output_filename)
- 
-     return 0
- 
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
deleted file mode 100644
index 9aeabd056a16..000000000000
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Converts Glade files to GtkBuilder XML format"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}"
-# gtk-builder-convert was part of gtk+ until 2.24.10-r1
-# man page transitioned in 2.24.31-r1
-RDEPEND="${COMMON_DEPEND}
-	!<x11-libs/gtk+-2.24.31-r1:2
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.24.32-python3.patch"
-)
-
-src_configure() { :; }
-
-src_compile() {
-	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/gtk/gtk-builder-convert.xml || die
-}
-
-src_install() {
-	doman gtk-builder-convert.1
-	python_doscript gtk/gtk-builder-convert
-}
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index fa5c58d8c7b8..8ffe9ef9c8b4 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,7 +1,5 @@
-DIST gtk-update-icon-cache-3.24.26.tar.bz2 92076 BLAKE2B 650d13d2848adf65fca545f03f599faea763f3380c9e1100d55089e1211808d52267f635bcdcc508dd98a7dd41bfd64c43798db13e3a9869e362cfe03f075dc0 SHA512 20f76853114a014d770756d857a633f41b218d65fd514eed4beaa56f629c392a7581de82a8ef5bffae2cdc7ae00fbdf44ded761f29de34a5912b37101da85538
 DIST gtk-update-icon-cache-3.24.30.tar.bz2 92369 BLAKE2B 89ec0003d527e8dea55c0afd9253f716c6f6b18a52815e861ea4764cc01ca40ffee6ac3d9112457b6a8d83d07364fd89d29efd3c839cd6c95756300ca919727f SHA512 8c9dab1034e9c2fd2029cc7d28d070db6c660bb1190d7842b60f95e209465a6621e49e1feb87af52a13d68d7a03d94938da36c06e89809bf9f9749bd8ae9b571
 DIST gtk-update-icon-cache-3.24.31.tar.bz2 92491 BLAKE2B 4388e7dfbb89e80bc686d5def74dc363562f944ee29b7355849c42ae391034039e138e1e25f5bfaaade09a6f71a5a94e47f5ad921a51ed6ab0485c0d863045ab SHA512 bc86fe49ce1e6eb3a4657dc536a9106eaeaa1f6682d7f8b61da36a5577add7ada8dd46e81de8274800c9e659ddbc4d4d610d6b691c8e582f35298a7e619c3c0c
-EBUILD gtk-update-icon-cache-3.24.26.ebuild 894 BLAKE2B e826d5017315b1682e6839af48816643f15ed4ae0b3de88b34ebfba09b52f661f22ea76db699703000c6e2fc71927c7ce627a3b2cef0e2c12a0504874bd4373b SHA512 e31664e37b5cad2da0ad2c4261cab6ca980d318860d66391aa2f7fb312069921563c432f0d54748a5786053e0a75e97a14120851a87e54934c6ae6abe60f0d41
-EBUILD gtk-update-icon-cache-3.24.30.ebuild 902 BLAKE2B 7715e8adacc6ceac7cda1f631c9aaf8813ad9d0ed7ecca6576f223dca9ae6bc4d269405492491f8f03167c74927f6d773df852690fef7c98d090a9c95854d350 SHA512 90b8b67859a82d65d9d57becebd7bdd1004c20c1556d0c8e66cbc16463e7df99fa21e9843fa78ee675783c2ffed9dc2eb2adf0d9c975f62ea6d8799ecccaf3d7
+EBUILD gtk-update-icon-cache-3.24.30.ebuild 894 BLAKE2B 45b27a3c237c85dd074fd98d73857dfacf87213bf19f7b63d309acd03e2c1bba6cd38c4a5bd70c12ee59749adcc85bcd8b6ab894347307e04da3f2298d08ed9d SHA512 5188a91c7b87b8ca1a194e6ed7602a5b341edbd3cb9f9d96d5a6ad1a399284a918e67760d197cb8bcecba05ff86513531bb2ab93b8cb0d5230b49ea1d2841860
 EBUILD gtk-update-icon-cache-3.24.31.ebuild 902 BLAKE2B 0b1a9bea9129fb2e828a1e42fcb55c3b76094fb2e7a29080688e8dcd757985d229f683a77b8320b718972be6d9ac241c797ba217c606eb3ff093f5cc15c3e48a SHA512 83da1a1ebc34a55fba1e226e5b6f223e5d02384ba0657a0494872ec7a1820e5413127f11d57e4bb759c0e6904f5fb09b96fa455bf24c1b7286692f1849b91774
 MISC metadata.xml 648 BLAKE2B ed19ff8bfaf0f16a46301b34de6f3b85031a04b094122ce28fe518ecea76d5b6bd94e81b374d4524b8eb9f102a252052c9e3a3504012095ce086536f067499dd SHA512 cd479d9f1b3316132d563e2d4f2d8353226b41b1020c76d020627ccb04af1dcee61abcc4fdd9307542e0abe91eca3eec6ce76b69ac4c802a71673a94bcf5dfd8
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.26.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.26.ebuild
deleted file mode 100644
index 55d3312532a5..000000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.26.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache"
-SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# man page was previously installed by gtk+:3 ebuild
-RDEPEND="
-	>=dev-libs/glib-2.53.4:2
-	>=x11-libs/gdk-pixbuf-2.30:2
-	!<x11-libs/gtk+-2.24.28-r1:2
-	!<x11-libs/gtk+-3.22.2:3
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.30.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.30.ebuild
index f0acbb5c0670..468ff108d936 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.30.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.ta
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest
index d635277f27db..326802569d04 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20200512145953.tar.xz 443884 BLAKE2B 74ff269e3e8aa51e6b34f795892f6e8922d098a81b4d855619520d3d366e79b611931cddf4ee2ec60a7e040af11ac8eba7582ad10e24de627df5a4aa4eba6474 SHA512 35bf2af22f2e632b3d6e546e5017df8effd0c7ad80beed9b95ed1e2f294d70215889bc6a0147506461254e951d70189dc48824af10a6620e996945d2cf5586ee
-EBUILD gyp-20200512145953.ebuild 1605 BLAKE2B 01ac4411cccbc243f96a0bbc1241a8f126e324004db0ab0ff576c8a7b6f386ace0dce51fb0e6eac87e793ed3851700ddaa97b5b2a9ae599cc3df7a7a8e2e3316 SHA512 f234adc429a697b3925ac91702b4b3cb398f3b2b03339efc6d645519f52752cf0d08d1825bec9b7a9149db37e82231c2b166172fd0608044d98d0eb3cf377354
-EBUILD gyp-99999999999999.ebuild 1582 BLAKE2B a1ebaba4e2bd2ada60cfc78599e298fea52d4f59c99054b3f779948712749086a8e63184f94fd76d12306e9afe04bb11783c89993068ec6146097ecdda961c02 SHA512 d478ca981d03d2f6d18ab4f1a7a63b433260ee2ff03546ea750d9636bb83865c32596330c97df6a50ca1b032b477dc36f5b2fd7c1b91d70100e1612a03cfad8b
-MISC metadata.xml 411 BLAKE2B bb30db63dcd77eb99e76db1b06d79734b55718c477649b770fcb0c92e11f0e00376f427e5b05dbb74d75432d3e419178fb9eed476aa8ddc10ca3d79618036af4 SHA512 97c994855a83ce9cd67fef4a7f76605de68cceaed5b564908cae20252bf406c6214e1f6410d5191b239f8e659fcc558303bbb247723cd36cd7f69c05bddde650
+EBUILD gyp-20200512145953.ebuild 1568 BLAKE2B ee5841cfe9246f5f3c9fd09f7ca0e42d7143819ed5ac0da6df2250a4da9708ee0e5303a913a851a84b507729d256b7af260c2f4a0e4ce6a45a08e1f8e6dc1333 SHA512 fc152fb305cdf5767f27be89e594da5fbf52fcedc0e441696a1aea27f94004fe848abca17513ecbbec9e8099948952417c14339b9b2ed27a91342fe18ec2c2b6
+EBUILD gyp-99999999999999.ebuild 1545 BLAKE2B 1be39d4ef4805b997a69a1ab022d79e34f902eaca3bd76527179516a2533bcdb7c2a403caed4e2c5b3b055304fef1a1be45f8358dd2a428e2c85a69a196020ff SHA512 e55bf4c3aefc777bdad101dc878243d865f79145912a57cdce4308b1ce32a8246a118a86767db244458362cd2e8afa2092cfce7cffef18fb36aaa4e6f4362fa0
+MISC metadata.xml 383 BLAKE2B 11d9ccc1a7c12278a0087dd176b09d4ef34a9e9372b1a278e3dc19744605a424f02c38d4c311a4148e4938274780020d45f77a5497fab070e80e0e2e655516cc SHA512 c7c78ed2fbac6a1eaa4e6c9ac1bbca07e6d4584ed925d9a37b53e903ee29497e98720cb5eb94918c103288cdb61e4a586e758e6bfbf5f4ff97c8ff5ba54921de
diff --git a/dev-util/gyp/gyp-20200512145953.ebuild b/dev-util/gyp/gyp-20200512145953.ebuild
index 04041f153491..63d9a50cbde2 100644
--- a/dev-util/gyp/gyp-20200512145953.ebuild
+++ b/dev-util/gyp/gyp-20200512145953.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL="1"
-DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
diff --git a/dev-util/gyp/gyp-99999999999999.ebuild b/dev-util/gyp/gyp-99999999999999.ebuild
index f163e0f3957b..9f059ca6f95f 100644
--- a/dev-util/gyp/gyp-99999999999999.ebuild
+++ b/dev-util/gyp/gyp-99999999999999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL="1"
-DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
diff --git a/dev-util/gyp/metadata.xml b/dev-util/gyp/metadata.xml
index afbc38b27c6f..58dbc167607e 100644
--- a/dev-util/gyp/metadata.xml
+++ b/dev-util/gyp/metadata.xml
@@ -5,8 +5,8 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
index aa7a67e16cf9..e21c8ba16876 100644
--- a/dev-util/hip/Manifest
+++ b/dev-util/hip/Manifest
@@ -19,5 +19,6 @@ EBUILD hip-4.0.0.ebuild 3451 BLAKE2B c219b26871ab9197ddd75a4d8e03bdb2d6f9c12cc9d
 EBUILD hip-4.1.0-r1.ebuild 3366 BLAKE2B c8663bbba532bca211de1a8b8253e2df9544cc656ae47a0d8e651161f7e4186227b9cdc11e3b3b010bbb1d8a18ff36ece37d5a9ad4092ed496f3c9d1e7dc7791 SHA512 fc2145fad2fe1e5a28331a91959c591693cec497504344e6ae2587276d7b20e7895d94780273a0f83307efbb0e6099e0bdc1874bcefa2595590a736092502891
 EBUILD hip-4.1.0.ebuild 3476 BLAKE2B 101bb84d3083388e6dc761dca7ccf0ef5393a44be7666831e83303d1dfbd50e81e3fa09d572f9c5cdf30c6fb738e0587bb9ddd0ccb0627bef543bd64648b66f0 SHA512 3af9dc2a5ab5735dfb0cd5341cfe1e99961858d40409ffb065231bea793b8faa3de3b305d28f2dce90e4535e0406f90a3f933b4cbab06933d83b04dd3e433023
 EBUILD hip-4.2.0.ebuild 3634 BLAKE2B 6ab4a5d74b08a2dd765bae85bb91fa7174cb0fbe411c7f4b741db6e49b47d42277e5bbba7e86637b8481a24d2eb0f53b7cb096d4dea09f0a6fc31538a4250fbe SHA512 ad8e4ba2df35b36f96047bdf40e0f7420256eedaa9432249d3d6d184ccfb2d0acbec7d679dfbef8fd278dd6d748334de927a50e7c00f35ce4823af2297d14b5b
+EBUILD hip-4.3.0-r1.ebuild 3782 BLAKE2B b3f7e96b664662e9cdae955993251af254cd44f66e9a4306035875eaed8f507badca6c357bf4fa82e93e76eefdbdf7923de5f56a9eeee762c7ba364abff2b1e7 SHA512 97f34852764c8810eb093ee2aa09f3484382f5a0af5f21543020138bcd8cc40838480a03b1ea88be8044bca71500bf746ed768749e6c71e939b8438f569bd8cb
 EBUILD hip-4.3.0.ebuild 3761 BLAKE2B 7fdd7e65a7b1b246ad94a1e5ee37e7c3199f9dcc02df575e774fdbacf9690ac7609f53c122eff5dd87cddf9afd9c4f52d66a5502b3ec311fd6e9db5f3889a895 SHA512 07d8317cae9f7b2f4c179938477eb00ff8d0a136c730bd18582a835c23a8d9934d03824c2bb520c53cb1c2525e26618236b12dfcbfe520612a60c191a1d2947b
 MISC metadata.xml 597 BLAKE2B cca1b105463e26741aa4bf95c9d85dd582df075795646f633ed5f0d39bace0b07be98f771aa8eb1b89984788249837303b67617e92c4076eb7601611cd2abf6d SHA512 42767156ae0e89b3ce438bfb163161b543e15114838a5c14b4b1c889fe799e44dd9bf9684ee685798a1fc5d2d4c520d3c42c9c74a88178a079ccb634148e0738
diff --git a/dev-util/hip/hip-4.3.0-r1.ebuild b/dev-util/hip/hip-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..59e92546583b
--- /dev/null
+++ b/dev-util/hip/hip-4.3.0-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake flag-o-matic prefix
+
+DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
+SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz
+	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+IUSE="debug profile"
+
+DEPEND="dev-libs/rocclr:${SLOT}
+	dev-util/rocminfo:${SLOT}
+	=sys-devel/llvm-roc-${PV}*[runtime]
+	profile? ( dev-util/roctracer:${SLOT} )"
+RDEPEND="${DEPEND}
+	dev-perl/URI-Encode"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.0-DisableTest.patch"
+	"${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
+	"${FILESDIR}/${PN}-4.2.0-config-cmake-in.patch"
+	"${FILESDIR}/${PN}-4.3.0-hip_vector_types.patch"
+	"${FILESDIR}/${PN}-4.2.0-cancel-hcc-header-removal.patch"
+)
+
+S="${WORKDIR}/HIP-rocm-${PV}"
+
+src_prepare() {
+	cmake_src_prepare
+	eapply_user
+
+	# Use Gentoo slot number, otherwise git hash is attempted in vain.
+	sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die
+
+	# disable PCH, because it results in a build error in ROCm 4.0.0
+	sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i CMakeLists.txt || die
+
+	# remove forcing set USE_PROF_API to 1
+	sed -e '/set(USE_PROF_API "1")/d' -i rocclr/CMakeLists.txt || die
+
+	# "hcc" is deprecated and not installed, new platform is "rocclr";
+	# Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include"
+	# which makes "stdlib.h" not found when using "#include_next" in header files;
+	sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
+		-e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
+		-e "/rpath/s,--rpath=[^ ]*,," \
+		-i bin/hipcc || die
+
+	# correctly find HIP_CLANG_INCLUDE_PATH using cmake
+	sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":/usr/lib/llvm/roc:" -i hip-config.cmake.in || die
+
+	# change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
+	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
+		-i "${S}/hip-config.cmake.in" || die
+
+	einfo "prefixing hipcc and its utils..."
+	hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
+
+	cp "$(prefixify_ro "${FILESDIR}"/hipvars.pm)" bin/ || die "failed to replace hipvars.pm"
+	sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \
+		-e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," -i bin/hipvars.pm || die
+
+	cp -a "${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV}/amdocl/cl_vk_amd.hpp amdocl/ || die
+}
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE="Debug"
+
+	# TODO: Currently a GENTOO configuration is build,
+	# this is also used in the cmake configuration files
+	# which will be installed to find HIP;
+	# Other ROCm packages expect a "RELEASE" configuration,
+	# see "hipBLAS"
+	local mycmakeargs=(
+		-DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
+		-DCMAKE_BUILD_TYPE=${buildtype}
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
+		-DBUILD_HIPIFY_CLANG=OFF
+		-DHIP_PLATFORM=rocclr
+		-DHIP_COMPILER=clang
+		-DROCM_PATH="${EPREFIX}/usr"
+		-DHSA_PATH="${EPREFIX}/usr"
+		-DUSE_PROF_API=$(usex profile 1 0)
+		-DPROF_API_HEADER_PATH="${EPREFIX}"/usr/include/roctracer/ext
+		-DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
+	echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
+	echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
+
+	doenvd 99hip
+
+	cmake_src_install
+
+	rm "${ED}/usr/lib/hip/include/hip/hcc_detail" || die
+}
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 12c9abe0841d..177805c85a65 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,5 +1,5 @@
 AUX idea-community-jdk.patch 379 BLAKE2B ac892a7e52d5c592b193d80a7933529f15e21982feb4c4a4b5c8286c7479a342a0121e5b464922cac68e9b7c8e3f7a4293df42d30e6907365116e736d9c862b6 SHA512 f984855440d2d4b495d8bf1b1c3172c9842c096e8fda148d8b2d1980bc3d03061954db06f73513998e52bc161c35abdcec2b88e3b31b4e36605714cb85a66fa4
-DIST ideaIC-3.1.213.6461.79.tar.gz 636967985 BLAKE2B b7ec8f5787fc37e17a3fb47167564745d7521ed8239c5322b074e67c3bafdc8dc2e3c8048451419aecb21ac272cc346c4832701833a7a787d3359a429b36610f SHA512 34033e4b0cce8ec4155aaf1935d1b4abdfa0f208b75486af2b7bab71c05c21e60ca9041cb032cebfa5b005db831dd21bc7291e1629bbb4618ee78fb21462a9d7
+DIST ideaIC-3.2.213.6777.52.tar.gz 636932173 BLAKE2B 0e00b665b0fb2544030d75d3b5c11a777f8b7eb4a97244494a1c844f9e49bfb36ab51030d9b86faf68be0ecf507764b90e30c34ad3f5183f4186a7b302de33cd SHA512 77f0816ca94b03b60ea414d4d645ba2f7bafe632f2add47eab28ff578718b173fb18cfdac6004741f921b4c2cee16c2dc0a6e4861320a38319ceb223c0d846d9
 DIST jbr-11_0_13-linux-x64-b1751.21.tar.gz 295860296 BLAKE2B cd6edd69fa34896a388ec929d5f53ebc1f078ceebbed8d4e414a19eb91e004e8f53cbae95c2e3b191c39aa89b307bc8a1854b8a86ca2129eb3997c62705563bf SHA512 7d97e520b67197718951609370e90a1e08ef1daca1433373ff6e34fc9c6f4f005478b142190ef5dab46f14e85440f9daca5c662348bbca5207fc2f8d7892361f
-EBUILD idea-community-2021.3.1.213.6461.79.ebuild 4233 BLAKE2B 7d9c559fee19c9b582dcbb1c328a15eb8c28c8828cdceefb26a8210ba4d58428182d3c40923818bcb13eea9bac463384278866752d13af838da34f600d7ecb1d SHA512 404c41c1179c5591244b4c534cabcf5772f14ebdb0df40ea19894d42341c85fe0651b5dbce5ef99706a7ffb4e07a06a4a11a0c8b7b47fa682c4b06e5602e5c72
+EBUILD idea-community-2021.3.2.213.6777.52.ebuild 4231 BLAKE2B 086225979a60444c5870dc603fbc747771b5fb29cbb26a2d2b3935112c6e5d3be7df209323f209d9e4bc60eacff92a05e606aa907e30b48af1a4067cf8e7bb61 SHA512 98bffb7f0b0f65089d9de6d39503dfc8ab5c810a40a2c0801451ab26e3e17037d3bf3038a79161869010caca458c73162582049f921fe491c1b664a0aed4321c
 MISC metadata.xml 454 BLAKE2B 297cfd8c543bf216cd45b66b5284f310659422e91f12af3d0bbe2ff689d94c96988d4c125c75a95526135b2c0f54a004ee43e1c1c4dfe4d1d68e86af5f75ab0d SHA512 5ca382bcbc51ea5400cbaeb067bccfcb4a245e208a2769d800cbd80fc7151310f895d410e5828c9a32223ab93345716ba4a2ebce521092631a4b7c0858519ef2
diff --git a/dev-util/idea-community/idea-community-2021.3.1.213.6461.79.ebuild b/dev-util/idea-community/idea-community-2021.3.2.213.6777.52.ebuild
index 3208ce53d972..baf7ebc203a5 100644
--- a/dev-util/idea-community/idea-community-2021.3.1.213.6461.79.ebuild
+++ b/dev-util/idea-community/idea-community-2021.3.2.213.6777.52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ MY_PN="idea"
 # ( jre 11.0.10 build 1304.4  )
 JRE11_BASE="11_0_13"
 JRE11_VER="1751.21"
-IDEA_VER="2.192198250.1510025193.1640803004-350593612.1638138682"
+IDEA_VER="2.64818794.438087111.1643395105-983510988.1643395105"
 
 # distinguish settings for official stable releases and EAP-version releases
 if [[ "$(ver_cut 7)"x = "prex" ]]
diff --git a/dev-util/libabigail/Manifest b/dev-util/libabigail/Manifest
index cdac49b05e03..6ce9b2d982fc 100644
--- a/dev-util/libabigail/Manifest
+++ b/dev-util/libabigail/Manifest
@@ -1,5 +1,4 @@
-DIST libabigail-1.8.2.tar.gz 258919334 BLAKE2B 6e06c888dcc3f5e0fc5d4046e69f14ba06b3a78206f89e32e4687b07aae1e1d798582285cff5ac9f43d6ba326fe11ec11552eefb5ed05813c25785e337092ba2 SHA512 fa8edaf39632e26430481f15e962a098459eac087074e85ca055293ba324ec5944c45880fcb36f1c54a64652605a439cbf9247dfea9bfd3ec502cc7292dd1c8d
+AUX libabigail-2.0-musl.patch 1911 BLAKE2B 58f9099cde19a18a44f2e1db208b74b8ee7371c2033da539b46af824d29067e13a543619013012d8fe8ca718cc7ee37fd06314608bcca53b2177d5d84cf54a86 SHA512 4591d3f838ac42e28ae28e059be0837c473edd41b44e942e5a7fbe324ed57afdf6244d4a93696b4498ab3c8d74fcb7175abbe951e4b2ef45ef59f985fa846ec3
 DIST libabigail-2.0.tar.gz 286383045 BLAKE2B 2ba6f59bcd7a1484c4a60c6c9f212ad76af239a552d2cc9e47748e0db52363afadd7a99ef3e123c263de34b416f71b9d679bf2a5c542c419bb38ee75f3d5c57b SHA512 288f63f3495f0cd38258c50b78f30a573e43ab60494fefa22c8cba6d6776c5f94742ffea26297a232b78d25f6804f1b3f51febd59ec487733e6ef683cef2c180
-EBUILD libabigail-1.8.2.ebuild 1513 BLAKE2B e54abef6af668ccc017e137c8e592f6371f9348667d06c0aa332a327ac322308c6e4b3ef02ead3c7afef2dc5b5ca1f4c422db54ce65a46d85ee26c56ccf0b706 SHA512 6efb448acfd4f8c201f0fbd3c3aa5c49d8fce8aafa1dd366e32f9205aa10cacf6ccbb316f1faabce30179cde75ac9146c067e226218f84734c3e743a79fd65c1
-EBUILD libabigail-2.0.ebuild 1529 BLAKE2B fddae7227ddbb54970363206f2728a346d537e1eabeadafc481d57636567e825a9e93c4820fb91e55e04d8a527a0b4cb0f18b42708dbd34c0adfd79104e56c73 SHA512 2e5f556c1eb020358dda35a5a4e5efe238f0b09e36105115ec6208050ad945230e9ea02c69476f9012d18c169fd1575bc324b3397f89bed36631117bf7f996d1
+EBUILD libabigail-2.0.ebuild 1632 BLAKE2B f7f4aa5c3c11176d3191acf9a0b048d9f7f5a32b02e4108423d27c289981f7709db42f1d4505ae83ef316f75b3b1abc6db31b481467fd8eb996f5b8832a86e54 SHA512 66544588fc517196bad4ead42f4c69f2de22e7d6b734d63e853857eebb5e60ec2771d9124d2811a47abf62b9ade97eeb34de39af2474b443b287f25f82419e9d
 MISC metadata.xml 245 BLAKE2B 4ac08132cfdd18d0ef2c38470da5045bca296f4975a8fa1e7094c1f6f524ebf02103d487ae7d6d0bb1c912d46eb207a74a417bbdc10bc92499331112f15392e6 SHA512 fa5b2d519f191de35a1f8719e8ba7ea346c54173c797e152df2aeefda32dfb0e0741ff171b87e1ee835c1d5383f424b8bb276d597bdf2fe911525bd5719cab9d
diff --git a/dev-util/libabigail/files/libabigail-2.0-musl.patch b/dev-util/libabigail/files/libabigail-2.0-musl.patch
new file mode 100644
index 000000000000..6057c65622a6
--- /dev/null
+++ b/dev-util/libabigail/files/libabigail-2.0-musl.patch
@@ -0,0 +1,72 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -143,6 +143,7 @@
+ dnl *************************************************
+ 
+ AC_PROG_CXX
++AC_CANONICAL_HOST
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_PROG_INSTALL
+ 
+@@ -201,6 +202,12 @@
+       [CFLAGS="$CFLAGS -DBAD_FTS=1",
+        CXXFLAGS="$CXXFLAGS -DBAD_FTS=1"])
+ 
++dnl On musl, we need to find fts-standalone
++AS_CASE(
++  [${host_os}], [*-musl*], [
++    PKG_CHECK_MODULES([FTS], [fts-standalone])
++])
++
+ dnl Check for dependency: libelf, libdw, libebl (elfutils)
+ dnl Note that we need to use at least elfutils 0.159 but
+ dnl at that time elfutils didnt have pkgconfig capabilities
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -41,12 +41,12 @@
+ abg-symtab-reader.cc			\
+ $(VIZ_SOURCES)
+ 
+-libabigail_la_LIBADD = $(DEPS_LIBS)
++libabigail_la_LIBADD = $(DEPS_LIBS) $(FTS_LIBS)
+ libabigail_la_LDFLAGS = -lpthread -Wl,--as-needed -no-undefined
+ 
+ CUSTOM_MACROS = -DABIGAIL_ROOT_SYSTEM_LIBDIR=\"${libdir}\"
+ 
+ AM_CPPFLAGS=\
+-$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) \
++$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) $(FTS_CFLAGS) \
+ -Wall -I$(abs_top_srcdir) -I$(abs_top_srcdir)/include \
+ -I$(abs_top_builddir)/include -I$(abs_top_builddir)
+--- a/tools/abisym.cc
++++ b/tools/abisym.cc
+@@ -11,6 +11,7 @@
+ /// in its symbol tables and report what it sees.
+ 
+ #include <elf.h>
++#include <libgen.h>
+ #include <cstring>
+ #include <iostream>
+ #include <sstream>
+--- a/tools/kmidiff.cc
++++ b/tools/kmidiff.cc
+@@ -11,7 +11,6 @@
+ 
+ #include <sys/types.h>
+ #include <dirent.h>
+-#include <fts.h>
+ #include <cstring>
+ #include <string>
+ #include <vector>
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -37,7 +37,8 @@
+ 
+ abipkgdiff_SOURCES = abipkgdiff.cc
+ abipkgdiffdir = $(bindir)
+-abipkgdiff_LDADD = $(abs_top_builddir)/src/libabigail.la
++abipkgdiff_CPPFLAGS = $(FTS_CFLAGS)
++abipkgdiff_LDADD = $(abs_top_builddir)/src/libabigail.la $(FTS_LIBS)
+ abipkgdiff_LDFLAGS = -pthread
+ 
+ kmidiff_SOURCES = kmidiff.cc
diff --git a/dev-util/libabigail/libabigail-1.8.2.ebuild b/dev-util/libabigail/libabigail-1.8.2.ebuild
deleted file mode 100644
index a3a00859fef3..000000000000
--- a/dev-util/libabigail/libabigail-1.8.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools python-any-r1 out-of-source
-
-DESCRIPTION="Suite of tools for checking ABI differences between ELF objects"
-HOMEPAGE="https://sourceware.org/libabigail/"
-SRC_URI="https://mirrors.kernel.org/sourceware/libabigail/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/elfutils:=
-	dev-libs/libxml2:2="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-		sys-apps/texinfo
-	)
-	test? ( ${PYTHON_DEPS} )"
-
-src_prepare() {
-	default
-	# need to run our autotools, due to ltmain.sh including Redhat calls:
-	# cannot read spec file '/usr/lib/rpm/redhat/redhat-hardened-ld': No such file or directory
-	eautoreconf
-}
-
-my_src_configure() {
-	econf \
-		--disable-deb \
-		--disable-fedabipkgdiff \
-		--disable-rpm \
-		--disable-static \
-		--disable-zip-archive \
-		--enable-bash-completion \
-		--enable-cxx11 \
-		--enable-python3 \
-		$(use_enable doc apidoc) \
-		$(use_enable doc manual)
-}
-
-my_src_compile() {
-	default
-	use doc && emake doc
-}
-
-my_src_install() {
-	emake DESTDIR="${D}" install
-
-	if use doc; then
-		doman doc/manuals/man/*
-		doinfo doc/manuals/texinfo/abigail.info
-
-		dodoc -r doc/manuals/html
-
-		docinto html/api
-		dodoc -r doc/api/html/.
-	fi
-}
-
-my_src_install_all() {
-	einstalldocs
-
-	# no static archives
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/libabigail/libabigail-2.0.ebuild b/dev-util/libabigail/libabigail-2.0.ebuild
index 61ac2094d397..8c7bf65df427 100644
--- a/dev-util/libabigail/libabigail-2.0.ebuild
+++ b/dev-util/libabigail/libabigail-2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools python-any-r1 out-of-source
 
@@ -19,9 +19,11 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/elfutils
-	dev-libs/libxml2:2"
+	dev-libs/libxml2:2
+	elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}"
 BDEPEND="
+	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
 		dev-python/sphinx
@@ -29,6 +31,8 @@ BDEPEND="
 	)
 	test? ( ${PYTHON_DEPS} )"
 
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
 src_prepare() {
 	default
 	# need to run our autotools, due to ltmain.sh including Redhat calls:
diff --git a/dev-util/libtree/Manifest b/dev-util/libtree/Manifest
index 11c6ad63baae..5c341bfd7d3c 100644
--- a/dev-util/libtree/Manifest
+++ b/dev-util/libtree/Manifest
@@ -1,7 +1,5 @@
 DIST libtree-2.0.0.tar.gz 161133 BLAKE2B cf681f06fef9dfb44ad6099a4b7ab950cb23aef052a180cdd646498ac0baacf0f0caa14bac6a629d2bac2bd638d4b6e5ad97dd0d705e4d681021a168a6753b0f SHA512 9272afd8540110f43ade864a2df58d8b8a7690c79cd29a9804b43e7e550bc05a4da530a763a27bd85a474673055e7a5ba63c0aa0bcaf8b246fbfc73a4f36c870
-DIST libtree-3.0.0.tar.gz 78989 BLAKE2B e930d2e88898337425906a285ad5fb318e9b36a0dd6bbdade528fcfad21aff3d460e619ff2f4a4534b0a7b1439a2dbe62b19626ee85d17fbe9a36a7ddaa63aad SHA512 d249e46c9f20ba51133ef9754a944f67383e5043a7e2a715d0937b3f22ff10cf96a69690b592a5118b3eed73a05b73bfb061d2f72583ad2bb9da969294f622ab
-DIST libtree-3.0.1.tar.gz 79050 BLAKE2B d1b14512fd29054c9625311841a86089a576f783233a181005d9b3454689f8a58c585f16fe26ad3e1d26ae4552149517989401a7f97e08265cf093ffc8aa5aa3 SHA512 92975fc2e77ca7e68ea22866e3a82836e9dcd69409f3fe0f61852c43b9aba6ceb67d1619afb27adc68ddb1615bd24621e3a8de8858b5ce84a9bd670830852ba1
+DIST libtree-3.0.2.tar.gz 79349 BLAKE2B 049eadeafe6a53c1428df474cc39c90f1cdc7d34304dc32d697f24e9e1fc4402c4b3003483059afeb2c71f5b4f787c2d949517906acae53099d1f3fa795f6ef5 SHA512 db2a8d7e69f1f3ea1c09f9af0739b7a6019cba1eef62d5961a9d0bac2703397b1a91e9d65a04db51bc63e2e4d333c9369311815ef8c2f810ab26f0ba17b1c8db
 EBUILD libtree-2.0.0.ebuild 615 BLAKE2B 9c4452eba48044cc321b8f4c38c3b31cddb5261fab0369e9bf2e759f285e781f080b067dd492078a236fe2abb27aeb048fd32c7b438f000ac277dfaa1cdcb627 SHA512 3c2f2b1e64458695c1035f9b2f36d941a429edbff116f011712d5bc5b235651f47e5c8239beca0185b18fb389478b2c05908dea6bfc1ff31027d73022a49337f
-EBUILD libtree-3.0.0.ebuild 569 BLAKE2B c6c0190fab6037a3f192fc4481adfa5533239b5c1a44f6942741816aeb1559ebd704376bdbb0c0ec2feb3aef39cfeb8f0986d4b9b433d42c7975ba74156519f7 SHA512 82252aa909946ee7f646431796e6739af70461d57cef3a4ab9fbed147c4178934aeaec0cb051f82083648d675633119edca270cfbce9f2ff4440a5f60802a2cd
-EBUILD libtree-3.0.1.ebuild 569 BLAKE2B fa62654c3f6111be583a93a9a26c33cf7f2d7ca2546e4ac94d6c1cb1ff9f7818a62be4b08cbc2763e6b7933c8d153a94c81a9f948ed8252e66d290e781af21ce SHA512 5413dd6ff2b2be20d280506f9943773bba66a2c4dd5a0d7a9f61555c084074e129b0f499c00102690195495d0bc5f52c2ca41787d3e5cb6ab9e1bdbd4fdc0811
-MISC metadata.xml 319 BLAKE2B efc2cbcd041b25c841224ec0c4e5b536c6affe00038edce1a97384ed3bd640b439f5ae6439bfe839c0ab45de42f0d58ae0128706f35de4621aa45980e52adfc1 SHA512 1231843b9b1965567ba827dc32c395da10629fa3c5a0e45a9bbd65cb8c6da10bf3015cd11c255c5e10f20e98f3cd081c8bc70d3150529c26c429a2e16619410c
+EBUILD libtree-3.0.2.ebuild 501 BLAKE2B fd9ba768e98f268e1eca77bd82195c18b35a78f6f1cca9fd10616e01d77475011d7b3654a22067f0b7d03359d9c3caa4baef3db6aa4c18104ee8fa180c52ce21 SHA512 ae9929c5d762bbd15b145cd28c8d7422751d38221cee3ebd9d71191b1da541172dfeac6e9af1f69c60f9f0b99c93bdebb9af9494b18104485a7812646e4341ee
+MISC metadata.xml 320 BLAKE2B 7c5fe56a3cb0f496d86aeec399e20af48e5b951f63f9fca6553488e7d124f5b1c1d7eb73bbc508aecfc246d67667307ac1dd3acc763eb8549d8a904a38e05833 SHA512 d6a205bddcbbbb0099f146861e2285bf6262f2195c484195f5cceed112396a1130451016e133c41dc6cac315eb5e8fbd9b57a4463ac03a5af198d5d8c7a33b39
diff --git a/dev-util/libtree/libtree-3.0.0.ebuild b/dev-util/libtree/libtree-3.0.0.ebuild
deleted file mode 100644
index 6897c8129672..000000000000
--- a/dev-util/libtree/libtree-3.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="ldd as a tree with an option to bundle dependencies into a single folder"
-HOMEPAGE="https://github.com/haampie/libtree"
-SRC_URI="https://github.com/haampie/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# 3.0.0 rewrote in C; tests don't seem to pass yet
-RESTRICT="test"
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/dev-util/libtree/libtree-3.0.1.ebuild b/dev-util/libtree/libtree-3.0.2.ebuild
index ac802156d332..6ed6a5aae88a 100644
--- a/dev-util/libtree/libtree-3.0.1.ebuild
+++ b/dev-util/libtree/libtree-3.0.2.ebuild
@@ -13,9 +13,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-# 3.0.0 rewrote in C; tests don't seem to pass yet
-RESTRICT="test"
-
 src_configure() {
 	tc-export CC
 }
diff --git a/dev-util/libtree/metadata.xml b/dev-util/libtree/metadata.xml
index e63def80e5ba..7899f431d5e6 100644
--- a/dev-util/libtree/metadata.xml
+++ b/dev-util/libtree/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sam@gentoo.org</email>
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 66450740e03e..1f540c50d427 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,13 +1,11 @@
 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
-DIST llvmorg-13.0.1-rc1.tar.gz 147284646 BLAKE2B 3a1d8d382de633b7f8fc998f8ad1e03c24b733aefc591615cbd34115d1d6d74962ae33bbf2224527b521a76930ffee425527225563a558a04173e9aa9487c781 SHA512 d487bfc9b898ad0046e0c94338d7757d8a05a1a84d683abfbc9ed4994c6d12caf88fd18575225e284070fc67b3ac0970ca6639e61b1a7cc2948b216a5364a22d
-DIST llvmorg-13.0.1-rc2.tar.gz 147304491 BLAKE2B 86b2c64e57e4aaab837229b25a95d5517ac077d22cf552d71ff6b996dbdbcd171ad51de7eb12d098b50a139beda4ace843727181a1c6978fc487215391e64a3a SHA512 0d890f3317504c8cef10e118b245e5a4c815cc19f07cbc511a66bde6c9b1f3d15c167942608a8987befe9115b24657d29f72305f9f2794385a7434b80167f40f
+DIST llvmorg-13.0.1-rc3.tar.gz 147302323 BLAKE2B 9ac2f97568062d7dd618295a68d6e14898fcd69e2bb66290b999ceb8c12132371f4e9b59d8ba2b252e5e5cb249045676b24fc50c117b2afae20abab98f426582 SHA512 88a04ad02af2d41ec21c7a62bad21ee0e627b7276a16795875afd062ed29ac7fb4aadec5b5e48785a6502c9fd797a4b67d648a21f193c9f7602112870b10a3d1
 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.ebuild 2587 BLAKE2B 916ff9a21b0fb99086f4f4039f227481adc63c41c3c480a319da7f1896d8a970d16b3bf813516b0ee3a56316182ff6cc4e61da1f391253d6d3be51c2c5fab367 SHA512 18955a92513b72d3e7fe83d9ad720d650cb2e084af9896c01e3828e19b74c5e2ba7fd523197b70eb190074399f9ce6ccb9d570b1d5ed15212996e9c61b673ab2
 EBUILD lldb-13.0.1.9999.ebuild 2568 BLAKE2B 3c58c2ed3cef87d9b86c1e3d0afc1908f5c79f331ffccff373c2cfed8078f6279c661d2f49ed6477ba64ceb92e5305b1eba5a6d7c18a9f05f7bdec086b8b1b3d SHA512 c63d65166b24322cb0e597ddc4c19a1aca7ff676eda37089587e9e126d75d11d445161a04ec5605a2acbb5eb474bb49ec12f34674bd2b90aaf625f5033e31377
-EBUILD lldb-13.0.1_rc1.ebuild 2568 BLAKE2B 3c58c2ed3cef87d9b86c1e3d0afc1908f5c79f331ffccff373c2cfed8078f6279c661d2f49ed6477ba64ceb92e5305b1eba5a6d7c18a9f05f7bdec086b8b1b3d SHA512 c63d65166b24322cb0e597ddc4c19a1aca7ff676eda37089587e9e126d75d11d445161a04ec5605a2acbb5eb474bb49ec12f34674bd2b90aaf625f5033e31377
-EBUILD lldb-13.0.1_rc2.ebuild 2568 BLAKE2B dda55f6985409392b8d3e4334e1e44285ccd50e1fc979a3f9ea373c2ef12f3c2d0b49f246ea06713dae9ef532a1c67e5f7f81cf26bd7b90c222cba8d7f5158db SHA512 11cba2782f484d8aa4f43826b8fe953339290f822f1a1315bad1b50d8cf5b7a0188f02c8fa7d4c9f98e9ffa7a93da82edf39345b6fca98988dc0b0fc8f06162a
+EBUILD lldb-13.0.1_rc3.ebuild 2568 BLAKE2B dda55f6985409392b8d3e4334e1e44285ccd50e1fc979a3f9ea373c2ef12f3c2d0b49f246ea06713dae9ef532a1c67e5f7f81cf26bd7b90c222cba8d7f5158db SHA512 11cba2782f484d8aa4f43826b8fe953339290f822f1a1315bad1b50d8cf5b7a0188f02c8fa7d4c9f98e9ffa7a93da82edf39345b6fca98988dc0b0fc8f06162a
 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-13.0.1_rc1.ebuild b/dev-util/lldb/lldb-13.0.1_rc1.ebuild
deleted file mode 100644
index 55d8be1e2739..000000000000
--- a/dev-util/lldb/lldb-13.0.1_rc1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug +libedit lzma ncurses +python test +xml"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="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}
-	)
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-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
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-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-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/lldb/lldb-13.0.1_rc2.ebuild b/dev-util/lldb/lldb-13.0.1_rc3.ebuild
index 8e5622759466..8e5622759466 100644
--- a/dev-util/lldb/lldb-13.0.1_rc2.ebuild
+++ b/dev-util/lldb/lldb-13.0.1_rc3.ebuild
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 82155180b60f..767161650c12 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -7,7 +7,7 @@ DIST lttng-ust-2.12.2.tar.bz2 861351 BLAKE2B 0c580285721b3d7932630c8d9f4a3606ee2
 DIST lttng-ust-2.13.0.tar.bz2 1408266 BLAKE2B 28f584f168544e28539511d3904d7ace19ce61e8490f8c021913f4e8c6b91e4f44e1816265ef54336dd724826a01425f77d3751468bf8a9b40e7f60b918eec45 SHA512 f132cbd98c6574e460c99a2ffd5ea181ac592a5f820171f45cf83bf7314ec9bad1397bf8505bad326b9bc8220bb87a42fdbbda5f1c9b89a39d5be8a3c0cb2cea
 EBUILD lttng-ust-2.11.0.ebuild 773 BLAKE2B 8ab82f84b6e9a444e8e24f02d3c3ff51f9dc187f8e327f709f86126e4b770987ac45f29f0bf2a24e8c56affb1f7834769bf78800424d715b1ebbb8a661911541 SHA512 cf354f8e33cb778b58b8afdbd64720eea0a13afe4362641fa59057531f31f9279b927b4359b1f8da6f466eba0d7f31ccd5eec043eab6300e369e5686ee056233
 EBUILD lttng-ust-2.11.3.ebuild 732 BLAKE2B 0fe4bbd05e5c18daf01e825f82bfcb9e4be762f845dcac1da730a0a88237c75ffa6cfbc6351af3b62be7a86cdddd998825c78f59a515e61a5e8d825fd638c81f SHA512 9301586063911e0b975e8ed003295d1f5acac7071b2ca75122bd9f8577a035fc41776f4c87bee92cb1292e2ad8161199670eb7f1689137858453a6444ce5145e
-EBUILD lttng-ust-2.12.0.ebuild 788 BLAKE2B 9b2eb907974ae73450f271e25ba5c133ba11cc0e5a517e5b106bc75a37ac4f334594301d1ecfe3327268bb4654403e75352f80d8bd1020bc70d911bac3cd2669 SHA512 d954112dc17d7a7424dad4cc1de705dfe9ba365b8d4786ddb5705d168b3f5b895e42204a7141ffde948e15e2dd3c521b3be5375c6ce04b21080d370b71ce338b
+EBUILD lttng-ust-2.12.0.ebuild 786 BLAKE2B 64652ad07761ab57fb396473ff814fa72b54d55db53ad0fc3c1c50a70c4e13915e8d5fa02e275ef99a8942bd9a1602b87642b411ed6abceb66be2cb8d0ffe344 SHA512 db5de27798866d4f880930bc55eee11499f9e518fc04f07058b4cc2922fefc00630ff5d0e9dabeca42844d4a97079ecba6a3fc9c700e3c1f3832ab5674e0e010
 EBUILD lttng-ust-2.12.1.ebuild 805 BLAKE2B d17d93ce40c9bc6371528c2e49b5d9628d69f3d382cb56a146cbedbd76e11de57c1a90a1cce71cd875b5240ffb1fbd28f33112a7a3ee86d9fc2656ecf2d29540 SHA512 65870e0d91137b0fb8378e4489465651b55a0ff86decedea0d826d4f7eac9cf0d7b2ebd7246704b085ab55e6f90be408229e3287ed0bb19fe6e664b65dbfd02f
 EBUILD lttng-ust-2.12.2.ebuild 807 BLAKE2B acdc598a8ece8bbfc7ea782fb10a4fb8986f59ded7428be8fbd9a11580ce0d1b5be0a046b1493d294320818d1d71c5af370c6d22ba720a1e4228859ef7fac6ee SHA512 df7e6a17c879366b5efc0c1b7a1a957ac78f07a4302a6a8c5f67d7269a94577765f6955692a28b8a36e65d5c75536d503e34a404de4dcb7faee230c2e855eda9
 EBUILD lttng-ust-2.13.0.ebuild 807 BLAKE2B acdc598a8ece8bbfc7ea782fb10a4fb8986f59ded7428be8fbd9a11580ce0d1b5be0a046b1493d294320818d1d71c5af370c6d22ba720a1e4228859ef7fac6ee SHA512 df7e6a17c879366b5efc0c1b7a1a957ac78f07a4302a6a8c5f67d7269a94577765f6955692a28b8a36e65d5c75536d503e34a404de4dcb7faee230c2e855eda9
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
index ba8711568dae..514bbc5a46b6 100644
--- a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="examples numa"
 
 DEPEND="
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 045c601e294d..f6fbea4619b9 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,3 +1,5 @@
+DIST lxqt-build-tools-0.10.0.tar.xz 25312 BLAKE2B 7ba08ee181353454264685f6ec7407cd4858acd55674213a5f2bab123b400e6caae0eb5e803ca4d0dc30b19ca069c0659c4531ac64ee017fcd619560e09195fd SHA512 ee7282344c6fbf09d85f845c60075b6c343ce6b6f8c233c7d664faff3b570e2836192aa2233b951242b66d86254971011d4d0bc225811344829fdc5bc83b0e5f
 DIST lxqt-build-tools-0.9.0.tar.xz 25296 BLAKE2B 9686a445c75a700a38150b4493f6c019ba0782e219b3482f67c6a324f35ffe252fddc614daefbd8616ee16ef8bc331c7e4302ddf2df870d1c3696a80cfb585a8 SHA512 9a464393ea6d871c5856ebf5b8fa3d31a89c6419ac084e7146aed675f2b20a139bb3eedde017d6ca03167ee6e30a37a62239ab4e8b76f5b6db244d26ab164892
+EBUILD lxqt-build-tools-0.10.0.ebuild 539 BLAKE2B a2ca92eafbf48e8b8bd601c7d8492a7b77e002e2128bb155f1f176b4a74fd6c9f4acaaa2cc892aa27edb20a98cf362c50f41046489e5514cad10c1ad4366fb51 SHA512 4e7aa2c53e5ff9cfd507a645d595e8bc176fb7ba2128c969b2ca229b83646edbd5849a34b499b60d6f69f6791fcf954d1716385ae5ebbdf695092885c2dc33b3
 EBUILD lxqt-build-tools-0.9.0.ebuild 528 BLAKE2B 7b1f78a49c2125264ef5d4a539359f60dbd733e09f238e0bb26bb2c74b88d7bc84c4ac55bed02a6fb6c65071cd62ea8223c2a49f58962a24e32bfd4956b5347b SHA512 78fe92caaf494d6699279d55b144221cf9e141b15a8eddc6ca6d1f07467f8e9f8b5e3ecbec187383f639c635f137c6f2ba5ca5f725d1b3f1af8d4295a925e620
 MISC metadata.xml 323 BLAKE2B 23d737cdebbafa977534a82a3244d697f8d3b55b16715d344ec46da7c71eb68d480e3a4196944e800400c94c900f240f92ffffc092c68aceeeb95c8cdead9a87 SHA512 403f0f0d13ce990a814e653032166c8cab4d3ea8924aec77f46050760d94e26afb42cb1d793ca4eda3a04a402f3817646cc876c35b506d1bff80bc03a020f0f6
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0.ebuild
new file mode 100644
index 000000000000..60e7f2c36aad
--- /dev/null
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="LXQt Build Tools"
+HOMEPAGE="https://lxqt-project.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0
+	>=dev-qt/qtcore-5.15:5
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-util/maxcso/Manifest b/dev-util/maxcso/Manifest
index 3abd1ac8bcb3..12e4791ddf49 100644
--- a/dev-util/maxcso/Manifest
+++ b/dev-util/maxcso/Manifest
@@ -2,4 +2,4 @@ AUX maxcso-1.13.0-ldflags.patch 797 BLAKE2B 6459e1f62048dc7861af1e6f568fabdbb84e
 DIST maxcso-1.13.0.tar.gz 3734868 BLAKE2B 8c8db7741d8c5fb42ca26660221f2f56141845ad8ab95cf84e910e15b6a01109203015de9fec51da23e786a5015399bfdee2782f7e195c6557ce2e05c901f4e4 SHA512 1d09dee8094d09debe69764f06356339de60da01aaaac7d372c66c4909b86625114f8d6dbdce22d9d700340f9a7b07f1ff71031ad8f1465a65fd38cd5df21209
 EBUILD maxcso-1.13.0.ebuild 823 BLAKE2B d6fc9245208f93f65fbf51b283ebd986de6f775e5e77871fdfab49ccec2c3031f9121f7fa5289fc08f5ade88ffa8b93dcb3c0ae90630fa3c8dfcb81769d9e4d1 SHA512 53fa75c24caf4b1f318066763152c8f7c4cbc779ee8a38cc54b09c4881697bf668f48d8eec27b9bdd4e68070905b9d414e2fe5ef20e064400c82f1d8c7bb8629
 EBUILD maxcso-9999.ebuild 779 BLAKE2B 5b8c29afe4632ab3fce679d87647d5546c0b70ffa6c8ecb1ecdc2844ee972632bf6768be2ba0976fbfcf9882d6b2c46e59994640e3f2b213b33502958cf08546 SHA512 8cf828b6533ab093f48c8fe44ce608b216020a7c173f28cc68d738f0d79621cbe7a86bc56e2516cc1d6350cc2315f727a4731fb1ca32b311c9f6ac06ce390226
-MISC metadata.xml 678 BLAKE2B 01209cedb979a2c55c77634e4400de72ffb01de0d3ec5463b5b3d4bf2ca650dc97957d108a54a8f52c6909a53b1be168a5a0e89cbf903b2be9c59f9c72b634b8 SHA512 9cdcacb261fc57bc1639eba48f84891eabc3729bc99856b34b01fb425d6002cf779ba54747ff529f9c97264c798bff1a30c451fd65d15893884ffc7c495417d2
+MISC metadata.xml 679 BLAKE2B 9903c27de738ff5446de53884c31914b8fa5ce79e68ce7828f38d07b2b5b16e38beb04d2db194f6f3f4ed6e5b05ebf20a3dd80d5fde9e1040b16a468e861a915 SHA512 a7b0f95f8dc031bcbeff66df3e0278db52388f9f790f88787c8dd7133dc244450e7581e92b7ee7ed62809dd15ed3612e1e3f217611881b634c9b958535cb5fc0
diff --git a/dev-util/maxcso/metadata.xml b/dev-util/maxcso/metadata.xml
index fa6c6aa051c1..3fbf99c2e0bb 100644
--- a/dev-util/maxcso/metadata.xml
+++ b/dev-util/maxcso/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>orbea@riseup.net</email>
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 091bb21d81ec..e3c51d253e77 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,5 +1,3 @@
-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 1729 BLAKE2B 06bf39e429858f54c240208c6283052856252d40c8be67edf9f71ba697dde3548ca9dcd21b9d3ba7b02435561527c9712c77acb0be6cadc0f72ee26b74f016ad SHA512 c6ef8b3fcb8c7b333edd9888c08b717abf39dc1acd3ced99725312575be4d62da5d9728d15d706697a23e618039561f0ac414100e72dd1be3e6bd95473644b23
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/meld/meld-3.20.3.ebuild b/dev-util/meld/meld-3.20.3.ebuild
deleted file mode 100644
index 79754373eef7..000000000000
--- a/dev-util/meld/meld-3.20.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit gnome2 distutils-r1
-
-DESCRIPTION="A graphical diff and merge tool"
-HOMEPAGE="http://meldmerge.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	')
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.20:3[introspection]
-	>=x11-libs/gtksourceview-3.20.0:3.0[introspection]
-	>=x11-libs/pango-1.34[introspection]
-	x11-themes/hicolor-icon-theme
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	dev-util/itstool
-	sys-devel/gettext
-	$(python_gen_cond_dep 'dev-python/distro[${PYTHON_USEDEP}]')
-"
-# dev-python/distro is soft-required in BDEPEND for python3.8 and onwards,
-# but it's mainly needed for debian and derivatives - seems the fallback
-# works fine, as we aren't a special_case, just an annoying warning.
-
-python_check_deps() {
-	has_version -b "dev-python/distro[${PYTHON_USEDEP}]"
-}
-
-python_compile_all() {
-	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
-}
-
-python_install() {
-	local mydistutilsargs=( --no-update-icon-cache --no-compile-schemas build )
-	distutils-r1_python_install
-	rm "${ED}"/usr/share/doc/meld-${PV}/{COPYING,NEWS} || die
-	rmdir "${ED}"/usr/share/doc/meld-${PV} || die
-}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index da2c8f74f998..11a430ff83c1 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,8 +3,10 @@ AUX meson-mcompile-treat-load-average-as-a-float.patch 852 BLAKE2B 669dfe4e4cff5
 DIST meson-0.59.4.tar.gz 1953211 BLAKE2B e8699c274e60708e798ab7a57e096e606ba1552d4062a909610f5a8db8d27b864a9b9f01f32d68f65e0dcc2a75add7916617861edcc6058fc44c312e7a56048c SHA512 e02d13a4af592078c4dc34a1d9531e49d3b99f0996bcc2b04d9b9b446f0f7748fc2ccfeb9e6090a9fd2d95ad06594c770f90a87fafd9b1974117f24c5fb491e3
 DIST meson-0.60.2.tar.gz 1998788 BLAKE2B 7fa59723e49f34a016eb3692ac63ebf38b5a7db1bfada522cc317c8500e29107783ef386a1312aa1ed73018fd93b22c6ee81fa9511e80e85461469d0129581ff SHA512 96064b49a479f81d6def321b4c3c24073b307c3ecd917ab2be2020fedf102da119b205e3d88b6fd1cd13af38949600abc72d4172967d651c78d2e9011276cb80
 DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc
+DIST meson-0.61.1.tar.gz 2009680 BLAKE2B d3a704a0f39bd92334f91d4206effb13fa6d7916a71d028e89b36dc8d8f82612f05cdefe8df73c5810faabdc59522592d0a22d6fba8c9208c8c9d2bd5306ad8a SHA512 6c9fabd6f70c276f6daa4bab14de148692d4ab55da964143b73a4e3197ad84c0074d64b729d4492a0c1e0fbea116fa82bd349ed22cb8f53981d492b515e2fb00
 EBUILD meson-0.59.4.ebuild 2757 BLAKE2B b64fd553319824c0c05059a41b639b4b8260196f17c4bca32cb587ff9775d11d97cf75e5634b1880105920169a950abc777946182a6c54da04d7f108cb406d1e SHA512 d43bb51ac9853a6820b40c2e683882982aea1ed8334d000459c7fa46607d56c8737651e48f313062345c68f1ceba66197e46f6d7d5bddfc08693ad242403ba54
 EBUILD meson-0.60.2-r1.ebuild 2756 BLAKE2B e3c00db9be838a448e1b63ab7987db64590375fd3ff6c714ffc883af5982a8ca109d56a3f5539808e90022091e83735baf804f0b75f9929b5b323080abad69ed SHA512 ab5ced255a8ab04475ee1f68c4b3b10769d17332c5f8cf3a9b4ba42d4ac5d2ea9664ba99e9638bc05fcb9f4d8201ca91a5032a1567e630347bf15d2ecd63d77a
-EBUILD meson-0.60.3.ebuild 2688 BLAKE2B 07df2f86ca9079443f8709f5f2231799793d03c844f3d31cdec3ca7491053f5126be078f62d928b9e770aa6957d8b769f8d5b0bc13884186a531516e7004218a SHA512 f953b6ce95a3bcfb187ff52e0214a32faf297fec1a280161c0b4e07d77b60cbe643511cbee915a27d17cf0fe4c2a2e0246750354bdd83119408fd273a1790131
+EBUILD meson-0.60.3.ebuild 2680 BLAKE2B 7391a09710a966e2dc274797c3c6a2c8bef5dc489c3c5d8f597db8fa10f8f76ed8021409991274f68f4de0556ab8d435480508a6dcec287a5e999bcf39c76098 SHA512 4275793478b7cb7e58eb216b3230de2592aff2ed42da138dcddeb313e9e9b1008c3e0e28dc4a63aaa88bbad8eb9d933ae95f93d6d8c243ff037c253001a557f3
+EBUILD meson-0.61.1.ebuild 2688 BLAKE2B c649dfb54d92828659db63ff7954462ecc1918f265d284bf7e35aa3daf8d10d93df4260d529192746754b78e9d3b2f869af20ac1a45be8f8a874333b2408ab71 SHA512 6abdf4ff1c7a27b31fdbda7b025eb0a6aac41b0c0115f2cb233fed791a17e5279296e90dd4bf1f5636d8067d2477a70ab518a8257458b8fc61363646b0560d2b
 EBUILD meson-9999.ebuild 2688 BLAKE2B 07df2f86ca9079443f8709f5f2231799793d03c844f3d31cdec3ca7491053f5126be078f62d928b9e770aa6957d8b769f8d5b0bc13884186a531516e7004218a SHA512 f953b6ce95a3bcfb187ff52e0214a32faf297fec1a280161c0b4e07d77b60cbe643511cbee915a27d17cf0fe4c2a2e0246750354bdd83119408fd273a1790131
 MISC metadata.xml 424 BLAKE2B 9e8cee51a5a6699950f1f4fc203732032afa7b36229bd4117a2b2164761ba0375bbc2c6001a81b48b67171f4b9850e948f6da229cffb9649acc0f514a675c922 SHA512 266b94131a352512bfac11c3db7ff840a6d050eb71c814a5223c9d3bb6f1be30506c9188ef1725a2b435c0b44923aa3efcea5f3d041f0acce0141dfe37ba66c4
diff --git a/dev-util/meson/meson-0.60.3.ebuild b/dev-util/meson/meson-0.60.3.ebuild
index b1532c0364e4..55dd71fc8240 100644
--- a/dev-util/meson/meson-0.60.3.ebuild
+++ b/dev-util/meson/meson-0.60.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Gentoo Authors
+# Copyright 2016-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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/meson/meson-0.61.1.ebuild b/dev-util/meson/meson-0.61.1.ebuild
new file mode 100644
index 000000000000..5f05ec422699
--- /dev/null
+++ b/dev-util/meson/meson-0.61.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2016-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" run_unittests.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodetection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/numdiff/Manifest b/dev-util/numdiff/Manifest
index e669df9dfe95..f47099d54f97 100644
--- a/dev-util/numdiff/Manifest
+++ b/dev-util/numdiff/Manifest
@@ -1,4 +1,5 @@
+AUX numdiff-5.9.0-fix-autoconf-2.71.patch 503 BLAKE2B 6842c5f6cbb6340e9fefc9b1a7ceaa6491526990f14b6213bed925add4e4e58e811e5a359a4a684ceff637b6388b79cfcfe172954236a7eaa74fc79bdcc6e0d1 SHA512 88ffe3f4d6c8ec03052b3128ee6d32f9247506ec2c13a6a1237ee4be6a1302b10803d46b0119a84c331bec27192da736eac42facfd23511f236b725c16cb7f5e
 AUX numdiff-5.9.0-fix-build-system.patch 6824 BLAKE2B ab87d5f4df3df3077ccc182bcda77ab3c8eb707353d7365eaca391373bc371e2f15274eee2d2e82956a38e9d2bd61f15fee424b3a475a97d822f7ff041dce651 SHA512 4ae5dcb4534b11ed54d3ef8f44b48ec5a20b7c4eb747bd14be9c7ba078c1e3cfbd107a3c1da1dabc4aba5881e1b14e2decef41cce6d4a06e8e5c1a780ccf2818
 DIST numdiff-5.9.0.tar.gz 915117 BLAKE2B 3f1edda377f43a9658bb62de1bfc02c8ff26f93f934628d5ac815c68b30e8817b9e004821aaa8c741686af4641993defd20f48e241bbd91b1f8c1b6edb4502c4 SHA512 7be7aad30afbb2a964046815807be0d9149edd18364660443220ce7032248cf83bf840eaf89e19193c8c68ad075cfa81759301574ed73151526e4eea34d33f86
-EBUILD numdiff-5.9.0.ebuild 845 BLAKE2B 67c44f461e8681894ebde0ed3dfe65bacde40f9d31370d0d1847fc5b360d968825a6b6f17a627abdd3c78f2b55c8ba7212a0cf9b978a9152883c790c10e5417f SHA512 40ff52862aeab59aca29b5d358b568a325dac70cb8704c7d59b1a86b00f5bec12a66c7941371841da6d9f979064b87cad6409f864496f9ed19f554cbd42e5f28
+EBUILD numdiff-5.9.0.ebuild 896 BLAKE2B 0d2eebf1c22d77a98f8227955d004546eabf606fe655071466eca5856190ee9d62c4a546314087f3fa5cb6bd4f51a27e775c1ba5b2e7501ed8025c3330bf9482 SHA512 3d275464221ec010b257dc4dd6e7057c7117b809d8b59217cd418db7afc014b88d74f69b9961f681ebd040893f133e418aa9827949ed1990ba595c805717c169
 MISC metadata.xml 729 BLAKE2B 8d231f004a4da1e88f0012d75975a22a8c7e1adec2e810f91f089243addd881db508535a1d7775340653872b10a962717d494216b1566970e7496a4b4477b8f6 SHA512 86e0891322c5f51ed6b20e4dea3b701959903b4ce4290b14a864c0c22eaf24555412594d769843e0417675becb792b75282170eee42115efd935dfd5e7343bbb
diff --git a/dev-util/numdiff/files/numdiff-5.9.0-fix-autoconf-2.71.patch b/dev-util/numdiff/files/numdiff-5.9.0-fix-autoconf-2.71.patch
new file mode 100644
index 000000000000..56319b99043e
--- /dev/null
+++ b/dev-util/numdiff/files/numdiff-5.9.0-fix-autoconf-2.71.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/806354
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,13 +104,6 @@ dnl ------------------------------------
+ dnl Checks for header files
+ dnl --------------------------------------
+ dnl
+-AC_HEADER_STDC
+-if test $ac_cv_header_stdc = yes; then
+- AC_MSG_RESULT(Ok! I have just found them.)
+-else
+-  AC_MSG_ERROR(Cannot find ANSI C header files!)
+-fi
+-
+ AC_HEADER_STDBOOL
+ AC_CHECK_HEADERS(fcntl.h locale.h stddef.h \
+   stdlib.h string.h sys/file.h time.h unistd.h wchar.h wctype.h)
diff --git a/dev-util/numdiff/numdiff-5.9.0.ebuild b/dev-util/numdiff/numdiff-5.9.0.ebuild
index ed9dec004b3d..9acce15321ab 100644
--- a/dev-util/numdiff/numdiff-5.9.0.ebuild
+++ b/dev-util/numdiff/numdiff-5.9.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.9.0-fix-build-system.patch
+	"${FILESDIR}"/${PN}-5.9.0-fix-autoconf-2.71.patch
 )
 
 src_prepare() {
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 7624cbacb761..cfe9e24ef9eb 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -25,8 +25,11 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.84.0.mod 717 BLAKE2B dc70c95cb4bb9be1d8c2c8
 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%2F@v%2Fv0.94.0.mod 475 BLAKE2B 06451cff2dbb5fc2cd3f292f75192ddf2f738ed0056e0ef1defba5829086e35c746860d5f734d33f5defab6d03ef5852e5f3fcbd84c6787b4dc0e40ee38705a0 SHA512 c388bcf56f5f6a5e5772f7d53cf8d98f6d5902ec0b842f9d750c1f44dc02a1256f633fd935c2793391f23cf5fc475e81dcded0d4974525909102f8e9b4a1666b
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.94.1.mod 475 BLAKE2B 06451cff2dbb5fc2cd3f292f75192ddf2f738ed0056e0ef1defba5829086e35c746860d5f734d33f5defab6d03ef5852e5f3fcbd84c6787b4dc0e40ee38705a0 SHA512 c388bcf56f5f6a5e5772f7d53cf8d98f6d5902ec0b842f9d750c1f44dc02a1256f633fd935c2793391f23cf5fc475e81dcded0d4974525909102f8e9b4a1666b
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.94.1.zip 1043991 BLAKE2B bedf3986cec2d32a0d982f144912ac3bb831943701f7bf75364eec48b5b911e3eb9c7c7153fbcb86e4630578d6289d03de8643f8cf77ea3166fcc3b9971773f2 SHA512 2e0d05a05941ac10a22140e993cd931806b547f8b8f920d302a95842d881a40711766d561f3511a34049779edd971aafdd4fa2b468820ee7079ba30431ed98ae
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.97.0.mod 532 BLAKE2B 996a12eeb459185cb2a50b542fdef80e86eca000d7488d395f53c7c2adc2dfa09aed056a7234c63c785259ba7508c193be1c3165d99b656c0e299a0a47e5db9b SHA512 982196dc4d90f57779d6f065688c6e96eb8159c7206876b50d6f55b3eafc42d3429c9e0b67a7c36f86fdeb74428ec5b4d8bc84338f1ad22aa2618375986655e1
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.97.0.zip 1048557 BLAKE2B 0718401e609f4a42edd87c4dff3aee5cde443c60587d5caf54bd5112363e5d7ee8ba4dee2e7c0f96483ad3c47681f2cc42567b18e3ce39abdd0ec81b9794f77c SHA512 35b43c82497faf703e122b80d93d982bcb592a8b87e087fa82bbc390431d49a556247d522a4298e06ffa65270226b0db6fde2b7e54922bcf9a7590edb36d88da
 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
@@ -43,11 +46,15 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.10.0.mod 622 BLAKE2B eda541042b6fe3c3f77512f322d535505b5545eb72dec0f4f3440af05e037bda987f1f97faf7a94ec946201e8ca26a2220bc570d7a9c40a08cfadd724fc2973e SHA512 2825d124965f45e40b36bc1d2f8133f8a1fb5ff94dd95d2ae4383bc4a300ddfe0efb75ace2f9408582525c377769bd1f75cd3c0c655c74aa75708f7a66c56352
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.16.1.mod 469 BLAKE2B e1fed67d06c0b1a993416a55136ca411da627d2d03c867b0d89b07ce48110ed6c75e16fc9ef8b9254dffd3849470896d3f3f5c3a85ed232e77ade0e5b8668a87 SHA512 e35fdd960342077aff3d8ac089b75f904b11fccec0877e8c12a73a98c20c1b4e5a6df4704782613ada8ca2a623d265293e9e187642292ac0ac8eec606dc1ec39
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.16.1.zip 456397 BLAKE2B 4a60718c5e8e283435c022b1f91c8594d773b50dbf176798de45b7d4ce8aa3778086aafd94e52be7b5e47243b641fa6c312c5b5a407507396a8635d917bbbe1c SHA512 1fdf71dd8c7f8d4e784a108c50c8bcc05ebde22e92c6f7c8bf2443670f5bc0002343d5df149a8eb9dc8423a411fb795e2470a0b962c000de2f0e62c6eb1d9e8d
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.18.2.mod 469 BLAKE2B 1527292f9d413bd3b24cb83bc8d093fe45a974071eb64e40a821774afc585c7e7e9594d950d695dde6a538eb78b439778d939633a0a29a31cd85334a54812152 SHA512 482a5841d34349b36a0897116c9609128b6eaf4e405e4ab8e383da160384021ed7d651c88056dbba2384a051816e4c98ad74c0a019008b8a70b144ab2e92ecc1
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.18.2.zip 465106 BLAKE2B 7aa871a3572b28c11a7609857bd5bf800f048c5db0c4840977741b78bf5e98acd191a38338f071e66c8d9f3962d5394c740f664159fa10105489266f542363fe SHA512 6f8bf18da78d17dbe5c74400284938f7641f82d34d8ad393947d6004ff45140d0c70577dcd331e4e72b230932036846fa47fc861ab4d98c89bdd4ccaaf3ebde2
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb60561cfd33b1f70839691a3970669c34c0bc1ede45a31ea53624d9c4d2b16de25533d3121792739006faecc1086afd2539e2a1c7e9b37fc6bead SHA512 33dacd4dc65bf8a7ead2e660e6719beb7024b1603e47e705ee657cf3024e5ec06c44ba88dfd05192142ce880903e94f8dd628d059ddc357e6b42e395953a86ba
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv51.2.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.7.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv55.7.0+incompatible.zip 57331261 BLAKE2B 1634c968a26100ad7ca40a2b073323bb48b1baed06e8df41bab306cd271010a4962c1708bd5f26789f8b9318f97b041a9443ea187f636723d534f36715fe37a9 SHA512 2d0d288c5f74f966401c34067ccae4435e632d1d6df148d85742126bbe00e2c44221804b24a4c7b08aed353a64c6dc7df64fb3ff7251793e5f7280dba59f0e0f
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv57.1.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv57.1.0+incompatible.zip 60134979 BLAKE2B cb5bea586c14d3fbcaeedce25264bddba728e5b5b400d97ddc40dad8ce365e5b46f162f7a0730cc8cd20ffd7c42193d1fb196e38b9ce66d5f8d225e1c3b23e3c SHA512 5f1b91bfcc5b80e92c1cf57263ef679e816cffd0cccf3caf1a3e667c9b65d7cf304376d29a9a8f001c484bd13b5aab15f073a5e44985c56cf936b5298b918abc
 DIST github.com%2F!azure%2Fgo-ansiterm%2F@v%2Fv0.0.0-20170929234023-d6e3b3328b78.mod 36 BLAKE2B 52a2c5272e004524397df00dfa03b4c2d2ebd985a0c974236aad6b847d6b2b4b7c9b69ef48e263f4c67983b845b020d2004fe749b46fee3c0525da0416b20f3e SHA512 350a16c68553738ce8c2f4a6ac8beba66a7dcf2386a42aff938ebaa3bdc526bda8e5c51c493331eda4666cbcf8411ee7ca3aeb0768cc4f557f34585960f9eb84
@@ -55,30 +62,50 @@ DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod 36 BLAKE2
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip 24733 BLAKE2B 66be4a311f84fec9bf833da384747f93cded83fb7cfe07481ef9a8a5747b626c3da56437e24b687524403d463463599c193a0e4dd367f4afd4b7c41fee7dbea9 SHA512 b5615d6e8b8e3d1550218258027891063d3296af88918fd63559d2c108a5faad4ee1281c57dbbe51057f1c417ba94895a59e969550acc0ed276a7cf648ff6ac7
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.17.mod 366 BLAKE2B 74f1d402b4fc7bb6bf54c6467067256504fe2e37419de2a5be55b9c105ca2d1c7951ece398fac6cf98d02b990da9ad0d2aa1f4d12c17dd99ad3b6df068d4e727 SHA512 67b890270798e538335a74754514d4f2fde7e012f1201d30d3450087866612b88c5613185a5dbc899af84d65fb4265fec59ea064eec3e9362aeecd1187dbfd30
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.18.mod 367 BLAKE2B c2bcb0e7c4abd9be609740163521e205aadb8f07ba624a313356f59ba2ad0ae452f40f28b78579670b5b2ea861490340e42773e8fc9b04571581c9b1231794b1 SHA512 87bf6ed1a08ab82817e95baa6b605c56d368bfcc859edbc3b16200700beacfc92a413f59052ae59988d24fbffa66aa5acc20d5f0b1c0f784b3ecf0e6179d893f
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.19.mod 367 BLAKE2B c2bcb0e7c4abd9be609740163521e205aadb8f07ba624a313356f59ba2ad0ae452f40f28b78579670b5b2ea861490340e42773e8fc9b04571581c9b1231794b1 SHA512 87bf6ed1a08ab82817e95baa6b605c56d368bfcc859edbc3b16200700beacfc92a413f59052ae59988d24fbffa66aa5acc20d5f0b1c0f784b3ecf0e6179d893f
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.19.zip 112742 BLAKE2B 87d25be0c85d347929cd78d8db328eca4ca40afdb4b5b7a7aba92eebbd7008a97d5f31af1a5021be90817ad3c41aaa7068ae0b2706d8fffad683009b2d0e5bcb SHA512 b625fc794a405ffe3fdf96afcd172c18800aec936f951aecd0d849d49bf214babdcc10a10dc3c65c09367fb2ebd83c7a83f4ae5a318fa816215b80218e7f5e6a
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.20.mod 367 BLAKE2B a21bf0758534501abeb28c10f78915550696eb729c15581e5cd7c0378e1aa11b19107090524ca83a8177ac03faf0ca6672b38c2d259ea81879f0472a6924a513 SHA512 b00a1a30545c8ee9f1080496af0ee046c5c48d3bd50053ad3993dce816d82bf3acb89bd73761c24905e6246547c964346a20042b0164a3b640f6e09e7b9b847b
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.20.zip 112823 BLAKE2B da0950585e24a03ba7e6b22bbcac214ea17dc6ce362d19a1c9bee38ce29894e051d2367fc1a48287e1e69797abed96a1e8420791c601367a83ffde30781a33ea SHA512 3826a1a1573587b402b0c6fc08677b69d837c9ed921ebc6ae48f3641301cefdca00bd130444bda315b3a1aa88937e6cd4eca1cbc36b67603f5e3660fb7ae6384
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.11.mod 424 BLAKE2B a2f4e0d3fc79a44d64421a8eeeefe2c4efa2b3332edce3517118387a0e74e23a37ef32fc0e5394ec3e03de0f0a19f559bf6f92a6e3689ed635d278ce4fb4dd3d SHA512 63dda9bdc3865c5b3d147dcf392855417c49eb133cdae0a3772c2a8f5a000b004d429325115e500d83095305e4fcc0c13ca613cf48222525351a32f1a8b2f5eb
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.13.mod 424 BLAKE2B 19dd207fb48b9175da4fb2afa17012cc48a2da5eea52ba9e2f32250b291ddaebc5fd8ffb42d19c8fb8fd1265ac2f7ae5525863010f6502c1c86616ca22600bcc SHA512 873698094ff3f392a54d01ae2b5744cbdce84e10b7c28b930aa7366d72dde4ece9636e168b003c46f8a21eeebddab150e687626338f6d938798b99c35bb62ced
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.14.mod 424 BLAKE2B 19dd207fb48b9175da4fb2afa17012cc48a2da5eea52ba9e2f32250b291ddaebc5fd8ffb42d19c8fb8fd1265ac2f7ae5525863010f6502c1c86616ca22600bcc SHA512 873698094ff3f392a54d01ae2b5744cbdce84e10b7c28b930aa7366d72dde4ece9636e168b003c46f8a21eeebddab150e687626338f6d938798b99c35bb62ced
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.15.mod 408 BLAKE2B b9a2d855fd000bb004e2b5936d7315d194911c357b30d72735149ed89002734b9107ffaf8311f4b042d379c32892bdef040a1c11e83d3fa3c0fb0e94b7b86943 SHA512 8b30da824620a677ae4a8cf691333bd3fb199d13ec567a0dab52142db58b4ef73b42862da9362b5afaddd74a0c35f684581833a66fce28c3973770a4b8bef04f
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.15.zip 47819 BLAKE2B 240b62f882e8c90d43560c7b38c0c08c34cc8779d7987e4cbbc1e6b2836344cf20f6b541837055899aaed94ff644a179915a78270e6e16a194b14ffe646e09c9 SHA512 0a1a779169e6e69644361f1e847ab63eb4db00e038dc28b45d8dd4d8262af8d17b8452e044d826a72eb83b2834745f3d614d7c865238a5209a1e6dd97a415a53
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.18.mod 408 BLAKE2B 4b3f6b4f3c35c154cf9064523b99649a48a31625dcd8dfdaf4790b1b99d62fe33cb07450e51f6c8baabd55b6a2c09a554a7beebf26c8497265b5e537c2ce82f6 SHA512 8b1cbf778607e8021b626919308232f679887e3e295b0589db0553afe4c1d95db209d8e8d3964bf284db65080a6c3190b60d048b0ea9cdca917c4d5c7082b401
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.18.zip 47718 BLAKE2B 0eebfffa29144667e683d26567a711cb631ad726e7ae4d1bc1f1bfff60e44a15a66afe3346c384438fbae51c06ef0246d1515f7572db18b4cadef7d29ff0a8aa SHA512 e1cc9bdc703ef87db18d3209aa4c9c7143e1c210a2a8a3468ef6dee0f5117dc7496f4bb916f2f0e4962d45d9cbc31d12f7a0159edae6fe073410f3430c5189a0
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.5.mod 380 BLAKE2B b6ea0cb491b11963174850acd4d525607eec5b63196c774afd73f974048a9a99d0ad6209fff72bab5238109d80d7498b4f8bb126b3c8a170f34373d69d96f4ba SHA512 63536f9954ee05c36e35abee4e91f9791fa97e10a945bb51c710cb2aeaf3a567d999193f968ce54e8d530be617fb55dd6e3a0c0b88f8edc96d1f92d348b13cac
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.mod 324 BLAKE2B 1098a558b4802839f636e6a0adafd495bd65ca95352ee1839d8a8708ef33fc17c6f0a112104ddee27d423b7af8676b92621b0a1e77b5324de8977b12df1d92de SHA512 bd16fa0408713689dead4e6ef5503a83489512de98535a55dc0662f626840bcae0373f19379ee0489c32531350383dbee7c645071c5d5e83552053be564d283a
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.4.2.zip 16255 BLAKE2B 6d9edc54aacc44e5ffe433241f2e7353ca4f9eb38ca24be7bdca2cf2d0c0db51f011f0a401fa0f8115fe5857136d54a5e959e23eb412f5f8dba3efa875feaf09 SHA512 b659673f500abf7bc23531764165e86e5a17209cc59098b0cbbd8c2b44c8b63e3fc54c10cc4346fe94f2fa451b8c6054b8d9e974b857f7893238b806b066de61
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.8.mod 434 BLAKE2B 091020e4cf8350352a91904ebdfe160ced60df18d1c07b3a4c0125c9f9fe5e4fa3dff8a6243d345e58d8db11c348737621b9a9a749282ac6c3e7e18bc218dabb SHA512 1137c6bd923a7878b5df1ebb01961d83a36343db8f7edbb7aa7fb810246ea7db0141381104917b5467dfcacfc4e7a48396342e152a2e252dfbc3ae8749e7eb7d
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fauth%2F@v%2Fv0.5.8.zip 16426 BLAKE2B ef1de7216cc55884a8be11cde732d0b8511d21b77136f6bbfc84ac5c34ddd148e0e455d146b10e5595668f5d5588d954fc4e4b23157de36faee574f9304f6802 SHA512 30bbd511d7c09bd175488fe0ec9952b97a99b1d22c8b177604fbb51c019e43979389423cb9e4a45c5a656f94eb86b573f6504627719efb66a29ecbd60fe2b742
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.1.mod 302 BLAKE2B c913350af2596f077dd70ccd71c3a50c3edcb8027eeb2a3a8e5f92636debdaec2bba056077fbeaa1a99ac1f7a52fa72072b61c0e89a588d324d60df80b19517f SHA512 09e11d4655a40002fff8472827035f1834881b689f84aaebcbe3a9795f94bb9ce8b281a6a5bd02fa0e310912822f2c3dee5da2fc794bc5c34cdc9afe1000e306
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.mod 307 BLAKE2B 9c1c9564a0795362c025c90df035bd4a15f91629f45c9b971179bf6025a9a47f838052c0f78a012a7406c1413fcc5852b6b555401fa22fb95f4e502efbf2cc0a SHA512 ac9b1bdaaf749350c3d122ac6730add5c399102004330fbf354834b07898b08a94fb7e5b65cda53409a584b1e370c1ae2bd58d880ed035f4be4e9846e8e6f50e
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.2.zip 10615 BLAKE2B 62ff9960bfbb12fe0c04b350034269c8b0f689d608a9fa872d8dae33637a76bb132ac8e3f4ea6d28e3c61b4fa04a28d0e0311a03827fb2633398c1435254a061 SHA512 68738597d748aeb770ad5e052e45bc05be6cd7231091d3067b15edbb8ea4a096da8685216490f5b1d8b0127926c748267185c2198b61c4be088082d78ebb45c2
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.3.mod 308 BLAKE2B 5456bff80754c54b757f5e7766815d43caa4fbb0f497cefad58f62bf1f45ace6ca18d00d02480775bc99e4f0259067ba65e395fe8f26a5a05fbc94be61e9e4b6 SHA512 fa6c38db8b93577437a1b9bde37659e6bdf35b9de1eee0c0ed452bec5a0754558f60c2d57ff9a2e37a3e3135b69a88f8751b3a92b06cd04f81ad816a54e661fd
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.3.zip 10940 BLAKE2B c0c65430552f578965fa5993e0863dd874dcae45d0ae4378323c74c73182dbc0a98b24b632f3dc50fcc4ac1c1480280b2ecf1c0912990799c519a72861199841 SHA512 6548fdd263fd420f4c8abf0934970ed85131bda066ac827c1f6d5b303c79760ef98faf1fb1fdb3c48802b9a078109ac179c11108049cb416fedea7346650e96d
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod 118 BLAKE2B 6c3b0310b2a333471afa5fb1c2cee19265ab4180b71cbfaeb875ae27e5db270fdbd141eb8d498e0e8dc300e4e0d9ea681e99e1a2a3b52c891cad52155cb88a58 SHA512 d48c483ef76bb5ec8d721ba828cade25defd91bb2c0dfc3b44df36742b86e8e0650a2d010bc7843a0b4317633676c393f4044998cf7f953125bed93bb7fb9375
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip 18297 BLAKE2B 5691fe3176a689e7f79f39cac16d24e00334f2107892df1b4f38d0816a69decd6ad0a906a4932e0d79db60723f51d3a92a87b359bbb87df8b0ef2131dc097ef5 SHA512 9e4a0d741c735d4e285ce8b0fbb7f19e98424593cadc64a5b958e273bab208e8102140c4570069ee4e35ae3c1f5bcddba3cda854f7a6df6b50f736008a5a34a5
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.1.zip 9299 BLAKE2B ade95bdf956e40a7c5a6e44d75d4b1b999aa02ef7b3a8bb6c33dac291d2ba06d4c691dc87ddedd6c3218b67b1fbb512529eea41d2d62a18226a82de2e01c0df6 SHA512 ff018e85092e3aaf288aba57d453088eaf24d22638f57f0d494dfa36899070c07938e50362d22267f1b40a65a69e7930a3214ea29f02ba6406a1de2b3c770de5
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod 116 BLAKE2B 064d7cb8cabde1b322a8bc6d6bcf80acb5e25573d4bb50d0b9753421412ffb140f8db409903aff01a67d399773c94a0eac85734f05dae36b98402d4bb2fc5bfd SHA512 1b6a8f2c23e225f4f83de03e4e23e2ad31357785ec5e8d23e8300f249048f7d8e14419f991b509f6a3c8a05cd5ffd61e2385703e950cf1eafffdab95df4a8b02
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip 8129 BLAKE2B 235415e90169c74bc7a78bafbc4e98751fd7a57a6676e74bc05152d0c40b211cf7e9b27ebfb510952fa890c0e66d43f76e8585bdd12aea4ef0fad47df96b40c9 SHA512 4198cfaca3923afd7dfd6eb7ab5ea3fc01a03543b771995d38000f0bddf2ce02cc44f77782878ae05ab44f121bcf7ab4c5ba046e49807ca306883e9db410c8ad
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.mod 165 BLAKE2B e9cebab5c6e8af36d160a6cc9afa1f857ddd347bc18d4c2f69fecdee2c6b612af20a3622abdb1d5336d4b1e9dda97a32ec89f4dd0792a2e4569cf8da1868443b SHA512 c71897f18a99fd5d01dfd6d2a6a4d1c451497e08d756a878a2f2c5b30dea3131f8cdee708e5d8eb6add7aa9c2ad789e6c413c35fbd20b7bee441207be93b95aa
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.1.zip 15606 BLAKE2B d12ada3cb02c1999145b3b2ee3b739cb6c846f4f6c43150e71e4bed4d07f441d40a02e47294f79e7c3d724b5accc9e5a04236921f02f6a8928ebaca2d8eeded5 SHA512 a906dfdf08cc5b8a5d09700d73b52aedb66ee586024fc31396d4ce2542a83f4998c138738b354c5611b7d3fe4d09f3ea9cfe384241199c4d5b77d89a15d8a56b
+DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod 52 BLAKE2B 83e3b09b165e45af373e2e62dc0b7799ac204794e1922b4134ebbeba4cf6cd9b6d883f6035624f2421e8ae613d071a2e281379ee4935e55b73540ad8104d79cd SHA512 ad433e42696f3b605cdb12c70438d3b1a4d4d52890cb28b8e76cb26bf1ae51f324e6dbe2043bd74bc9086efe743da65b8cbddd10618f4b59d27858e0898279d5
 DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
 DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
 DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.1.zip 10631 BLAKE2B 23199c0e4bffb67d890f4ac5729c97f3546e178e53f65c725fcf3728f625696ad96a6bbdd13fba9c45da6c849eed44e5143e6efd174c8dc0dc0b2a9345f61929 SHA512 974649535e3db11c2ac0ae8f3a3b401f0d967ce3562c55f92c41af6a9aaad69cc22066d00c15d8be17ac545e1b39689e35b3377eaae8d48571a961f86476e59f
+DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod 112 BLAKE2B 37e4e4987feb544f6382e506e0721975c975cfd239138221555dd238350b534400256fa7118705a7ded177877f3ead64275789839cbeff8c175aa3e4f8b9c8e5 SHA512 a513562aef7037e4f62d099d2fb3ee2015bb43d6bb32b734ef2597d32642d7cf7eb13f1e9a71edf424e274912d90de5db5c038b8cdc4276836740bc045cd1a90
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip 7440 BLAKE2B 51b84bff91f8490df83c9a013b58acc0cbc6fccb77ee765379e94797073521242aae7066de134c1064f460c15df57d9bce42e934d95336160413050c61b69276 SHA512 b602a1a658c95e12e71c814c40ca44356a615d48c1cc8f1aeb0130edf0c5eba10f2da2e335ff70989a1dbe4dfe789b86ff5f02424d6ae4ff3f5117e292951b3b
 DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.mod 35 BLAKE2B cb1abbb2d5d094d5946f868ec3fd1b6ce72721b5e220ddf2be7c8376195fda1659112b93b7af24b08c66b441c950e6d555c858e51e81c9d3d29bc5b72271379f SHA512 b9bb8b7bd45785e18073235507b6e570ae27df026d38676e0b36cb19bae6b53a085099fd23d4a0bc456dd9bcf3459f1f53d0e8d11b6bfc7e61a88f8673a3ca9c
@@ -105,6 +132,7 @@ DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.mod 177 BLAKE2B 4dc3ea105
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.16.zip 111695 BLAKE2B 8e2a00ebba135af9cb0b8b766255bd2ad68fb762161599e568e3a1c5748263fa76a7f775b1179f58a32cf996c0e526f16d9db132d45839fe6edca62191340825 SHA512 4cf0575e874ee97053cc4928183e6f9f5e8734905477c67165c2b43a5b6de03732c652dbad1eaa92446dff10ae1972a6b4fc0fcc3b2e1184d1aff306402261ce
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.9.mod 1715 BLAKE2B 2404c8d3fa21fbaaa7f43c4799c320c9c251dfe3f630f7b6d85696c270baa6c4cb017087a4ddc7f7da0b29b94239fc20399616ef1c5f3ce76f05e937779425da SHA512 9d9ed47cb1b8c51ddf79159682aeb99a043532f912514c2ef6574883f5bcb24f1c77c8cdc6238eba436bf3a6ffd095e53956ea1b28eef9fb5dec3646b5549efe
 DIST github.com%2F!naver!cloud!platform%2Fncloud-sdk-go-v2%2F@v%2Fv1.1.7.mod 54 BLAKE2B 32f7e04af6cdd01b4bd779eefcc09e834d050bf4e644bbd5ea39e3147848587b9589598fc5b59526bd0e702e36654f5cfe0419966de12b4fa8f855852fa2c6b2 SHA512 2710a3d6ce1438444157b9647f0b726352e05c35d37af985acb2472e85eb363a79a4d1e3f5438bf5365b081101fe0d9b67435392b0682fae3fb8ab0179811a92
+DIST github.com%2F!naver!cloud!platform%2Fncloud-sdk-go-v2%2F@v%2Fv1.1.7.zip 858290 BLAKE2B 87309440ac15f254374defbbc7687054698d4dbe261eb179fc222d1297a622d4b72b16b6601e4487dd4c4ac15d7ca973f559ace889fccb387400c2ee08ed591b SHA512 faf901cfa5bf74df90ff0bacfa60f7c91ff2ad38ea3c872c17875ea8c2bb174d60207d2065c91e83e478445db3a885c6a351781998bd4ccedea192e27264f212
 DIST github.com%2F!naver!cloud!platform%2Fncloud-sdk-go-v2%2F@v%2Fv1.2.0.mod 54 BLAKE2B 32f7e04af6cdd01b4bd779eefcc09e834d050bf4e644bbd5ea39e3147848587b9589598fc5b59526bd0e702e36654f5cfe0419966de12b4fa8f855852fa2c6b2 SHA512 2710a3d6ce1438444157b9647f0b726352e05c35d37af985acb2472e85eb363a79a4d1e3f5438bf5365b081101fe0d9b67435392b0682fae3fb8ab0179811a92
 DIST github.com%2F!naver!cloud!platform%2Fncloud-sdk-go-v2%2F@v%2Fv1.2.0.zip 861022 BLAKE2B cf7c1c1da9ed1a24a80ce41260e16e7480576d6ae429e1a36635b7be62819a0185888d537feb0a3270d110ad3a511e25a6d17e58331bb248850b4d8b23813a81 SHA512 64dc71406f7c55dd98ee8f3b2377b01b72800364782a72a0727181b3b9b57e8b95b4612b884d2bafab9d3247e24de8e57c951d59e8fc1bfb3b56d4ad61d35f28
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
@@ -117,6 +145,8 @@ DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad45
 DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip 8169 BLAKE2B 61db06641c2c1db4102b72c097f63fae0bff296481556fa16e66ddd1808478aded29256befdc3d767b72f3abc91e376ae61656f8da2cfbfbb5ffbfe3fde20361 SHA512 9746be89f7fc5d50acd6376f77d43754e4a40d9da173a0b3226b78b1b1fab9afd859f15332ae5a429ce1e0e85227ceef05d94f2237c4969a8e6fc5e8454937e6
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv1.2.1.mod 86 BLAKE2B 6c2c22f1d5872c1b1dc64b77d2275d5f639866ee0e8c923090b8435d0873f358cf041356d2fed267e5a8d5952ef007cb21deaa0ecce688444b40ce3416d9b47d SHA512 5d265223a8ce7ca21d85cabf22eb44adc5021de447f085ab0734f278fe05dfa897040c40350ee13558491c9c1ce6e1e36320625e86a9b9b550319c787da60b78
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv1.2.1.zip 16105 BLAKE2B 0b066c6e8641294301749adfdd4afb2093444518b66fbc2d03ed3507551cf1a326d1e4e781701f57884d2d4112278e711ea3ee9cdaa203f7a93c2484608a8564 SHA512 27350fbcf1f6b76b704af269766b408f8ef2500b9ae4ba22f311839bae3d1148c12a59f7f940dbfbe528824918c6b06f9856cce39dba73756e2c2636659aa890
+DIST github.com%2F!telmate%2Fproxmox-api-go%2F@v%2Fv0.0.0-20210804143723-a6998deceba2.mod 94 BLAKE2B 3e0cb84dd13707c4d7096483fb7032e8deac39496058924bcad4b14e174abb3310d989537e5d626fa5093dc61b8b7b02b0c7106672dde73bb59256f2b849b2f2 SHA512 702bb5110ce9b81b580556ef4f4f1d7e129f3019ba63c6a198fbefafec29601d8a155819a8972d4e0eb6be260c4f3d69510c99a0c35d07c58731667ebdfc2136
+DIST github.com%2F!telmate%2Fproxmox-api-go%2F@v%2Fv0.0.0-20210804143723-a6998deceba2.zip 34221 BLAKE2B 3fe8725feb6f13c26f6e02f0d9b8dc0921bb7fe243e5e98e657087118cec3610ab7446fa79d7b57fac9f2a7d2d272c1497d8880093783e8e9e8be0488661bf29 SHA512 1f6912eab7e9f0b56caea544c776b180c2ddad55d1906aa026e08a9d274aae1ee91b29d3a1215e53157ef984d6cd01a952aeb2377cf11897f7f0ff2a98493891
 DIST github.com%2F!telmate%2Fproxmox-api-go%2F@v%2Fv0.0.0-20210825163308-5e4c0d698a78.mod 94 BLAKE2B 3e0cb84dd13707c4d7096483fb7032e8deac39496058924bcad4b14e174abb3310d989537e5d626fa5093dc61b8b7b02b0c7106672dde73bb59256f2b849b2f2 SHA512 702bb5110ce9b81b580556ef4f4f1d7e129f3019ba63c6a198fbefafec29601d8a155819a8972d4e0eb6be260c4f3d69510c99a0c35d07c58731667ebdfc2136
 DIST github.com%2F!telmate%2Fproxmox-api-go%2F@v%2Fv0.0.0-20210825163308-5e4c0d698a78.zip 35774 BLAKE2B 064ce06bdbde9275f730f43e10e70c768c0774d8276719d5617983b581ec61ccd1a8627904be0971c49ec81cf43b3fa60bf6cdd60bd09adb02e7e28def144123 SHA512 34d82a6abbcf35ccf507e2011d118b37c1bf884b88d1c2876963b1783e0489ac4b705e4b4edefb3bdb4ef9550508fab2f292a20b4644976b888d6c9975b50c66
 DIST github.com%2F1and1%2Foneandone-cloudserver-sdk-go%2F@v%2Fv1.0.1.mod 53 BLAKE2B d018bc6973e65c7d9883945807fadd6291f3eb6db6a9adffe26680d06d1ea86b474b2a6352420db33cad766c0de944e9a0f24c580f0a1998d0f99a292b2067f2 SHA512 8285ea2d3ff15dba4ad9cf504c491cd0a9733b81df501e338b6c2fdb9911e351d668742dda053765b9abf5c588fe870cdcdedde84061a18abc2928a6ab945022
@@ -136,11 +166,13 @@ DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.m
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod 79 BLAKE2B 51cb1c2c33300626f74f843ce56c333b194b9a46230d3befe94343fe9daa62314a59b74a6d78c97415f839997fb42700c762fe02ef76240924ba52d18f723ad6 SHA512 df2dd357e057bb1fc65ef4869f64149f6446257406886e89a39f7dbc7e6c9da25a8c17567b14c8d3adefaf21fba98e0f2663924c7d32a4f82d30377ab4032162
 DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv1.61.1028.mod 569 BLAKE2B 7d4cb5297389948fc8fb3a376786538f817b646bcc7401fdc548c4f7b1893e0d9d2df0d17d1957d01a582f6d4125123856124cfe681cd4a62cdec04a97bc3799 SHA512 e45651c05354ad34041809da05b64990a41d3e444231bd48a0dc1261c845fbeefca0813d1f1dfc69cbb675d76d64239a6da043730ef87fec652d95a37efeceb9
+DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv1.61.1028.zip 27447294 BLAKE2B db6ea45d51d5ec8cd9b715f93f43ebd5fd8674ec2890baeab69988b44a48decf19c3e3e3789c889f572adff1e966e334f88444d843381abc846c6de788d14af8 SHA512 cca15b6c668d79ec6e997493490fd2cd6d05d000da0d0af6af7ac948e5a3f22e6e8989a6e8d7d450dd0b14c4ca54cd372311d85c019c38d4f4a10778b9b6bc7c
 DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv1.61.1244.mod 638 BLAKE2B 6bcf69fbd4a64667ca5ddb84b36c12450576f1e22c35c8634c76991ac6030890e2c6af50791b511d5749c7160a40ef042aa38039bbf3a11c6525f06c7242fbb6 SHA512 b17b9a0c8b3c9c15d3fe63ce2a2c38e52178ffbe022ca25c3ece03ee270b5dff5802987726fded1aebb9ab9a0f04e389cf3be88d6f896f95f5c42f1e1cb08bf0
 DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv1.61.1244.zip 29233439 BLAKE2B 6b863cc0de63f44ee02b3a2eaf648a74b2897d66e07a498001e8aabe32c39ea3668b9065e388a6081d45e6d923d7a190f598cee9a1f045ad138e585478ad2f73 SHA512 39c876ea13846098cbb57db45b8df2e962630f967a682febf9b1e3feb6966194a7e237c529b4c61577cefd5ea20beeb2405d981dec9e33c8d8c712f36d10f336
 DIST github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv2.1.10+incompatible.mod 43 BLAKE2B 4ad44ed79c3a1293847e7fb6ac4751a1188e294eb1eac69b6e42afd58f272bc64ecdc478ae78a4db170bfa295d5e4c7db3e0d7ac8852710cf902685d24b47895 SHA512 6db56823eb55279ac19e6127768c0763bd3c754fbf1b8e57c354a30fa4a0f13deb9ad31b5b7d109dea3ea844d69663e2be1e05788da76926f6d94a78fe8aef71
 DIST github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv2.1.10+incompatible.zip 855340 BLAKE2B 0278e274289483ad5113b584cb16e56de83f1c60c85c166693629f4b8d3eb76c2260a68897f6e28df8a36a969c3196027d7b1c2185b59dc155d2ec3da25e745e SHA512 4e102a57fa828c7f75a979780114247bf3db67426f6066bfcf5147c338d77fd81cc379ba355d72f4c19d1e1c502526f5bf515bdc95274172397a9321c3f48451
 DIST github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv2.1.8+incompatible.mod 43 BLAKE2B 4ad44ed79c3a1293847e7fb6ac4751a1188e294eb1eac69b6e42afd58f272bc64ecdc478ae78a4db170bfa295d5e4c7db3e0d7ac8852710cf902685d24b47895 SHA512 6db56823eb55279ac19e6127768c0763bd3c754fbf1b8e57c354a30fa4a0f13deb9ad31b5b7d109dea3ea844d69663e2be1e05788da76926f6d94a78fe8aef71
+DIST github.com%2Faliyun%2Faliyun-oss-go-sdk%2F@v%2Fv2.1.8+incompatible.zip 849532 BLAKE2B a5c284048b983873bf8d47631df0cb1767a15f2e110de315ad937396a90bfc85c6646b5e7f4231eeb1e614c865ede4ee149080afb9cf35178bcbe4b846bd6480 SHA512 bc12988993401fb9a3bde2531024eacdaca74ce8198716426dd0b8bae138dbd7210f7002efd8c764091ec2bb4971949aa1e3560a32e271f0bc438a1cac1db400
 DIST github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod 33 BLAKE2B 5aced043cac582e67e8d3ddfef0a54dae0f7e4792dba23d7c6cb18fe687be98649a90e9aa46f591385003f945a2ffc192aca18bf1ef0516ac22fe1526d2e3b85 SHA512 8960a9c2dcaa7ab5225d3d10fbba4264032ff9bba80fd8efe2ecda6f9b925dab4db320a4650fba43c0d9c61d31005c6045eec4a650411bb549c60792f31c3b09
 DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod 35 BLAKE2B f41c90b71b4b9e1876a13df9703b57f52ec6d7fd4258a7c44bca15c12310b512e400b32715180bfbe4726887aa7284fa21832ca9f9eb1dd759ee7d0c627307ac SHA512 5a93ead508f4f5e229e5d0e59dc820840819d9b32158ddecf2d6dae7ee96ce92af6bd80d18a98e437cbdda5de6df6cac03f7b535017fa92ef868dcccbc6e1f27
 DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.zip 5273 BLAKE2B fd47f46372a66797bb7028a856f903e9768589b550f869b80cb271fc6ae602f57fed7a296cac6ca14d668d4220f2c3f9f6e6e67bf23801ceed6b2b8e3c8a4494 SHA512 7002be4436a93e90cf69cdf16b92d93b4651e3f18bbae099c3780c6b8abc24363044807dcda3d943c0d6f6fb5f428effeea6a3b8e456eb151b072edf5f4fbfed
@@ -155,9 +187,11 @@ DIST github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.0.1.zip 6967 BLAKE2B 2ee0f4
 DIST github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20180507223929-23540a00eaa3.mod 41 BLAKE2B 92a4fb1da6a0a6a82e47382500de2198757bde5f430888faa91ea3723b0eef0f1fbfd3149b9c957fc0aa251e151e07d86bc412a22533384de0a9deeefb26511f SHA512 33bc2c426426b2fe25911154c63fffb0542943dae982c7e1fc0b054314969b94a470d9e75b5afee5273f7355a3d5400cb6a4c50c48d2b254fa5f3238ed32c18f
 DIST github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20180507223929-23540a00eaa3.zip 7682 BLAKE2B 54272babd11b8156d1886f99a5a5be58f6426ee3faafd1d96f561915deea01bc06b02901bb7640700e529dba8c2a8132659c3114f47d65ae1a568853e3098147 SHA512 425d07b5ab50da4009cb8af090fc9619cc2169e84d37fb51475123f38f6a315d76fb8b4cc171c1b9d69193e7a7c638317f88380461510f55ac8d459de5fa7978
 DIST github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.mod 44 BLAKE2B 770e15635e43111b74151815d493796982cea2dafa5ac8828de2b12e857d30b108091bb04068d037032d8e42a07ba10dd92fcff6fc78ed4c93a75869a9639c39 SHA512 a1570f4b4c886947f5c747387871a09ba0ef2fd19b7afb702be4e7625d76027ae722dbeb601e85b1eb1698eb490a5f0a38db2ba14d32b6ee96fa83279d010715
+DIST github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.zip 133293 BLAKE2B 9d62348e8118a4099568f5ffb309d9b83763fe06466d408611279edf1c0412147cd6aeeb8966df2bf7eba4251e9ca5cb62272b6c25e97f0d36e9207b2204e101 SHA512 80fd9f8b561a3caa7198f064892008cb2549e228e48d83440b3a2648426e834d5909c3685e97ae0cf7fccd0efdc489665789b521a2f6501e171c6a69c73bb6e5
 DIST github.com%2Fapparentlymart%2Fgo-textseg%2Fv12%2F@v%2Fv12.0.0.mod 57 BLAKE2B 59143290eb1b5bd14d2132acf39e0bce9135370ba9fdd69d311fd8b53b2a26c4606438191b71255716ddaf7dcf7555bd202a8af522fcd1871e81d338d7296372 SHA512 cb6c6194e179fdc5bacc742dcc56d29e04eeb87b9a494fa1588c9a7f7e158e2837e3199c7fece5b7e0b0d03f2026930dac355914a5be8a6f7bc99616467f68fd
 DIST github.com%2Fapparentlymart%2Fgo-textseg%2Fv13%2F@v%2Fv13.0.0.mod 57 BLAKE2B 6f1fb77433057acb007dbd0dcd12f5e0b7c69b7b5732435941a7f073aaf51918ae2496c85065d385c34f95cbbe92b9a2374b3ba84b4cdcb494708e8308be4587 SHA512 1357c0adcd02495b531d9211b9de107fcd5ee8032de2daa538924af522b3c8d29c9da8d84a573abfd7747b48078d7b762f77bdb28f97d663b28e993e1625fdbb
 DIST github.com%2Fapparentlymart%2Fgo-textseg%2Fv13%2F@v%2Fv13.0.0.zip 134637 BLAKE2B a561a60fd9f7dede11d70e05d8b6c10952c3b5056fc275c35c0b74901629951b85b275d7c054f84fd20b192f377880863f429a9be456b0212d2bfa0f218ae1d3 SHA512 583d60942b2f91c33410dd86c0faaf25d538fd9584d7c5a4be25f84bdec98147120215c38983075095602d4c93bd60bca0bdbe6572aaa86a33a780e64e6cf78c
+DIST github.com%2Fapprovals%2Fgo-approval-tests%2F@v%2Fv0.0.0-20210131072903-38d0b0ec12b1.mod 55 BLAKE2B dfe4046ab2b7fc7a0c5fb7792803cfd2a20571695fd2b88dd9024d94d46ed10f1fb27b9447c729e763a99cf1eca4090aa1246ab512d3fb4c98b2911e50a2a668 SHA512 7453727ec07931a93beb6291fcccdc5235b6617901b676529f1d4fff1ecf2caedb02997f7276b26bcb0763f1a25c45fb040b1762a2f4dc2c0c2a0d2c35034272
 DIST github.com%2Fapprovals%2Fgo-approval-tests%2F@v%2Fv0.0.0-20210131072903-38d0b0ec12b1.zip 42134 BLAKE2B 7a33300cd671dd4473fb2945a00d86b2268e67aa885ba1bdce69585b39bf14802da9f5d3e90b1bf40019da7de4228028437209207123c3c29a274f55ae6e4937 SHA512 c1362b490cd5978316aeb1513a47b254de1c90a2454f2f99c7c51077a7854f8c0dd033c6735cb4d0867da41e36fe81ea527fdf993e7ae6be5e25748991e044f0
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
@@ -186,8 +220,11 @@ DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.9.mod 217 BLAKE2B 37aad2fa34cfaa
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.34.28.mod 217 BLAKE2B 1ecb795a3b0fb98e5a1a90fe90bd37f399fa3668cce958c78343c2fcf9823f2a375a6faae68a552f74952cd8ad15897cf83760ceec9c54a3c104d535807a35ab SHA512 04f1943e2b78bc1480478a2946bcb0e15289008e1ccab9e0d7fddef8862750de3d22635b11b09b377b3abf0a51f38adf7ec13a246fd3cbf5f7dff7734c6ee2e1
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.0.mod 178 BLAKE2B 1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3 SHA512 376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.38.25.mod 178 BLAKE2B 1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3 SHA512 376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.40.34.mod 178 BLAKE2B d5365036f6619c1cc6c69cbc8235901d29e91d98b52eda0af8e2c6a0206ff6f1e9227595c0e51d7f896d341dac15649d36997d736c8ae491fd80c9441ba62d27 SHA512 0a2ac8ddd88d926f8242ca65a1049395f13fb534f8520856db7e9dcb7f7c2b90069920085b6bbb045426a29e8269414618c4c919be1d2564692cea606f828bdc
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.40.54.mod 178 BLAKE2B d5365036f6619c1cc6c69cbc8235901d29e91d98b52eda0af8e2c6a0206ff6f1e9227595c0e51d7f896d341dac15649d36997d736c8ae491fd80c9441ba62d27 SHA512 0a2ac8ddd88d926f8242ca65a1049395f13fb534f8520856db7e9dcb7f7c2b90069920085b6bbb045426a29e8269414618c4c919be1d2564692cea606f828bdc
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.40.54.zip 22692493 BLAKE2B 611fa630c2a4ac33874d87a15472222dbd519d266b547a652c33a94fc9ac4cf9d93db58e2feb148a5367868c526229b82d386fbf20e2ef1ba00d3a0c323ec7d5 SHA512 a9cda1dfb750a57f975784aeb256a62d52cee5d4e2cc849c2fd2f52c3d6fd6fff25325cf43cf6e30d0926742149c6b30fe8bb65e50aa692c553ae74e89f4d4e2
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.41.14.mod 178 BLAKE2B d5365036f6619c1cc6c69cbc8235901d29e91d98b52eda0af8e2c6a0206ff6f1e9227595c0e51d7f896d341dac15649d36997d736c8ae491fd80c9441ba62d27 SHA512 0a2ac8ddd88d926f8242ca65a1049395f13fb534f8520856db7e9dcb7f7c2b90069920085b6bbb045426a29e8269414618c4c919be1d2564692cea606f828bdc
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.41.14.zip 22994771 BLAKE2B e8ebe4f8133972189335821a0cf9e692a4bfe98d9ba5be5e52f4cfc881a50b99e268067e83b0b0a52984c5dd67a1cac2890d4f79109c315311b367f7ebed0d7d SHA512 e7f8da0adcdae129d40580a992f899818f7487ad76b1be5d86fe60871f587fc474d2cc6d4a688791c62200d27ff18f0b94c089a064757374d8c8f9942cf3e3c4
 DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod 45 BLAKE2B 224d034afb0473cdf6f065978a0b8cbaea268a46e3dc6b1b8ea89bed2d013ff52bd32408bb6d768097d3ddb20f95e35953b9b679439309ff832b2481d4e35401 SHA512 b398c531571bc397b2d97f369731fb7bbe8e07328f95043dec62c9be4a9f09562a0ef0faebeb05f1bafd488a77c30e6e957189d54548ddb94b9dc115b85dff53
 DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip 7657 BLAKE2B 068727abe4a8d862a04d3d269d431af59cf048d596dfa951112c40e249b623278eaa74aab6a0afeab45bb62d77ce7fa3c5f341d3236c4ebe1c7c92fe48984b31 SHA512 c147af6f868c87dc6b1b311f5c78496dc8cc65e2cc3c3984651751f58a1762941d555f74936554a0beab1bb8530f7c6e8c249d83548a348fe83918644b89303c
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
@@ -206,6 +243,8 @@ DIST github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.zip 10210 BLAKE2B 8bc8ef109
 DIST github.com%2Fc2h5oh%2Fdatasize%2F@v%2Fv0.0.0-20200112174442-28bbd4740fee.mod 34 BLAKE2B 2e469082d73b68e8c5cff1450b2c42a365ca8edb7273c9b62ef91f28015d6a4a4acc5d7d61620539b6a2a9050b15b605666f2a4e399f47c2d6f071b85c23bce7 SHA512 1800482a405d15faf2ad38b33a57b529e6ebad290d26625f6f508f4a5818a737923cc9a2e68a4c9c598c23ef2103c58108bff7f42902d40e2444457d0808b430
 DIST github.com%2Fc2h5oh%2Fdatasize%2F@v%2Fv0.0.0-20200825124411-48ed595a09d2.mod 34 BLAKE2B 2e469082d73b68e8c5cff1450b2c42a365ca8edb7273c9b62ef91f28015d6a4a4acc5d7d61620539b6a2a9050b15b605666f2a4e399f47c2d6f071b85c23bce7 SHA512 1800482a405d15faf2ad38b33a57b529e6ebad290d26625f6f508f4a5818a737923cc9a2e68a4c9c598c23ef2103c58108bff7f42902d40e2444457d0808b430
 DIST github.com%2Fc2h5oh%2Fdatasize%2F@v%2Fv0.0.0-20200825124411-48ed595a09d2.zip 5406 BLAKE2B 06bd96b64db3170cd33020667e29ac07b603643466d366284aa26b6390efef2ab681af2128fa7026513faac6aed76bff76ccb2e316fd30d6a96b2421d3f5991b SHA512 693251bf6707b3052d1eb522ed04e20b481acfe87105d839f5f6c81afaeb82bc33b9501c8e917e5224019aac5b180b3eb1dd48717e2ac6b15ab3b482b28346a4
+DIST github.com%2Fcaarlos0%2Fenv%2Fv6%2F@v%2Fv6.7.2.mod 81 BLAKE2B ec635c9e94c4e91b423e4d2df315ad61b734eabe150bfbce73f38c9543d5cc600d3c57bbadbfc699c0a046ee338f2e5f3fe9ad3ccc8314044df0aa1ae8d2d9c3 SHA512 97935ff18057eba9545b3aaa77879c18a121558e0f8aebedeb9a86f08cfb49835146a0766b8f79528df9ad718d8533c9494bad233b12a439f0081738939b1654
+DIST github.com%2Fcaarlos0%2Fenv%2Fv6%2F@v%2Fv6.7.2.zip 20585 BLAKE2B 29ba3e4a25df331934a4de409eb76deaa6b33b36f7ec8d0dc54b52f78f55018308ac02e2dc28116d0c00f63b7c00681bdc279e06bf2d9c0d41470ebc15b5ea8b SHA512 8a613055c7558b86042f0646aa9134731f7b61947bcf4cdb9ae237eeaa09b543c748be93d2566daba2f34ee92bcaa0ba64f88bc3fe103bda18f8f6f5f1456e6a
 DIST github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.0.0.mod 47 BLAKE2B 8e7e16fa5e3538dde53ba6ca7be4fe7fcb4f010ea8ca8ed54d19883e231f6c2652162580421547d5e67498f0635a2e72c6162e7488b654bacacccf73539a6d30 SHA512 5e35c77db398e3bea053d04e5f69071d74956f4fa45431ba3e74d9ba7d1137021f17c9493dd3ffd11e30f58477417eaaa1b78cc96a33d4797fddded1ec69dce0
 DIST github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.2.2.mod 47 BLAKE2B 8e7e16fa5e3538dde53ba6ca7be4fe7fcb4f010ea8ca8ed54d19883e231f6c2652162580421547d5e67498f0635a2e72c6162e7488b654bacacccf73539a6d30 SHA512 5e35c77db398e3bea053d04e5f69071d74956f4fa45431ba3e74d9ba7d1137021f17c9493dd3ffd11e30f58477417eaaa1b78cc96a33d4797fddded1ec69dce0
 DIST github.com%2Fcenkalti%2Fbackoff%2Fv3%2F@v%2Fv3.2.2.zip 15009 BLAKE2B c57ec3e0244e88b3fe1bc096f66d6edcfe5212f310ba4b7b458509d63b57b6379dbb0d46dac4445b87dbb65d8fcde82eeadc237503ca26c46b8aa5e2fb37e831 SHA512 295b143d5dcca9c7d974ea5c98835f2a401a4c21944ae4b3ccf1f97e9ee0d688a1f3d75e99419347a6241cfa0386757719e5afb84b8d18e06a55ae6f52949b1a
@@ -229,6 +268,7 @@ DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod
 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%2Fcncf%2Fxds%2Fgo%2F@v%2Fv0.0.0-20210805033703-aa0b78936158.mod 169 BLAKE2B f8ad79343477a3ec93894b14455df80a67e35f5ce14950b0e41005535bb11147be95bf362ceabb251864a64297a5d6a8a594648928be0e8aac87052f19e9f91d SHA512 cd8c47886f01235398b4c2538ccb516754e2bae6e9a88e0fa2bd80232f974c5f8cd79249f459c9788fcb7b0c83ced5064f1d8916869e71a15377df20077f52a6
 DIST github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod 34 BLAKE2B 21714162b9a8fd9c535eb49321b31d8c574339b2f548a64d4c224323f87e795b5412d502499e83917a1395dabcc9e2455f5e786ae2c3f204688d5c6ca402cdfc SHA512 58f3cc974ff4897b4f160dc47440241bc7084dd62f20c16c019b0c3090d3c8a8adb46ee8cab1afa675c9d3830cfb2eee97e1eb1315a683307d87ea3d2b403efa
 DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod 411 BLAKE2B aaed1a7526861470d053cfa204fe5af2ba4ebca024322c8007d3660acce6fdca03264a12ca0bedcb6fe1f0cc5c78de920f8e8e19a36b12e1604cc3274bb88733 SHA512 32f6adadbc5dc2c9a57c698ba76fa4fd83637e67f58da55c6a22d4faad9f705fef7a472c2b2b2b94b2bba2b839b85856254fac4681dc9770893afa940bc734a5
 DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod 37 BLAKE2B 7037e2b6c6f7927a37d8298f91976232fac6e1723d9ffda59b2c01bf81c24acaf124fceeddd8791b6a6bb1e81b03e1bd5ba88ec9613784462a235bdfdea76498 SHA512 3d4ac776b750aac30718ecb1a3efdb383cf39d0838ca60db5ba266152baa1dcbee739a8f384965b5b8d39b9d9b18561ac317eb8c64c61076986db66bc10bc1dc
@@ -256,6 +296,7 @@ DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B a
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
 DIST github.com%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
 DIST github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20201209184759-e2a69bcd5bd1.mod 208 BLAKE2B 636fd02b7ca236da4917c4db5996dab6e2cc7ff9defb79267e28dc989da6ddb99662d39ac1294cf69cbf83f0525cfacdde6298882154f4eda9435f50668778bb SHA512 34aed56705fab83b5175eecb51ed70d1c39f339fe70ac6bc78ca1627099b4155837b0cc5944731a5e64fdc1cd9ba7188ed3f179ff9926493f1c2cf28d1b97bcc
+DIST github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20201209184759-e2a69bcd5bd1.zip 186084 BLAKE2B 99f7d59915023546961a5fe480ec9ddbb88b7fffac43476eaa7ed1b2b5074f6ee810142eefcdd2fa33e421217400d6ec2b2239ae0aa764b4eb9d43d785b902ea SHA512 cf76ab9a8ec077e7e6a0dd057a5a07e9be125acfcb8ed79f34e075399367dc3c6db2f3639770292e864edc77831ae866b7f317948fe09f3b2f10d864637ee4e6
 DIST github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20210723161134-761cfeeb5968.mod 127 BLAKE2B 24fc2ed090e1df47f8a99b5be254d6e3ca450d74bf86bbfc48619971c435b463972cea39c3aa20f8ca4ca35a34f5382a7d16573ad45654a6acf3c06158a7d8b9 SHA512 db7fa66fe088d0763ac93ac7fbac2eec2ed15a93b8b2ff1854af32023903af43eb94cd0b2c7e0146d2ad586ace0e400871b5e89d55321ba8932c0d19c84d4fa2
 DIST github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20210723161134-761cfeeb5968.zip 197168 BLAKE2B 7f4cfae878cec02e38396f74d9721aeaa9f806ff04df072b8b1ab617f9ae51a190ad6dcf9c0ee2615334b4e024806739a460a04446afd9b732c0772a214619ce SHA512 7ca77cff75aa3ab6f37d97f55a4372cccf397b62295d4306a2bb34fc0535fa26eb97af9db6835809d486f1afc5084513f57c6ee79dcba5098b36ca9626d94627
 DIST github.com%2Fdigitalocean%2Fgo-qemu%2F@v%2Fv0.0.0-20210326154740-ac9e0b687001.mod 220 BLAKE2B 3d1ac2f4ac0f3d5e9a22d6e084e3b33df41835bd11b997f22f96e5d86270882e11b09f2e53a6e3af059340792ee6b626a2324875e36a2149e350e35a17b27d31 SHA512 f1b2dbcd6612c6e136970fce314b76ee7c93eb4c793ef787be32b66b07a669da042470e998a5895b17a671c314590831bcb5e1dccbe0899339732f430bdafb3f
@@ -266,6 +307,7 @@ DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.mod 36 BLAKE2B fc3f6a7a743de397801f3814ff9d164976370c0b4084806b72d93b027c85f95a2a4beeb7b87082b0c2795f3108e95b1906b16e04317eb0722dbcd558cce03733 SHA512 61f4f9c015313ad381be1c47d53278f5215c2aea5ca778bd117061652e6a879cb77b3f786797fd6fca3247f2ff22d4657d0dac2f8a8105758bd4223fe3f5d7ec
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.1.zip 9862 BLAKE2B 1afeef2dded5ca4ee36d0f29821cc9eae0a40b605b5a82caab987b7269fefdf4379960ad0565b21ac33c2fb64c8fc1c5fbab078fe75e7e0d2b2725c66c9030de SHA512 2e1990eecfb1d73d4c3cf8205e700009076ff7745593d8cfb1f9a010dc2a96d58426b009c7b86042dbba69c40a8ffc82997dc4935ccf7f48f45fa2f26c36cae1
 DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
+DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.1.0.mod 142 BLAKE2B a27c476533f00a425fe12cdd92f92cad52b3946b1d0bf8b714992f5d8d0aff810d000f8f41fa7cc2d832c9bce938b602528e567e3818146bde92fe65c652196c SHA512 aebfcb1f46c48fa7bee541d7c15e6de360b5e336c4417854781c00e15260e33f46cab3c8998bf0421155c9c40db29a18fea6623fb9fdccff0cd3055ba6e5319a
 DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.1.0.zip 30103 BLAKE2B 74418cb5119cccffbf58ed236621281f3777152512ed76e9be5bd9adb3cdab79255c01a71daef8097a38f86a7222330ab54ed402c6c9ab1cc5438977157d6aac SHA512 c10bccbbf97d4a8e4ab1b7fa153516bc942db01adc4f33b293e7b59a26f1fdcce1ae6b057c9165ffb5aaed2f3b38e6eaa586edc9139cd1ce1cc5186f375388e8
 DIST github.com%2Fdocker%2Fdistribution%2F@v%2Fv2.7.1+incompatible.mod 38 BLAKE2B cd95ca3c9baa32743ad6a0c2359dfb95eaa79009366a4019e5e1a4d3ded54090b005d307ef18942fe4de4027e7fe688e7ad046f226c77a3495e2ec579223a9ee SHA512 662e7810daa3242958f5ac7c71bccd25fc39ce814db684641cf69e96a5573dff638faff15aad77b7abddce767f4ddbfbd8a1bbb85a2aee5a0e80c96baa3f39a3
 DIST github.com%2Fdocker%2Fdocker%2F@v%2Fv1.4.2-0.20200319182547-c7ad2b866182.mod 32 BLAKE2B 60d7bedad25f2503b81b09e753b7f5aac1ce61c5b128e08dbb42f73cb5f3748d376aafcd475cda1f50f97a88790992ec920d2309e8b3faf914640ebdf4b21404 SHA512 ac7ef0a0baf8fd96efb31c685f838842cecc51e9332cafefab138f16438fe00962e91b31e53d93214ff9d18558634d4b9bed4a0a9567e06646da2d2bd3e9c439
@@ -285,6 +327,7 @@ DIST github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.mod 33 BLAKE2B bf061bb336cde22
 DIST github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.zip 148704 BLAKE2B 10ad3722d4a9d021df0f6966c2c814e5b494eb58aa0c7928f32c6de54fbef4f92aea690def61dd9ccffb014ed7392a15fea713d17f862f57e46851a6d2af40bd SHA512 1cc850fc9776273855dc7816d96062e676ef0e53458ba9f156e69d58020f1ae64be7f6a8c1adcc4160aca5b3c86d6d8ece9291ac04b2280ecde12306b32e55ec
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.10-0.20210907150352-cf90f659a021.mod 581 BLAKE2B 4ed45e2bcfe947832a5a24a322473fa9f896aaf4f8791b961f347aa00a3d9d451ec45b6b41c33a982cae86bd27aa9acba52b72d0486bc20cfe6cb10a967ce948 SHA512 2eb8b102c6e4fff6e4edd74102c8002f3f2a6f7f782f3a6703855aa7ecdcf800e79c1e3254249e612149de470b1958b50616e5169372361aff1e460904aacc3d
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
 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
@@ -520,6 +563,9 @@ DIST github.com%2Fgolang-jwt%2Fjwt%2F@v%2Fv3.2.2+incompatible.mod 33 BLAKE2B 2de
 DIST github.com%2Fgolang-jwt%2Fjwt%2F@v%2Fv3.2.2+incompatible.zip 62447 BLAKE2B d03c56abbce70cbb964500399020378509d842edc9b60ec4896e220a44c0c4b225f802c963e7f9a40433f83cb21e0eb5157c01cb9228c1b1513b0ee53daf5d4e SHA512 d826234c774d9f4cb6646a31a1412bac979a2b4e65969f865917e9b300df62b3d6813a29a2d433b78e56666f40847b5a2af3135a06b429bfc2902d60af6a81f3
 DIST github.com%2Fgolang-jwt%2Fjwt%2Fv4%2F@v%2Fv4.0.0.mod 45 BLAKE2B 2e5ddaa467fce947b6fd4dad05d8e482b29bb0a2eb4ec5e348bb97c542b600e582201b90850531164a9c49b05bdf05f971f04de0c8cb0ed0240baefaccd0913e SHA512 f4140cce8dba7346cd09a6e2603a137d337a244f8db1bbebe1ec09dddbbc1908fabd8c91930b4476fe120d0c10c26ab297ba96c2372350ead40463a3ea441fae
 DIST github.com%2Fgolang-jwt%2Fjwt%2Fv4%2F@v%2Fv4.0.0.zip 61658 BLAKE2B 5b15ca53d37bca9cedecf2f550ff1b4fc700fe2ab2ac0d430ce27a861d5761cc8428ec725c38a9a873a4c656415b5b734976100c37fb801d699ee9da08425d7c SHA512 d1878a17fedc90a0465e5f25c7d0256d5d85e83b7237c47f0cf48bf1347841f8ea83c9d21ad131e25223a6dd5d8b4e6ad65c8eb0f68528599aac92cfe2066e6b
+DIST github.com%2Fgolang-jwt%2Fjwt%2Fv4%2F@v%2Fv4.1.0.mod 45 BLAKE2B 2e5ddaa467fce947b6fd4dad05d8e482b29bb0a2eb4ec5e348bb97c542b600e582201b90850531164a9c49b05bdf05f971f04de0c8cb0ed0240baefaccd0913e SHA512 f4140cce8dba7346cd09a6e2603a137d337a244f8db1bbebe1ec09dddbbc1908fabd8c91930b4476fe120d0c10c26ab297ba96c2372350ead40463a3ea441fae
+DIST github.com%2Fgolang-jwt%2Fjwt%2Fv4%2F@v%2Fv4.2.0.mod 45 BLAKE2B 2e5ddaa467fce947b6fd4dad05d8e482b29bb0a2eb4ec5e348bb97c542b600e582201b90850531164a9c49b05bdf05f971f04de0c8cb0ed0240baefaccd0913e SHA512 f4140cce8dba7346cd09a6e2603a137d337a244f8db1bbebe1ec09dddbbc1908fabd8c91930b4476fe120d0c10c26ab297ba96c2372350ead40463a3ea441fae
+DIST github.com%2Fgolang-jwt%2Fjwt%2Fv4%2F@v%2Fv4.2.0.zip 71592 BLAKE2B 6c4f4f7c774e427c0be11c8f758c87522d8bfdfbcf68262c01dc0ba9c8ff689fbc1e4bbee062a045774cca0d91018e7122db767ba0e66f0d4c081e4a9b68285c SHA512 584b22a73f611eeb4733da210208abae2787a4e29b5befc359355a34a9f1936c1e60c0aeb7ff0cc646e99778b32bc2f62eb535dd25ce804080631d0fc7b6629a
 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%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
@@ -567,6 +613,7 @@ DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b297788
 DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20150127133951-6f45313302b9.mod 31 BLAKE2B 8b444a2f4fcd8323bb5c69f5b6a534d6d2b46b8f76a5cef4fea77c9ea8f67846a69daca9405d70182bb28804458214ff53cdff13a362211216f287e00a9baa5d SHA512 bf92a95139e1c279091b2adbc91ad5f0ab9d93852a2852a8701c753cb2a54a866b7d442f166c3b11e550cd04165d703f4cedec0479270b7406133b06cc99ca16
 DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod 40 BLAKE2B ddfa83250a6d66e0f112a249993164e9dc1880abef25e9d8921c58bba907eccc0fca5f34cf3333523d81b22e615e6bda8e1080a7bbb8d21e33fafc168de0cf8f SHA512 33a53fe7874517289a9eb9d87b62060ab4827159300acb6f933018b30fc56e3356ec3d33ee64e452137cc6c892a0c6eddeb7e6bd383be8972407c6e7568f94fa
 DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip 8977 BLAKE2B 54e69095f7fc33a26037f2a924ce3291b3a9455c6716a50179ddb161accb07d79f30a72400ddb13229109fead8a9a2e8e85c78f63ed0c2303e0777a571e2be84 SHA512 74bf278d42859148df97c1fdefcbe962ebc583e3c567157b4e17721fd4cef5db7d24c9a76fb32a3d827e6bce6ba761181d9a2d1eca804b59f3cb792a30198906
+DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv0.0.0-20170306145142-6a5e28554805.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.2.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
@@ -577,6 +624,8 @@ DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa2
 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%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.1.0.zip 45774 BLAKE2B 4255657410cb8a37acb7f08c87269fe35056ef96120c71795ebebce9761f4a931f902b7038ec0ba73fd06b8bb883982396a5b654a183df9532bf3adb72b1608d SHA512 456afe416bbe1480490cbb390c7caca1fb799d936a667bb30865bdf9c093f6dba96feaca2862aa839d7765cede140189c358f94fa2a3e25517733c76bbe3f7dc
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.1.1.mod 257 BLAKE2B 4a85a5b7f9df2db9bd2316ef1e8516426b2e95189e108f63655ec89ba20f32a94fd28393fdc366b62779c2336e4c83fef45bd3bee3254607ba7bec56b73b6cdb SHA512 d7dc6a82b035808094f0a525fc650a51d778e5eb6de70976ffd81b99f9fd6426f8c2320da18f92f89cdc376dbea9b65b8a8e8e726981e5b27e42800ece08430e
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.1.1.zip 46014 BLAKE2B b96da9294b1475d113cd295a18ba3bf8f83f46069c7ad86e680af768ce580e28210cbbb3170fe299286095d518e541f3dbc55c16d045f58591a073c407b32405 SHA512 95039bbbf914c38b2a22b911c10b337bc310daebcf7768cc81bb1fea5ca7a17aaed7ceda54a223c3c1f847194125ac2cf859e0826cc243ef8850eed247738c73
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.12.0.mod 572 BLAKE2B 7d42f91a8230c31654878829577a0160bc3fc3f954d4ff246220b7ad8ea18f564a9d11a94fbd2a7c3f9663da5c5da4ef058f69e4e3778e42bb829ccc9ec9275b SHA512 b364b013c82f9f20de89cf5fdec98c666bd2301b064abfaf51f92d229d83838c249fb81687dfc0cfe636405a260283b85aa80fdf6f6224d7883d235225299695
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.12.0.zip 1933603 BLAKE2B d8585b2a6910dca6dd66b53fd092054504a98137d5d5206c307ca793b80b9de4228d2633375761fe0783315ba64834b3b07c026a7559596f52339924f96a560d SHA512 c46f02319d73737779a112833afe572d893a8b7afbb316c085e66d0e1738c46caf6f19cf718979022c1a70e52eaeba19a7d266307143306b60d59bb0e7501385
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.6.1-0.20191122030953-d8ac278c1c9d.mod 136 BLAKE2B 30918ff7a9fe07deb706dae946872ae188d15a1c30096e7b907a4c57ccbbe6624dabecb2f26444e7fb84a1e428bf104d299ff2f8805b88b6124deec7ac786a19 SHA512 4e76c8f5be6ca281057dd42021db748d9fc38ed5886a4959c0212677210b172e3e50b180c0bf2f3800f8240f5115b5c7d37f669f36f5e12f9907073ffd6ea8ae
@@ -588,6 +637,8 @@ DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181103185306-d547d1d9531e.
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.4.mod 39 BLAKE2B ce025298653101cca2bccaa3f6797881c47f92443d0835d57c2900c62bb34a82d1399884826c863a7a51fbf731c1a8f836674f4416ec2364a20c690d788eaf14 SHA512 3398e8e140093ee9f7c27ce680fc141df5bbeacffb365a98b64898fb6b28cca8eadcbed1d593b90a101a1aede53a5602eb3455e4ec364ea4b76aa3ca043f68f8
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.2.2.mod 914 BLAKE2B a387d5c347d4a5a0d8b18a7b93b3fd3fbb1b48a6cd00a94309bb01649e24c10443fc681f0dadef77ee58e4cb2206eed524379e7a1d32a4f6815a23e58b5c9d45 SHA512 cd222c9b59f4c14a6b37b576fe682aeb075ca22664bc16393bdf8c5df553ae4aaabd5dced19b9ab687c2d882f388043ffaf61a3b5793b2b80d2e47909a0eac5f
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.2.2.zip 159743 BLAKE2B 19704fa214b2f42512fe379acf0ad9a93b4f45ca1e8499591f83fb6a6e7c93927d605167a3b03361089dfe1a25868205538456e8ecb62bbbd7e7f9315e3ab985 SHA512 4def1c1d42a7a87d37720d0f7b6ab28d2db3b18428ffbe30efa7907d754429ce8faebef50a4c48d3febc31995b9da82f059a5f85ffaed5cbffaf0fdea7c53c94
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.mod 746 BLAKE2B 91753d65b726ac5bfc246b9b84783a9374369c8883cffc0f4a55379ce12332f6bd611f698334d5431f9f39386d076e0e4c02c1303c3e7268b4f4fbd89f8a072a SHA512 3554fb792cf0898b664445f00e1d93a7298e3a8bfef948686f13b915592715e447c3c7e1214d640a582ff0bd83ee5ef1113709c0cb202c218ba80a6534c4f7b1
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.3.0.zip 166741 BLAKE2B dc31b1a683b3c7e1a34c79b2716a3c8bdd9acc625fe3fcb5656f07c12efa00ff83fd23f29c5834d00d200bb09a4aeca00bd082a06d76aac4d53a0800bca3c21e SHA512 8a95316e4e86e6406603124aba7daa8854798da59c0590309942ae545794cf011b2cb709161f9abd22432e3c0d669b45a91ce9bca5a1bca7080660d80edb4a21
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
@@ -617,6 +668,7 @@ DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.2.zip 9586 BLAKE2B 41c33c
 DIST github.com%2Fhashicorp%2Fgo-cty-funcs%2F@v%2Fv0.0.0-20200930094925-2721b1e36840.mod 304 BLAKE2B a726ddfb6b80330ca0222c042634bdf7a34c6156974330072892733f47d8ec4ab68843a203d3d7bcd87fb7a27d542907c45d1b02e3a8be5d80ce9ea007b089a1 SHA512 88e97ebb7f4b444c8c25c1cce97c2f69fce785c33cd951b8661895dcaec195d7f88b8e88230a575e07f76673dc97e8e66fe9dee3fd742f71b44a248def341658
 DIST github.com%2Fhashicorp%2Fgo-cty-funcs%2F@v%2Fv0.0.0-20200930094925-2721b1e36840.zip 40907 BLAKE2B acbab7b7a08f51dddb300a2b5927dc11f32621ed9c77c86c053344d567d8815e837a584ededb7251f9683a13cf10279d79182cebdaea5d7f9ce31447bc49c7cf SHA512 cfe42245a0702a6cb275cfedfc8f94abc09ce4e5d0018b185bba9d6838a27638d63d1d2e0807a93455bb316e68458e5a53210d15509223f139419d5a0027b596
 DIST github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.1.mod 867 BLAKE2B d0efbc99d605ba60f89c4a2eb7cdf943b8f4da5f0d8e09e45f8e58ea0f492e47308c7e17ac090291ab673f5f32c1f281527d370da55571ea06bf1cb17b6c87c7 SHA512 23b1e033f75e68d59e43f0b1f0f0692f0ad15c7ba8d25326f2805eaf4af5e2a841550007dffba81cfcd8f1a9754fb08b5fec407384b7adb06d62f1321340f555
+DIST github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.1.zip 132621 BLAKE2B c03c3a5fca713c888b23d212a934613294dd6fcc22013180973830b2e53e5b033995fa8068bf93134493b138f6682a5a08d58dd7d7a7b4c45364ec3ae7dfda00 SHA512 54d419e8bd97a12f1b1460e7e3fd8d9620a6c8a692ca325af67122f8ee0837f563d062edb57f91931bdcd86475d23b8f070361f9d120251bd4d5b0c1d05cd53a
 DIST github.com%2Fhashicorp%2Fgo-getter%2Fgcs%2Fv2%2F@v%2Fv2.0.0-20200604122502-a6995fa1edad.mod 254 BLAKE2B 587d82759c2502176696cf5d09134328720f09a04af4ad30b12e4300f6338b7e7b9a540ef7d9376465ae00d4f5b88500ddc5bf7eb23f3c66a1725eb30b0a6c2a SHA512 2eca72829ae94eb00f72931f1b4315d8414d87a7c848e21d20843e2c9d4f65fb00f4211a450fa1637c546283030f809b0b198e7a173ffaa3c167f26ed912bb82
 DIST github.com%2Fhashicorp%2Fgo-getter%2Fgcs%2Fv2%2F@v%2Fv2.0.0-20200604122502-a6995fa1edad.zip 21996 BLAKE2B 5324743295169f2be07cd71d081d72352052f5436bbaf019a49c7a479b7e1c3616f87ba7132b00d51ae206fa0bcc22334735860e1f050e339d6d2cb2ad75eed4 SHA512 b3696e04130e72b2cc6771206082f4eb54de027b4e0145c09a883e145a0881c769604fc92cba50d87fd063bafb7fff21722ef2d305a294db22dafa074f00e421
 DIST github.com%2Fhashicorp%2Fgo-getter%2Fs3%2Fv2%2F@v%2Fv2.0.0-20200604122502-a6995fa1edad.mod 221 BLAKE2B 458b25c998ef27d899525ef925361d9019edd5fee0c8fe11bb40421111b6e11045d1dab64bd79c519bc79307e53c6e92c2694ef511a9b1dcfc80adf00655e863 SHA512 b2932831d20bac0143feb3da30d245a9f5ef51bcdcaaae2b16cc92ce217e194f251277d51bc81445822b63357fb86f3c24ff0ea9ae3f65079bb7e6628e4e7d2c
@@ -682,8 +734,12 @@ DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.10.0.mod 863 BLAKE2B f2f19ec678e886c0aa71289f49e306a1bf83ed38dcaba44646315e29344d060678b3d9f498f640330c2c5dd9a634114ea6228f754743a2b3a1fce6a35a8a696d SHA512 dc3bdcf85d1106276cd63c16b735cbb6ff1694a3412e93b31c8686155a6b42e22ba3d48c7a30ffb44a1238ae9e7740fd0b39a7d2ad714b7e143c8432912e04df
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.10.1.mod 863 BLAKE2B f2f19ec678e886c0aa71289f49e306a1bf83ed38dcaba44646315e29344d060678b3d9f498f640330c2c5dd9a634114ea6228f754743a2b3a1fce6a35a8a696d SHA512 dc3bdcf85d1106276cd63c16b735cbb6ff1694a3412e93b31c8686155a6b42e22ba3d48c7a30ffb44a1238ae9e7740fd0b39a7d2ad714b7e143c8432912e04df
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.10.1.zip 535167 BLAKE2B 2af380559736e5f64c740a35c985ab262711cc885530f498bbc65a84d715974a105db71bde443aee9edbacbe43f36f86ba7b6916c58d6777c73fc0737af4f6ff SHA512 df813c520da46e81edb40af248169dd1ae1269104bf7f9c88826fff2a573a6e576a2e73f9c2e9d3e85ed6dd0667913d5e718104ebb56abef126ca37caff00312
+DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.11.1.mod 863 BLAKE2B f2f19ec678e886c0aa71289f49e306a1bf83ed38dcaba44646315e29344d060678b3d9f498f640330c2c5dd9a634114ea6228f754743a2b3a1fce6a35a8a696d SHA512 dc3bdcf85d1106276cd63c16b735cbb6ff1694a3412e93b31c8686155a6b42e22ba3d48c7a30ffb44a1238ae9e7740fd0b39a7d2ad714b7e143c8432912e04df
+DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.11.1.zip 537498 BLAKE2B a1565c3acc40bc5270a0cb8bfb73fdadca553f268d080dfcc5f0fcb071c44ec2059ca0f3f86941cf608bf60e7c9f1bb8c8bb13ba74f31e042e6b2d204c274445 SHA512 8446b90c65f6ff49e1aaacd11e9c50e2a175197f60c33042be239f77a4d39042c2099b20a61da1644ecdb88db9858c59e21a26aadf9469798fbb78097538eea4
 DIST github.com%2Fhashicorp%2Fhcp-sdk-go%2F@v%2Fv0.13.1-0.20211004174420-0f36fadb8a34.mod 555 BLAKE2B f13c459695da200b0d819544916b7a63c72d4baec9001d9acebff2ea8e4852940586eca2aa12077882405f9af9d88b629ffb86f1de6d1bac10a92684653a43f8 SHA512 dee34c99ac8fc7ba3f0c4747b8813bbafe45650b4ccfd3f6f183d67b6de93d2a38e6424164a03a66727869ebcf0b5f5730564d94675383ad69e6315424d12906
 DIST github.com%2Fhashicorp%2Fhcp-sdk-go%2F@v%2Fv0.13.1-0.20211004174420-0f36fadb8a34.zip 898203 BLAKE2B be9edc1a50c0e4eb1a7091dafefcf1ef2504aa72ded027fb5dc37cf6454f3b39d76dc2e82fbb918ec015219284553f169bb943c0ad73afb3d355a7504e1d53ef SHA512 9e9b6b82cb8b8aa17a4a3e99664cd03e50ecf279c7cc6413547b234c67c46538ec658adeabe0eaff8265d77b22d4dcd48feb53dfd7633dd21f62ad5209d868e5
+DIST github.com%2Fhashicorp%2Fhcp-sdk-go%2F@v%2Fv0.15.1-0.20220112153249-f565607d7cc4.mod 555 BLAKE2B f13c459695da200b0d819544916b7a63c72d4baec9001d9acebff2ea8e4852940586eca2aa12077882405f9af9d88b629ffb86f1de6d1bac10a92684653a43f8 SHA512 dee34c99ac8fc7ba3f0c4747b8813bbafe45650b4ccfd3f6f183d67b6de93d2a38e6424164a03a66727869ebcf0b5f5730564d94675383ad69e6315424d12906
+DIST github.com%2Fhashicorp%2Fhcp-sdk-go%2F@v%2Fv0.15.1-0.20220112153249-f565607d7cc4.zip 917000 BLAKE2B d0a66e6711f04964e7bc3dee2dc68e9b948a984367c360e5e8c78c8a84bd3bfcf88bac82b593e50148a43d1fe9b03c5972750e3ffd0c105c077f096563c20b32 SHA512 a06aa76a13c338b86627c09e1954cc12c9148058a0df644f172953d1c69a87ae64dbec621878567697631a0030191f19adeffea1bf4f8476d5be3417bc2d2760
 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
@@ -692,36 +748,60 @@ DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e224
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1
 DIST github.com%2Fhashicorp%2Fpacker-plugin-alicloud%2F@v%2Fv1.0.0.mod 692 BLAKE2B b42b6dd9cfd83c40557005a0fb351f427128738089d49f20faa21144c0fff5a526a4f740b4157b574c9f1cbb5b9f45074ea048dc73c9f4a77a0cbc476a305a02 SHA512 61e5a8d3db339d246b5251732cbcab2315eb0c71c12dfcf1a7cd5b9dea35543f44f85b049e2c4aab6a8b06f7038148f2d5341893f1e25383758b6660f47e2daf
 DIST github.com%2Fhashicorp%2Fpacker-plugin-alicloud%2F@v%2Fv1.0.0.zip 141695 BLAKE2B e3ec39876ab2cf3f88f0562ae065dd8cad962ff158884f17a5ec24aad7ed1287b4ec9760c7f10299c8269e07bb9bc4bcae4357ac12fcc867b67fe0b4e5e43480 SHA512 6c3e651f6995205fa8aea75fae9751af296f7e7c7b3c4e498efc344a1e435938011d910cb0bb7a3fc2b40af8b18ea3cd95fd821916dac09c3fafee2e9449d959
+DIST github.com%2Fhashicorp%2Fpacker-plugin-alicloud%2F@v%2Fv1.0.1.mod 4942 BLAKE2B 924375ce1595ae3365bdf06a1852dbe6ccbf7f6c9ea301dbc57df413bbafd838990f29741f04e2129b34603dba2781cf6766891654c1279f7129ff8278989445 SHA512 7850a8970a0878bcaa583d1106abd217cc3e779251d0dbcb72209265f8277bc6ff727cc7121572ebd4e0bd92a9a6a73719ad3346fa8f7d9049a2c64a727fecf6
+DIST github.com%2Fhashicorp%2Fpacker-plugin-alicloud%2F@v%2Fv1.0.1.zip 154822 BLAKE2B a0b8860bb6ec45656a698d353a9705521fad1d2c4257b4194a3e171e9a14bc22cc9e3a550b7d0b0b88fb470fc2e28cc313466caaff062ad472b0f0ae06b102ad SHA512 00151ae3e35013fd7745c1abae01085bfe70303973a296cc62ca6d6cbbe280a5c5af2497fe87bd630df750755283e0ac8c4629430bd8e81a0ba40d720bf033e6
 DIST github.com%2Fhashicorp%2Fpacker-plugin-amazon%2F@v%2Fv1.0.4.mod 4607 BLAKE2B 9c05ac03b88abf2b26e9743dc9d04807fad32f705443752efe88ddf881fd6dd91546510a4f71ceb85c9b888bbe00aeb840c37a7582b227a75965a50001012440 SHA512 dfc00460a57b28578bf45e9389251b3ca14b1a27a16992cdb770480c2f3110c72bc1fdd5c8039d7ab9a1c7ae54ccca557a406b5af19e5a70656ebe9854b20bbd
 DIST github.com%2Fhashicorp%2Fpacker-plugin-amazon%2F@v%2Fv1.0.4.zip 397574 BLAKE2B 94b80777707fbb17acfa0babc5d7b86982db4fe7ba1bcffdb990628abaeb0ba64c9896eb1cff13e7853d27bb357558dd0aa90941b33608b25053ab9961a03119 SHA512 07c2ee3320b52ba0671894424404cc126d5095d99bd3ec5c36d60c71a553fcaedd0148fd57a87b0c7139a995af7c8c1a53d74d9828bca3aaac853ee2d8423cd5
+DIST github.com%2Fhashicorp%2Fpacker-plugin-amazon%2F@v%2Fv1.0.6.mod 4609 BLAKE2B 81c646d9957c361eb0ada7956f8fe3ec95027265c89fae8f536cc198fbdd8f828afc673fdd95d541fb78c4751c95f58985a0a6bf86b556b83f6c1b18d18340cf SHA512 ccb1e76c57e29bcac4287e6c81ba3c165fc75dc03c4fa374bfd994f0ce1bcc9e7abdc87eb90f97878b7dbbd39bb8fb1f7ef804c4c56be5b2845693205bac1bff
+DIST github.com%2Fhashicorp%2Fpacker-plugin-amazon%2F@v%2Fv1.0.6.zip 400156 BLAKE2B 3de740260806adbeb7f6bb96408906b6afedfb402c992da3b01214d7dfdf8ba532f9f78d6801e0cdedcfb6fd4884fc8629c75cbdfab8d1ec3e7756dd7f6ca2de SHA512 f3b0852141fefd01c09e3779f9013b552939ef405b9ef5b855b37e0c4b120ff09615bea81a9f49b5d218a0d4a96353996f224eafb7363d93d040e91faa5a4430
 DIST github.com%2Fhashicorp%2Fpacker-plugin-ansible%2F@v%2Fv1.0.0.mod 394 BLAKE2B 6a522981a00d729ea46d2efbe144c2db1966712783e8dc7b0cf4010f91745febf92967ef6517f96b5d329c839bb3cc639464a900ef5c523de2a2e0d08ec1798a SHA512 c6cca968be0c570513a7f7a1481d339f6337dcbd3eb851c4f7b5bdfb98b46d738207f6c308434b8630038369c14ab4c7257d62c5049090b7c54b74329fe7f699
 DIST github.com%2Fhashicorp%2Fpacker-plugin-ansible%2F@v%2Fv1.0.0.zip 182070 BLAKE2B cfecc8ac6a85f7fe4aaaab26030cbde5b0cc2c82cbc2304381c1b9a939345954a5282f4efb73136916cc75c5b5a5d2d47764c670918462d7b3166dd18e5fc2cf SHA512 01f2481af3dbdb3258c0289c4afa4262363d38c2146e7c103461b732fcdf214c73b02ec3ce31a8a253942426edf5b7a66de06eb6be73c327a3e69fc439983fc3
+DIST github.com%2Fhashicorp%2Fpacker-plugin-ansible%2F@v%2Fv1.0.1.mod 4784 BLAKE2B eb8d891709176b18fed03d4380be5a75756ca8b9948f377767ea73e1dc5e524a64d72ddcda9d21c1b09861e7fbd8135dadf79eb5117d8420db6a685ad6066657 SHA512 a3ef08b1585d9cd0f5d982dc8df5124a9e501b0440fca536f417a5a3340e2c39e07c38a45e58d0703ea67caff15e2f12955f1f23330851551c82b064028899e4
+DIST github.com%2Fhashicorp%2Fpacker-plugin-ansible%2F@v%2Fv1.0.1.zip 194846 BLAKE2B e33779f401ce189c10e3ec1d4b8d9b4f70c37da5e9fdc70a2f1bb0996f7739cf8493ced68cbf47b45a6372b9efdeb2667de361a2760fa309860b15fdf2dd3f11 SHA512 9b272fc3c14b1fbe1733ffee0e2251207a49b3cb2a9be84ac31a55b655b3b6bba53bd893044864a8f49fe2dc65547c1db535fba7b17847dc2f778eb153d92adb
 DIST github.com%2Fhashicorp%2Fpacker-plugin-azure%2F@v%2Fv1.0.4.mod 5639 BLAKE2B f555e6744fc9532c2a9507d9781389c3f38add536614c688bd315ea3e3729959ce7d65e3cf229cf27d0423155735ab1069b1289e9a5e4f9b350ce12fc6084afb SHA512 14ed25a4d73ffc6448abdeeb5ed3d3da1c5c9fac6aa0b8ed80a2e84e20ec1f16e39923f86a905f045a80954e8cfcd7d693b54e2ffe32947857a2b8617822ba67
 DIST github.com%2Fhashicorp%2Fpacker-plugin-azure%2F@v%2Fv1.0.4.zip 479547 BLAKE2B 802c8d900738a36760d69ee0d34aa13138b6f95b7764ad4e20878a9090c3e9144a6ff5ec23db58294eede68ddf7b02062a60752dd1c83966997996bbd4e6084b SHA512 cce15d04ccc94f8d3b89a76033656b095e2c89d4db62ba40a5477deb9499f17ddebe3eaed63128ec115472f4a535116ebc0775f298e1f8d6e565b8018ffa04d8
+DIST github.com%2Fhashicorp%2Fpacker-plugin-azure%2F@v%2Fv1.0.5.mod 5625 BLAKE2B 752c29ca2a1d3d88e9f95592e8b6d20620d08b0cc02542d93841cd8389fbe25a87eb6c4b8a03250b06ab7ae0beb1bcf1b15b41e00d31feb1db9f688939e344ee SHA512 417e908205f35305ef05f8a47229567978758349e6e95a6ee0e8d65e0a16610ef71bfc3bd372e2d470ae7cc212e3379e14c0e706f98b42e90b898809c36fd0a1
+DIST github.com%2Fhashicorp%2Fpacker-plugin-azure%2F@v%2Fv1.0.5.zip 480136 BLAKE2B 5e2303581db1ad80d62397461913be86c667ceefe7eb9c27769f742014b0a7b54def523a86fc46ce7762b2b24abf5d03b21863ed4ad1979eb4b5ae469c73a13e SHA512 8fdf72c92e06d9493ae9c98a6da33c8598824653807fa2fe77fe4d04e97d2bbbda14ee700f765414849ef53ba3ee56f3f603d564b1113b13b98ffcf2fa36270f
 DIST github.com%2Fhashicorp%2Fpacker-plugin-chef%2F@v%2Fv1.0.1.mod 300 BLAKE2B 604041ae93ca3cf1d39034f8e65d9def5826b77fddd50e7b39404d470477f44a2252fc8dd23b3463e965e3d8902cd8b07570d036f197059b24a33a4d6822278d SHA512 da6c2dbbf040ef5db214d88c76aff40a10efccc9f6047d9736facef6821471f1af46a3dd9455ccab57f546e5b6d123b3d6b99724554ff4a72eda378a1f6f4e66
 DIST github.com%2Fhashicorp%2Fpacker-plugin-chef%2F@v%2Fv1.0.1.zip 80536 BLAKE2B 2150e0d258ff3370a8628118b8aac9647877a2a18a7fff3e61a4c55f62b077e1009bb96170a51cb43f015b804e0dfe4ed3e8b30983bb06509760de8144d635d0 SHA512 67a8f51df9fc8474ee28456064b1f7da3d0a45b15682facd4e55ba9af055383d061acd04a8517a65c7d085601722eedc6450c222d7f394db1c4c49aaa03ca14a
+DIST github.com%2Fhashicorp%2Fpacker-plugin-chef%2F@v%2Fv1.0.2.mod 2841 BLAKE2B afce645de172bf43a9d155cf97a056afb0982118aa03ab751f8a57bc1922fa5371e507d09287f96973aa4d9fdcec428b9d45deaa9540ddcfadba25eec351927a SHA512 b698e5ba651cd06c942797fae3111b559f047d3d45b22b7d0b6e914ec322cfb078698d7151eae9e76df32bc74158b0b604e02fab55589b66008a5e78fd0df1a5
+DIST github.com%2Fhashicorp%2Fpacker-plugin-chef%2F@v%2Fv1.0.2.zip 91851 BLAKE2B 15942f438b01e30cd6fbbb29ffb0951b95db00cb805232259d831e5bc263acfac8632c580cb6137c3262b5d91b21ab529ed96515482b9f6e58723109da54328a SHA512 fb0e8089c799f147a834e4e328aaa94e7e8b7c28da80d5febd89254cfdfd876aa7107816f587b07fe602f2819736a7db7269531614ef405953390b7c4bbc5793
 DIST github.com%2Fhashicorp%2Fpacker-plugin-cloudstack%2F@v%2Fv1.0.0.mod 245 BLAKE2B 0849b10d2851a758a3c57666926c3dc8e69788fb1727d8680e5e13968434fecd724a7da2e91ac861079d2285b4218c4ca456cccd50a1f3327b00a568ad13ff28 SHA512 830cb5733e3b8e128672a516f274dec3f8722e628e1bd4905f2f8b3eedb5b1b46efb78b96a738ae3fbef82310fea069f1b0d59a1d3c21a7c2530af76d3e23dae
 DIST github.com%2Fhashicorp%2Fpacker-plugin-cloudstack%2F@v%2Fv1.0.0.zip 87112 BLAKE2B da0d3974705c3dd63f2599ea765aa85df33f150c94a310e78b05deb49d42a1645c83752fb850341a31fa5788bdb55d3011d254bd1ef3acbac2eb52778bdf2cc2 SHA512 a0697de4f811d291791b99e3f209fc05db560874fbace10c0e6cd0003531bfb05a2a62a424e728f18d1ac40882c86836ee5e04261c46ed39ed8d8ad914d12ab5
 DIST github.com%2Fhashicorp%2Fpacker-plugin-converge%2F@v%2Fv1.0.0.mod 191 BLAKE2B 3550fc336271ce19cf2dd8424f93b18bcd3d074a6a65b72a2e5089db4d8d66817099ca0915ec29a71b505310301cce078f56f0201641a675812a1e05ca6a4c44 SHA512 cbd0bf944efa142890593d364b1bf5f7784cc39fee3eb3308da604ce76baa1ba750241dfd4b034e41ed1dad54fdeae9ab179d79794c3bfc35434f8b4256c1208
 DIST github.com%2Fhashicorp%2Fpacker-plugin-converge%2F@v%2Fv1.0.0.zip 57955 BLAKE2B 0e55762abe53507b63289a9d3e2e8b342f99ee512f05407a4f0c35d0d9d8921f47d78c04b07121b09ab64d64e6eea746eee92d77e5602a8760a937f9aeba94c1 SHA512 9b312584241805a927c7119d5cf933fd481882e0f06f975c90d92c5cc25abccd495d9bd8b6ab4e480205e16a68ea6f4cfcb237bce4853f9726a6b634b966e37e
+DIST github.com%2Fhashicorp%2Fpacker-plugin-converge%2F@v%2Fv1.0.1.mod 2813 BLAKE2B bcb79a736992610bee3ccf9adcf22983c062399c43a068b40436a79af3056826b179f82a96ee8df2a8c043ba910a30df8d6edcdf7eec23333b2e53c18ddc7a73 SHA512 7361ed1d4470a808a12cab714b1a10405ba268c86af405dd7e745c35791935af132e37c1c9adb05155b341221136e9fb9cb9de3fead50cd89566467fab40ac3d
+DIST github.com%2Fhashicorp%2Fpacker-plugin-converge%2F@v%2Fv1.0.1.zip 69236 BLAKE2B b4a7a56130c0660d1fc006f9dd92fc5f10eb9fae81a915351ec72f361f24103ade49b91e889788d16a4c82cbd1fed0104b73c1089129089d07603a629643659f SHA512 b056c24efab8c1cc7aeeaa03c1290d4b210b99dd89b6858da24c9eabcc9ee764eac3da75fdd1aded1e01768c77f2c9415aa404e13d1eaff4d7fbe23778b4889d
 DIST github.com%2Fhashicorp%2Fpacker-plugin-digitalocean%2F@v%2Fv1.0.1.mod 367 BLAKE2B deaac5b2e3cf5a02a156ab4f4fc35e9135ee1db7a3087bd2a477d0c47c7ccf8db8fdd446066122476028fcd5662a157f22df93c836f9c2ee8ca590ac8ca0348f SHA512 6bdceea2e2e941e4f628941eda7c5198bc8e31286274c3e8df6ab01d56eca675992794f0c009240dde143212ec3ac54f6e479351158720db9b93ef3a202dfcf2
 DIST github.com%2Fhashicorp%2Fpacker-plugin-digitalocean%2F@v%2Fv1.0.1.zip 86257 BLAKE2B fa1eb6eb4b5a76a21ad4f8c6437144c3e6ae57633b006bff6d86b3f92a429b5c4e700b99aed76fa3e2b2eed0531b98d54119cec7421dd8d43053d4540eabe970 SHA512 6f1b24c3c811b0725cb719e58bb6039c7f9d71648f796abdefac5cd82b2e5abe8dd3396e079a3872ed743574543a1f952a135b19ffc53d25de63cbcc527d2bc5
 DIST github.com%2Fhashicorp%2Fpacker-plugin-docker%2F@v%2Fv1.0.2.mod 4643 BLAKE2B 2eb24ee8e4ef742fa59553ce4edb224c9035fc42de93b56078381e6d52e08edf7408e2c6f96b8f4a185eab9aab268d6d0c60cb53403e4c7779fdece85f23bc99 SHA512 d6e9cbcb17474a7a4c6652587061061ef7c8f60b24c7857226d274d8b3477c490b66e8454682dba446522cae5e26b9f9f87ac37012243ff5bd5ff788b3bf415b
 DIST github.com%2Fhashicorp%2Fpacker-plugin-docker%2F@v%2Fv1.0.2.zip 138687 BLAKE2B a4f1946d59ce8c9b1f236070b667f81555048bbcd34a046ee8a9fef5c3ec7aba33b45e3d2ffa378611749c517e3de57378b9b29c2263286e0d24f3e423594ae8 SHA512 3a244d922692b1993f240cff7e6f53c3537236148e6944ef49538b9275950af10834c80ab25d62543ca7750d45692ce64e79c1c1e3a68eac04ab10b6e6fae819
+DIST github.com%2Fhashicorp%2Fpacker-plugin-docker%2F@v%2Fv1.0.3.mod 4643 BLAKE2B 2eb24ee8e4ef742fa59553ce4edb224c9035fc42de93b56078381e6d52e08edf7408e2c6f96b8f4a185eab9aab268d6d0c60cb53403e4c7779fdece85f23bc99 SHA512 d6e9cbcb17474a7a4c6652587061061ef7c8f60b24c7857226d274d8b3477c490b66e8454682dba446522cae5e26b9f9f87ac37012243ff5bd5ff788b3bf415b
+DIST github.com%2Fhashicorp%2Fpacker-plugin-docker%2F@v%2Fv1.0.3.zip 139315 BLAKE2B 9a1cc9a61b3f24be61921a1c3b186fd9876af2d40fad33094df2e4912365d1ea7c4bd437e89cb866ee76bda6ce2bba13cab44e30dd8f7b69acd3e9525363d08e SHA512 1b46bd4e2abcd2be355c17edbfaa701111dcb509bda6cc7f058f21efb9cc354e50d2282f7049cea9f68493a038ccbb2b8ab8c66337d623bb4a962e4e97f42305
 DIST github.com%2Fhashicorp%2Fpacker-plugin-googlecompute%2F@v%2Fv1.0.6.mod 4593 BLAKE2B e0b8a1cb0c790afd32f27d7c6a4762532cb1f31843827a77b60532de28a28d47da19197c6bb80931faabcc25d2077076a7af099d0ddd5d578b58869df43acaf2 SHA512 dcdb81a059ad7f21dc49bcd0bb58e97b5cb13eeb90fd03324f6fa26e107c9df7d3baf0bac25a5ca9de9bf0916b13039025a1f987e7ebadec146c679472fe1b2c
 DIST github.com%2Fhashicorp%2Fpacker-plugin-googlecompute%2F@v%2Fv1.0.6.zip 170523 BLAKE2B 095b7d3ad2eadde82f2fbf4e76bd48bc77b277a3908eb75de907404d86ada3edac960aab80f85178d6b7bf725bfcf0f20fdf1492edaa83185c0949b684f0a55d SHA512 28dcd1ddf0c223275c6025833f8c0d9cba1ce0a1effaec443639750ce8120c12179d991ff9da053a3fc0e63f409be464b652e30b0074ad68b4f4b0fe04f4d134
+DIST github.com%2Fhashicorp%2Fpacker-plugin-googlecompute%2F@v%2Fv1.0.9.mod 4595 BLAKE2B b0727cb59c0719adbbcdb0326bf45cae6dec214f3735fa8c7977bf9becce1fe3e4022c2212fd07f9a5a93bac54ec7f9757d46de28d33a078b4dfb1f73c4a82da SHA512 0c20445a75c1b58e5c0bb687f046e8b97f00b82428fee494f45197d8001781f053ab057c190dd7d3b14571a0cf97947d5bc9ef9daf62b3a2e2fdad16cd00d317
+DIST github.com%2Fhashicorp%2Fpacker-plugin-googlecompute%2F@v%2Fv1.0.9.zip 173026 BLAKE2B 0624ff0916c5c4c11f6aee1c0468b4cc8a5c67aa8e9bed4e2fcc7fa9b906157f7990f21db16e02e90483f76d779bf4dca5be405cab5cc0f1f3c2e4cbfc40fae7 SHA512 be0e5e5db7478405583e6df6f39d218d68ed884805eb4e05fb5a6982e2a01db42aa99e50314304f3aca09b1c84a519f3ca6bcef4105c334512844f031248ad75
 DIST github.com%2Fhashicorp%2Fpacker-plugin-hcloud%2F@v%2Fv1.0.1.mod 4680 BLAKE2B 7e9336d336ee6a33fc9e23b9354e7889c0be1b519b5c4c317f935a6730c3ddaba878c8d20583214fe7baf4c0a1bf4bd7645d6683895476192272ff1f576f5402 SHA512 b166f1a9430b8c6e9a4e09b88aad844bfa04028b04afbfa3fbccab2dddebc96311a7f7019ed11a18ac1dcf7b8b740adb3d3049402f347c2dfa8495672d5711e0
 DIST github.com%2Fhashicorp%2Fpacker-plugin-hcloud%2F@v%2Fv1.0.1.zip 70384 BLAKE2B 7ec413a57feb00b2f961578fb45001d4bd30443700bc0f5b0c9f836bdccdce89a6227c8911150db85825cb5617e2cd74ee41d0d57c49d7b7fb2fb9be1b3958af SHA512 5d833f2e2f51698fd7d515aa8f827bb2aa388421121440594aaeec5dbc6cb8a64956b858cd73681258766bbe6df57ac33b0845acd854e1fbb275aba5f4caecc6
+DIST github.com%2Fhashicorp%2Fpacker-plugin-hcloud%2F@v%2Fv1.0.2.mod 4430 BLAKE2B 8f62fd08ea021c3e434282847524ee37513b95373a2fc8d45e8e523682477cb38a62c82e768b3c124d7af6d956795ddb4ebce4155c24681ba25d4f8cdd7e0735 SHA512 be2ad4f1465cbd5c5fccb5c010b2fa024b10787962227aaa267b8147094b390490c39bb8bbe03a4b5f63a514883b2f9133142c3030a30d4c6afce3c1fa85a1f9
+DIST github.com%2Fhashicorp%2Fpacker-plugin-hcloud%2F@v%2Fv1.0.2.zip 85602 BLAKE2B ceb4ed5b6f58b2ad5f15e5de569a24c68ce3376914bfd45915dd7b5dc1d8453226d1591ae83aaf1a0a0443f51757d0ad0338f9d44e66c6edf417fa48844be923 SHA512 d2160890c6afff5588e717c6f117c6fdf616f005b63ec8cea5470e909739055f1908ec3885cab0c106d12a0b1c2114890472e6fea1aaf9e26a752b3fd78042a8
 DIST github.com%2Fhashicorp%2Fpacker-plugin-hyperone%2F@v%2Fv1.0.0.mod 437 BLAKE2B 94ab0040ac18fb122cc08e41da464216296ea85cc95725d9036d628a2f043bc11d8050725c51f60f002cf3dc79f360545c78d88ef89a8a68ea050ce67ba3f936 SHA512 e2b1f15b93e7c4eae21bf3ffe7d71c1d49b96416ade5c5e406817b7975d4129d14270a15cea6aaf16de94dee7e24ab06bd2c4270b8e3908898167ed114b53fdb
 DIST github.com%2Fhashicorp%2Fpacker-plugin-hyperone%2F@v%2Fv1.0.0.zip 85000 BLAKE2B f4a5383e8d498d799b6bb9440d91ab913a9f14bea58e46bfb336ece56b6ad5898eeca3e94911235ca7fc7370d110c50ef46757c9085110d5df6b8275859d0093 SHA512 8b82149449c3d0c2961564d011bb7163edf02d07cf4f903363005719381fa8f2933e87a0fa3f784f15d57e61ff8769c8506c0b8e039ec3581e114af679f92cd0
 DIST github.com%2Fhashicorp%2Fpacker-plugin-hyperv%2F@v%2Fv1.0.0.mod 189 BLAKE2B ca6337f6d7627d2587e5bda3a5c9a1cc70af4ca197988453b9dea380ad511f8fa560cb8af21fcc157163ae61d41bb2f27973a58cea2cea1f52adf6140c4c610f SHA512 9274e4b4a0a10b808ae3bfdee0ff9e8652f056387447789d0ef876168653f2f0833945e311ebfa1cc74cbdda58f73ceb0dfe2fc5263dcab1cc2d78d29edb982f
 DIST github.com%2Fhashicorp%2Fpacker-plugin-hyperv%2F@v%2Fv1.0.0.zip 175735 BLAKE2B 301ecc08cd7a96ed142022670f9b2fbb31238a5bbd60b005496c289c283a7020da62fbbab1822ab422b40e65239af433e24756610edec7e09f4c4d2f6ce1c1da SHA512 5c50bbacf8285b826ebd49b020e381fd5579f41cb7441081564dc8eebbf621770e8ab4c8ad77f0a42e454675cda977fc4adc7d54dc83c894b3dda3abdba61818
+DIST github.com%2Fhashicorp%2Fpacker-plugin-hyperv%2F@v%2Fv1.0.1.mod 4481 BLAKE2B 5d9f6f216f6cd7bee6f2a084cb60f72fb740ee36119ca9fc56dae0dd2a499bb8352308350bd5050317238411e9a5b688d8c392636e6a793e97327245f76291ef SHA512 52fb798a76923f7ca3091f1c9751a9592efdfaec4fb144b76bcc329d7a0a295681cf1b1234671a180a2688e0a707fc4b139d868d746266d91ed3bd1f9de4d995
+DIST github.com%2Fhashicorp%2Fpacker-plugin-hyperv%2F@v%2Fv1.0.1.zip 187785 BLAKE2B 11a32979140cdd6d0f0c451e6f8a651b7ab2b63169c0e9b06a00ed24f9d826e0a13f4a0a5f7ee03fd44ad8484aae6b826a5827bc1cfc48a25e0bc306f5aa64dd SHA512 8217ae4ff221f2fccca87fb1a5ee792ffc162a3d201c97809fb9ff08b30f79eb4e0da4e3c01325099554579cff1ee745335ef942419649eed9a4643ca2321c29
 DIST github.com%2Fhashicorp%2Fpacker-plugin-inspec%2F@v%2Fv0.0.7.mod 2983 BLAKE2B 71257c4b00a78dc07f6e4f3334ffe3ccb03b419d678d05761480ee25da833a86f90a36f12160c9ddd77df5463813a8d5bd7f7d4b5e8869fe31543be67d17eb7d SHA512 10b26656f0720268fab024e266e4eaac6958399bb5e473d04d05f4680b9fae8a7115035f0b8417a73274b4fb61ad97878288f315374c42375e4b021983426936
 DIST github.com%2Fhashicorp%2Fpacker-plugin-inspec%2F@v%2Fv0.0.7.zip 71038 BLAKE2B 06e099ae0693dcd50af1a952db05a90b01abc2f528b8113e9bea215a125770e1efe186351808a0c4ddddb528b9d6618e65a61e8fb39741d2609d9ff3b5f2eb15 SHA512 7f52b97ae5c50f608f3b836a4bc03970a6476feff8c93cd7e3a0824c4ed74490bcee314bf65f0b116e20401c8471702884ddb78ab2db8f8709dc201fde9b2a85
+DIST github.com%2Fhashicorp%2Fpacker-plugin-inspec%2F@v%2Fv1.0.0.mod 2916 BLAKE2B 721f7181b8af4dee15700c892368b0a75d19469f7cf0839e0a852d73bccfb1a86e611b6d4cf45bac6c8e8fa1025888f46a26b4eb70f781e64f676ed0de80fe1a SHA512 5612b891f24caa0b1a0b75d2714ac9b493b0c85d89f14116597b71be743a04097be56736b52c640711a069187c2d9f8c92dee18a6cf6226199cf4d5f751a2033
+DIST github.com%2Fhashicorp%2Fpacker-plugin-inspec%2F@v%2Fv1.0.0.zip 75018 BLAKE2B ef4af30edd0eea2fdda040c1e816f13a157ec56758c1aceaafdecf9920718fb061b5ee12251221b02704e31c8adbf168e62e7a651847e2e04bcecbb2178fe40b SHA512 add1e880045a161a7429eb2ba15bf1e899d47edff4f5cf23e25539800aab441d2a7c717893d4c3162e98f3a66a41dac598dcb27bf29d53f3388257753735013a
 DIST github.com%2Fhashicorp%2Fpacker-plugin-jdcloud%2F@v%2Fv1.0.0.mod 266 BLAKE2B 307e99a7ffbcb659fe7a2a7e30e0e0de6ba0d68787e6ee9301f124af3c96ca229a108938d349aca35baefc45ebf5721b8365c01935e82b6a9ebdc6106117ca6f SHA512 c44bb63dada606c040d9ce35328e4c234d72bae56b19c6dbd8f535d2ef7617a4a43defe0e2384f7f4ba3b31999ca45e52f69799dc1313edd05b9146fbd377bd2
 DIST github.com%2Fhashicorp%2Fpacker-plugin-jdcloud%2F@v%2Fv1.0.0.zip 77654 BLAKE2B 210e51e3d9146df0bf05b7bd6091fbf15259869549a64539d9e008c44aab1b4b3511f6b324b97f1eb4895970c5eec7bba7bb1f2303ad16a4b5910f0b7bdf775e SHA512 997f3b9d7287c5fc77d6d4cbf18a03c9b074173b8e310366eb0160e10123f4f18d8cada747e1e5b7830fdfb312ab97051f6298e0148d4a42d9faa6ccac717ab6
 DIST github.com%2Fhashicorp%2Fpacker-plugin-linode%2F@v%2Fv1.0.0.mod 386 BLAKE2B b30826524d569f0e7436385d88aefcae4bbb3742ff47a0eec673bb1cebc5d89be7f4ead19441c43af81dfc0cf78f3a987afac82518af87c71998c3ac26291e58 SHA512 14815cdd7cba1a79b10f12501ea342632db44251acaf28e284a344489c06493502b648cbcdaeec10329e9fdc0d8c3fc7bfa290178417d99498b7a96b5d019aa5
 DIST github.com%2Fhashicorp%2Fpacker-plugin-linode%2F@v%2Fv1.0.0.zip 69481 BLAKE2B 65387ae7f7d8faec56b435d4599f964cfa2f5824648e02b4ee98a935b8fe6b73fad3861e8f1cbd15f2a20f324cf87926da0a27f9db4a1cb1effd9015cf94c962 SHA512 186c3c9303302a7feed97897f8f4f1d50f13483a85c24c796adf07a2628d6b12722069b0eeb12ef4f1132d843e38e3945bd664ddc8089e016fa1eb885e6a138b
+DIST github.com%2Fhashicorp%2Fpacker-plugin-linode%2F@v%2Fv1.0.1.mod 4474 BLAKE2B f9095011caaf065e13a6a4147a39d8ef31d2bdfef8506e757d2d3437853667d51044c60de9c9e3357e27280853db6dc0f492ed0157eab38bcb586b5343c6fad2 SHA512 ff746945490c9d03c549e7a96ebc7d41bc020f766e14ea2f2d17d1372cfe24b54fc085e37620a4dcb61feebd0607c4e582a37ea5aaa131fba3e1027038086f8d
+DIST github.com%2Fhashicorp%2Fpacker-plugin-linode%2F@v%2Fv1.0.1.zip 81112 BLAKE2B ec43aa7c6c023148ddefd0452407e2253ba0f8b9dd7095a16e3eb6551e99bc5644b5405b1ff1bc69cdf9e8dd46fa8f1a4cf738e6f6aff63b1d62dd68925ce59b SHA512 912d922ce2a46b6dadeea2c2c8091945d939011dcb944e0fbc00a9b960ba1b4dad796699215cba15c1e2d06cd7f4a01a6e62655f133e3f29a712a9ef969a1688
 DIST github.com%2Fhashicorp%2Fpacker-plugin-lxc%2F@v%2Fv1.0.0.mod 228 BLAKE2B e48d31bd4c50620437c989863b1ad0c86a70ed90c7e6300f3ff318d031a3d9c9826ece8ef473675b48604bbfd040a89f453e093f96d37618b28b6a84c8b0d56f SHA512 e1f86bf282519a63bd163ffd8145ec4b498d62829f39f49de0a1e3ca53334c154e6059e729ef7f6ccf898c97b7b20342d71eb2b3e62ba538fe0e68063b5f3275
 DIST github.com%2Fhashicorp%2Fpacker-plugin-lxc%2F@v%2Fv1.0.0.zip 68474 BLAKE2B 9e72097a8dde4cb03c2cd0edbd224f3ad30a0c7e2a8ddceebd7afc3ac2eecdaf1c7646fa089251181d60e9dadfc7350d62c4e4775ba38570261d6a2ef6af7f9e SHA512 81848429ae8e31549f2f8d55ded6242969169125432a4347d6d5e15f940658958e05f1e395eb66db9c003277cbc7f084536a20a7d1cbe4a524acea3778c4dcf9
 DIST github.com%2Fhashicorp%2Fpacker-plugin-lxd%2F@v%2Fv1.0.0.mod 228 BLAKE2B 48cd06d749042e0b75d934283bedb246ae4c22d874cb75428d89a6ca9de5230a467bd71ca1dca1244989234cab7bb47bd62a166a503b94d4fc5e85cdba4a2aec SHA512 5655387f27d668a7d04df3c5e2e292f6a0c97edcc3f00bd82020d6ac1cf053ff98905757b263ff4749f09f5890278223f93f045b96351f3c418be146f0cc6fad
@@ -742,31 +822,51 @@ DIST github.com%2Fhashicorp%2Fpacker-plugin-profitbricks%2F@v%2Fv1.0.1.mod 358 B
 DIST github.com%2Fhashicorp%2Fpacker-plugin-profitbricks%2F@v%2Fv1.0.1.zip 65071 BLAKE2B a90e2036e4c1a08a58fe012dfa0440f76d9add79c6ba804b9b1c5b846023981d210c866dfaf589b825c200f1bc1412556c3fe2529cd2b9b174dabf25dfa89b94 SHA512 970d04d3894e383527c9ec0fe0be6cf6ca8d23f4b1baab23cd6c2d93630515dc3a32626fb45637c6b58c0754da268e7800fa2b79d5eab983909f757623a832da
 DIST github.com%2Fhashicorp%2Fpacker-plugin-proxmox%2F@v%2Fv1.0.2.mod 4986 BLAKE2B 07b7d75ab6d4bae4d9812400571bec6b78782770a5f62ae13a3df79c6b90ceda0ba4bb942bee633c40758cf8aad558a46f3ddea332daabb98e75db26a8f2fdc4 SHA512 3c2bb629c0b5d55bd6518927617603a3eaed799f30635309444a80033f5e959d30fcaa25fd39f9435fbfbf40f7d1528491ccabc59b26cef7f1d5b30cc3b9ae26
 DIST github.com%2Fhashicorp%2Fpacker-plugin-proxmox%2F@v%2Fv1.0.2.zip 120977 BLAKE2B ed40284f5a347bb571947d296adaf60cda85e9d415cb317b9e4047faffbfe5d90f4195b5bef579d51f51bc26204b5602ed48c60e1d168b472314f2a93d2a5519 SHA512 fbc2958d9403e65311f07c672d6be87095527eb2d67891c5ae209bc499486b4998a05875e4cf0cec7fe3f4add4efe2d188b8a397ced0a614a4ce78bab1a0cc7c
+DIST github.com%2Fhashicorp%2Fpacker-plugin-proxmox%2F@v%2Fv1.0.4.mod 4738 BLAKE2B 17d6eec92d9870c1af7495c390926ba0d4a0cf7592e805b3aabb972e29b50e84a4010cb69c2b77db10dd13d12ce3fbe83be3b4bf934f6e3fb449d29665cc88f2 SHA512 e2e4e6ea3f1ff893fb58681dd4bd92458b3f32297ed65fde59d18e6ec937fce45d04280d871f7bcadceae5265571f5c2f5c5025cced49e8267d2847e733ee894
+DIST github.com%2Fhashicorp%2Fpacker-plugin-proxmox%2F@v%2Fv1.0.4.zip 132477 BLAKE2B 2257f46afcb52cc2148118923cb7ce29fd2781f42441783385623e80ba17319b7386e89dc3b214e39d390b900cbae987f5f38c33ab99b708e76e58f4a9581265 SHA512 e8f394e246c234af4606a650a8310c2e6b1fa69618548ce262df25ea15cc15f31b6703a4fb56166084e597c79fee16ec6d22e81d2bacea9d062427bb1c00febf
 DIST github.com%2Fhashicorp%2Fpacker-plugin-puppet%2F@v%2Fv1.0.0.mod 342 BLAKE2B a9af18ea7343da1a008e1edbef7aa6b30463114df618965d8e15c02a14ab7cf56b53a02efec5a84192afaef50d18ffc930b2f20aa54f766a7fcb8a1c5c92df89 SHA512 f61158f71913abe88416a3c08c3bcc6e1930462318c98e9e91759af7950b5f838442ff0775d027b0dddb6421ee79a742a4756a99a08200de5a58bffdeed1ff9a
 DIST github.com%2Fhashicorp%2Fpacker-plugin-puppet%2F@v%2Fv1.0.0.zip 72654 BLAKE2B beea635178a6145c16d47ca7a985d6dc13cd780a63f72d79d19bbe80d5f2a019ea6fe8ebb556c58934d0eaf5e761b70ae71899cf259d555e64bcdbaf61ce1fd6 SHA512 e224907f6d453aa810ccfcddb56d59248668291d59424318bbce4b4472d7957d434507e58501178fa3303f96eab598f0ae43d9057f37a68efbbc15ad223f6d2d
+DIST github.com%2Fhashicorp%2Fpacker-plugin-puppet%2F@v%2Fv1.0.1.mod 3126 BLAKE2B 8d968a746a16e3f6d182ccb2cf02cce2acc1713ed1163bf26dd554f47634b70889e7d9fdbf120ebe171f0d5e0e3d030bfd85e5789f8bb949322cca42e8d3e635 SHA512 173637a52b4e328c1ec572163da6692f89e24f6c316280953f4374a97741eb43adf9a6b0b893862acdd4d411cfdbfe021b5dc88fb0970b819419ba84a62f10b9
+DIST github.com%2Fhashicorp%2Fpacker-plugin-puppet%2F@v%2Fv1.0.1.zip 83885 BLAKE2B 54dab4d13c955a61a04712ba8d08694366c3253536563102c958a4e1dbeb5aca447895c5d73d2e459f883aec602a696b94cd43314807d1c9c204d29a95a26101 SHA512 89a16c1cb51529f7aac73f2f989fffc1d8ca57c01d772fcbc8c8234ab8d6a220ce51cebc7dee79af8376b20bced13c5fa3c5445505943b20fc972024c9d77dc5
 DIST github.com%2Fhashicorp%2Fpacker-plugin-qemu%2F@v%2Fv1.0.1.mod 4878 BLAKE2B f7e97eba980de414d9b7755c6c255c742957f2c22aca373722910124218dd17e4bcf175b87e0dfa358260f066f1ccd65287feb41cec8343eddf360d32a552d99 SHA512 692eb173de044fa9113e0df6a4f030521c6b118a61e0edf12dd5802230b0e8fa01de2ba881fac52f4cf89814e2f0b69a82cd486c8eea06865ee2a599ac241023
 DIST github.com%2Fhashicorp%2Fpacker-plugin-qemu%2F@v%2Fv1.0.1.zip 132594 BLAKE2B c8c3df50265bdd26c485b2263c7b9d1657a8795ad5c13df4aa51fd0c5c93c2e7f3db6f5803438052430cfe1cbdbcddd55cd1f1d2a09680cf0d2bb228616dd344 SHA512 f232090929a0a257a78734ca746441dbe41cc8c6749c3118f36339ea6d76a023433ceb0fdd15b16f81a1668c774acae7aef7197d5bb7c18da362bb45a8548feb
 DIST github.com%2Fhashicorp%2Fpacker-plugin-salt%2F@v%2Fv0.0.8.mod 2909 BLAKE2B 2f42ae551127b2842525f019cfa9996c6af5b3dc48dde42c79a71080c892beb37957533ad090e25f29ee3fd0c0bec7176be6a8af5da52f978c27c4ddcd3e2999 SHA512 ca714aecd3e4cbfa3de5a1bdde44b92b1282e6c16477497532a46b0502f22e2aff63f9df6170cd15cc38b787b70569b926aba8c99f56b3c40385feaa1fda9188
 DIST github.com%2Fhashicorp%2Fpacker-plugin-salt%2F@v%2Fv0.0.8.zip 68108 BLAKE2B f1042ca93cf2de982bcf3976195ea152007603e42b45968ac37a1bc1afb3a176d12570468b823038f610b9c1d89418150d5d8708a9696f3061f4aa87d330eb20 SHA512 6501e2a334925b663964564acca028b2fdfaaa1cac7b779fbec154b2d94a435807d09164da716d6db65d94773fe98c3b93f6966754902d43fdeeb7a78486ba45
+DIST github.com%2Fhashicorp%2Fpacker-plugin-salt%2F@v%2Fv1.0.0.mod 2842 BLAKE2B bed09383ede16f81db543d77caed2191f4e35a6c11b38057d02e16478fb9b5710624a27a656307aeca986dfacd44d23c5724f15826fab97c222875a64b691552 SHA512 21300e007ef98ed1fe8a7d85ae4edc3b7e99755a9df345aa8d0a981bdab9b6b4689ed2ae4b9b3d4f52b7f3c71678327542b986609d797cba02199917beef40c3
+DIST github.com%2Fhashicorp%2Fpacker-plugin-salt%2F@v%2Fv1.0.0.zip 72148 BLAKE2B ab1058ccb83dc1e189ac46d42817f5eac58ea6c55930f0b2f8d489550c3a91397806d0f2a6dd57639af65a6f337788326bf8b6dcb18912503f6827403877d93a SHA512 f1895273a18db48185eab01e6262fdad729019dace30cb5b787b0db1728f2c3c65f24ab9242896558d01218a8969665a2654b943d0d9032ef3df26a696a21d14
+DIST github.com%2Fhashicorp%2Fpacker-plugin-sdk%2F@v%2Fv0.2.11.mod 5423 BLAKE2B 2b64c62b04e6741e51198fa07672c793fb8b8d73d8ae4d7ac530c288215615e2e893304357fadf002b760ceca829bf19df334bf4e3cd7ca5268155b5c47f4a39 SHA512 5a85bcfc56ba18249495ad32fd7f662a5a7df9acec05f54b14cde3c2101846739872bb66860f36807e769e88bf7104904102b56aab8bc5db15f795175cceb45e
+DIST github.com%2Fhashicorp%2Fpacker-plugin-sdk%2F@v%2Fv0.2.11.zip 486530 BLAKE2B b9b85b224e13c78e5a8cdf76043b79e149e6cb5b7b3b6cd0877c9879862b59328c1dd9d81534a8ad4398f8dd98a1759bf7b792f33907f807ded93afbe6832db5 SHA512 bbbab402027542a3e34807078e2dad1da0e2dbfd8249666068a794fd1beb61b53038eed2ce03084632ad92e35838fef1ab07013ab360f9992f8d6789d2e2811a
 DIST github.com%2Fhashicorp%2Fpacker-plugin-sdk%2F@v%2Fv0.2.3.mod 3231 BLAKE2B 969d985a1eed69e051b530c66ea18b7cf8a311514530259af97b2b40d0e084058c64a781f13206f1e3b0c32c87511a52c6cc84e36d27891f8794e8666df3fa46 SHA512 735bec3dd1b74468695fe319929011406f94deb1eda86f54c2d9e102139f155b56c73ed128462ffd3723237fcb6274cd591263f8f3374328c8f34ed877663902
+DIST github.com%2Fhashicorp%2Fpacker-plugin-sdk%2F@v%2Fv0.2.5.mod 5422 BLAKE2B 2c33520d9685a1cfb8ffd2e1f4d9f5f9baedc0caa9734c03d39c55d6ff99df008fe7e835128e66a3cfecbb6babb02552c4b3f9f086ba296a29bdb066de9fca95 SHA512 ca3ea9b2e68f20fea9a2277237dfc18c98e6d71bd64ab814c90931a8761e60b00297b8f465a432919083040a055d2f384f3e6813eaf4ae2f86505daef1f77a3f
 DIST github.com%2Fhashicorp%2Fpacker-plugin-sdk%2F@v%2Fv0.2.7.mod 5422 BLAKE2B 2c33520d9685a1cfb8ffd2e1f4d9f5f9baedc0caa9734c03d39c55d6ff99df008fe7e835128e66a3cfecbb6babb02552c4b3f9f086ba296a29bdb066de9fca95 SHA512 ca3ea9b2e68f20fea9a2277237dfc18c98e6d71bd64ab814c90931a8761e60b00297b8f465a432919083040a055d2f384f3e6813eaf4ae2f86505daef1f77a3f
 DIST github.com%2Fhashicorp%2Fpacker-plugin-sdk%2F@v%2Fv0.2.7.zip 483493 BLAKE2B 4a0dd104b5833193ef4050f84d4758ce7477baf0099cb2335e53106876d7f811a8904ef61fad05fd68928cfa3f4d456ae4ea48b8e75f71aa29faa3a44d6ce271 SHA512 29be5bf14ebb2273420212c3e855b4f13649371b8c365a4eb2f01764beba6e47f425d3f0936156c1d8f1d203680aa878d0be58a8b4a5a38ecc13deff92862685
+DIST github.com%2Fhashicorp%2Fpacker-plugin-sdk%2F@v%2Fv0.2.9.mod 5422 BLAKE2B 2c33520d9685a1cfb8ffd2e1f4d9f5f9baedc0caa9734c03d39c55d6ff99df008fe7e835128e66a3cfecbb6babb02552c4b3f9f086ba296a29bdb066de9fca95 SHA512 ca3ea9b2e68f20fea9a2277237dfc18c98e6d71bd64ab814c90931a8761e60b00297b8f465a432919083040a055d2f384f3e6813eaf4ae2f86505daef1f77a3f
 DIST github.com%2Fhashicorp%2Fpacker-plugin-tencentcloud%2F@v%2Fv1.0.1.mod 388 BLAKE2B 65fec4a012ce4421006a4e7bd16ef9d1b430ff63a0f921ad13021c5c4fcbd22c7904eff0aa4c1bffc3429f08927c7e36c738f7f033bd4d67dbbbfb30a27cd5e3 SHA512 20a20703c95849c8d501fa26c5dd1bf5db2e55f95e213f4d56996d6a90e8d4967e2a5e34c93aceb108b3e3f9c80b3698a989be84d3926f31a1b13b5b83fa05c1
 DIST github.com%2Fhashicorp%2Fpacker-plugin-tencentcloud%2F@v%2Fv1.0.1.zip 94806 BLAKE2B 2fbcc90138d2596873cd944449fade44cd0122b2c99aba1551742145581fd70063ba3bd6208b2dfd7822340fb1c4d112483c34aad393ca77b23082efc8141cd2 SHA512 2f47e513b99968c133c86bcd00df4e492603e9a54fec8f3f0d5dbf4bf9f4473fc0bd07414c312f295071f799e433593b44e3b3115cedd3f8b2e6db2b2c5af7d5
+DIST github.com%2Fhashicorp%2Fpacker-plugin-tencentcloud%2F@v%2Fv1.0.3.mod 4809 BLAKE2B 0f8f4ab46d22d593b548645c05eeaa41c7b3aeb633eec93108399864c89401151fb366ee351b522f1edc41d593b06c1aacb8e02c6153b426a883f49e627edd55 SHA512 e3ec87f21cbeaa1d90ea89235331fe8fde0c529cb14c80734e276c7c6ec1f7dfdca493320aed368facaae03a6af232072fd9312bc24001d9322507993ba702d2
+DIST github.com%2Fhashicorp%2Fpacker-plugin-tencentcloud%2F@v%2Fv1.0.3.zip 106939 BLAKE2B 8e1d2177ad113e955121dde1956c2f771c57b076da823031f84aa74d77970f300a15c14830d8a7bd844e2b105fd52ce642e827a7bdc500948c4903788f9d75c4 SHA512 7e06fb27611cd0c2536d4c0771633255cb9f2d79b79119017d7aa892aea79300b43d427153ec409b5d2d3bb53541f7043fe3851cf707ba2977cbe5cee9310f67
 DIST github.com%2Fhashicorp%2Fpacker-plugin-triton%2F@v%2Fv1.0.0.mod 317 BLAKE2B 885c29a59b65cd19cb9388b72e1c59d9a0d42013f379a1a02b3bca32aa207eac34058247b35a2a179b0714642bda7401c2bcc5ad2536dc026afbe78de2186025 SHA512 12212550f3414bf3b846f51ff48fd2ab931944e7c3e6725b6f4ff5aa2c96c9420acac1a6693c2b86288cc67591ee7f0a66fe812b2bb00a80d6b164215df7919a
 DIST github.com%2Fhashicorp%2Fpacker-plugin-triton%2F@v%2Fv1.0.0.zip 94185 BLAKE2B a768f3d5128e8ea4aa8feacf7136f3ba7dbe8211f820e8df650c10a1dea53334b614ffbb9e333afb62f588303ae41d3f10c4eeea6ea3a97d30b9700dce0d067d SHA512 09a81567d2a4cd8da93173e7fb8efcc80665589aaede5500b6fab2177e4939a60b75e73258ce8c1f40cb84c98716d97924d7889e76b67852bd09163c8a16f425
 DIST github.com%2Fhashicorp%2Fpacker-plugin-ucloud%2F@v%2Fv1.0.0.mod 357 BLAKE2B 95a147ab396015d7cb1555f91141f3dce0f9c89c624a267177a8b428722e87d90e4f628f3ef72511adb678564d4b7ca57c6b6863cac336ca54390b40d81dbe3a SHA512 63a7428964d4961e9f4f873da392205b0638ab4514c61c6470c9df0585389b5cc00a93acb1d23219d8b27dbcffe6f876a7bb2c95e15d36f79b1dbfa6cf208288
 DIST github.com%2Fhashicorp%2Fpacker-plugin-ucloud%2F@v%2Fv1.0.0.zip 111070 BLAKE2B 42b9c600db8e4c8661a9a9c65f19995d927fe26855a7048a2e439a20648cbff567101899d7bbe38d49332821b14886eed0ab46ddcdd2b735ecd242ab4ddc6852 SHA512 f966565c32325663f2890b443a18404853e96df501888a4f722755bc94685b3948ede72bc4ae9db8ea0b9b19238aea0a9359ba9d1cdd46f2e7844a66fd4c9ca0
 DIST github.com%2Fhashicorp%2Fpacker-plugin-vagrant%2F@v%2Fv1.0.0.mod 470 BLAKE2B 0151259088c260bf0c3ff0b77cfdfe4d8530df071e2f58863e9e120810a64bbf02af288c18b94b960cd4144c514a13a10dcfbb3429f408bb1d4ce857ad880af0 SHA512 ea41d4191a0cc8028d4a3f3a6442bf09e235ac8198cdf6e1e5e8f86e0eca07ac3a7788c98094f2f92ca500654841e31d7b3a4926b5980fe9f476160a8e815fed
 DIST github.com%2Fhashicorp%2Fpacker-plugin-vagrant%2F@v%2Fv1.0.0.zip 140287 BLAKE2B 78cc7c0c2253e2dd18a6c479b4447282bb4ae5e0e35227ecbd58eccecef3cd45ff8a7ea8ed447d23957278c99655453f0d3f236df4e3a0e06fc9c17f46590f8f SHA512 cd497b2cd941bfbcaa454ce5d9fa408df1970bbadf1a0db22829f6b32120bef07becb8f03191af23731fd403112994a4d499f9ed4f3220a34a0bb4e7db9e43a3
+DIST github.com%2Fhashicorp%2Fpacker-plugin-vagrant%2F@v%2Fv1.0.1.mod 4818 BLAKE2B aa0505a447ad7dac6bbb6aa0a0df99da842d7b19b80bf38d5f9c01670d9ca7d2e9dd7c2c059190375e144beffa23feccf2495440afad6491509faa39eb772170 SHA512 3e8cb91643c4a1a312951b086fa4b0f3efbc81e532c962f309b7455df0f22da2bf38009c781430a9026878542e167fbf8540cbceebcdb0fa315aa8cf5cf4f02f
+DIST github.com%2Fhashicorp%2Fpacker-plugin-vagrant%2F@v%2Fv1.0.1.zip 153040 BLAKE2B e4234e498ed6b2a4e2d62b6174f403dc7ed579c4518a3b73c420add692318868339361fad1c637f69d9e7d48612304d8347c822a15da67e435f82919378b4699 SHA512 659d43a444d078b7839e195e160620348f505ef1bc47cab9f83aebbbec337966a35caf788189457b1427dc686b3f7c99630de44d57ec6be5c5c670e9e0e305f7
 DIST github.com%2Fhashicorp%2Fpacker-plugin-virtualbox%2F@v%2Fv1.0.0.mod 347 BLAKE2B 30a32ccdabf5e93a7e188f14b7c25fabf6ed0d086ec68d8db0f37902d9c8f445f90b76a5bd3f56a51ba099430396387085b083635f170c3dfeef46d01c042768 SHA512 c69046d0fda1feff577112533c4e63dd1abc1c342c0ca7c295653491f155cab1f0dfcd8ee65b33d4c75ba760d9ecb93f9df39b645758a07c6e8814df72df8cbe
 DIST github.com%2Fhashicorp%2Fpacker-plugin-virtualbox%2F@v%2Fv1.0.0.zip 184222 BLAKE2B fb70ed40089602f6ca102e318659e8dd319d813f9f47767b1cab69b865eab326e8b833cb97165ff83b61f945a24494f44212e13392a717e6d8e37ffda21bd52b SHA512 261c52ce54a62aad2083bee7f3dd1938cfdb06491fb2ae07373f2ac941b95f5b4c48ea0c5c9f0e33db92d2e57e9aedf008ce7c96e17e4cb357c23e6bc2551e4f
+DIST github.com%2Fhashicorp%2Fpacker-plugin-virtualbox%2F@v%2Fv1.0.1.mod 4749 BLAKE2B 902a6b2cd784f6486684f5634b8e93688fa39fa08c0a37d82e62ba92188d32414aaadca20577fed287a392389a6eaf2781953844fa3c1f855fd36f877056e4ae SHA512 538a0cba0bdb409fa21efd72f58ea343ba97a758f60229c473224329205fbb6160e9e32e49996321af81729da16b311d86b291b71e9cbfead1abc62c3fd79425
+DIST github.com%2Fhashicorp%2Fpacker-plugin-virtualbox%2F@v%2Fv1.0.1.zip 196353 BLAKE2B c4573c59ef01596708f78b00dd22c545454cb2ec4cb1747b08b273c809ef41404da0b9c6acc32182880ffaf75f2b1857d5796c131471b31f541aa3e742ec4791 SHA512 7be0d2d56fe36cc731e8efa12d1e40731a230005f9bdbc7a4a5aa714beeedbdd9bfe56cff88de27e260a42032c70e10c8729662ed82d1b760bfdd30f66bb067d
 DIST github.com%2Fhashicorp%2Fpacker-plugin-vmware%2F@v%2Fv1.0.3.mod 5023 BLAKE2B b3656af8acc19e5b3e27827d678c96de8e8c128f2bea9e848cb828d85f4d61293995c36831aea8680bdb91b57ef9960506d64a946dd87e50fca8a6047b42ccdb SHA512 7818487a5af71da09db6998fcfe50382b7c5141b1cd0ea9e9aa7901eab9819498199fb8068ea66d96888eb19a73eaf160f51402ab800434051d5dc204cab530d
 DIST github.com%2Fhashicorp%2Fpacker-plugin-vmware%2F@v%2Fv1.0.3.zip 253044 BLAKE2B e97cb500eadd654ddb05d5bf672f20dfd1d9d023dce07a01f243bfb993e4c760590cd8ecedf336a520fb571f47c09c7273ae3665a1bf71da3c86cdfad3969d15 SHA512 be4ccdedb8f278e237d49cd8d11b27588fd4645e703b05a124e41b029644b92610ab2c43821c6ae0300fd155f7a4ddf5a8a8a03ffa63f04d7086a328f763fd50
+DIST github.com%2Fhashicorp%2Fpacker-plugin-vmware%2F@v%2Fv1.0.5.mod 4799 BLAKE2B 942beca4ec0015bd6623e4f5762ed6a4744b1359f994d715c1df52b39ca299264e557c3fa8f87996e936052ec1f9688d163d18eff0b63389024af9ced959b846 SHA512 7a0dc368b7b426aa5571007ebb3942a4c4ed2e8a912458a8e076c0942b400660b1985b2a4b6b5950fbc696d9bbb32d03d50ec13e6edc00de0aa3c9f6afb69a05
+DIST github.com%2Fhashicorp%2Fpacker-plugin-vmware%2F@v%2Fv1.0.5.zip 263742 BLAKE2B c1a2097374c2eaa9cd754e89e3c10e977078c8ba0c6e14699d149b96b3fb6da04c9bcf997b3e4657c5fc62b3c76ea9fe4a8638e795d78da70635a3c3128864f9 SHA512 02fdaac8ebeed7a1b6525df62e28ba235d15df973ba9db26dbe1f37de0bb8749d5f9d1e85fbfb1cd7a470f57608dd9384213328e638c33425d0011be6cc9a32e
 DIST github.com%2Fhashicorp%2Fpacker-plugin-vsphere%2F@v%2Fv1.0.2.mod 4627 BLAKE2B 5c81a1ad824aa9e2d2f54ccb6fe6524fee6a8ca08331a19447e7f620214a826432c0ca67944fb92e2dc6ece2d9ae263d3047503151bea6e992e7e042050aa087 SHA512 af51109091cb7d892cc6db32219a35b78323ece5ac20b4ccf544be10ee0e8c982ee8ff9b76447d642fd5d8b2f91d0f9ef2281d1e12d5f06785eb521be478caa7
 DIST github.com%2Fhashicorp%2Fpacker-plugin-vsphere%2F@v%2Fv1.0.2.zip 285899 BLAKE2B 04264ea5456237aea14cb38336046d6c63118ea24f3982f33dee452136dad6cc929064f81428bfdb00a26a1447e12e9aa354e283f743f8713870b21b0f40553f SHA512 e4f3446e3bba42b919484dbe8691036d52babad05becab36117cb9df1f4c02ec4cba5f320f2a001ad81878f7b931519be17a25b3ee982b54d0f05abc4c89dd99
 DIST github.com%2Fhashicorp%2Fpacker-plugin-yandex%2F@v%2Fv1.0.2.mod 5289 BLAKE2B c4d8be164f86b7b14f92e11e5a673e366ed70f80fb7c99c7b65a044cbd354b23a4e3791efe3b9d0245e8d63c34a84e9f34dd50fdf9cce5f9067194ff373487b1 SHA512 26640bbe9507a4ca77207416ef155b41937c467da23d25ef1c817719df99a8e0510652ea3fb651fdd40d777e4c22013a0f76b625919f7a1668ee069fdbe66f87
 DIST github.com%2Fhashicorp%2Fpacker-plugin-yandex%2F@v%2Fv1.0.2.zip 140796 BLAKE2B 47793dbc029d3c5abae15e06f55e142ae51d06b5a17c443900837066ad75b91964923c093d8028dfa7a2937a8f3b77f379807a1f156cb94b47475bf4ef1110c7 SHA512 16b27d6d3d03dc79f4691936aa799ce06c281c524c6c34c4e2a75855e89be6e1043610073e2195dc014d2edf7e61f4cf4fe2daea5f918ed9fa98e5cfcec66b49
+DIST github.com%2Fhashicorp%2Fpacker-plugin-yandex%2F@v%2Fv1.0.3.mod 5109 BLAKE2B 8c39b381a109a120f68eb26173b6ce9735924e6443e3fd92f018c602c84a19650be814ce4e79208a7f3c525f97a91c0c60cc8f2a70f39788f4f5983931a827be SHA512 57193580f51890485f3f45d58d63001e5d5c1c83d8ad81a0d8d0bfb1ce2bd41bc2b70a6fdcd3b5211f9ec5f7b2d1339d35c154087313d4245ea5a16a70017548
+DIST github.com%2Fhashicorp%2Fpacker-plugin-yandex%2F@v%2Fv1.0.3.zip 149785 BLAKE2B 9ec1e29b4af40a753ca4de3ebeb3070af54d25192aa2a64d9945055f12781e429e5efcb9d77369bc87f0e529c2c31a75cdbbe77c5c32eb2142b9d27903ebd25f SHA512 9e5cd09ed480beabe2e77661231710b329f7bae69df8c1b50f72ad5d4b7ef3585e9d68ecc9ec1c5ac30c8154fdf846c16f11142226a711a119f4b263ac057c7a
 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.2.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.5.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
@@ -783,6 +883,8 @@ DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mo
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.mod 43 BLAKE2B 890dfc87298c1c0c00b166f7a85097bc57715f8f5190a2aa04ba1216b9d077b37086a680eb2f7b02d0231d4e65e298e24d39ac51cb1203e46130072620ce353b SHA512 db547341e505f669fc36b66df9dd1b72a6893d8e36c678217c6f6931f5a50b0c9d9ad3f4488b8cf0e514e1333fa79857bfa734d1626732d364f087cf06dd8bfd
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20210826001029-26ff87cf9493.zip 31053 BLAKE2B 0f5b36a4016c1ef0479f0e5351e5abd9fe56c8b1b41a702fe31cf252c29fdc130f2dc489fe62ea2b611f84e5d18ca11d891f31746c2fc9cbc122758ceb24313c SHA512 639159f7cea081254955fae095c6840c66e66a7d800d01f28cd77e9eda3aa6b7d1cdb423d96fc7218a8b8d48e108342cb49a25da910a924628fe2a284be0e5d2
+DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.25.0.mod 132 BLAKE2B b175e68ab59001c2d690368dab1e5d72ede2b48ab7fd86641b4d69daca3517c4876770779cefbd731f923d7795eb2b05124b6e6d9fc4d10861e2d9c134996d83 SHA512 5a2153f34834e34b737fc95fc35a2ac4b3496e308b23a425f84c1201905043ffc1bbb1bde3c2e4fac7be9cc8f1e33d7d8306bca45b976096a60a0c0c98978724
+DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.25.0.zip 131093 BLAKE2B 5c73e29e68d766351c5821eb67343f94acdbebf6900143adc610d6b17bea9ac9d0132366ac4d293c8790283f9449d13eb23f7ad13a68f1ed2dd6a1cbbf7e54e7 SHA512 427b4668a48e6b4c1ab6c455b8f327b67bca7fc85304378ea6dc06e8025b053889af649df3075a29e49933e48cfed830c5183db121320bcf49f6321cb66e49ad
 DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.32.0.mod 833 BLAKE2B f5fb74180cf3645f28365608dc4deb87946afa8c1a361f4aebfd5f791e3d304f4655a2b198bbb13d4fffeb82da243c439db42192a70809f1c4033499d4198471 SHA512 8c94e4367b99e76be324186f4f484b31776d6f26d148c26edf1556564dfa494793d1fbdda4fd760d7b0710318b530dc46a0d9fa862afd29d42732c176b632a29
 DIST github.com%2Fhetznercloud%2Fhcloud-go%2F@v%2Fv1.32.0.zip 151152 BLAKE2B 860e609b79826d4e0f16f7fb1e8b968d99426429efe7c13dfc5452c4a79667db5079785a2c9bae7066f6842cc2bb088517f32f86722e7d2d15bcf929b9b671b3 SHA512 7353c7be1a9bb8ec81cc46b5697d1bb184265072b2728cbbc5f80c0c0e5dea43cb562c0f2160dfd39854e576f5a1d04c34755a02929b72c074c6e931375dfc0f
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
@@ -822,6 +924,7 @@ DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.8.5.mod 1251 BLAKE2B 15cf38b28e69
 DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv1.8.5.zip 251679 BLAKE2B 42c87bc9447753a5761c8e0efc1c838ccda0e5ccc29837de2044e1a237dfd4d59cfd6be73b5f060fb5b196fd8883a857c74edea16836bdc95090e136ee4a4c75 SHA512 54b39ef667bf0b3ee655569ee10bf4e31b401e267df853786ed6db0ab1c299ac0e9eca6c2ef788506d7688f4e563e17ed2fc39d9eb61a3c1905c67101162eb85
 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.10.zip 138645 BLAKE2B 90b085fefbded221903d24f63cf0fe9f2dc95c215b5ec2f9738c384c9118642425d810ca405bfae689fa1985f4d6a8a44c832f79300ef82fd28419138dbe5630 SHA512 1e1e5ed05000dce783b69b47af8ed0d59b11bb0b1739eb9620b576f67b98976cba9e9227519fe247a1aa3ac9c8c423b4896d1dfd9af6877e5eeaa6514761ba7c
 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.11.zip 139812 BLAKE2B 508f9a7823b1b52f042ecfd5bf1f12abc59d3a1d059e6168c10f2e9f0bfe6692e2a3eab75fd061d961459a2b98ffe21d29230c0a0f29f3871a5f95310eef792b SHA512 f922b107c536ef5b737ac5555074c237e92046bf0a8754f062c3f2dd0ec04820e32474b5ae3d9b32ef8272800e21fcfb90c5225b8bb466f0022b4adf1d79e910
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
@@ -853,6 +956,7 @@ DIST github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.mod 34 BLAKE2B 9a841f2f76972fa
 DIST github.com%2Fklauspost%2Fpgzip%2F@v%2Fv1.2.5.zip 127654 BLAKE2B 2339218b7256f2319a9d3c2518b1256f200a421923bbd99f72044968a890e482a282b8a5d24e75a86585c83cc8935c16c3268c8c4a369de133b0f9bc50275d01 SHA512 3deeeb2edc9b02fa384d3a69439c9ce19d8206700b5b0420f361bd9ddf17d0a8062629c9addacf9663e1f70e22108991723d375ef6d4c2af559d62a76213e162
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip 3966 BLAKE2B b638ca22c4f9df8cce5b84837e4f72b009c1ead300c08807b8268d26f04d6cc5476d9af56f676d8f4ac046c78c333614670e0853bee13de3439b5d89b96bfbb0 SHA512 ff98f8c05d8e23fca69ee5ed780e728f9d1779ab55cecd16bff890a91d14af81ae7a0304f34b3e04fbcbbb61e3c97c044dd9c190bd8359f3b19bdd31f8a37329
 DIST github.com%2Fkortschak%2Futter%2F@v%2Fv0.0.0-20190412033250-50fe362e6560.mod 34 BLAKE2B d338d71640d826213b273c048c27fa14dafb1864105f4fac7214350e30913b7d796d9657b5b465d3b6cd24c91d86de0e8f1fdb6aaf039d6b392068959edb9b69 SHA512 9b51e82d0044b4f476da2f8fb7870a85d12ff2dcbccefac5416c352e21303fc009a6b745272440987eb21eab8b5a907eed70a5ccb43bb4b0a4f1d5a88bcca209
@@ -873,6 +977,8 @@ DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
 DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.28.5.mod 254 BLAKE2B 43bce3e9f90f211fad8a4e7b0e2d48fad313113446d745a599ce30bb4c8103a05d34428cdb76fce8238e493258ba18c98f901277194bc53a5a2215ba2490d065 SHA512 7c061af13863becbbd940b2b780d2e4983c9c122919917557b468deebff1bfb9e5b97aec66a7e7f9443a6a87ee72da322dac81fa2fe60e72a16550ab633cf2ba
 DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.28.5.zip 104903 BLAKE2B dec40a8b2f2af08acca7ee6e179fd4e33e505663bf7a29a766e56c20b6f35dc4880c6b5ec70d24cb574fe4777ad1e3715792452207a1fbea8c859986d33d7cc2 SHA512 6247e85263bc7187099734c9f3a2f4735988609ee2bd409a59808430a0af53c94a8640b023cb7258ff3c1aeb28d5c26cfadf0bc7fd00f2773f222ac2c6f0761c
+DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.30.0.mod 254 BLAKE2B 43bce3e9f90f211fad8a4e7b0e2d48fad313113446d745a599ce30bb4c8103a05d34428cdb76fce8238e493258ba18c98f901277194bc53a5a2215ba2490d065 SHA512 7c061af13863becbbd940b2b780d2e4983c9c122919917557b468deebff1bfb9e5b97aec66a7e7f9443a6a87ee72da322dac81fa2fe60e72a16550ab633cf2ba
+DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.30.0.zip 106163 BLAKE2B 19da692473939ac3bc5d4041d7b810665088ede7517b0c9bcfc445ef3b09e66e7a4cd366d5fcca0cb0be88ffc6f2fdb2486d68f63c274cf53ab6ecddb4553180 SHA512 1b7e4fc246b2fc2e1f4faed8c6464ba3ad0f5b2b99eab2b8500414b9ce7b21b574a6bfcaee5f140f1c8b3c3a6bcfb882b8d517abce12445a26ea3de28550be92
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20190312143242-1de009706dbe.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
@@ -891,6 +997,8 @@ DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20210623064412-3b76017826b0.mo
 DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20210623064412-3b76017826b0.zip 52900 BLAKE2B 4aef7bd69c88985f20e0b61b4dd825c87e84424e731f1408ae845b950164c0564bd95be6883df1d3f0f9f03d299a411113dc196ba033c60e9a21104b880c3186 SHA512 41ffd7e4f940857b4316160ecb59f615d5ed2f6a4f52b048261bb436cb65d829b1fcbf5770bd97bc0abb44a8f02e1cca6c4c8dcf7362e551c6007e3824541ed0
 DIST github.com%2Fmatryer%2Fis%2F@v%2Fv1.2.0.mod 29 BLAKE2B 042f93b2f68e81b89cd22c903256ec1d0e0a040ee4780e5b665d3a159e28c5111501fcc197cf182f5a2c76d0644905b7d645000e99bfaa155aac6095318fda4e SHA512 3cb19b4cba01316f0a16169fb9592f8ff6e4338379ea84a80d2ee34934d97b176260a1cc3bae8e1af6694bf815c25253f5c73321210d185378ce9b4a1a136188
 DIST github.com%2Fmatryer%2Fis%2F@v%2Fv1.2.0.zip 253080 BLAKE2B 081c650bed225f8034a896eb49bc30bf4ac03f4c315ba8455b1335549c6b103442c08e0e029a6dd6e0388f2e2f6b746a91ce90f1ec47dbbd0cccc39dbe2af2f8 SHA512 55193d1569b3cfdd7c9a803b4dbffb5119c169609b9720b9f7d8c1cd507374c4f0adfa35cfb4cc8c1b0a66ef3aaec012e0562d0ed4fd8787c645cd3ce2270c9d
+DIST github.com%2Fmatryer%2Fis%2F@v%2Fv1.4.0.mod 38 BLAKE2B 85ea41c9c75e2b9f7813be485fa2db0e73544259c79bfe2aaad548fa9108fdcec0b29c75de21384029174cc9c6f32007c44721aeb792cd5317a53594aa0b582f SHA512 c5ce457ecf7fa17661ba5043bcf4368d569748c70ed8df341d85f2e3ae679f13c0126e0d3310b69c292b4640645fe1f2c334d3b2a5fc42be5ebc3016be90cf6d
+DIST github.com%2Fmatryer%2Fis%2F@v%2Fv1.4.0.zip 92341 BLAKE2B c9b38163fbe6b6f9a043f5cefa6ef1f6c85b7b1a14371263f6925126a7d8f898ef1e3ea4cf7e5f68ed8eb95db44eef9efb28f8c77339f1a20f92da4812686074 SHA512 a8450f5903c007c967f19a3b05f0147b722bd8f2749c77a4347f068aca0964ad890de74142a92154655139b6882ddca7718f343017e14d90d5db277e8c64744e
 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.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
@@ -963,6 +1071,7 @@ DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1
 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%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
+DIST github.com%2Fmodocache%2Fgover%2F@v%2Fv0.0.0-20171022184752-b58185e213c5.mod 34 BLAKE2B 5981b46e852dceb2aac593c3aa2ce67b760cea88b6991b897ef1a24adbd41930e020faccbee855379809180c0bc5419fff94d92178b9fae055b43627498afe1e SHA512 92ea13554daff3e7c29901d12dce5d62d34a1838ad77962718cabac41b477f8ba4d3eb3081b527559bc3581d4887e305facd797edb088ac9f4647dbb3a08fbbd
 DIST github.com%2Fmontanaflynn%2Fstats%2F@v%2Fv0.0.0-20171201202039-1bf9dbcd8cbe.mod 37 BLAKE2B 19d1ea7d880f811795d06af263c6f11c05c45b65e95a035b0a46bc132f456c41a5ec726fd934672b88129ce172ddbf5d584f524939f494cf3f6ae66671d6ea31 SHA512 b624ab08a47139a1fa45e00136e8199f27fb2d82b9589ea9227a323a7d7f3e0f58114876c0af82281ff3300eba8b1241ba804d73e63370768f58881bf45fabf7
 DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.mod 31 BLAKE2B 5b5d97cb4685ef921770276b81b0bab6f0acc362b49544e23c228fa4e26c3ff712b58e61815616fafc19233d3cfac47b05e9d55d926b2559137ad4e7d734e113 SHA512 f868673a9af26c1735e257c840e1f9f5de035ebdf3814f8568af504af6f3d94284e050f49e96670a5643804760db2ee8e50d396f6d6c1d17c94258695ef41748
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
@@ -1087,6 +1196,7 @@ DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.3.0.mod 393 BLAKE2B b9d712acd24d7a
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod 337 BLAKE2B 41471db637c5c0363cd36be6d16a6228671ce9658ef71103ad2122a2cd8cfc13c30b87bf2b34df7ba9d6c1fff1ac821462fbb86b622c274cf26a1e3ecb7fd2e9 SHA512 29a4efc27c658b047fbfc6eb2ae311753b01fe878cc733e2fdfd83f5791b3e30ab50b08addd300dff37e7880f6b57662ac0cb0f4b98df2c5a5a9f7d555bc98a5
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
@@ -1124,6 +1234,12 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff111
 DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv1.0.152.mod 60 BLAKE2B 6e13cc2a35e2d4cc6d24e534f0038e9a1f4f6e12121822a546e282f2a6a8be1bb4ea8ae20097b502a4ac37dda1ad062765de8f7fed3852e19268a2e5788b8363 SHA512 3004f1a66c2a680e5a64993b821bcd610ce06ec7016b76a56a7191453ca63ad194f875b6d9e627044ca78a898bac27ca73a8605ccd25b2479eb545e4026132e4
 DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.233+incompatible.mod 51 BLAKE2B 08863dd989e6100eeb94aea780331caed21f93fa1ccc6dcb4c77050afe0b8ede362f40e0a8271668e2ca0e328a3594dfb6481640ff3d5f1d1ad3e6b4e7747e11 SHA512 dcbae023694dbb97fa3e1cd6bc20ab7eee364117c45a45912e6d782744a54e0b2292936cce6e807af0dff179a495993e19ff86360b27d3a79c90a1f81b6e22b6
 DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.233+incompatible.zip 2048160 BLAKE2B 88f48716349ca0bbc36bc1c32d249e7056ea5b64d76e4cc8e1b4b8c208c9a5ae2d2f8688680c914f59f0d8625ab2ada977efe5a5d9a54ab7008fea750c86c9f8 SHA512 2d1592256b3b6f3fa5114d234dae334e4dca6e9764918a0407d87a7e28a310a2f4bbec7f2ac45ad3fa676fcf973fa37caa70dc3c94cc3106f2dc6d24d7347665
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Fcommon%2F@v%2Fv1.0.283.mod 80 BLAKE2B 354dd733f8f875b97ded8669f5fbb9b8dcaeb2e9967afdeb70e80c5dec10834e86f8b094166918ebed08bc48c630ef65572847f3320669e354bc68dd12857005 SHA512 f042263899faaca5bded3a52d8fe1e91f9b75ecd92453ef42f109743cf2ce9eb38d4ab6373105736bee93fbc76e6b1f1c8d44e3ce381ea124179210eda74dcd2
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Fcommon%2F@v%2Fv1.0.283.zip 43787 BLAKE2B c50aa89afd3f813b4c9229a8f0bf8fe4075adc7dad8d2da02e05d931016c787bda3252ab8f38d72d3a3756778e8b65c09caab9a3d54e78bf404f1bb047ed3011 SHA512 7e9ca461064ed47f6c4b72472ee28769d9fb817212d287dfc91d9d0f654ba999ffe777e5df58a138fb202a3cda06e2a474daf021dd7bf74bd69c63991e24021c
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Fcvm%2F@v%2Fv1.0.283.mod 77 BLAKE2B 89e8678859cebad1858db434b06836d5ddee73544457f871cb3ca1f7a1cac83e795fe01693ee0efae75da011719f9c2cbfa09fbdf3dd4cffd85c9f3fb372b950 SHA512 62bd9c668619bc2123de752879e129c90066cdbe67d272dad40cee678c644777dc5e909d94f410246187415de89fafecd02872154890913ad9a48c8e559b29b9
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Fcvm%2F@v%2Fv1.0.283.zip 74282 BLAKE2B 41fadf4e4cfdd07b8b3c23faf58d40b7e46f9c3a07e6f1c1b5e5e09c0b8e711fcdd2e5e14f0d202dcd21210febbc5f41e34bf1f017bc071c55611e03ce9b6954 SHA512 85afe96194a47733ac438ab3333d20fa0ce862ea4230089c55e17e9ef51eec1f6dc8d6e898062bc00c5d9873f559b38fec9b309d99ebee259d6f9ad396d100be
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Fvpc%2F@v%2Fv1.0.283.mod 77 BLAKE2B 312ac17b0ce04fdbe146b211fa494d8865e6a1d5665c178e851632c40fb0fa69751452f69abafc960924990d0a37bda384ebf65882a50da627720b4f5947db7b SHA512 2f518a7fce9d4cf9cd359a48b024f5a75b8305748577c05b5366c7c1886530bb07005007bead1a1ddc4dce3b2bc1fdba5bf62742564e3ef1fa0d35410c96e015
+DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2Ftencentcloud%2Fvpc%2F@v%2Fv1.0.283.zip 122726 BLAKE2B a233a0b7582fc98cc3029dc5be168fb537acf78bceeedfbee9fc001f8ac774186f9f09a75d905512555edd59b912d633b7679ef5c803a33ca28d6d2e17d3a260 SHA512 82331e6275caf6aa78316de5365dd477026420b191bf8fcb005af8115b7bdfc27cbcb60c8d9790de629d50d9f71ef5f4980e89c63c987cbd901c8cc4ea052401
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.zip 9803 BLAKE2B dbb2623f6e506180cc64bd0d00d88c0fae0f5334f21bedb6f23757a3fd297d11c91ea6726ac9ff1d3de7dbf4a3d400cc7771412ba7978034e78c170b635672d2 SHA512 760da1b31d891006582c28c8394a0cc3494adefbe76ae77882b8340f1ed057011d96ca10bce9d86e881899ea683e6af402770f6f769726811c7776e040c3a787
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
@@ -1135,6 +1251,7 @@ DIST github.com%2Fufilesdk-dev%2Fufile-gosdk%2F@v%2Fv1.0.1.zip 36290 BLAKE2B 6f7
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.2.4.mod 80 BLAKE2B c8f1a63a901dee001461aaf45a17fa094e38a148ec16b21add46ae94021704808f9b9eed034633f18a6e8753c33a3456008678518f2c945596c5f42be9017d99 SHA512 591ab4a9f63c57f4ae5bb299a4e1eda35d1b749ebb55ad79756f34841fd85a7c1b101507eb96301f923dbeba9fbf8ab2443db51f609f2694dff7f6d84c1b5761
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.2.6.mod 80 BLAKE2B f81f7c887e41ca22785e78b13cee9d0735d9728156d85ce2f0a177c218ac463d1ba625f7f8f7a046a2b4b2d3f248c9c916f38f6ea56d38a24752757a704b9bcf SHA512 882a294c9138de026661786a8ad3fbde263b484f8fac98596288d2c473f6a97c4b0aa28bff725ade0f1c92ad3473a13edd34e2bbf1a80942170b3509d7340d7b
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.2.6.zip 5612 BLAKE2B f8ad6b7bbbe8251c294dc60841e77722cb3d47ff1155a1ba2810dc1e821083987e014edbd4da51cf8af5a440bc820154718ba3f5d1a12d14c77446ef02ccc23b SHA512 66cc41fbb63cd52e55df6c96ac1478d613e9b718384563e96d287f34d8bdaf0de6dc3f1cd0e4bdfb1c7d3cb4e15ec9b6866eec22d3e5344c00a2594e835f4d22
 DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
 DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.2.4.mod 80 BLAKE2B 3f679741a7df8b7152f9997b22d12815f1bf13939d2a4b7be16de15f5e1938467d58400d7016674df9b552330f5fee08605b83d5f1f08aa02241f308fb9a536d SHA512 758cd1dccc6f32fdca94131c10b286e64aaab3052562db54c3af65c6729dda6dbf8ca490b6ae2014c0d8ed9f188006f22125ba5548946b544115d6e623bcfa01
 DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.2.6.mod 80 BLAKE2B adc96f22f56effd278a9b0462269631f264e72d04bd393cf5eb756935351d5ef1e45df1ccb0aa08f3099ac81ef8e23577d38f09ab242d3ff6fd8085941976b48 SHA512 cbee39f95f83fc64180aba990a117e09ff83d4c953425635eed4b3251d7aa3b89807fc0adb968cc61fbf9448baeaa11e3d6179bbdff737545795df0d7762507d
@@ -1149,6 +1266,9 @@ DIST github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod 311 BLAKE2B b7d3826a21681
 DIST github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.mod 38 BLAKE2B ad63f2622bcdf456d30122d1d6d93400d706923ecdffe13656683c5b6937708f7700c4632e3cf23992f46f35b74ed133849e42a70c85d2197a8c6a37a7e483ac SHA512 12e2b25a46cd8c1c59f7120b0728115e0586d453a57ad6c387798adc6fcb9c3536841527503fd4acc0be79b951fd389a7a50f1708cda0697e8fca46ff17f86b2
 DIST github.com%2Fvmihailenco%2Fmsgpack%2Fv4%2F@v%2Fv4.3.12.mod 382 BLAKE2B 6f41d1e7f377e399c8744e0cc6ebd6bfa3bbf716061e40dbafe8710440beb4d577907263e88ef25a96fe35c261791860c469d46546ba22f795403ed4ad2eb618 SHA512 59caca36c98f86ec974b2fb0d4787a2d112e5803c40495f97e482021aaee53807819a72dcc4cea8b5b849bd5c108cd635028d42958014304c2bf307095cff16e
 DIST github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.1.mod 49 BLAKE2B 2e7d51fc92b731f735cbe882454b412a97ebbb6f6c19e98596156f26f99f55103e6568cebded8f319cb8a56601af378d3870358e7d1a63a952d2ed6478b8c4e8 SHA512 8d238d62e6108c0b7495909ca512ab36ef7d36f36caf8e14354f9ca3e098fcb65ba44051fd0a5bb3cdb4aaf0a7cbaa2b71a1f368833eb3aa226d12aac3227fd6
+DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.24.1.mod 508 BLAKE2B 6d78bd01d8efd89078cf9a61d7665235f67347928faec3f29c1802da0e3259d4d4cc0141fcfb8123cd36b21094227163103752bbe6f61f299de07b5961f071ec SHA512 a7e9ca8badc617a9e50685e23fba518b7f75f7fa4c2c34aa914ead2a4e3cedcbf40c5b7d531dccde6ed9ae397d8e928c378dbedc8da60d7aee5825f0a944cadc
+DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.26.0.mod 536 BLAKE2B 73989f5a5b06e37b10463d832738a1b214ab8ed6813c8a6a6b941890f5046f7dfe42faf9b3f42e480f84972c0be99de4c59fe6fb1247c181034e211805190468 SHA512 8bbe6f81779c99e18fc6efd50927ceddf2db4810f13e875f4198b0a3f13a03d2e4ae7d370a5287e61ee4b4108958d88f8afba8ffe6adb545a249ec5837050496
+DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.26.0.zip 2308000 BLAKE2B 35ff82d23f7f47243a2ac6b59c72638126afbaf421822b12e2cc6abafaf7f089288c1004b3ad7e0c82bb251e048b620f6127cda4f92b2a90641f7bf8c734f480 SHA512 0eaf0a99f273d4fa6a7a9030b70411feac474185adcab5daee439eb8292a6baa4617b13e24725f0e4abe7f19d93666c441b5dc6ddb828176dce0d0dcdfffcbb6
 DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.26.1.mod 536 BLAKE2B 73989f5a5b06e37b10463d832738a1b214ab8ed6813c8a6a6b941890f5046f7dfe42faf9b3f42e480f84972c0be99de4c59fe6fb1247c181034e211805190468 SHA512 8bbe6f81779c99e18fc6efd50927ceddf2db4810f13e875f4198b0a3f13a03d2e4ae7d370a5287e61ee4b4108958d88f8afba8ffe6adb545a249ec5837050496
 DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.26.1.zip 2313652 BLAKE2B 86a7916bae88755fbaa90f0117a74a80165281b1691d8fda77188bdcda641e047bbf349731ec4b3889116486b5dc9a6097805a2e34431b802fee42e3af237417 SHA512 7ce9436879346d681dcf23870756d76a31062520f2e6fa3afbd2c962ce5302953107422f89e907bc75c2830cab86b8163150c31f6a6bccc735501dd058931266
 DIST github.com%2Fvmware%2Fvmw-guestinfo%2F@v%2Fv0.0.0-20170707015358-25eff159a728.mod 39 BLAKE2B a7c682f92dead1de08dda3fa009ca8a07fc689011e5f303f23ed9c548f29d20acf0e51236ac775eb73d7af729da3835a2465905bdc2912a3c61334324b603968 SHA512 ac827417163a71e86ef52a622ce4cd5c285f233674e04c1ce1af126cb084b64a7220a35aa56d1c72ddf7b03d13f39d11609f2bdaf1f9879b978b161f30a969aa
@@ -1162,14 +1282,20 @@ DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mo
 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
 DIST github.com%2Fyandex-cloud%2Fgo-genproto%2F@v%2Fv0.0.0-20210824140926-1bca7bc0c005.mod 43 BLAKE2B 2a4b8b9e30cfd3c88a92205e3e9c1e2335095683ea964f1587e15a41339e7942bccb2939da84f5bee5239676bc175a8c73b970e71f8cdfe198e81eb3674fe8e2 SHA512 91f2a05654a107fdd60df2284ea03c17bc1690c60137931f13e531580ef22e876fcb8c2d1a170b268cc14e08d19a19a3a7d6d22e28e6ab352a18116b1a03960b
 DIST github.com%2Fyandex-cloud%2Fgo-genproto%2F@v%2Fv0.0.0-20210824140926-1bca7bc0c005.zip 2574895 BLAKE2B 4d8ad821f7607ea706d261249d2caf4ee581d7a56cfd0c85aee6e32192cd433e05780111f3e3e45e69a076b9e22aae464e982824ac0f47474d5d8b38cb671c42 SHA512 bc37869bf9f771e4829a2afae6113a07bbfe72bf73918c40fa284d5af7af2c486ce9fa2083dc467a15ad609cafc2a839308ba63810eb95ebf1888996b299781f
+DIST github.com%2Fyandex-cloud%2Fgo-genproto%2F@v%2Fv0.0.0-20211202135052-789603780fb2.mod 43 BLAKE2B 2a4b8b9e30cfd3c88a92205e3e9c1e2335095683ea964f1587e15a41339e7942bccb2939da84f5bee5239676bc175a8c73b970e71f8cdfe198e81eb3674fe8e2 SHA512 91f2a05654a107fdd60df2284ea03c17bc1690c60137931f13e531580ef22e876fcb8c2d1a170b268cc14e08d19a19a3a7d6d22e28e6ab352a18116b1a03960b
+DIST github.com%2Fyandex-cloud%2Fgo-genproto%2F@v%2Fv0.0.0-20211202135052-789603780fb2.zip 2965075 BLAKE2B e560a15a933bd657687999c4db00f0f5b8ec1ad3c55914dc71a35e025f1ce6711725997962d881666e52ba1c45724269cf0c842b93e143276af9ed304b3fce1f SHA512 8ddebc96911ac5995086db5460f0ad67bbea6920636d3f35a84973be3c3304960510b434fb00d512d0e666047ba5b0e6ac15e5421185cddaab7ff0edc657db1f
 DIST github.com%2Fyandex-cloud%2Fgo-sdk%2F@v%2Fv0.0.0-20210824141121-182aedd44a25.mod 686 BLAKE2B 8becc259b1b6f9d76b37a239ec7a5abb34c974dc6593883f330ed20f5eb1705c69506eb4311ea5c6c7d7632f1fb49c946c5e6d8b51a0db112267b046cec10dfa SHA512 3d54b8de00f7e593ee51e8553d466cd04d8e39d7fb9db41cb296057d74a6cf1c6552ba921b5daba4629584cbd6f4ad002d25308b67e8e13d358271b238d8daa2
 DIST github.com%2Fyandex-cloud%2Fgo-sdk%2F@v%2Fv0.0.0-20210824141121-182aedd44a25.zip 324126 BLAKE2B d6ef4b3c02d7d4aee7500948c4ece4d58a6521989cb5d80f54e7d26d0d5a1fc86ec9c82cad967742d4e568842fac1dbf9c1a5d0cdbdd44412c4f8a83d15cb452 SHA512 8b907efd2d12c4b77ee414400a57949982d73fd00ec5d20c65d39e165b214092f3643fcaf99b4e9ef2399ef8ad8bc01273f2493c06ebe2ea8172b8911a1e8c86
+DIST github.com%2Fyandex-cloud%2Fgo-sdk%2F@v%2Fv0.0.0-20211206101223-7c4e7926bf53.mod 667 BLAKE2B bec330b2315a143e4a21f3dca97a3a5481cb0c687d615681e871af2593a6f8cff02af0e9602c54eaae234d33498c127ddca14e104b59c9fbf2790280a3df3748 SHA512 f790614d46aa00198baf9de8eeff2f7de82e2699c8780502a97be0bf05856bda41b2f39b623ec62e3ee84562af347dc3cafdac25a59a6c0d74d2e761132241fb
+DIST github.com%2Fyandex-cloud%2Fgo-sdk%2F@v%2Fv0.0.0-20211206101223-7c4e7926bf53.zip 348963 BLAKE2B 60099c20f9170437bb66415be6fef2dcfbd135b60ead6e54857dd223d7838ab88aef3b396dba4aec06d721dc5d987180bbb17ab93f49367c6688d2d2f0739dac SHA512 9290a1141e6f22bda1dcf380436cd328df683c65500bcf7fb8b486dac59995c1d79b31ce90e6d1c7ce3f8f711105c6fe60feb535b96166a72ba2da386c120476
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.27.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.3.5.mod 41 BLAKE2B d7c63b68781b147d3baf10d81bce0539aaf0a046a70cd91958b59541dfb35107e01a73937b19de74504f42fe49983b46985a9635c45239e4d7a3e2cca2b85f72 SHA512 a6233a0864081261d4b9cda2d73cf37b236acada8f5fbc85b7b7978ccfbc3bd2949632f2fb67a7ba9db6eb43b41796df54460728379e0172082922820d6143a7
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.0.0.mod 568 BLAKE2B 12b73afcd7376480c316ad5912040275ee1d9cb69c44df8dee6b66039eed44e3e15bf2f2667e5311ed5de896a87335e1369a6258abf57305640ee9ed94a34c1d SHA512 a5461300e9290c382084daab8f5117d73fbc923d264c7832e8da09e9e768ca93702a858739f26727129482de67ba62078e64bcb04c47aa680383351fba2fe5fb
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.10.0.mod 207 BLAKE2B c6fa7bea22c978311fb4a7bc92da56725efee8c4055a63df58f09cca207fd82551b2108754a0ebb9e300bd4d05aab29ddc51f63c63df296690a3f213e9acf5df SHA512 fa73ed9738f477f22319d9ce7be0f655caeac3164097632425c8480facd0e50a385823093d490d795be61367c92afb8181b7c192ff94d07398874df8677eec7e
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.10.0.zip 273963 BLAKE2B 47c8af2a1a8ad0ef4162919ed864f11e262d6f5c1e12a40e335eb99d15fca781534305ae5a9678cc77f7d6e03234a8326fdb3196d171cf789700b02c8fbb738b SHA512 cc7f2d093cfd2677689c07bf66623556107e26232a6206d91bc73e9c807bf0d5e12688fc500248ab5e30f31549347086750fb4e9aff6ce25f01f745fbdd3063e
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.mod 601 BLAKE2B ea57e572a8fa50a2bea579915eaea6caeefaf85d2dbc68ebfd468e514a05d5e0ce5e0d19fde245f0a83bc8cd80803f18b640539bb3e072759ae331d01577ee36 SHA512 d71075f8e5fd435020a7e27b20df1026b1c841c06b5235bd6414faecbff4f67ff9812eebb8c21f8735dcd1ad605fb36e662692ff67bf3ee4bf2c06d97ed71aee
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.4.0.mod 549 BLAKE2B df283746e9dc0e249b15fdd39ff88fe97bf78012b3f0727413566bc76e4fa39c383ec0f5cb3167ad4fba5e7418a155af7145e08c9832158e0de6a366e23b6b7c SHA512 494c91b0a0e52ac0fa7d64ffebc60fb53c64c0e2a9faf3450a7744c9bb6d853010c5565951eb7af92dff96d631dae2db3047939d86857082cc16651a58267dc8
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.8.0.mod 207 BLAKE2B c6fa7bea22c978311fb4a7bc92da56725efee8c4055a63df58f09cca207fd82551b2108754a0ebb9e300bd4d05aab29ddc51f63c63df296690a3f213e9acf5df SHA512 fa73ed9738f477f22319d9ce7be0f655caeac3164097632425c8480facd0e50a385823093d490d795be61367c92afb8181b7c192ff94d07398874df8677eec7e
@@ -1220,6 +1346,7 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod 146 B
 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-20191202143827-86a70503ff7e.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200422194213-44a606286825.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
@@ -1233,6 +1360,8 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210421170649-83a5a9bb288b.mod 209 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210513164829-c07d793c2f9a.mod 247 BLAKE2B 66c7bddf0c6300cb14884379a13eacf7ce4cbd1e86cdd94fbef5f67bbb27e263ecd4cc2c936b7f95751b7afadee561629014be9d997159c742be2e5ce7bf099d SHA512 36d6474a79deda7b8749681b46e682e0440d07b3e8930279c66a45c0d42a6f2c6dd75b7bc7c3cc1ef50cdeff988442630af904ff0f58bb2def5f49040ade16cc
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210817164053-32db794688a5.zip 1876172 BLAKE2B 3b1e29d33ba8af42f20fc885b38014859d3c4d9d688f82354d2165649166a2211ce456afe273d61f302e2c1dab9f2ecbe8afdb0d6fde391e788c4783954bb104 SHA512 bb0e7965c8f5f6910d8d63951b16c23f0a832b2b5ed379b3261207f38dd4e859af47007163f5cea2bf7f8ab618f3e93abd91fcfcb64a942643d5273ea92f38af
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.zip 1878482 BLAKE2B 0eef87d2e4c8998450fa976e54b3d00625faad61125a442e3c824763e803257061a05d9046e3c95659cb3a18f8c0f37bea529bcf53c79fc5f7034f1f6d9d1130 SHA512 c49fad474be5b84f99f2cf45970bf1bbdf02f4ed6c8c9d6aab8d672e49972059d4f6f0535bae7647b2d5c40c7a2168a20a0557e1cb29d30811b719f50aa6b226
 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
@@ -1244,6 +1373,7 @@ DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191227195350-da58074b4299.mod 485 BLAK
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200119233911-0405dc783f0a.mod 485 BLAKE2B 84e7d8f764e53841999e798d24dcbffea37708b68eb430f91e3e09f77cca2a2d36d9bfd115f0fdc9eb87e967d6ffeb0ff6f6990afd722e86b40046995f22600e SHA512 2c7217344b34e4870f799968403146268e8e6f85680aac25702f22e69bc4954d35a70a0743646ee8aa36f268c252a9c647e88b1dce8c47db302a1d3eca638aec
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200207192155-f17229e696bd.mod 515 BLAKE2B b37d0d779f058e58ca3e350248cceaac958c4e406d70872fc3682f49b862391dc75d0a17a9ecac8a5dde4339552a222ce2f36b99d8daa3ad01fa5d8632351b3e SHA512 c5f79afe4531059fbc6acf58b7ec7f1e9558df83c4936c830dcb138cbfd7dbc4bab6c0acce6e0c588cc742ec3984d4116ad3e03be815c4f64af32f7ea5024053
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200224162631-6cc2880d07d6.mod 572 BLAKE2B fe37c4263fa4f07a01e65941f859f6abd92e26911622e8b06464ca1e4b65efa46b43eb1c475d6888a67d21b6104aca3c227f42210f0ea8e6709a497f13e1b45f SHA512 a773e3b5c26e95dd24414b9f2aa88225a330581cd9ed0c1ca83a3a6712dd3639e1526abe7c0ea47f9ca701828eb39e1df2144edd6ab261caf584a058f092f0fb
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20200331195152-e8c3332aa8e5.mod 626 BLAKE2B a58cd68fbf85374d55340edaff0de625de9d72f55863880579de5424028768981e6bfa78e082d7771fae27cb50b369c3eb16c7792e3e6f0f5516085aa2c08e51 SHA512 495be32e121d119b3ef9572fa92e7a9ea72a977cbd582e0830bd326c1c73a8b4bd88298063622b362d2ec51f2b1b2da4049d5a980cfa2000308e70bad9b923e2
 DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
 DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
@@ -1310,6 +1440,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200226121028-0de0cce0169b.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200320220750-118fecf932d8.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200324143707-d3edc9973b7e.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
@@ -1333,6 +1464,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210405180319-a5a99cb37ef4.mod 179 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210503060351-7fd8e65b6420.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 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-20210614182718-04defd469f4e.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210825183410-e898025ed96a.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210902165921-8d991716f632.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210902165921-8d991716f632.zip 1569669 BLAKE2B e2a1f24e7f0a13b1e15aea55a3070ef57a3ea6c0352d09c49d70a72859ff2a720de6232195f716613fdf949a582ffca900f22b5d1b3885b9a6a2cf68f4cd4aa4 SHA512 175d28a144dad06b243ea59cc279c5c11995607e9c362700a8caa728fb5438db0b86e59c7e5d9e2190c45f832c139ca8a686c026591aede8204fc43d05a62825
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
@@ -1351,6 +1483,8 @@ DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20210628180205-a41e5a781914.mod 167 B
 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%2Foauth2%2F@v%2Fv0.0.0-20210819190943-2bc19b11175f.zip 138383 BLAKE2B 00d64f5729d4b2a0c6aaa9ca9927179f6aee02dbb294fd0b41437da8bfb95e8a09f048e519b23bb909ec267811e941ab9ced82221b0364f334d05ba4e73c3936 SHA512 6c27638f5fdb1eef0b2a9d3b2044afc35a4dfc1fcd37449c37288055a4fd6b6b70d5e5d4a2a0bba65ff985011d34b9459f0ae292b681d713d6853d39b2b88f7e
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20211005180243-6b3c2da341f1.mod 167 BLAKE2B 3b982295c2a92ffd5db60660c7558fbe2c133d1bcd654a697366b942fe40ca76f8ecc2acdad15215886792a61b941b2c49871f5659b31cc06aa6212a8eb91cf0 SHA512 0e23b4599eafa0468fd16b635497549e36a217e052244aa2cee251f7c432e7fd8f10b4aa60649f4695850e79f4206e6be7c386cebe4bbf7b85bf58a311aef732
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20211005180243-6b3c2da341f1.zip 139510 BLAKE2B 67e80f7063b4ce79065d875e2cf5f0ce886d7e50a897b1837b27abe6ee2b8f6502fec16b17dce5e3b01fa08523f1577cbb1aea34fb67f9c79aff0cf59fa8a2c0 SHA512 b17aeb9ba8a30e0dfcb0398d4bf4b35940030e04347b1a4e6a0d721771ec793432abd3930936056fb1828183d2d6d15d2aa3739ccbc97ebadf223a3c65926425
 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
@@ -1410,6 +1544,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200331124033-c3d80250170d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -1440,12 +1575,16 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE
 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-20210603081109-ebe580a85c40.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-20210831042530-f4d43177bf5e.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210831042530-f4d43177bf5e.zip 1657869 BLAKE2B 8e92bef44e7b8194c554ecd511aed4677cda0faa0f0de117c0cd862fd25af6a0fe3980d0e6aa1f7a8be54860e7481865c4223b6f52886116efd3e3dbfa6eac42 SHA512 28cd177db4989c398e1882bd0db628fb7d0f93bf8abe1c86dd0ad2e7b600ec6969018b81336c681d34950922f0f02fa4924eb96ec5da192b78834269b739054e
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210908233432-aa78b53d3365.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210917161153-d61c044b1678.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210917161153-d61c044b1678.zip 1656830 BLAKE2B fa5771993d7de658d2a4f8a1811f2bd763662b9791483145823f492cba1464b279987382617f481182b8f02b17aa7d0acb53e6420a85123005d85438d90f328a SHA512 fd9ed44cdfea1e1cf02faafbbe71698b365217f3099306874b40ed6e8051755a1d45bbbc6e3f4b8ca7e039d3dba6ab627272ba3a189d2ad22aacd4bbd75ee18a
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210615171337-6886f2dfbf5b.mod 95 BLAKE2B 1d166082ebb4ba2dc69bdce6b84f285aa98967551bbfc1cbadeb2db086ef01b66455cd86b78deeec5ae998a7057c7e4f12026b2e02a9c5053093b9f644a59d1f SHA512 81f571821c669188c4482da38b6921ac4c2c1747f8a803a6846531127cfde25dd04819d971f08f601c2d2cee2e636644c1648eff55dd24d89dfb3777e90fe9a0
@@ -1574,6 +1713,9 @@ DIST google.golang.org%2Fapi%2F@v%2Fv0.54.0.mod 661 BLAKE2B 137f95ebe57d08a2a989
 DIST google.golang.org%2Fapi%2F@v%2Fv0.55.0.mod 661 BLAKE2B b789ac2c45898063b409a9804d980dd6b65d055fc39c0cd0424b8a6a195bbf73fd01e03d3ba66bcbbabbec71a2524d2d61d3685752937a66f9c6b79ed91a7f5a SHA512 f53b4510cbc07c8fd04e075b7a57ea34fe014955bc6b3b74fb1db8bec0760fdbb9e1af1a910bccecce1f4a7a34f9f3c6163ed4b921ace85da2ee3d0f45f9351f
 DIST google.golang.org%2Fapi%2F@v%2Fv0.56.0.mod 661 BLAKE2B b789ac2c45898063b409a9804d980dd6b65d055fc39c0cd0424b8a6a195bbf73fd01e03d3ba66bcbbabbec71a2524d2d61d3685752937a66f9c6b79ed91a7f5a SHA512 f53b4510cbc07c8fd04e075b7a57ea34fe014955bc6b3b74fb1db8bec0760fdbb9e1af1a910bccecce1f4a7a34f9f3c6163ed4b921ace85da2ee3d0f45f9351f
 DIST google.golang.org%2Fapi%2F@v%2Fv0.56.0.zip 23343626 BLAKE2B 9c6b48ae573b861620ce658a3cb8ce92639a6e41994e6c8d60687db0df121f839a0b3a11f4f9e372a8d806ab9c50b12fd5a74dee4c3788d4795aaae3b0fc5f40 SHA512 4a8a8b0e6aff86c30e3d373a9d7f394344b6e6715d069bab7b6e96a51fd69be0185ce12764f601d08fe4f697e1ded35f2b6768bc6bf41e5e505ba991794f2fa8
+DIST google.golang.org%2Fapi%2F@v%2Fv0.57.0.mod 661 BLAKE2B 46ac3005cc4ed5cb507ff5b7227e46509c127c560c1a804a33a7b97aaddb36b9b1643c894a806441c8cda5124d291a1b0007f324bc37521f6873aa332de78114 SHA512 edd8111b529705b1ba00fdbc839213b421c75e236f607c57121e4c1929de3778a134f8cbd62fc9247b3a1feda4f9b1b87bb95b50b965f74c48df3b8915304dbf
+DIST google.golang.org%2Fapi%2F@v%2Fv0.58.0.mod 580 BLAKE2B 3489c902cd272b8be776eec3144bc08ebd465d82544d57f08ca7b2ad5861a441e769f41f933a55b091307468d74cb231f87e5064d786a36e0a388436caf3faa9 SHA512 81c1b62b819576afe6eb386fb05f8c76a31fcf719e6eaa9a6522eaab9f2ecf154b0c6125e2ed76ad55304bfba7c462a01b48961152e2c69db18c0e6e75361980
+DIST google.golang.org%2Fapi%2F@v%2Fv0.58.0.zip 23504628 BLAKE2B 772cd94af32316b177fa8e6b718286900602a543798b7d67004c4c3f773f334600606420c5b0e59f76478b60bf74b31a2d91a51e9bba7b9cca06502d201d891c SHA512 5f1bf61a9123b267f510be5b4dfbdc26af3c7a12748ae8af8ee29a0c34fc0fe3f02ab5c726a62814baf7a750880cae3d2c283d824a7f6ff97c6210defc6c8f3d
 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
@@ -1646,6 +1788,13 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210825212027-de86158e7fda.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210828152312-66f60bf46e71.mod 278 BLAKE2B c536c2a37cb43bde4d32407cad4b8ed577eead6cc35697a8dcb986869924d234aaaa0a2e60098bfa109abaaf7bc03a6e86ef708cb96f04f8cadd16c1fa6f7987 SHA512 4aa8d342e58f401b4b3005add3ddd4df50758ff346a09728be67830ad4ebb3db90edb12bf81cbb819b343a4de4b5290148e462bf07ef392cf94538b0477e734f
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210831024726-fe130286e0e2.mod 278 BLAKE2B c536c2a37cb43bde4d32407cad4b8ed577eead6cc35697a8dcb986869924d234aaaa0a2e60098bfa109abaaf7bc03a6e86ef708cb96f04f8cadd16c1fa6f7987 SHA512 4aa8d342e58f401b4b3005add3ddd4df50758ff346a09728be67830ad4ebb3db90edb12bf81cbb819b343a4de4b5290148e462bf07ef392cf94538b0477e734f
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210831024726-fe130286e0e2.zip 13377075 BLAKE2B 6f1bc3d93821c0dcd4c457f6f947c31e73d26459fda8ea117c88decda69b5849f7f4f0d7ddf6c0f307aa8341c7801f891f2869e55529d14f6cc765e30653a444 SHA512 b145382225db7ac1d5916c50fa6357c860d629750cef366896faafd73b1e208a69ec60305608e4da10e3c1c1698456c97d5bb3a01dd60e16f0135a7d3fe27d35
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210903162649-d08c68adba83.mod 278 BLAKE2B c536c2a37cb43bde4d32407cad4b8ed577eead6cc35697a8dcb986869924d234aaaa0a2e60098bfa109abaaf7bc03a6e86ef708cb96f04f8cadd16c1fa6f7987 SHA512 4aa8d342e58f401b4b3005add3ddd4df50758ff346a09728be67830ad4ebb3db90edb12bf81cbb819b343a4de4b5290148e462bf07ef392cf94538b0477e734f
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210909211513-a8c4777a87af.mod 278 BLAKE2B c536c2a37cb43bde4d32407cad4b8ed577eead6cc35697a8dcb986869924d234aaaa0a2e60098bfa109abaaf7bc03a6e86ef708cb96f04f8cadd16c1fa6f7987 SHA512 4aa8d342e58f401b4b3005add3ddd4df50758ff346a09728be67830ad4ebb3db90edb12bf81cbb819b343a4de4b5290148e462bf07ef392cf94538b0477e734f
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210917145530-b395a37504d4.mod 278 BLAKE2B c536c2a37cb43bde4d32407cad4b8ed577eead6cc35697a8dcb986869924d234aaaa0a2e60098bfa109abaaf7bc03a6e86ef708cb96f04f8cadd16c1fa6f7987 SHA512 4aa8d342e58f401b4b3005add3ddd4df50758ff346a09728be67830ad4ebb3db90edb12bf81cbb819b343a4de4b5290148e462bf07ef392cf94538b0477e734f
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20210924002016-3dee208752a0.mod 327 BLAKE2B e2389d5ffd3a6c761fc75cfe0f928fe01530ba281bad7396153420aeabeafcd810f67885660398bd45998839602311b85b4441ccb9b5851a40c9449e23034d64 SHA512 d9c46bcb8546f671cc357a13b336eeef2ef6d2f5a9241397b56e29c66e9bcccad754dda28b47d8beaea0d2453c4370bc4d7d941411aca3d7fbab0b4545c04f0d
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20211016002631-37fc39342514.mod 327 BLAKE2B e2389d5ffd3a6c761fc75cfe0f928fe01530ba281bad7396153420aeabeafcd810f67885660398bd45998839602311b85b4441ccb9b5851a40c9449e23034d64 SHA512 d9c46bcb8546f671cc357a13b336eeef2ef6d2f5a9241397b56e29c66e9bcccad754dda28b47d8beaea0d2453c4370bc4d7d941411aca3d7fbab0b4545c04f0d
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20211021150943-2b146023228c.mod 327 BLAKE2B e2389d5ffd3a6c761fc75cfe0f928fe01530ba281bad7396153420aeabeafcd810f67885660398bd45998839602311b85b4441ccb9b5851a40c9449e23034d64 SHA512 d9c46bcb8546f671cc357a13b336eeef2ef6d2f5a9241397b56e29c66e9bcccad754dda28b47d8beaea0d2453c4370bc4d7d941411aca3d7fbab0b4545c04f0d
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20211021150943-2b146023228c.zip 14009149 BLAKE2B de6db6748541a46c53a727fea4de66b3875f3bad04e13bb1c2b973f3ea0a24cd7aa2209d9ac05fc09ac729498fb09f427000da664d29dfbe50dc03c2fb0319ae SHA512 32e2f9e7c68e32751dc4d7350bc7e0dd248f6e497188b6de3093f23483b590aa09822076f79798bac6b1d06b5140976ed9d2256b4daec6de0b7e23c3ac673720
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
 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
@@ -1677,6 +1826,8 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.39.0.mod 608 BLAKE2B e0fd588267fddeda3a9
 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%2F@v%2Fv1.40.0.zip 1605734 BLAKE2B f9bd8fdc8c07572c9874b17186769e7b1d25e55b0ca1f1e25c1fea3d2f5ba0bdb56c2fb074f3f3bb79e94f697f1e7bc77a9c31e790fa6c7817c139aae3cd3625 SHA512 f7174cb178412fb7e209d61f85f4572c67a2de32cb186ebcf0f4743c5c895db78e13541fa27abbead881ff7bc45c9db68c304e243979c314233302acd3d6e732
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.41.0.mod 646 BLAKE2B f75e6beeaa807e84af40b9dc0b9effa7bca4989f432f4429c26e4b1004ef6e0dd3227603d2862e1870276be77376d21478854a851b75b434114d6a19800d4886 SHA512 5f47f73521505ab30ab6a6ad9c850a308983354fdbb3da60c1f2c79da333f908f5fa4b7ba4791f033539fafee7b734c349fd27f570a7e1fa4b78753f2be02136
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.41.0.zip 1667867 BLAKE2B d0fa8239d283573b9fc6876fb6e89b3e9765289d8717d7f7c6afa441dae465c9831a2ae15470ca01d23b9e09f575b5a653040b423c5b2708645b0e939d111d96 SHA512 fe80a97e7d803eaa538ea59da1d87ddcdc56eb26ce8c75d4a84b08f5148661c60f0aa833340758a5f45416bdd87627eeed8ed4421ad3fb26f5e3da9e378021b9
 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
@@ -1747,10 +1898,12 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2020.1.4.mod 300 BLAKE2B 3aa707c72ce7e
 DIST packer-1.6.6.tar.gz 17130110 BLAKE2B 3e348d3b3afc65cb50d4e855dd3138892dbc1c1f049fa50849e988ac2d0263a7438b706d595e99fb7a6a11e4b1594e3027ffc137fe7c263017c7b00153b350cb SHA512 0b856cf7a745621bedf8b8b7998e1267a8b16fea2f066d39beeccd2b6bb5eb9ba01276c98bebe9f2f53f3916be71ba2d86d409ad532a8b7648a00c256aa776d2
 DIST packer-1.7.2.tar.gz 17972088 BLAKE2B 6599c9bb19380ed08d186b1f1bd5d9ad581425acce59920a02d4dcdc5237e8f9f9f9af264b4d1ed93f39a56061b9c391fcccdd2582393af420d72421abbd1beb SHA512 019bd07571ca59cb8fbf6edb5dc7f57af11c43b144986222c3d560a812f25d61bbc87a554963eea479f8bfe61abacca7173c4f12b1bc09ffaf78c269624c826e
 DIST packer-1.7.8.tar.gz 2397541 BLAKE2B 0bb551653e0ed91a69e325ddb43f27a3d468855767e14393928f4a8858337b3dcf6b4f1247d1973e6aa3d028d99fd87c85293c18a8b7cab6ec8d21de9a06365b SHA512 6ea9fbf0f45fad3387a0462b1b4f788e5d1c5bebfb9f7e1cc82726a97e4a42ce5397e829bcc0c3441e10c0230ab4cd1d749f8e9d4839307f97bd72e699db708b
+DIST packer-1.7.9.tar.gz 2419810 BLAKE2B 3ff92d5f6245ba72285f78d42281789cde7a7a1e5c0e1d6dba00082b47c2a612eea0a67c7daf925c9e9be9e44d7b696bf06fbeb3d2bebbad96dcde38b6039fbf SHA512 530725b12c1aad52b63569ef6a7d8664aef47673c5ece0abd94b582014732074d9dc349bc2e9d460125cc0bd820d81fde9375f59c1d6178ca3a1cea4aca814ad
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 EBUILD packer-1.6.6.ebuild 697 BLAKE2B fdb8cdd7b8317cbed4769ff211cb156ac73561d907e60cd4b44a3444dfa9708b24f4f798fa667cc2577ba56feeb611a67807620a93b35679920fd51dbf67bf10 SHA512 eed36ddc36584ad45477e778badf49939dae8ed6fefcec3c8b45dc48120665ae0bc090ab3907821a70cc85a7ba6fb7d4e959bd63ea31727fbbafcaddd22bb39b
 EBUILD packer-1.7.2.ebuild 697 BLAKE2B fdb8cdd7b8317cbed4769ff211cb156ac73561d907e60cd4b44a3444dfa9708b24f4f798fa667cc2577ba56feeb611a67807620a93b35679920fd51dbf67bf10 SHA512 eed36ddc36584ad45477e778badf49939dae8ed6fefcec3c8b45dc48120665ae0bc090ab3907821a70cc85a7ba6fb7d4e959bd63ea31727fbbafcaddd22bb39b
 EBUILD packer-1.7.8.ebuild 95788 BLAKE2B 147ae7822e4102e3df4cda1fc2be0d81fd9860f4a1e9ca209126015b450a450e515e7462f4619185f2d921c7c9fc8215ceb69a76535e65c7a7cd202252d823f8 SHA512 ff03520fc85e32e56b9640a4fd6e3695fcaf67fe5b0363d6b142e1a76c2139fd3dcee0fa0f4c9f88aad7a3bf2202aa8704facb255ec574749d28a2e6e7ad0ec5
+EBUILD packer-1.7.9.ebuild 96639 BLAKE2B 4782e5ff9e42d7f2a3922f893673185192a309ffe32826aaf33a0122f0d0060f45c5d3f63895b91a972119e25ff0d9fc8e81b55bc6d21db10d650f84460762bd SHA512 8bb758eec5443ccd4d7948fa7138fc8f7b5dbe25776303de78f3858687634eb18dd5e6dd5146d415111b2f3f41f40b6538253a5c399cf3510feb82a6eb22a1db
 MISC metadata.xml 1408 BLAKE2B 04204c3ac4c45b58a23e611fbd34014423fd1839829101f7a30a188fc8b4588532f72b05c41a77f093170c6a6d9bd804c47bc831a8006ecbda5d3a30ccf6ade6 SHA512 2a45870ccadf85968c81c3129cfffa16184c3cc6ed135b716a84e545d9c80ed35064be231386b0bbfbe6fb7f9a12704c25d7fabc9383b3211d61720691c2ae9b
diff --git a/dev-util/packer/packer-1.7.9.ebuild b/dev-util/packer/packer-1.7.9.ebuild
new file mode 100644
index 000000000000..7d23552d89c5
--- /dev/null
+++ b/dev-util/packer/packer-1.7.9.ebuild
@@ -0,0 +1,1801 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+	"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.66.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 v0.94.0/go.mod"
+	"cloud.google.com/go v0.94.1/go.mod"
+	"cloud.google.com/go v0.97.0"
+	"cloud.google.com/go v0.97.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"
+	"cloud.google.com/go/storage v1.16.1/go.mod"
+	"cloud.google.com/go/storage v1.18.2"
+	"cloud.google.com/go/storage v1.18.2/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/1and1/oneandone-cloudserver-sdk-go v1.0.1"
+	"github.com/1and1/oneandone-cloudserver-sdk-go v1.0.1/go.mod"
+	"github.com/Azure/azure-sdk-for-go v51.2.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v55.7.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v55.7.0+incompatible/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.18/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.19"
+	"github.com/Azure/go-autorest/autorest v0.11.19/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.18"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.1"
+	"github.com/Azure/go-autorest/logger v0.2.1/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20191115201650-bad6df29494a/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6/go.mod"
+	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/goutils v1.1.1"
+	"github.com/Masterminds/goutils v1.1.1/go.mod"
+	"github.com/Masterminds/semver v1.5.0"
+	"github.com/Masterminds/semver v1.5.0/go.mod"
+	"github.com/Masterminds/sprig v2.22.0+incompatible"
+	"github.com/Masterminds/sprig v2.22.0+incompatible/go.mod"
+	"github.com/Microsoft/go-winio v0.4.14/go.mod"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+	"github.com/Microsoft/go-winio v0.4.16"
+	"github.com/Microsoft/go-winio v0.4.16/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.9/go.mod"
+	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2 v1.1.7"
+	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2 v1.1.7/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7"
+	"github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/StackExchange/wmi v1.2.1"
+	"github.com/StackExchange/wmi v1.2.1/go.mod"
+	"github.com/Telmate/proxmox-api-go v0.0.0-20210804143723-a6998deceba2"
+	"github.com/Telmate/proxmox-api-go v0.0.0-20210804143723-a6998deceba2/go.mod"
+	"github.com/a8m/tree v0.0.0-20210115125333-10a5fd5b637d/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+	"github.com/acomagu/bufpipe v1.0.3"
+	"github.com/acomagu/bufpipe v1.0.3/go.mod"
+	"github.com/agext/levenshtein v1.2.1/go.mod"
+	"github.com/agext/levenshtein v1.2.3"
+	"github.com/agext/levenshtein v1.2.3/go.mod"
+	"github.com/agnivade/levenshtein v1.0.1/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"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/aliyun/alibaba-cloud-sdk-go v1.61.1028"
+	"github.com/aliyun/alibaba-cloud-sdk-go v1.61.1028/go.mod"
+	"github.com/aliyun/aliyun-oss-go-sdk v2.1.8+incompatible"
+	"github.com/aliyun/aliyun-oss-go-sdk v2.1.8+incompatible/go.mod"
+	"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239"
+	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/antchfx/xpath v1.1.11"
+	"github.com/antchfx/xpath v1.1.11/go.mod"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
+	"github.com/antihax/optional v1.0.0"
+	"github.com/antihax/optional v1.0.0/go.mod"
+	"github.com/apparentlymart/go-cidr v1.0.1"
+	"github.com/apparentlymart/go-cidr v1.0.1/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3"
+	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
+	"github.com/apparentlymart/go-textseg v1.0.0"
+	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
+	"github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod"
+	"github.com/apparentlymart/go-textseg/v13 v13.0.0"
+	"github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod"
+	"github.com/approvals/go-approval-tests v0.0.0-20210131072903-38d0b0ec12b1"
+	"github.com/approvals/go-approval-tests v0.0.0-20210131072903-38d0b0ec12b1/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+	"github.com/armon/go-metrics v0.3.0/go.mod"
+	"github.com/armon/go-metrics v0.3.3/go.mod"
+	"github.com/armon/go-metrics v0.3.9"
+	"github.com/armon/go-metrics v0.3.9/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef"
+	"github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
+	"github.com/aws/aws-sdk-go v1.25.37/go.mod"
+	"github.com/aws/aws-sdk-go v1.30.8/go.mod"
+	"github.com/aws/aws-sdk-go v1.30.27/go.mod"
+	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
+	"github.com/aws/aws-sdk-go v1.34.28/go.mod"
+	"github.com/aws/aws-sdk-go v1.38.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.38.25/go.mod"
+	"github.com/aws/aws-sdk-go v1.40.34/go.mod"
+	"github.com/aws/aws-sdk-go v1.40.54/go.mod"
+	"github.com/aws/aws-sdk-go v1.41.14"
+	"github.com/aws/aws-sdk-go v1.41.14/go.mod"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/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/go.mod"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/biogo/boom v0.0.0-20150317015657-28119bc1ffc1/go.mod"
+	"github.com/biogo/hts v1.4.3"
+	"github.com/biogo/hts v1.4.3/go.mod"
+	"github.com/bmatcuk/doublestar v1.1.5"
+	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
+	"github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod"
+	"github.com/c2h5oh/datasize v0.0.0-20200825124411-48ed595a09d2"
+	"github.com/c2h5oh/datasize v0.0.0-20200825124411-48ed595a09d2/go.mod"
+	"github.com/caarlos0/env/v6 v6.7.2"
+	"github.com/caarlos0/env/v6 v6.7.2/go.mod"
+	"github.com/cenkalti/backoff/v3 v3.0.0/go.mod"
+	"github.com/cenkalti/backoff/v3 v3.2.2"
+	"github.com/cenkalti/backoff/v3 v3.2.2/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/cheggaaa/pb v1.0.27"
+	"github.com/cheggaaa/pb v1.0.27/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+	"github.com/circonus-labs/circonusllhist v0.1.3/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/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod"
+	"github.com/cockroachdb/apd v1.1.0/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/containerd v1.3.2/go.mod"
+	"github.com/containerd/containerd v1.3.4/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200709052629-daa8e1ccc0bc/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/creack/pty v1.1.9/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/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/digitalocean/go-libvirt v0.0.0-20201209184759-e2a69bcd5bd1"
+	"github.com/digitalocean/go-libvirt v0.0.0-20201209184759-e2a69bcd5bd1/go.mod"
+	"github.com/digitalocean/go-qemu v0.0.0-20210326154740-ac9e0b687001"
+	"github.com/digitalocean/go-qemu v0.0.0-20210326154740-ac9e0b687001/go.mod"
+	"github.com/digitalocean/godo v1.65.0"
+	"github.com/digitalocean/godo v1.65.0/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dimchansky/utfbom v1.1.1"
+	"github.com/dimchansky/utfbom v1.1.1/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/dnaeon/go-vcr v1.1.0"
+	"github.com/dnaeon/go-vcr v1.1.0/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182/go.mod"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/dsnet/compress v0.0.1"
+	"github.com/dsnet/compress v0.0.1/go.mod"
+	"github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/dylanmei/iso8601 v0.1.0"
+	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
+	"github.com/dylanmei/winrmtest v0.0.0-20170819153634-c2fbb09e6c08"
+	"github.com/dylanmei/winrmtest v0.0.0-20170819153634-c2fbb09e6c08/go.mod"
+	"github.com/emirpasic/gods v1.12.0"
+	"github.com/emirpasic/gods v1.12.0/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/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fatih/camelcase v1.0.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.12.0"
+	"github.com/fatih/color v1.12.0/go.mod"
+	"github.com/fatih/structs v1.1.0/go.mod"
+	"github.com/fatih/structtag v1.2.0/go.mod"
+	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+	"github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod"
+	"github.com/frankban/quicktest v1.10.0"
+	"github.com/frankban/quicktest v1.10.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.2.2"
+	"github.com/gliderlabs/ssh v0.2.2/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+	"github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod"
+	"github.com/go-git/gcfg v1.5.0"
+	"github.com/go-git/gcfg v1.5.0/go.mod"
+	"github.com/go-git/go-billy/v5 v5.2.0/go.mod"
+	"github.com/go-git/go-billy/v5 v5.3.1"
+	"github.com/go-git/go-billy/v5 v5.3.1/go.mod"
+	"github.com/go-git/go-git-fixtures/v4 v4.2.1"
+	"github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod"
+	"github.com/go-git/go-git/v5 v5.4.2"
+	"github.com/go-git/go-git/v5 v5.4.2/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-ini/ini v1.62.0"
+	"github.com/go-ini/ini v1.62.0/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-ldap/ldap v3.0.2+incompatible/go.mod"
+	"github.com/go-ldap/ldap/v3 v3.1.3/go.mod"
+	"github.com/go-ldap/ldap/v3 v3.1.10/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-ole/go-ole v1.2.5"
+	"github.com/go-ole/go-ole v1.2.5/go.mod"
+	"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+	"github.com/go-openapi/analysis v0.17.0/go.mod"
+	"github.com/go-openapi/analysis v0.18.0/go.mod"
+	"github.com/go-openapi/analysis v0.19.2/go.mod"
+	"github.com/go-openapi/analysis v0.19.4/go.mod"
+	"github.com/go-openapi/analysis v0.19.5/go.mod"
+	"github.com/go-openapi/analysis v0.19.10/go.mod"
+	"github.com/go-openapi/analysis v0.19.16/go.mod"
+	"github.com/go-openapi/analysis v0.20.0"
+	"github.com/go-openapi/analysis v0.20.0/go.mod"
+	"github.com/go-openapi/errors v0.17.0/go.mod"
+	"github.com/go-openapi/errors v0.18.0/go.mod"
+	"github.com/go-openapi/errors v0.19.2/go.mod"
+	"github.com/go-openapi/errors v0.19.3/go.mod"
+	"github.com/go-openapi/errors v0.19.6/go.mod"
+	"github.com/go-openapi/errors v0.19.7/go.mod"
+	"github.com/go-openapi/errors v0.19.8/go.mod"
+	"github.com/go-openapi/errors v0.19.9"
+	"github.com/go-openapi/errors v0.19.9/go.mod"
+	"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.5"
+	"github.com/go-openapi/jsonpointer v0.19.5/go.mod"
+	"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.5"
+	"github.com/go-openapi/jsonreference v0.19.5/go.mod"
+	"github.com/go-openapi/loads v0.17.0/go.mod"
+	"github.com/go-openapi/loads v0.18.0/go.mod"
+	"github.com/go-openapi/loads v0.19.0/go.mod"
+	"github.com/go-openapi/loads v0.19.2/go.mod"
+	"github.com/go-openapi/loads v0.19.3/go.mod"
+	"github.com/go-openapi/loads v0.19.5/go.mod"
+	"github.com/go-openapi/loads v0.19.6/go.mod"
+	"github.com/go-openapi/loads v0.19.7/go.mod"
+	"github.com/go-openapi/loads v0.20.0/go.mod"
+	"github.com/go-openapi/loads v0.20.2"
+	"github.com/go-openapi/loads v0.20.2/go.mod"
+	"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+	"github.com/go-openapi/runtime v0.19.0/go.mod"
+	"github.com/go-openapi/runtime v0.19.4/go.mod"
+	"github.com/go-openapi/runtime v0.19.15/go.mod"
+	"github.com/go-openapi/runtime v0.19.16/go.mod"
+	"github.com/go-openapi/runtime v0.19.24"
+	"github.com/go-openapi/runtime v0.19.24/go.mod"
+	"github.com/go-openapi/spec v0.17.0/go.mod"
+	"github.com/go-openapi/spec v0.18.0/go.mod"
+	"github.com/go-openapi/spec v0.19.2/go.mod"
+	"github.com/go-openapi/spec v0.19.3/go.mod"
+	"github.com/go-openapi/spec v0.19.6/go.mod"
+	"github.com/go-openapi/spec v0.19.8/go.mod"
+	"github.com/go-openapi/spec v0.19.15/go.mod"
+	"github.com/go-openapi/spec v0.20.0/go.mod"
+	"github.com/go-openapi/spec v0.20.1/go.mod"
+	"github.com/go-openapi/spec v0.20.3"
+	"github.com/go-openapi/spec v0.20.3/go.mod"
+	"github.com/go-openapi/strfmt v0.17.0/go.mod"
+	"github.com/go-openapi/strfmt v0.18.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.2/go.mod"
+	"github.com/go-openapi/strfmt v0.19.3/go.mod"
+	"github.com/go-openapi/strfmt v0.19.4/go.mod"
+	"github.com/go-openapi/strfmt v0.19.5/go.mod"
+	"github.com/go-openapi/strfmt v0.19.11/go.mod"
+	"github.com/go-openapi/strfmt v0.20.0"
+	"github.com/go-openapi/strfmt v0.20.0/go.mod"
+	"github.com/go-openapi/swag v0.17.0/go.mod"
+	"github.com/go-openapi/swag v0.18.0/go.mod"
+	"github.com/go-openapi/swag v0.19.2/go.mod"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-openapi/swag v0.19.7/go.mod"
+	"github.com/go-openapi/swag v0.19.9/go.mod"
+	"github.com/go-openapi/swag v0.19.12/go.mod"
+	"github.com/go-openapi/swag v0.19.13/go.mod"
+	"github.com/go-openapi/swag v0.19.14"
+	"github.com/go-openapi/swag v0.19.14/go.mod"
+	"github.com/go-openapi/validate v0.18.0/go.mod"
+	"github.com/go-openapi/validate v0.19.2/go.mod"
+	"github.com/go-openapi/validate v0.19.3/go.mod"
+	"github.com/go-openapi/validate v0.19.10/go.mod"
+	"github.com/go-openapi/validate v0.19.12/go.mod"
+	"github.com/go-openapi/validate v0.19.15/go.mod"
+	"github.com/go-openapi/validate v0.20.1/go.mod"
+	"github.com/go-openapi/validate v0.20.2"
+	"github.com/go-openapi/validate v0.20.2/go.mod"
+	"github.com/go-ozzo/ozzo-validation v3.6.0+incompatible"
+	"github.com/go-ozzo/ozzo-validation v3.6.0+incompatible/go.mod"
+	"github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod"
+	"github.com/go-resty/resty/v2 v2.3.0/go.mod"
+	"github.com/go-resty/resty/v2 v2.6.0"
+	"github.com/go-resty/resty/v2 v2.6.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+	"github.com/go-test/deep v1.0.2/go.mod"
+	"github.com/go-test/deep v1.0.3"
+	"github.com/go-test/deep v1.0.3/go.mod"
+	"github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod"
+	"github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod"
+	"github.com/gobuffalo/depgen v0.1.0/go.mod"
+	"github.com/gobuffalo/envy v1.6.15/go.mod"
+	"github.com/gobuffalo/envy v1.7.0/go.mod"
+	"github.com/gobuffalo/flect v0.1.0/go.mod"
+	"github.com/gobuffalo/flect v0.1.1/go.mod"
+	"github.com/gobuffalo/flect v0.1.3/go.mod"
+	"github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod"
+	"github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod"
+	"github.com/gobuffalo/genny v0.1.0/go.mod"
+	"github.com/gobuffalo/genny v0.1.1/go.mod"
+	"github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod"
+	"github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod"
+	"github.com/gobuffalo/gogen v0.1.0/go.mod"
+	"github.com/gobuffalo/gogen v0.1.1/go.mod"
+	"github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod"
+	"github.com/gobuffalo/mapi v1.0.1/go.mod"
+	"github.com/gobuffalo/mapi v1.0.2/go.mod"
+	"github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod"
+	"github.com/gobuffalo/packd v0.1.0/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.0.9/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.2.0/go.mod"
+	"github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/gofrs/flock v0.7.3/go.mod"
+	"github.com/gofrs/flock v0.8.1"
+	"github.com/gofrs/flock v0.8.1/go.mod"
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+	"github.com/gofrs/uuid v4.0.0+incompatible"
+	"github.com/gofrs/uuid v4.0.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod"
+	"github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3"
+	"github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3/go.mod"
+	"github.com/golang-jwt/jwt v3.2.2+incompatible"
+	"github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod"
+	"github.com/golang-jwt/jwt/v4 v4.0.0/go.mod"
+	"github.com/golang-jwt/jwt/v4 v4.1.0/go.mod"
+	"github.com/golang-jwt/jwt/v4 v4.2.0"
+	"github.com/golang-jwt/jwt/v4 v4.2.0/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/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/groupcache v0.0.0-20210331224755-41bb18bfe9da"
+	"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/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.1.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"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/golang/snappy v0.0.3/go.mod"
+	"github.com/golang/snappy v0.0.4"
+	"github.com/golang/snappy v0.0.4/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"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"
+	"github.com/google/go-cmp v0.5.6/go.mod"
+	"github.com/google/go-github/v33 v33.0.1-0.20210113204525-9318e629ec69"
+	"github.com/google/go-github/v33 v33.0.1-0.20210113204525-9318e629ec69/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/go-querystring v1.1.0"
+	"github.com/google/go-querystring v1.1.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"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"
+	"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-20200905233945-acf8798be1f7/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/shlex v0.0.0-20150127133951-6f45313302b9/go.mod"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+	"github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+	"github.com/google/uuid v0.0.0-20170306145142-6a5e28554805/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2/go.mod"
+	"github.com/google/uuid v1.2.0/go.mod"
+	"github.com/google/uuid v1.3.0"
+	"github.com/google/uuid v1.3.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/googleapis/gax-go/v2 v2.1.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.1.1"
+	"github.com/googleapis/gax-go/v2 v2.1.1/go.mod"
+	"github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
+	"github.com/gophercloud/gophercloud v0.12.0"
+	"github.com/gophercloud/gophercloud v0.12.0/go.mod"
+	"github.com/gophercloud/utils v0.0.0-20200508015959-b0167b94122c"
+	"github.com/gophercloud/utils v0.0.0-20200508015959-b0167b94122c/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e"
+	"github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod"
+	"github.com/gorilla/mux v1.7.4/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.2.2"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod"
+	"github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026"
+	"github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026/go.mod"
+	"github.com/hashicorp/aws-sdk-go-base v0.7.1"
+	"github.com/hashicorp/aws-sdk-go-base v0.7.1/go.mod"
+	"github.com/hashicorp/consul/api v1.4.0/go.mod"
+	"github.com/hashicorp/consul/api v1.10.1"
+	"github.com/hashicorp/consul/api v1.10.1/go.mod"
+	"github.com/hashicorp/consul/sdk v0.4.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.8.0"
+	"github.com/hashicorp/consul/sdk v0.8.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/errwrap v1.1.0"
+	"github.com/hashicorp/errwrap v1.1.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.16.5"
+	"github.com/hashicorp/go-azure-helpers v0.16.5/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
+	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.2"
+	"github.com/hashicorp/go-cleanhttp v0.5.2/go.mod"
+	"github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840"
+	"github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840/go.mod"
+	"github.com/hashicorp/go-getter v1.4.1"
+	"github.com/hashicorp/go-getter v1.4.1/go.mod"
+	"github.com/hashicorp/go-getter/gcs/v2 v2.0.0-20200604122502-a6995fa1edad"
+	"github.com/hashicorp/go-getter/gcs/v2 v2.0.0-20200604122502-a6995fa1edad/go.mod"
+	"github.com/hashicorp/go-getter/s3/v2 v2.0.0-20200604122502-a6995fa1edad"
+	"github.com/hashicorp/go-getter/s3/v2 v2.0.0-20200604122502-a6995fa1edad/go.mod"
+	"github.com/hashicorp/go-getter/v2 v2.0.0-20200511090339-3107ec4af37a/go.mod"
+	"github.com/hashicorp/go-getter/v2 v2.0.0"
+	"github.com/hashicorp/go-getter/v2 v2.0.0/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+	"github.com/hashicorp/go-hclog v0.14.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.16.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.16.2"
+	"github.com/hashicorp/go-hclog v0.16.2/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.3.1"
+	"github.com/hashicorp/go-immutable-radix v1.3.1/go.mod"
+	"github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.5"
+	"github.com/hashicorp/go-msgpack v0.5.5/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-multierror v1.1.1"
+	"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+	"github.com/hashicorp/go-oracle-terraform v0.17.0"
+	"github.com/hashicorp/go-oracle-terraform v0.17.0/go.mod"
+	"github.com/hashicorp/go-plugin v1.0.1/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.6.2/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.7.0"
+	"github.com/hashicorp/go-retryablehttp v0.7.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.2"
+	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+	"github.com/hashicorp/go-safetemp v1.0.0"
+	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.2"
+	"github.com/hashicorp/go-sockaddr v1.0.2/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-uuid v1.0.2"
+	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.1/go.mod"
+	"github.com/hashicorp/go-version v1.3.0"
+	"github.com/hashicorp/go-version v1.3.0/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/golang-lru v0.5.3/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.10.0/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.10.1/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.11.1"
+	"github.com/hashicorp/hcl/v2 v2.11.1/go.mod"
+	"github.com/hashicorp/hcp-sdk-go v0.15.1-0.20220112153249-f565607d7cc4"
+	"github.com/hashicorp/hcp-sdk-go v0.15.1-0.20220112153249-f565607d7cc4/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"
+	"github.com/hashicorp/memberlist v0.2.2/go.mod"
+	"github.com/hashicorp/packer-plugin-alicloud v1.0.1"
+	"github.com/hashicorp/packer-plugin-alicloud v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-amazon v1.0.6"
+	"github.com/hashicorp/packer-plugin-amazon v1.0.6/go.mod"
+	"github.com/hashicorp/packer-plugin-ansible v1.0.1"
+	"github.com/hashicorp/packer-plugin-ansible v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-azure v1.0.5"
+	"github.com/hashicorp/packer-plugin-azure v1.0.5/go.mod"
+	"github.com/hashicorp/packer-plugin-chef v1.0.2"
+	"github.com/hashicorp/packer-plugin-chef v1.0.2/go.mod"
+	"github.com/hashicorp/packer-plugin-cloudstack v1.0.0"
+	"github.com/hashicorp/packer-plugin-cloudstack v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-converge v1.0.1"
+	"github.com/hashicorp/packer-plugin-converge v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-digitalocean v1.0.1"
+	"github.com/hashicorp/packer-plugin-digitalocean v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-docker v1.0.3"
+	"github.com/hashicorp/packer-plugin-docker v1.0.3/go.mod"
+	"github.com/hashicorp/packer-plugin-googlecompute v1.0.9"
+	"github.com/hashicorp/packer-plugin-googlecompute v1.0.9/go.mod"
+	"github.com/hashicorp/packer-plugin-hcloud v1.0.2"
+	"github.com/hashicorp/packer-plugin-hcloud v1.0.2/go.mod"
+	"github.com/hashicorp/packer-plugin-hyperone v1.0.0"
+	"github.com/hashicorp/packer-plugin-hyperone v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-hyperv v1.0.1"
+	"github.com/hashicorp/packer-plugin-hyperv v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-inspec v1.0.0"
+	"github.com/hashicorp/packer-plugin-inspec v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-jdcloud v1.0.0"
+	"github.com/hashicorp/packer-plugin-jdcloud v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-linode v1.0.1"
+	"github.com/hashicorp/packer-plugin-linode v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-lxc v1.0.0"
+	"github.com/hashicorp/packer-plugin-lxc v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-lxd v1.0.0"
+	"github.com/hashicorp/packer-plugin-lxd v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-ncloud v1.0.1"
+	"github.com/hashicorp/packer-plugin-ncloud v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-oneandone v1.0.0"
+	"github.com/hashicorp/packer-plugin-oneandone v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-openstack v1.0.0"
+	"github.com/hashicorp/packer-plugin-openstack v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-oracle v1.0.1"
+	"github.com/hashicorp/packer-plugin-oracle v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-outscale v1.0.2"
+	"github.com/hashicorp/packer-plugin-outscale v1.0.2/go.mod"
+	"github.com/hashicorp/packer-plugin-parallels v1.0.0"
+	"github.com/hashicorp/packer-plugin-parallels v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-profitbricks v1.0.1"
+	"github.com/hashicorp/packer-plugin-profitbricks v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-proxmox v1.0.4"
+	"github.com/hashicorp/packer-plugin-proxmox v1.0.4/go.mod"
+	"github.com/hashicorp/packer-plugin-puppet v1.0.1"
+	"github.com/hashicorp/packer-plugin-puppet v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-qemu v1.0.1"
+	"github.com/hashicorp/packer-plugin-qemu v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-salt v1.0.0"
+	"github.com/hashicorp/packer-plugin-salt v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-sdk v0.2.3/go.mod"
+	"github.com/hashicorp/packer-plugin-sdk v0.2.5/go.mod"
+	"github.com/hashicorp/packer-plugin-sdk v0.2.7/go.mod"
+	"github.com/hashicorp/packer-plugin-sdk v0.2.9/go.mod"
+	"github.com/hashicorp/packer-plugin-sdk v0.2.11"
+	"github.com/hashicorp/packer-plugin-sdk v0.2.11/go.mod"
+	"github.com/hashicorp/packer-plugin-tencentcloud v1.0.3"
+	"github.com/hashicorp/packer-plugin-tencentcloud v1.0.3/go.mod"
+	"github.com/hashicorp/packer-plugin-triton v1.0.0"
+	"github.com/hashicorp/packer-plugin-triton v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-ucloud v1.0.0"
+	"github.com/hashicorp/packer-plugin-ucloud v1.0.0/go.mod"
+	"github.com/hashicorp/packer-plugin-vagrant v1.0.1"
+	"github.com/hashicorp/packer-plugin-vagrant v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-virtualbox v1.0.1"
+	"github.com/hashicorp/packer-plugin-virtualbox v1.0.1/go.mod"
+	"github.com/hashicorp/packer-plugin-vmware v1.0.5"
+	"github.com/hashicorp/packer-plugin-vmware v1.0.5/go.mod"
+	"github.com/hashicorp/packer-plugin-vsphere v1.0.2"
+	"github.com/hashicorp/packer-plugin-vsphere v1.0.2/go.mod"
+	"github.com/hashicorp/packer-plugin-yandex v1.0.3"
+	"github.com/hashicorp/packer-plugin-yandex v1.0.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/hashicorp/serf v0.9.2/go.mod"
+	"github.com/hashicorp/serf v0.9.5"
+	"github.com/hashicorp/serf v0.9.5/go.mod"
+	"github.com/hashicorp/vault/api v1.0.4/go.mod"
+	"github.com/hashicorp/vault/api v1.0.5-0.20200519221902-385fac77e20f/go.mod"
+	"github.com/hashicorp/vault/api v1.1.1"
+	"github.com/hashicorp/vault/api v1.1.1/go.mod"
+	"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
+	"github.com/hashicorp/vault/sdk v0.1.14-0.20200519221530-14615acda45f/go.mod"
+	"github.com/hashicorp/vault/sdk v0.2.1"
+	"github.com/hashicorp/vault/sdk v0.2.1/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493"
+	"github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493/go.mod"
+	"github.com/hetznercloud/hcloud-go v1.25.0"
+	"github.com/hetznercloud/hcloud-go v1.25.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.3.2"
+	"github.com/huandu/xstrings v1.3.2/go.mod"
+	"github.com/hyperonecom/h1-client-go v0.0.0-20191203060043-b46280e4c4a4"
+	"github.com/hyperonecom/h1-client-go v0.0.0-20191203060043-b46280e4c4a4/go.mod"
+	"github.com/iancoleman/strcase v0.1.3/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/imdario/mergo v0.3.6/go.mod"
+	"github.com/imdario/mergo v0.3.11/go.mod"
+	"github.com/imdario/mergo v0.3.12"
+	"github.com/imdario/mergo v0.3.12/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+	"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99"
+	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod"
+	"github.com/jdcloud-api/jdcloud-sdk-go v1.9.1-0.20190605102154-3d81a50ca961"
+	"github.com/jdcloud-api/jdcloud-sdk-go v1.9.1-0.20190605102154-3d81a50ca961/go.mod"
+	"github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869"
+	"github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod"
+	"github.com/jessevdk/go-flags v1.5.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.4.0"
+	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/josharian/intern v1.0.0"
+	"github.com/josharian/intern v1.0.0/go.mod"
+	"github.com/joyent/triton-go v1.8.5"
+	"github.com/joyent/triton-go v1.8.5/go.mod"
+	"github.com/json-iterator/go v1.1.5/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/json-iterator/go v1.1.10"
+	"github.com/json-iterator/go v1.1.10/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"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/karrick/godirwalk v1.8.0/go.mod"
+	"github.com/karrick/godirwalk v1.10.3/go.mod"
+	"github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351"
+	"github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.4.1/go.mod"
+	"github.com/klauspost/compress v1.9.5/go.mod"
+	"github.com/klauspost/compress v1.11.13/go.mod"
+	"github.com/klauspost/compress v1.13.5"
+	"github.com/klauspost/compress v1.13.5/go.mod"
+	"github.com/klauspost/cpuid v1.2.0/go.mod"
+	"github.com/klauspost/crc32 v1.2.0/go.mod"
+	"github.com/klauspost/pgzip v0.0.0-20151221113845-47f36e165cec/go.mod"
+	"github.com/klauspost/pgzip v1.2.5"
+	"github.com/klauspost/pgzip v1.2.5/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kortschak/utter v0.0.0-20190412033250-50fe362e6560/go.mod"
+	"github.com/kr/fs v0.1.0"
+	"github.com/kr/fs v0.1.0/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pretty v0.2.1"
+	"github.com/kr/pretty v0.2.1/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.5/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348"
+	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+	"github.com/lib/pq v1.1.1/go.mod"
+	"github.com/linode/linodego v0.30.0"
+	"github.com/linode/linodego v0.30.0/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/mailru/easyjson v0.7.1/go.mod"
+	"github.com/mailru/easyjson v0.7.6"
+	"github.com/mailru/easyjson v0.7.6/go.mod"
+	"github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod"
+	"github.com/markbates/safe v1.0.1/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
+	"github.com/masterzen/winrm v0.0.0-20210504160029-28ed956f5227/go.mod"
+	"github.com/masterzen/winrm v0.0.0-20210623064412-3b76017826b0"
+	"github.com/masterzen/winrm v0.0.0-20210623064412-3b76017826b0/go.mod"
+	"github.com/matryer/is v1.2.0/go.mod"
+	"github.com/matryer/is v1.4.0"
+	"github.com/matryer/is v1.4.0/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.8"
+	"github.com/mattn/go-colorable v0.1.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/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.13"
+	"github.com/mattn/go-isatty v0.0.13/go.mod"
+	"github.com/mattn/go-runewidth v0.0.3/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/go-runewidth v0.0.13"
+	"github.com/mattn/go-runewidth v0.0.13/go.mod"
+	"github.com/mattn/go-tty v0.0.0-20191112051231-74040eebce08"
+	"github.com/mattn/go-tty v0.0.0-20191112051231-74040eebce08/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
+	"github.com/miekg/dns v1.1.26"
+	"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/cli v1.1.2"
+	"github.com/mitchellh/cli v1.1.2/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/copystructure v1.2.0"
+	"github.com/mitchellh/copystructure v1.2.0/go.mod"
+	"github.com/mitchellh/go-fs v0.0.0-20180402234041-7b48fa161ea7/go.mod"
+	"github.com/mitchellh/go-fs v0.0.0-20180402235330-b7b9ca407fff"
+	"github.com/mitchellh/go-fs v0.0.0-20180402235330-b7b9ca407fff/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 v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.3/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.14.1"
+	"github.com/mitchellh/go-testing-interface v1.14.1/go.mod"
+	"github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed"
+	"github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed/go.mod"
+	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.1"
+	"github.com/mitchellh/go-wordwrap v1.0.1/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0"
+	"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.3.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.4.1"
+	"github.com/mitchellh/mapstructure v1.4.1/go.mod"
+	"github.com/mitchellh/panicwrap v1.0.0"
+	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
+	"github.com/mitchellh/prefixedio v0.0.0-20151214002211-6e6954073784"
+	"github.com/mitchellh/prefixedio v0.0.0-20151214002211-6e6954073784/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.2"
+	"github.com/mitchellh/reflectwalk v1.0.2/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"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"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod"
+	"github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
+	"github.com/oklog/run v1.0.0/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.5"
+	"github.com/olekukonko/tablewriter v0.0.5/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v0.1.1/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/oracle/oci-go-sdk/v36 v36.2.0"
+	"github.com/oracle/oci-go-sdk/v36 v36.2.0/go.mod"
+	"github.com/outscale/osc-sdk-go v1.11.2"
+	"github.com/outscale/osc-sdk-go v1.11.2/go.mod"
+	"github.com/packer-community/winrmcp v0.0.0-20180921204643-0fd363d6159a/go.mod"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pascaldekloe/goe v0.1.0"
+	"github.com/pascaldekloe/goe v0.1.0/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.4.0/go.mod"
+	"github.com/pelletier/go-toml v1.7.0/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.6.1+incompatible"
+	"github.com/pierrec/lz4 v2.6.1+incompatible/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/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/pkg/sftp v0.0.0-20160118190721-e84cc8c755ca/go.mod"
+	"github.com/pkg/sftp v1.13.2"
+	"github.com/pkg/sftp v1.13.2/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"
+	"github.com/posener/complete v1.2.3/go.mod"
+	"github.com/profitbricks/profitbricks-sdk-go v4.0.2+incompatible"
+	"github.com/profitbricks/profitbricks-sdk-go v4.0.2+incompatible/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.2/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.4.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/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rivo/uniseg v0.2.0"
+	"github.com/rivo/uniseg v0.2.0/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.2.2/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rs/zerolog v1.4.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+	"github.com/ryanuber/go-glob v1.0.0"
+	"github.com/ryanuber/go-glob v1.0.0/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/scaleway/packer-plugin-scaleway v1.0.4"
+	"github.com/scaleway/packer-plugin-scaleway v1.0.4/go.mod"
+	"github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7"
+	"github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7/go.mod"
+	"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+	"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sergi/go-diff v1.1.0"
+	"github.com/sergi/go-diff v1.1.0/go.mod"
+	"github.com/shirou/gopsutil v3.21.1+incompatible"
+	"github.com/shirou/gopsutil v3.21.1+incompatible/go.mod"
+	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.3.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.1/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+	"github.com/spf13/pflag v1.0.2/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/objx v0.3.0"
+	"github.com/stretchr/objx v0.3.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/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.283"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.283/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.283"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.283/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.283"
+	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.283/go.mod"
+	"github.com/tidwall/pretty v1.0.0"
+	"github.com/tidwall/pretty v1.0.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+	"github.com/ucloud/ucloud-sdk-go v0.20.2"
+	"github.com/ucloud/ucloud-sdk-go v0.20.2/go.mod"
+	"github.com/ufilesdk-dev/ufile-gosdk v1.0.1"
+	"github.com/ufilesdk-dev/ufile-gosdk v1.0.1/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go v1.2.4/go.mod"
+	"github.com/ugorji/go v1.2.6"
+	"github.com/ugorji/go v1.2.6/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/ugorji/go/codec v1.2.4/go.mod"
+	"github.com/ugorji/go/codec v1.2.6"
+	"github.com/ugorji/go/codec v1.2.6/go.mod"
+	"github.com/ulikunitz/xz v0.5.5/go.mod"
+	"github.com/ulikunitz/xz v0.5.6/go.mod"
+	"github.com/ulikunitz/xz v0.5.8/go.mod"
+	"github.com/ulikunitz/xz v0.5.10"
+	"github.com/ulikunitz/xz v0.5.10/go.mod"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/vektah/gqlparser v1.1.2/go.mod"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
+	"github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod"
+	"github.com/vmihailenco/tagparser v0.1.1/go.mod"
+	"github.com/vmware/govmomi v0.24.1/go.mod"
+	"github.com/vmware/govmomi v0.26.0"
+	"github.com/vmware/govmomi v0.26.0/go.mod"
+	"github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod"
+	"github.com/xanzy/go-cloudstack v2.4.1+incompatible"
+	"github.com/xanzy/go-cloudstack v2.4.1+incompatible/go.mod"
+	"github.com/xanzy/ssh-agent v0.3.0"
+	"github.com/xanzy/ssh-agent v0.3.0/go.mod"
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+	"github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yandex-cloud/go-genproto v0.0.0-20211202135052-789603780fb2"
+	"github.com/yandex-cloud/go-genproto v0.0.0-20211202135052-789603780fb2/go.mod"
+	"github.com/yandex-cloud/go-sdk v0.0.0-20211206101223-7c4e7926bf53"
+	"github.com/yandex-cloud/go-sdk v0.0.0-20211206101223-7c4e7926bf53/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"
+	"github.com/zclconf/go-cty v1.0.0/go.mod"
+	"github.com/zclconf/go-cty v1.2.0/go.mod"
+	"github.com/zclconf/go-cty v1.4.0/go.mod"
+	"github.com/zclconf/go-cty v1.8.0/go.mod"
+	"github.com/zclconf/go-cty v1.8.3/go.mod"
+	"github.com/zclconf/go-cty v1.9.1/go.mod"
+	"github.com/zclconf/go-cty v1.10.0"
+	"github.com/zclconf/go-cty v1.10.0/go.mod"
+	"github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod"
+	"github.com/zclconf/go-cty-yaml v1.0.1"
+	"github.com/zclconf/go-cty-yaml v1.0.1/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+	"go.mongodb.org/mongo-driver v1.3.0/go.mod"
+	"go.mongodb.org/mongo-driver v1.3.4/go.mod"
+	"go.mongodb.org/mongo-driver v1.4.3/go.mod"
+	"go.mongodb.org/mongo-driver v1.4.4/go.mod"
+	"go.mongodb.org/mongo-driver v1.4.6"
+	"go.mongodb.org/mongo-driver v1.4.6/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.opencensus.io v0.23.0/go.mod"
+	"go.opentelemetry.io/proto/otlp v0.7.0/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/atomic v1.6.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod"
+	"golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod"
+	"golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/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-20191202143827-86a70503ff7e/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod"
+	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+	"golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod"
+	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+	"golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod"
+	"golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod"
+	"golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc/go.mod"
+	"golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod"
+	"golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod"
+	"golang.org/x/crypto v0.0.0-20210921155107-089bfa567519"
+	"golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/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-20190731235908-ec7cb31e5a56/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/exp v0.0.0-20200331195152-e8c3332aa8e5/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/mobile v0.0.0-20201208152944-da85bec010a2/go.mod"
+	"golang.org/x/mobile v0.0.0-20210901025245-1fde1d6c3ca1"
+	"golang.org/x/mobile v0.0.0-20210901025245-1fde1d6c3ca1/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.1.1-0.20191209134235-331c550502dd/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/mod v0.5.0"
+	"golang.org/x/mod v0.5.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
+	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/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-20190320064053-1272bf9dcd53/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-20190522155817-f3200d17e092/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-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/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-20200421231249-e086a090c8fd/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-20200602114024-627f9648deb9/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-20200904194848-62affa334b73/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-20201202161906-c7110b5ffcbb/go.mod"
+	"golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod"
+	"golang.org/x/net v0.0.0-20201224014010-6772e930b67b/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-20210326060303-6b1517762897/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/net v0.0.0-20210614182718-04defd469f4e/go.mod"
+	"golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod"
+	"golang.org/x/net v0.0.0-20210902165921-8d991716f632"
+	"golang.org/x/net v0.0.0-20210902165921-8d991716f632/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-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/oauth2 v0.0.0-20211005180243-6b3c2da341f1"
+	"golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/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-20190412183630-56d357773e84/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"
+	"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-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190321052220-f7bb7a8bee54/go.mod"
+	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/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-20190502175342-a43fa875dd82/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/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-20190916202348-b4ddaad3f8a3/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-20191008105621-543471e840be/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/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-20200420163511-1957bb5e6d1f/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-20200602225109-6fdc65e7d980/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20200828194041-157a740278f4/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-20210319071255-635bc2c9138d/go.mod"
+	"golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod"
+	"golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
+	"golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod"
+	"golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/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-20210831042530-f4d43177bf5e/go.mod"
+	"golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod"
+	"golang.org/x/sys v0.0.0-20210917161153-d61c044b1678"
+	"golang.org/x/sys v0.0.0-20210917161153-d61c044b1678/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b"
+	"golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/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.1-0.20181227161524-e6919f6577db/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/go.mod"
+	"golang.org/x/text v0.3.7"
+	"golang.org/x/text v0.3.7/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/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
+	"golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac"
+	"golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/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-20190329151228-23e29df326fe/go.mod"
+	"golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod"
+	"golang.org/x/tools v0.0.0-20190420181800-aa740d480789/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-20190531172133-b3315ee88b7d/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+	"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/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-20191029041327-9cc4af7d6b2c/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-20191203134012-c197fd4bf371/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-20200117012304-6edc0a871e69/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-20200711155855-7342f9734a7d/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-20200828161849-5deb26317202/go.mod"
+	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
+	"golang.org/x/tools v0.0.0-20200915173823-2db8f0ff891c/go.mod"
+	"golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod"
+	"golang.org/x/tools v0.0.0-20201111133315-69daaf961d65/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.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"
+	"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.21.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.31.0/go.mod"
+	"google.golang.org/api v0.32.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.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.55.0/go.mod"
+	"google.golang.org/api v0.56.0/go.mod"
+	"google.golang.org/api v0.57.0/go.mod"
+	"google.golang.org/api v0.58.0"
+	"google.golang.org/api v0.58.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"
+	"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-20190404172233-64821d5d2107/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-20200423170343-7949de9c1215/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-20200831141814-d751682dd103/go.mod"
+	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
+	"google.golang.org/genproto v0.0.0-20200914193844-75d14daec038/go.mod"
+	"google.golang.org/genproto v0.0.0-20200918140846-d0d605568037/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-20210825212027-de86158e7fda/go.mod"
+	"google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod"
+	"google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod"
+	"google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod"
+	"google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod"
+	"google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod"
+	"google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod"
+	"google.golang.org/genproto v0.0.0-20211016002631-37fc39342514/go.mod"
+	"google.golang.org/genproto v0.0.0-20211021150943-2b146023228c"
+	"google.golang.org/genproto v0.0.0-20211021150943-2b146023228c/go.mod"
+	"google.golang.org/grpc v1.14.0/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.0/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.22.0/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/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.32.0/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 v1.41.0"
+	"google.golang.org/grpc v1.41.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"
+	"google.golang.org/protobuf v1.27.1/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/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/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c"
+	"gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/ini.v1 v1.62.0"
+	"gopkg.in/ini.v1 v1.62.0/go.mod"
+	"gopkg.in/jarcoal/httpmock.v1 v1.0.0-20181117152235-275e9df93516"
+	"gopkg.in/jarcoal/httpmock.v1 v1.0.0-20181117152235-275e9df93516/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.6.0"
+	"gopkg.in/square/go-jose.v2 v2.6.0/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/warnings.v0 v0.1.2"
+	"gopkg.in/warnings.v0 v0.1.2/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/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.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/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"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"gotest.tools/v3 v3.0.2/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
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" ${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DOCS=( {README,CHANGELOG}.md )
+
+RESTRICT+=" test"
+
+src_compile() {
+	go build \
+		-mod=readonly \
+		-ldflags "${go_ldflags}" \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/packer
+
+	einstalldocs
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+}
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index c1e35ab0a1ad..40439b6cca88 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,6 +1,8 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2021.1.2.tar.gz 466806126 BLAKE2B 403cc5949ccb0e5f7d39d55b91d962889e35342715501466c007a5b3b044cbe33260de99e7d299f35a6e789c6f7e5726bc7106bc206d4e4890f8948eab7a15a2 SHA512 180d813d1162456312eb4482f414443350d784effab56cc53f2f6c2c79931f9af597849ec395089d8fc1ca2b87015722fad3cc43e03bfb4418e2c926b5af0107
+DIST pycharm-community-2021.3.1.tar.gz 505888477 BLAKE2B a203c9171857ef6b888db11da44b207ef8b35d3d20ecda8ebda41a9feede6c3da377a9123c3fa45662f5c9c5d0442f41717aba42bd33c5165b13043bbc4d6816 SHA512 554b9a34642ca904aea88e064cabe3af779ffda2bd99e8d0748f08628cf827b21585b44436c3548a21393f29c186720e76c465a18e5c182b64247e370c455417
 DIST pycharm-community-2021.3.tar.gz 498868447 BLAKE2B 7c439d47f39d3f715fc99b139c0cbcde8de3224d433e8d79b050cd08dee7cefaef6f2e647cdbe659d6c447580e83a9186783c251aef3011e0bbabb16b5e32589 SHA512 6513ea22a6948abb3839158ac0ba31d6acda709689eaae6bfa014d49c1b8bc958ddb507404d169a212ff2b61387ef44b8207b899adb5ac8a71b75ca7da3732a2
 EBUILD pycharm-community-2021.1.2-r1.ebuild 3198 BLAKE2B 94d0ce4a952f182fcca3d10ab2f405d9fec7dbfa10638e5bf73f870300cb4b172fe6c1717ebf2dbeb3a731900ac981c87ebc327d6108b2917498e1a26f0ba607 SHA512 6fa94b51a29292e428850e99ae95776339a49afa4d8840d2f5b876546e797755c09778e60387fba9442f4a4b19ac6c8caaaca44d94cee59413231e4eb8042db9
+EBUILD pycharm-community-2021.3.1.ebuild 3165 BLAKE2B 0a44bac0d58eea54735acc9b257f5267c34e5ba3847c04684c2d3917fc67e914cd4d188447876da47fb2b8df8762afff5a832c18e023b2434b7c8434c47a97a5 SHA512 ecce4a8f505740d89963893977f4da1a12fbec4f13dd14406a8f4295ca643fc0e74d29f157476b639d3b7dfd305c88ebea6f67a276f4c7516a6d3728d084f7ba
 EBUILD pycharm-community-2021.3.ebuild 3165 BLAKE2B ab768abb1fe5d29447a705d8bff9c3e0733c92f78178ff5008e15fa798c607a9385175421e0c346aaba32be7b500506fdca4ffb7f6d248d3f2f7e84b7e65f18b SHA512 c9d8ab3f6b3ac7626b9e49075da9e5d9f9870a331b4c8f36c1ca2b9ac94e544b2069c6e07e52f527af023143bd64684f8ff541ad59a7e7a6ffdb1a3c90e2bc67
 MISC metadata.xml 305 BLAKE2B a5ee9ceb727e22160e23fc785ddcf2b7b22afd9599e956de38bf4318c4cab2acf5cffa6d1f075ac24d866d407e9412ba02362c9942b3aa34a7276e55cc44f161 SHA512 e67f65a2f5fcb0c7a7bfecdbba77c91844e89f4110ec66bb5838fdf7fb5abb57d141c2a816b7867001fc919c8721fd7837705b9a4f8853ce0728e33096fee19f
diff --git a/dev-util/pycharm-community/pycharm-community-2021.3.1.ebuild b/dev-util/pycharm-community/pycharm-community-2021.3.1.ebuild
new file mode 100644
index 000000000000..219b26936799
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2021.3.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop readme.gentoo-r1 wrapper xdg-utils
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
+
+BDEPEND="dev-util/patchelf"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+	app-arch/brotli
+	app-arch/zstd
+	app-crypt/p11-kit
+	dev-libs/fribidi
+	dev-libs/glib
+	dev-libs/json-c
+	dev-libs/libbsd
+	dev-libs/libdbusmenu
+	dev-libs/nss
+	dev-python/pip
+	media-fonts/dejavu
+	media-gfx/graphite2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype:2=
+	media-libs/harfbuzz
+	media-libs/libglvnd
+	media-libs/libpng:0=
+	net-libs/gnutls
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/jpeg:0=
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+RESTRICT="mirror"
+
+QA_PREBUILT="opt/${P}/*"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -vf "${S}"/help/ReferenceCardForMac.pdf || die
+
+	rm -vf "${S}"/bin/phpstorm.vmoptions || die
+
+	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.so || die
+	rm -vf "${S}"/plugins/performanceTesting/bin/*.dll || die
+	rm -vf "${S}"/plugins/performanceTesting/bin/libyjpagent.dylib || die
+	rm -vrf "${S}"/lib/pty4j-native/linux/{aarch64,arm,mips64el,ppc64le,x86} || die
+	rm -vf "${S}"/plugins/python-ce/helpers/pydev/pydevd_attach_to_process/attach_linux_x86.so
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo" bin/idea.properties
+
+	for file in "jbr/lib/"/{libjcef.so,jcef_helper}
+	do
+		if [[ -f "${file}" ]]; then
+			patchelf --set-rpath '$ORIGIN' ${file} || die
+		fi
+	done
+}
+
+src_install() {
+	local DIR="/opt/${PN}"
+	local JRE_DIR="jbr"
+
+	insinto ${DIR}
+	doins -r *
+
+	if ! use bundled-jdk; then
+		rm -r "${JRE_DIR}" || die
+	fi
+
+	fperms 755 "${DIR}"/bin/{format.sh,fsnotifier,inspect.sh,ltedit.sh,pycharm.sh,printenv.py,restart.py}
+
+	fperms 755 "${DIR}"/"${JRE_DIR}"/bin/{jaotc,java,javac,jcmd,jdb,jfr,jhsdb,jjs,jmap,jps,jrunscript,jstack,jstat,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+	fperms 755 "${DIR}"/"${JRE_DIR}"/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+
+	make_wrapper "${PN}" "${DIR}/bin/pycharm.sh"
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	dodir /etc/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 0bd1fb888389..4c64e016a124 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,5 +1,5 @@
 DIST RBTools-2.0.1.tar.gz 229394 BLAKE2B a3864c5a39854ffd8744cc562fb888aded06b86945b7b08bab1b172e557b80c0183352068722e6d530a7b0c2fae85f24ae1bbef9116538c5c31735ae5c47f313 SHA512 41ef3f6ad030e3551b76cce5358806442ddc78ad14cb3f2f5978d25858b44647fc80a8a98c84edc112d3e121748fa49aeca0ae24287c392d2f8d1d3b72df12ff
 DIST RBTools-2.0.tar.gz 229078 BLAKE2B 23a0c9e9241a6d989044a4197ed5812d81d43b10195788c7754265969166f654af5fafc5ac027f1cf6e9d00bdd7938455beef6719380e09eacf219fa13bc74ab SHA512 aa773744365fcb5bd2ed5413684290c1d794c8bc76f9f9d0fb9400ab1e2baa1b647db85b8992dfea3e3bffe7ee87f2d735b1e6d5385d621d011be62a64d8890b
-EBUILD rbtools-2.0.1.ebuild 1252 BLAKE2B a63fd7c4eb3e0d532444f5a5afb31b85897c229128236e8c8a0e84df00fe185082386cf69155d71fad439cb93fb7b0d3589e92d891cb406e40fd1db34a648646 SHA512 79a501cb726f3a0b9995dfc8a06733f5e59e58cc5cb4989bb18d34ad6ff1f7ac08b2cec91bf75bd158b48728c8b8ac1731a715fea5854fdbb1b2db0990873f8d
+EBUILD rbtools-2.0.1.ebuild 1250 BLAKE2B 8c939c64d8bcb5ec0d15a27aecbba090f40a1b4d2dd35e2f38863b36b7f95db3ae558f7cff3cb0d74aa5d04eda9c7e93aa000994e4ca60c3d2eb355e1a0059f8 SHA512 447cb645f0715067e6e22817bcb2ffede46ed87f9ed10dca60c6b9375e1738ffcd26295aa404707ecde6eea99a326d2f8ff1379c0d087c06a8f893f19ee40521
 EBUILD rbtools-2.0.ebuild 738 BLAKE2B d88fb41903444f565e20c78ddf05b73a75526f6b87f113012b40469f4983d80bff471ddd265c716875246d895df19476bdae8236f1b95aeb6f74117bb9b65070 SHA512 be221d9bd604c9f3780352d51ecace526779277354a8209235520c775f56d0b06ef402b50d34c9f3a719ef722f1db9ee4543642c8c56fc8b4e7528ab3f55033f
 MISC metadata.xml 218 BLAKE2B e25e8013045a9887590c6b042f7b200cff82f721b120d495d01d69fa07fe49cbbbb996b77f4f6af08527d5f89194b3fa650c9ffc7c279328652b21709353bece SHA512 ac49327c1e8833a999126e219e7f7b0008fbaee02eabda53f36d0957a264619e5bd695edf6279a932cc49bd4aa48ca22373177afed7ab427cb454c9de53d01b1
diff --git a/dev-util/rbtools/rbtools-2.0.1.ebuild b/dev-util/rbtools/rbtools-2.0.1.ebuild
index 49b1123b1a0d..dce8b43ab697 100644
--- a/dev-util/rbtools/rbtools-2.0.1.ebuild
+++ b/dev-util/rbtools/rbtools-2.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.reviewboard.org/releases/${MY_PN}/$(ver_cut 1-2)/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/rebar-bin/Manifest b/dev-util/rebar-bin/Manifest
index 435d98af8805..41203ee53f8a 100644
--- a/dev-util/rebar-bin/Manifest
+++ b/dev-util/rebar-bin/Manifest
@@ -1,7 +1,5 @@
-DIST rebar-bin-3.16.1 942316 BLAKE2B c3296d54f85c146a58ff24a9b337f7d26e2beb3287257ecca6344c082b84295d9daf042b7bcb422df7c5dd29dd681f0c81064c1ef5b7b30ed8be8328ca694bc4 SHA512 be9e4ffdf654f8038ff14cd4b53328bdbc8b26e0f1306a16220f4d5d4b13bc36ac2f302d52a799424ffc3835e41ce326a4fd8e422ececf70ab8c0f951e3e4b24
 DIST rebar-bin-3.17.0 944741 BLAKE2B 2ae670b36019afcc6e595bcbb7d9db7286bd0ea44ad095e7bd0b45be579f6b45d0cc4bbb11478e13adbeb68231f3a888ff231ca4ee4881cb30a26dd68eb8b60e SHA512 908ed9018e456cb4a8f6c9b2737ead58f632bbcac4960834de841b814a97f8fac2181b8630e2ae9e8e9680c4965488b2a736c54baa561a089489987615f6405e
 DIST rebar-bin-3.18.0 952478 BLAKE2B 3719582dd2328bcc63b328bb177de14702d517049e0935fe25def30c1b290efa64b891711cb6616152904b48ad4dade9623fd50d81b7f850c118156991bacb43 SHA512 f52b79f3e1527687ddddc50062eb0a520e913f8a381b9eb836886988460f2e38f135d03e1ecf1022f332498116a498619b3d1f71663bb51d9af9cd7a5c4efc0a
-EBUILD rebar-bin-3.16.1.ebuild 610 BLAKE2B f8b801213ff3d41987f7b54747d200ccab01f11e21be2a8fc540a5a3b6da7976f5c767d5b1752ac0328834f34c187719e501e5ab9ad841fbc34147a834c2a2a5 SHA512 6d794157feffbc22160e67569a536073711412d81c34af0f429496940e0c9c55098c92742b65bb43bdee326fd2defa730073a359801885e67328f43a69bf4bdb
 EBUILD rebar-bin-3.17.0.ebuild 524 BLAKE2B ee1ed99e3544b940c774524b9a6a75913cb604799fa874fea5acca264f87b72e1ec195dbf6459cf271e0210bfd6ee99ab315f9a29234ae13eb186ca96119e7a5 SHA512 73445a2015b24ca8eb4b73ae4bd7790bfc92c7fe7859b33d78db541c9e436cb6eb6f20ee145b02ed3d40c4c939b560e3bab17ed889114fb5bbaa5a1f5c5bcf3b
 EBUILD rebar-bin-3.18.0.ebuild 525 BLAKE2B e1b30402f9ce8548da1983b7f27196df3181a8a2f475423bc78330eaf459a07c4ee39021e62bbeb898d92a55c32f1ada97807aa3a73f065e76fddebb6a25a7d3 SHA512 ea7192af8961345f944bce65449d6f826ee3c1df43c67be2e7b889c24f59d12094dd12757c36c0f3c77d00fc2d800089aed16d772628d9736c826039ccd3b98b
 MISC metadata.xml 1187 BLAKE2B eda5aa3b730fd7b60fb73d0e8aa3fff5e1d67996cb7abebfdd4de568eae0c02fa6a9a1980a1e1d85a6f0581f26d8f8d94b25b5a486489457e6b7319120dcd1ea SHA512 6f86d6ed8df338c5c2807c9ff4a8f2fbb2f68f4ef1f139a97e4712c5365cdbb686f117a18b3abc87f54273eace33a9863c34b7c3765597cb39da4e413d6264f1
diff --git a/dev-util/rebar-bin/rebar-bin-3.16.1.ebuild b/dev-util/rebar-bin/rebar-bin-3.16.1.ebuild
deleted file mode 100644
index 83bb5eb671c1..000000000000
--- a/dev-util/rebar-bin/rebar-bin-3.16.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${P#-bin}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://rebar3.org https://github.com/erlang/rebar3"
-
-SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3 -> ${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/erlang"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/bin/rebar3"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${P}" "${S}/rebar3" || die
-}
-
-src_install() {
-	dobin rebar3
-}
diff --git a/dev-util/rinstall/Manifest b/dev-util/rinstall/Manifest
index f146481227e8..c21fed5ba6ad 100644
--- a/dev-util/rinstall/Manifest
+++ b/dev-util/rinstall/Manifest
@@ -78,4 +78,4 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST xdg-2.4.0.crate 14035 BLAKE2B 9a2ce4737bbc4f36b007008fb6d66065bb2354c03df4feab127992d360f2e2d9a681c314f61b856b165b6515781917976bee415fba0b9e814695a046de467387 SHA512 d45b090c83bda578d89480f783e7238149203256d61aed46ae1657dc3de62551a618aa5a02e9d9867b39de82a8df527d37432b9b8c41afbbf0188f3644c4ad2d
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD rinstall-0.1.1.ebuild 1876 BLAKE2B a7bc920d550b994d2fffd9db28a2f4f1bc2fc7ea680023b544223cc68f122bf1d097541380cec472bf33e0b91441c2fbe0e4985b1940b92ff5c67aceec06c3d1 SHA512 f388c912cd732ed91e5574459f57b0d76c955867d6c79719224fe1306474e9ac57acd5b7f60e234fb77d3e785e067e0183d3331335bd9c4d0f3e60257d033f84
-MISC metadata.xml 843 BLAKE2B 555e959e22db4a20355ec71c3043955ba219de17190657d6f8bb1956928962e01ab0650ea2cbacfdf8afb5de110d65582cf1d038b65895ff3f1ae951bfe56254 SHA512 db6e83f6b2cc1cb25e75b32ad255b096b33efe739dd3a1624f5fd9c41d13708522b5c0683fe2f2e4ebc5056dd81112b11b91730cd1e69742edb6e97ce939db52
+MISC metadata.xml 844 BLAKE2B e2839b8fe70fbe3067f11da0bb7016fe5e2be2d94fc86529e1e029431abce6a4714d052bfa71cc9fd221464d7bacdad1462b3ca4c6d3c0c011142eee8989424c SHA512 069db1b272fc9481c5fc392a9451fe7a747db06977a92fcb5ee5461f06d74f54f6d16d18ce498c2919fa4935e3ea8b1620e1a0f7a3e662f8d0bd55ea1b64c615
diff --git a/dev-util/rinstall/metadata.xml b/dev-util/rinstall/metadata.xml
index 3c301aeaf416..471616872957 100644
--- a/dev-util/rinstall/metadata.xml
+++ b/dev-util/rinstall/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index fd26d9276c82..77cfa36f4d2d 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -2,5 +2,5 @@ AUX rizin-0.3.0-typedb-prefix.patch 5175 BLAKE2B 08fea1ba6297f17d42f518c1739875c
 AUX rizin-0.3.2-never-rebuild-parser.patch 1493 BLAKE2B fd5a4d306336ccba939e9d96e97d4b653b83407352f9babf9c39bbad28a18b4fc1a3e2f1eb57b25b7f8dad35b3400271cf6a6bf1cec55c74dc00f424da715c91 SHA512 7a105831cbdb99633c43411b7a407ff6970cb8e89cae561886ade96c75579c0484271641e957762189fc68762952a26ca0a2536bd1342802c408041066852b16
 DIST rizin-src-v0.3.4.tar.xz 10411432 BLAKE2B 99745f069e6bd72aec6a6f335f3aa0ccc46ebf186b1dc0aaf32b4f95d2be4bb49e8d3d976a72978c22fce82d896e70bf8403568e100b73898731045ef06a2ad5 SHA512 cda35afe8c031f3207c055ed31d7f76a46b7addd04cead0f5aadf0733b66f4dd953ca16f054b47da7921d4726d6ea1250436012954a9755c1cd524a8fd0d670c
 DIST rizin-testbins-aa6a88dcdfaad54335e3935c16ce21a124ff861d.tar.gz 127254454 BLAKE2B e7a4536be7169abd197c2128e103b8d669fbb7532ce265b27da3ce347b1aa58c8a96c95d85cf7700f66a44c041a0575175de3a0e176a0d31c490f7ccfb2f6d6b SHA512 20cf299e5324793f07f8a2fdcfa3d66c3a418f09bfc6a272e35ab31d4a64408bf91532ae431098dede1a2d0ad0b1c02433304c514816d98dc068f6c0528a4099
-EBUILD rizin-0.3.4.ebuild 2945 BLAKE2B 0a2591f74cb16d23957114fadff4ec2279c3b7f21423d65ea6674f486f9f5ad55dfd347464d1f0af93edda904fc8f71be5bdf21b34f54f3186980670f7d40312 SHA512 af755c1a1a23ced8d2e67f2b7178303c8e1875a5a1cd26898fbe473a97c05b157fbc1674d1e567d95be72895eeed24a5961ae36d72a4365174c2756c4aa96d97
+EBUILD rizin-0.3.4.ebuild 2946 BLAKE2B 85143f41416e9bc566732da7b0ce0934cbe2f8d9d49c1924e824877ced1e6f80ded2b4e7ef8be14bc7270c50296038b462093d8ddc837e4f673c662de6b0b22d SHA512 608ee39d62d881c59a723bba80afa5ac8ff60022aed1c70ae4172b264abedea6da668f4dfdd6b48c07ef707df95e1225223e6a93d9922f3d11afb01b13f6950e
 MISC metadata.xml 348 BLAKE2B eea14d9f2e713f2f272a46bd754e500b28ec3958f0f4295e6fe6e73c9dcfa1e180fa62901bdb591fdb43ec8ead23a63f20416e52605e6ae186532e651e0eb1a3 SHA512 db41ccd0ce1493387c47eb707dd303c556ad784ffab2ffe03509a4ff7b0c1b650b0f0999edb5e4e040f95f1f550e9a11ead273ec74ebedb97e645e40c6ad37d5
diff --git a/dev-util/rizin/rizin-0.3.4.ebuild b/dev-util/rizin/rizin-0.3.4.ebuild
index b4bfee6c1042..4c4e3500887e 100644
--- a/dev-util/rizin/rizin-0.3.4.ebuild
+++ b/dev-util/rizin/rizin-0.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=(python3_{8,9,10})
+PYTHON_COMPAT=( python3_{8..10} )
 
 # This is the commit that the CI for the release commit used
 BINS_COMMIT="aa6a88dcdfaad54335e3935c16ce21a124ff861d"
diff --git a/dev-util/rocm-clang-ocl/Manifest b/dev-util/rocm-clang-ocl/Manifest
index f70f011ca7ff..e0d17ebfa5f0 100644
--- a/dev-util/rocm-clang-ocl/Manifest
+++ b/dev-util/rocm-clang-ocl/Manifest
@@ -1,3 +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
+MISC metadata.xml 453 BLAKE2B 4c1e76cbc277e93a92a95cda405973cc72863882ab9a6729a07976e7815119e985688387c14fc5017fd6e85aaa64eaa72b900375c7f7428eb6bbb2569c5ecaa6 SHA512 0e42066a5ac8720d1b561bcf23269013d9cceff52a9ddd6a6e0af58c7d2628c335bb290e0dc6c262a0542e286f54fd07cb487dd908343fac5cfca07410df6e56
diff --git a/dev-util/rocm-clang-ocl/metadata.xml b/dev-util/rocm-clang-ocl/metadata.xml
index da47ad0ef39f..e74d41fd607c 100644
--- a/dev-util/rocm-clang-ocl/metadata.xml
+++ b/dev-util/rocm-clang-ocl/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
diff --git a/dev-util/roctracer/Manifest b/dev-util/roctracer/Manifest
index 523b1c0119e5..aa1e8d5139e9 100644
--- a/dev-util/roctracer/Manifest
+++ b/dev-util/roctracer/Manifest
@@ -7,5 +7,5 @@ DIST rocprofiler-4.2.0.tar.gz 1408433 BLAKE2B b35a7710d680167bad78ff74be153ea994
 DIST rocprofiler-4.3.0.tar.gz 1402250 BLAKE2B 3826c3b26b0d5838ab3475614c2ecd2265e177fe40b8a90abb491746513bd50841e5ceb34d1fcb4bcb2fbe8a6854b9715d0670d38f08775e5e14cd855f15629b SHA512 e327146604459f2f827ab943a21d0eaa0ee41cf6770ab94dd019d461cf6438e70a48139ce67ec1553d0f450fa5bb233a7ed39438e8bf39b33218d53e2c270d3b
 EBUILD roctracer-4.0.0-r1.ebuild 1572 BLAKE2B dbdbf598991d569c3bc4788d5be653678431df80f8dd5229f5be5a0dda05146ca9417d738ecae08eb6eb10f9056e09403b5289a25badddf5b24d1a863ea778fc SHA512 b4dc5f0f4b189139df9ffcc854daedb0a59547ad99156814ae50b95c888a209d2b4b4771e39599cc3bc5afb5fa44a4010d0fc77b8e80299ecd7a275b7bbf4647
 EBUILD roctracer-4.2.0.ebuild 1794 BLAKE2B 068823ead6d587839af1abf89aa76362dbd7512ca30f0b3c42b4c924d7cd911bae6629cdd779ff9ab1fd7ae50ae0224e9ba94e3f013880859ec0f2073cb862b9 SHA512 52a962894901a1ef2bc8cdc93de1dacbeaadfc7f84ecebf365c4fdcacdca4a2e91badb8bebae6a183613c61979eaf4c785a07aed410b52bbcde691fc57d57369
-EBUILD roctracer-4.3.0.ebuild 2110 BLAKE2B f4853acadb2b3176bd56462bf1b2489f1e01f96dbcf9c853d5ff2373578da457e29ed719c773900021568b1b9203f89bc9eda1f0bb363cdf5704be8df3e0ca31 SHA512 ec1fb68ffc55cfb8b3ecd8b6d28367803207f5e71de938f30b66e504d74b055c4bd9bb93efe07419a6464f1cf4be8f19551b6271bd4867b813e804e147e0ebae
+EBUILD roctracer-4.3.0-r1.ebuild 2114 BLAKE2B 4261ddd8b20cb8a9ec6b650953055183d5c352e798230259c6a0f07df3ef054821cf29ca299774f4fc652f7cc048a2b88c85c3aac0385bbb33f6da05224ead76 SHA512 fe8e5a9963cb69936da43561778d0757e9f57172244af685a3bceeafcb434fd2a987e0361e51918b1b1fc7dd5a5a4527a0c26418ec61ea755d6b34a58f3ef40d
 MISC metadata.xml 603 BLAKE2B b81a956c8e1b3d4bb6363919f82389ec7030baf7cd949e2ee8704543c515335acc8e497743dffeca426cefc5a89210e75b85c90f5dbc482f54f257e52f5fc77d SHA512 dcad8256b50fbed9b24458d845330756081aaef4c864ca753c074c6299a9dc0234e9dbe421e12e28548887d5ce8a07c06fc54d6942e4902d63964fb229cc734b
diff --git a/dev-util/roctracer/roctracer-4.3.0.ebuild b/dev-util/roctracer/roctracer-4.3.0-r1.ebuild
index 35092c81a554..5b0d3c3f5b5d 100644
--- a/dev-util/roctracer/roctracer-4.3.0.ebuild
+++ b/dev-util/roctracer/roctracer-4.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,7 +47,7 @@ src_prepare() {
 	sed -e "/LIBRARY DESTINATION/s,lib,$(get_libdir)," \
 		-e "/add_subdirectory ( \${TEST_DIR} \${PROJECT_BINARY_DIR}/d" \
 		-e "/DESTINATION/s,\${DEST_NAME}/include,include/roctracer," \
-		-e "/install ( FILES \${PROJECT_BINARY_DIR}/d" \
+		-e "/install ( FILES \${PROJECT_BINARY_DIR}\/so/d" \
 		-e "/DESTINATION/s,\${DEST_NAME}/lib64,$(get_libdir)/roctracer,g" \
 		-i CMakeLists.txt || die
 
diff --git a/dev-util/ropper/Manifest b/dev-util/ropper/Manifest
new file mode 100644
index 000000000000..038309e185ba
--- /dev/null
+++ b/dev-util/ropper/Manifest
@@ -0,0 +1,4 @@
+DIST ropper-1.13.6.tar.gz 1491005 BLAKE2B aa82c9791eec2362c79f3cd96995cb505b73c8131b0b6fe6a7d0932e3551dd15ea401383e12ab79901ea05e749cb2ca8244fa3c909e0e8955910d321c8436ea9 SHA512 c3e20bc7182a94984f50c42334a7af1e64bd564615a3aaaa08f432b0641a9557d27fd19bdb6c33a276d66c4b512534c625751e20531c324bde96a58d9c89b6d4
+EBUILD ropper-1.13.6.ebuild 1102 BLAKE2B e52ef8a6bc3a1aa70d72d0b5d1b172312cc943ac029ab53281afe52d72bc2c9666fccdaf06a4475b5811e2114cde8b8d8c800168e137e7757240c26b891f3132 SHA512 e8302bfe62bb3c97bc1260537b4c2561d2d18e21832e81cab4693a1870e614cb74a4bc9a81e3af2eb6010ddfd66690c95a9fd052b278e47c4825cbbb8a8daf04
+EBUILD ropper-9999.ebuild 1102 BLAKE2B e52ef8a6bc3a1aa70d72d0b5d1b172312cc943ac029ab53281afe52d72bc2c9666fccdaf06a4475b5811e2114cde8b8d8c800168e137e7757240c26b891f3132 SHA512 e8302bfe62bb3c97bc1260537b4c2561d2d18e21832e81cab4693a1870e614cb74a4bc9a81e3af2eb6010ddfd66690c95a9fd052b278e47c4825cbbb8a8daf04
+MISC metadata.xml 742 BLAKE2B b5f76f0022f4e73f749cc26c4302d940b598d96352a9bd5ff783d5c7bbbe937f13c16d5d0fbbd794e63d19b7299cefd7321dc13277b5ee615666f4d074ae28bc SHA512 ddb1ea4d6594260ddc0b8865b3d667f1a484c8014c98b13b89c47609e141ca327c8bf2679c95dc6c5634a3e7dbe65a0260b4efb7ea32950d3bef2cbbdd6b4de9
diff --git a/dev-util/ropper/metadata.xml b/dev-util/ropper/metadata.xml
new file mode 100644
index 000000000000..a1652b1a8756
--- /dev/null
+++ b/dev-util/ropper/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>mario.haustein@hrz.tu-chemnitz.de</email>
+		<name>Mario Haustein</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<longdescription>
+		You can use ropper to display information about binary files in
+		different file formats and you can search for gadgets to build rop
+		chains for different architectures.
+	</longdescription>
+	<use>
+		<flag name="z3">Enable Z3 contraint solver support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">sashs/Ropper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/ropper/ropper-1.13.6.ebuild b/dev-util/ropper/ropper-1.13.6.ebuild
new file mode 100644
index 000000000000..6bd50c5a169b
--- /dev/null
+++ b/dev-util/ropper/ropper-1.13.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Use to display information about binary files in different file formats"
+HOMEPAGE="https://scoding.de/ropper https://github.com/sashs/Ropper"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sashs/Ropper"
+else
+	SRC_URI="https://github.com/sashs/Ropper/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/Ropper-${PV}
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="z3"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-libs/capstone[python,${PYTHON_USEDEP}]
+		dev-libs/keystone[python,${PYTHON_USEDEP}]
+		dev-python/filebytes[${PYTHON_USEDEP}]
+	')
+	z3? ( sci-mathematics/z3[python,${PYTHON_SINGLE_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Remove test which dies on trying to import itself (stub loader, not a real test)
+	rm test.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/ropper/ropper-9999.ebuild b/dev-util/ropper/ropper-9999.ebuild
new file mode 100644
index 000000000000..6bd50c5a169b
--- /dev/null
+++ b/dev-util/ropper/ropper-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Use to display information about binary files in different file formats"
+HOMEPAGE="https://scoding.de/ropper https://github.com/sashs/Ropper"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/sashs/Ropper"
+else
+	SRC_URI="https://github.com/sashs/Ropper/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/Ropper-${PV}
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="z3"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-libs/capstone[python,${PYTHON_USEDEP}]
+		dev-libs/keystone[python,${PYTHON_USEDEP}]
+		dev-python/filebytes[${PYTHON_USEDEP}]
+	')
+	z3? ( sci-mathematics/z3[python,${PYTHON_SINGLE_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# Remove test which dies on trying to import itself (stub loader, not a real test)
+	rm test.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/rosinstall/Manifest b/dev-util/rosinstall/Manifest
index 71fb16ea5d2a..1a3b74cb280a 100644
--- a/dev-util/rosinstall/Manifest
+++ b/dev-util/rosinstall/Manifest
@@ -1,4 +1,4 @@
 DIST rosinstall-0.7.8.tar.gz 26430 BLAKE2B fae82276f5376a94914272e60b2e3b0f81cb37bd7b41e0a4df73c8b58d19a73505a0c5e193495fd59c931c04265cbb372abfad19fd4043fc77e5224127bd97f5 SHA512 a53ae8fb96f9dda4671b22dfd9dbadc18d1e4adbf34a50b6706baf971c1c7ee418e14641d334346b02638f06c10d1bc984b4759c92a39510dd0044fbc346be67
-EBUILD rosinstall-0.7.8.ebuild 1545 BLAKE2B a3c73b17a9516ef032ebe314c957f47741bfde4628c708d25571ee20e5ca5514ea46f02f2f27dbf3daa889f640dc66f73e8dc4e2c70fdac8ad1316b12f76ce84 SHA512 371e493fc470411d558260373cb8a19c85d7065d4f5ae7d511179b58d9abe0821ad9ae407896811e11aef1f40270325ee67ad91aae9b66cf6a38e54b01f8a6c8
-EBUILD rosinstall-9999.ebuild 1545 BLAKE2B a3c73b17a9516ef032ebe314c957f47741bfde4628c708d25571ee20e5ca5514ea46f02f2f27dbf3daa889f640dc66f73e8dc4e2c70fdac8ad1316b12f76ce84 SHA512 371e493fc470411d558260373cb8a19c85d7065d4f5ae7d511179b58d9abe0821ad9ae407896811e11aef1f40270325ee67ad91aae9b66cf6a38e54b01f8a6c8
+EBUILD rosinstall-0.7.8.ebuild 1490 BLAKE2B add7a7f86eeb05a45e14613d5e895de63449104390721f52bf4d67bb4d3f594fe0dac735d5ec59409b8dbcbf8f13962d31578a6a0affd8e88991fc8df7c03ef2 SHA512 6b4195663f55d7daa95e17ca833abc0a2f9d4037e782aeceb0b0492f1ef0f52d1abbd81c37275c932c97124d3715989f2256351ee71c10e34ac24fb2e01f2af5
+EBUILD rosinstall-9999.ebuild 1490 BLAKE2B add7a7f86eeb05a45e14613d5e895de63449104390721f52bf4d67bb4d3f594fe0dac735d5ec59409b8dbcbf8f13962d31578a6a0affd8e88991fc8df7c03ef2 SHA512 6b4195663f55d7daa95e17ca833abc0a2f9d4037e782aeceb0b0492f1ef0f52d1abbd81c37275c932c97124d3715989f2256351ee71c10e34ac24fb2e01f2af5
 MISC metadata.xml 334 BLAKE2B 122018b9b2cb34c070abad5e4f6ba6400f240279013fd76f711d5aad1a7cc29e7d811ddf667046ebf46d997d2786deb2fead1f5249a81ea14191e26a9e420a54 SHA512 3bdac7021be057bbf3491275f84095cc315353ca802befc35440971834346d7f3f7957ba143493b04ca5571e7bb6fe65c79644bb0ace6937cc40fa6f00a6ae26
diff --git a/dev-util/rosinstall/rosinstall-0.7.8.ebuild b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
index e77de122d88a..9ad54ef86e60 100644
--- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild
+++ b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/rosinstall"
-fi
-
-inherit ${SCM} distutils-r1
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD="yes"
+inherit distutils-r1
 
 DESCRIPTION="Command-line tools for maintaining a workspace of projects for ROS"
 HOMEPAGE="https://wiki.ros.org/rosinstall https://wiki.ros.org/roslocate"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vcstools/rosinstall"
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/vcstools/rosinstall/archive/${PV}.tar.gz -> ${P}.tar.gz
@@ -25,8 +22,6 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
@@ -34,9 +29,8 @@ RDEPEND="
 	dev-python/rosdistro[${PYTHON_USEDEP}]
 	>=dev-util/wstool-0.1.12[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-vcs/git
 		dev-vcs/bzr
 		dev-vcs/mercurial
@@ -44,17 +38,20 @@ DEPEND="${RDEPEND}
 	)
 "
 
-python_test() {
+distutils_enable_tests nose
+
+src_test() {
 	# From travis.yml
 	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
+	git config --global user.email "foo@example.com" || die
+	git config --global user.name "Foo Bar" || die
 	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc || die
 	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
+	bzr whoami "Your Name <name@example.com>" || die
 	# command to run tests
 	# Local tests work even if ros.org is down
-	export ROSINSTALL_SKIP_PYTHON3=1
-	nosetests test || die
+	local -x ROSINSTALL_SKIP_PYTHON3=1
+
+	distutils-r1_src_test
 }
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
index e77de122d88a..9ad54ef86e60 100644
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ b/dev-util/rosinstall/rosinstall-9999.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/rosinstall"
-fi
-
-inherit ${SCM} distutils-r1
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD="yes"
+inherit distutils-r1
 
 DESCRIPTION="Command-line tools for maintaining a workspace of projects for ROS"
 HOMEPAGE="https://wiki.ros.org/rosinstall https://wiki.ros.org/roslocate"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vcstools/rosinstall"
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/vcstools/rosinstall/archive/${PV}.tar.gz -> ${P}.tar.gz
@@ -25,8 +22,6 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
@@ -34,9 +29,8 @@ RDEPEND="
 	dev-python/rosdistro[${PYTHON_USEDEP}]
 	>=dev-util/wstool-0.1.12[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-vcs/git
 		dev-vcs/bzr
 		dev-vcs/mercurial
@@ -44,17 +38,20 @@ DEPEND="${RDEPEND}
 	)
 "
 
-python_test() {
+distutils_enable_tests nose
+
+src_test() {
 	# From travis.yml
 	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
+	git config --global user.email "foo@example.com" || die
+	git config --global user.name "Foo Bar" || die
 	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc || die
 	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
+	bzr whoami "Your Name <name@example.com>" || die
 	# command to run tests
 	# Local tests work even if ros.org is down
-	export ROSINSTALL_SKIP_PYTHON3=1
-	nosetests test || die
+	local -x ROSINSTALL_SKIP_PYTHON3=1
+
+	distutils-r1_src_test
 }
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index f3a943948d32..e058f484b50c 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-tools-1.2.198.tar.gz 2888894 BLAKE2B 036f2457863c1bff47939d6238d6f270baee67253edeb5dc4cb1270eb32b9fdb6427c959bde4c5496056784c0334922276b9a4e0ac5530a4c662abdf0190f119 SHA512 90a53d0c7c6dfeb5ef2ee3e8b92c00cd39211f18f57aaeae079ac95b94ec4c839443017eb39fbee0f737d0c070ed64e2369609e81dba149f08676724b254f714
-EBUILD spirv-tools-1.2.198.ebuild 1210 BLAKE2B a3e96c23a4d3eb8423e44b2ac239966def305c7daec3505564deac06273c9717b41ff6aa12e9e44d657f76bcd8bed6f368181b720b254899be2cd3b9096677ab SHA512 2264f3d602fc78cd3276c9824302a7d879da2d2e484896c1451a687d764768ee2f2626bc8702b624e602911f736b379530242a54abe3e56cf550cfc445e75924
-EBUILD spirv-tools-99999999.ebuild 1236 BLAKE2B 101d3118290f2679161fbdf1507c95507c7192149445cfa3b613e010b29ddf4dc9556c8712b3883c19fbab50d9c039d0d0765bdd015f513aa64dbeaa3671d2b4 SHA512 dd412cdbef05706242e6a7d45c230791f48dc086c940171c190fdd1c2f51f29f7bb8f206bc2a242ed28df4704e8179e2466c7d3d47ae7df72e461f9ecf5b5944
+EBUILD spirv-tools-1.2.198.ebuild 1234 BLAKE2B c24dd15b41ef53e246aac254d77a8861e9a528965c83004e5dd8400295de9c154744ee64719a577f292e43633ae0a01f5df2872b53b844fcf8a231c720a61e8b SHA512 033f36f7da530fe39aaa86e6a84e0cf6cc2408243f765bce1dfdfb5e6fdc16627aec8419859142be8b05ef3374daf376a1a8bd0e1423558492e15db2a1655680
+EBUILD spirv-tools-99999999.ebuild 1242 BLAKE2B d243ffb7a2b93b2e3b9b08d7759749d21d644b91c7db6ad2495aebdecad71e0b32df36807f3429510bb6ae516f8176369506241fd031ea2bdf42b3f859f2483b SHA512 f4f086ed7f6ffc472420708e3f94e325e0fc202421bf14e5475ce6370d13e4ea23e516f082a6fad8dfd8cc156094b3b8ac9b486352123b5a6d4b2a450f5ea706
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
index 2cbe8404537c..ec2ad8d84ae9 100644
--- a/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,6 +6,7 @@ EAPI=7
 MY_PN=SPIRV-Tools
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
diff --git a/dev-util/spirv-tools/spirv-tools-99999999.ebuild b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
index 96183daa2dbb..0f6f4bed3c27 100644
--- a/dev-util/spirv-tools/spirv-tools-99999999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,13 +6,14 @@ EAPI=7
 MY_PN=SPIRV-Tools
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="1b35745ad1c9a988bc427b976a9a2fe7afd4dada"
+	EGIT_COMMIT="sdk-${PV}.0"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
@@ -34,7 +35,7 @@ BDEPEND="${PYTHON_DEPS}
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
 		"-DSPIRV_WERROR=OFF"
 		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
 		"-DBUILD_SHARED_LIBS=ON"
diff --git a/dev-util/splint/Manifest b/dev-util/splint/Manifest
index b858d8b64831..88f64cd0af9b 100644
--- a/dev-util/splint/Manifest
+++ b/dev-util/splint/Manifest
@@ -1,4 +1,4 @@
 AUX splint-3.1.2-musl.patch 232 BLAKE2B 1d802cba805a993ccec83b2beeefba3f7971fe31d4c20f03082538aa47ff3614fa8c270a6011c21745c85ad9325884d7447446dcc415995909bcedf1fcf10f9d SHA512 4e74cd5181848c3babf3a6d6687eb6d274be1549f26b7817b2c3fa4c0cee048c841d71a28931ae4db21c0c67154cff536218e7ace6d6e5ba4c7eccb7a800790f
 DIST splint-3.1.2.src.tgz 2284033 BLAKE2B b071092ddb82be76734e00cdc8f96b697c20d0beaeba921b74464ac0b1f727c396f8f15845cf8c6c20011186e4da00199411545e0e167fcb9ce4ef2b27efa975 SHA512 9bbf3f6575763c022940efde947f845f52095a1bcf645f7f4a98feb335b62d2bd50d78420e7fe95f81eb139b110d8fe48112b025deace45f7994360b20d47e0b
-EBUILD splint-3.1.2-r2.ebuild 1093 BLAKE2B 0141c0b33181e364b21f169ba53912f2ef5a9795d0a49a0c970433c4199cef3e83cfae61dd3428f8ae5e21be72d6bbac74d266104f8092c44973d3a2eb401cdc SHA512 75d74e6966cfdddc2b3b0b707d8e2cb8cffc4d57314f1eeb7ce35fa5a9dd8b6c5c38fc4bfbf007a34d510635563572ea49708442ae50d28192f36566613e274f
+EBUILD splint-3.1.2-r2.ebuild 1092 BLAKE2B 98e6d61e3e4129de211ca66d9f89d440bea99094c837c6281cf3d233b9abe5d0b2db080e5880e1714848783699de1f5602e1645e98f64c7602d155498265913e SHA512 e99c59a8bd6bbd328874b3ee77967e66f885c56e747ea903070cc937882de7950383847cc7424c1739071f93b15f7b10d25d852d665ba00849b25a765434892d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-util/splint/splint-3.1.2-r2.ebuild b/dev-util/splint/splint-3.1.2-r2.ebuild
index 1975543f7f9d..173c468b8cb3 100644
--- a/dev-util/splint/splint-3.1.2-r2.ebuild
+++ b/dev-util/splint/splint-3.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
 
 DEPEND="sys-devel/flex"
 
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 1c4cb550f809..8571976ad951 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,3 +1,5 @@
 DIST stripe-mock-0.116.0.tar.gz 631741 BLAKE2B 8b8d3e0db1b0cb9e6f54773ac0a2f340c7a609e147c398b55b3616638163a88e8924d3739150b040eb4068aed142bad7f3de3db3679a8bd111b028286ae0ac68 SHA512 bf6dd3abf0fdf4472047060ed28d6709b9215a7c708e40ee573a7ada4be7af1d68d26000c7f1517b15d04923479f5e5113cc952457e810ca29220284b76dd783
+DIST stripe-mock-0.117.0.tar.gz 649146 BLAKE2B c7e51c932f43b012df28cd83a4232e0cf5a4892e60bdf6d6fc5a8e34d1ba480a69b7f86a7bb61eff0509bd22b1ac67e9292daea874aa1a291cac78d1c9b86001 SHA512 2a3b7979180be47bd0ade3f920fc17b5a341e38999cf6492e36a572be4308bc10225b0ba9de0f61d5826b2ae189a2c98f99f89e51235faccadaa00db80dd8d91
 EBUILD stripe-mock-0.116.0.ebuild 582 BLAKE2B 3e5f302fe8efdfa19c81b51aa1f733c8695650a2ab7982ac737f67bf0005c4d94ecbe47c59c41ee81377d9e02671119e19e084ff37be10a555ea031d1951f6f8 SHA512 25771845d4987ba1fd2e4f49ec69825c59a36d0ad967ef258b149de7f53edc7ef7cd3198095b2684e7364e0f46d8a62beb653e6b088f14184ee5a6efed72d53c
+EBUILD stripe-mock-0.117.0.ebuild 584 BLAKE2B 486108c7f444df5c7ea00a24a18853340fb6c68b58182f7ac1a4015c6e0ec93af8724caee49cc0f6b78a50660a34eac81243e3b086393b1b2b5a715ea16c0fec SHA512 ea77133eb4c99e7715be358986cab5be65904d32e1ee9695d5602f4aed952f6652141e15c14b9007dd4a9554aecbe442c7629f90ed0e4da49d8d53866987a0da
 MISC metadata.xml 643 BLAKE2B 6a45b4c6f7e3372850e8947db71b028a32f6fc63d202b912a0fed600dd7f426984828af2f80dbfbdafb69a15a3b58b82c2b738b424727b28704aefb43f43e361 SHA512 3a1d0724f14ca0885c6dde06b9c0fed1dcf7a9dcbfb32de75682cee9ad2b29fc94f9544319a2fe5d5fe3c25afb01e0f6492616e13e3d01640af7defd0ba9c098
diff --git a/dev-util/stripe-mock/stripe-mock-0.117.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.117.0.ebuild
new file mode 100644
index 000000000000..0f98e7040d17
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.117.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 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/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index 460e87249166..381c27199456 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1,9 +1,7 @@
 DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
-DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
 DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
 DIST sysprof-3.42.1.tar.xz 484096 BLAKE2B bc1124651f6323d6757050ef3225df222039ac7a5c6a6e2a0e170354a0e89705ea03173302ac7fa2bc172b27485d4e4cdee0f7504a548d51e88b88a19cc8cc9d SHA512 15bf7efadfc88c1342200009e4b74ecd23a320ca272b4ca3736dd41baf9cb4e0a1fd75e0aa20ee784b98c6fee7f86a2b52e63bc4769b6ca9759f58b64cba0dcd
 EBUILD sysprof-capture-3.36.0-r1.ebuild 754 BLAKE2B bab0ff01030d72f2ab0df460e5972b32cfc72a16f5e924a85575e060ff1f796ddf3fdb4f67670204988088dfe838c561888d47486cfe93aaffa2c128501857d4 SHA512 9d7cf4c5d7e569d751a097d1d71e6451b7bff42993bc88c5d0e136d3422b6e30780bfd93fdaaa5477a17df3a5da6503c162f16e6adfc0e775d8c22041125ed40
-EBUILD sysprof-capture-3.38.1-r1.ebuild 800 BLAKE2B 41dfaec309c88fcb5a57ccdccea37654cdc2eab647468c63dc1538e5cf63337d62001e576e35ffc5fdc7c6b049af1d6a66830f04ddfd6ff8e66b120896d4eb1f SHA512 cd4f32df882d07dc5d68619028f7e3e1be635e3b952408bac904b45ead90efa0cca5322f0f4179ea873c37e1df8a8a5f0f98393005999c460ca997ea9df635cf
 EBUILD sysprof-capture-3.40.1.ebuild 807 BLAKE2B 09e39959667a1a05f9828732fc9b8c7012f2c4dee0cb354f3133f954cb73dbecc33893d76d478b5a7ce32cc99651fc538553c1f8b48251dc401dfd1eb2c56ef0 SHA512 1574481b6dea0337d8464a3d1bacde8e829299472f5bfe36dff5b773af40963ff248a287b0364c532042d0fc5854df7219e182a636c3d0dc612cb1b74c8a3af7
 EBUILD sysprof-capture-3.42.1.ebuild 809 BLAKE2B a735cf69e2bafbacffb4f4fdccb9120a90aefe2f6ada5cf7a12958e99d2927edd3cebda0916e4f196cc801d0f9ef9132d9255520283258d43012cc713079d533 SHA512 6be3a666630b985e6d5329ac42fa4238551b6f662a180c56ad862a05ff859eda1b2b5c61b45e787650528f4c209d87904813994626eaf9773bb1c0d95599bdc2
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
deleted file mode 100644
index 0c08f4b82662..000000000000
--- a/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="sysprof"
-
-inherit gnome.org meson-multilib systemd
-
-DESCRIPTION="Static library for sysprof capture data generation"
-HOMEPAGE="http://sysprof.com/"
-
-LICENSE="GPL-3+ GPL-2+"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="!=dev-util/sysprof-3.34.1-r0"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-kernel/linux-headers-2.6.32
-	virtual/pkgconfig
-"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Denable_gtk=false
-		-Dlibsysprof=false
-		-Dwith_sysprofd=none
-		-Dsystemdunitdir=$(systemd_get_systemunitdir)
-		# -Ddebugdir
-		-Dhelp=false
-		-Dlibunwind=false
-		-Denable_tools=false
-		-Denable_tests=false
-		-Denable_examples=false
-	)
-	meson_src_configure
-}
diff --git a/dev-util/uglifyjs/Manifest b/dev-util/uglifyjs/Manifest
index 6bbdfa3ffa1d..a4da8c8a51d3 100644
--- a/dev-util/uglifyjs/Manifest
+++ b/dev-util/uglifyjs/Manifest
@@ -1,3 +1,3 @@
-DIST uglifyjs-3.14.5.tar.gz 492153 BLAKE2B 2bf02bde9421c57f9cc5db474342c8e05edeeca340ba92a4b8b0e11fe45c4749273fb97315833db8fe87af9ab64d4e741ba9d7468f0932622d929f2ef4033943 SHA512 7b09c1c40d402f225fad78fa283ca8055c5e48bce11d6639f70b60574c9ce936e715c0c94725fa87400d80954aa7455ffd5c5997e7a501e1851dd1f3b0c9e78a
-EBUILD uglifyjs-3.14.5.ebuild 776 BLAKE2B d1ab3cca46fcd56f33af01636cb74dfc6d08323982a1a1443a7e3af6692d70a5ad9be4cb1506c935da5d250431707ee6ebeec6b3bea9820811cdf9abba3b312e SHA512 9e16abbd07e58895790de78149b18675e79bbd04d3ab6ad295f7e41a08336d5c396739ff7d9318f8fb58804267814c0aead92694f667ff0210339bd5f13a6f4a
+DIST uglifyjs-3.15.0.tar.gz 506210 BLAKE2B 3c08c0030b1e42b47236c66ac9d655fb79f3740b8bcaeb23e7b6fed0f913def3052b5b375f86e9cf035638a023dfb5d8a3063640f0986e5c7caff1c0aa135903 SHA512 d001c7943b2d0818000571d503e1c7e73b56087c0bd8d8ad29a8e4ff490a130c06735bc881df369cb99fcc164fc4e24df04c86678801d9e86f6059a79f88f5b3
+EBUILD uglifyjs-3.15.0.ebuild 776 BLAKE2B 02765a0ccff1ed52a7242f972f701066f2c397d7aaebfb18edf8c86511549d2cfc3b9c2e1aef19734a27491231760db7cae2c788a3220177a8dccb670fd018c6 SHA512 f54336748ca69b332555aa90283c8bf5105d70536e31bfb7e513f277198e7b3093c65e4bf231f07805a98f9387e358e9142dee62d3b1e6c3f1c8e66fc4ed29f5
 MISC metadata.xml 328 BLAKE2B 74d4d808f158dcb49e996da74b67d65fe12956d7486b91941b03f3bb237d7d13387ac629b9689ebce8bd0580b0ce24d359a788911134fef6f006546c5365f2d8 SHA512 3db3efc0f0f5f0f3c7d453d4edae27d0ddfc62aa7cb778684d58460cfd55187fdd90c06bfb2629fb0d84874ff378dbccbc7ef182a10e35fd4b85991c5777a213
diff --git a/dev-util/uglifyjs/uglifyjs-3.14.5.ebuild b/dev-util/uglifyjs/uglifyjs-3.15.0.ebuild
index 66d57eae5391..1a44c1a32320 100644
--- a/dev-util/uglifyjs/uglifyjs-3.14.5.ebuild
+++ b/dev-util/uglifyjs/uglifyjs-3.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 93c4143a5029..f4ceac425a8e 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,12 +1,6 @@
 AUX umockdev-0.16.1-Werror.patch 596 BLAKE2B 029f0db068fa900a1b0acff33e38634194b70447c0d853f9a869fb629eb5c1f555e796700fab29bca3e9a684a85194ff34416889e898ff6038b2f5c45fd00ee5 SHA512 0c500019d66e6a1f8658a97b2ff022d87cf32e424c3d1e7e8ad66ebbb197e3ba931c03a05fc69daee899fd66ef77f7b86fa0ae085fa6751dd36ebeb7b56ee897
-DIST umockdev-0.16.1.tar.xz 478308 BLAKE2B 3d49ca1d9c9b7573ac63f5f7ecd81071041597732b507619c333379095434ac55eb26f16bdf5897b94bbeb5c307a34b703accd220cd6202482e172dd3a6d1983 SHA512 baeaf05cc6b8d8e2a5cae16b808db759a18a969cea0f2ceed5f6c2521edc0c4c07dc16265a4821051de51f4314fd39d63ebf2da124fcd3e103ec743dadfedaa8
 DIST umockdev-0.16.2.tar.xz 478388 BLAKE2B 8fb2116ec7d48b238898052d959c596f4f91a65cf7b8292de8b8731e6fe50600282cb56093b8d6ca1afdc082a12c9af3c4a4f443283538ffb2aeae4c2b775596 SHA512 82020c068d5a158a762f865f4b25d1ee8596785a5b379c316c652004e1b1b9c533d4dad87818a490f89983a4c065f34e4ff5ca91360bac6d79b141dfa2139eea
-DIST umockdev-0.17.1.tar.xz 485480 BLAKE2B 5768d08c3f1cd2334afbf095c7d3f0d9290b92c8b4fbc9ae17f81168ab6320c0e86ef9709d1fee547b624cf084c0a29e1f653d67574a639a65ae71d5950c7f05 SHA512 b747a25cb83c7cf222693818c37fb917e599567a04e69784fae6afa97381cfa630641c2858a6fa156fc1e5f872ae40ea360f9b8e2a20c5adb69fb9eca3852164
-DIST umockdev-0.17.2.tar.xz 486076 BLAKE2B ae1df8b07d93290c9f2be267c4aaf795e8e2e0a9fd492fad4cfe46d8929bb020d9482f7769a62d9b3325a361c3ef276b92454026741f0b985e12f283e2a4f7cc SHA512 fcf8c972dfa063922286702eeede8c273b9e78c1b1274a67ec459f64d17373a172400bff27f2fd9baee19af188fbd28c0f5e97b71bd7c8b50886933ad75547f3
-DIST umockdev-0.17.3.tar.xz 486052 BLAKE2B f1a2bf53de0a041abb23558c0ca245f86bf30453bf1f8b211fec3b654984feef3e9d62bca2e3625594538bfc9070e8a02dde81f62b0fb58c77e9b7e2d72961be SHA512 93bd60097541f6821e6d5d2b407b0e59223a9eede0f1e2d44facd3a407599802ea5fad7cc3cc148a8bdb2b2a34c5c4c017346640f10a5f695600f23418a9afc5
-EBUILD umockdev-0.16.1-r1.ebuild 1189 BLAKE2B c12e23c8fd73e5b7bf152820300bb74c0b0bf28623800aac162a7e95828f54f6a21a934285d694c8840968a3338c5fa4d078e419d7eecf9db5597b6c0c8d7284 SHA512 2c29ab977fe681fc5f9c1054858a7af993689f3db59d00c088cbf0857ed5039852d3060659c292167890f4bbf422c23bbd34bb800c627c93e3d9688a0ef5659a
-EBUILD umockdev-0.16.2.ebuild 1208 BLAKE2B 126666b85478185a70e38b23f0b9940f4d00d18e53058cb1f0e49002c6e5f42a1c929663dcd05019e88b7c02260bfd1b8577fd71dc4f37111981244615bac780 SHA512 023b535bdf6ef5ab951b4ec1812cd31bc1c8b2233ee98d67abf3accf7d7d43e78dea4eed6c9f27e810dbc225d6818fe55a304ad213ed4a469ed352e946daf955
-EBUILD umockdev-0.17.1.ebuild 1143 BLAKE2B 49fa6878982a7ea2028b8061253ef3133c92fb1ea7d5df0608bd4df3b36bd01dd563823f8559f3fde8d73ae951b3efd6f728b6c933f0e76cfb07cffd58254275 SHA512 8fb0bc69fa5e7db04c409b8aea9ec93a1008e5cb01ea89ada29d04d6b2417b7364cc0faf4ee546e6345927e91ab0c590c0c16ca566fb3ccec35d4e22ce7ae9b6
-EBUILD umockdev-0.17.2.ebuild 1143 BLAKE2B af1e7ce8e0adee72f52fefc186b2c920fcfe681153d0ad288c2a1c8dfa0695569f8b1280a5369f6b95301b36cfd68a1bdaa61ff34a3154f903c551e355ea8624 SHA512 22fe773dd3be79e64eb45130b8852e4f305c4005c99d96dba3238ef6bed00ad1cf4335042ea8296031161b9d669e3ea0f6ddf088cbf62959d694b60167e4f835
-EBUILD umockdev-0.17.3.ebuild 1143 BLAKE2B af1e7ce8e0adee72f52fefc186b2c920fcfe681153d0ad288c2a1c8dfa0695569f8b1280a5369f6b95301b36cfd68a1bdaa61ff34a3154f903c551e355ea8624 SHA512 22fe773dd3be79e64eb45130b8852e4f305c4005c99d96dba3238ef6bed00ad1cf4335042ea8296031161b9d669e3ea0f6ddf088cbf62959d694b60167e4f835
+DIST umockdev-0.17.6.tar.xz 486668 BLAKE2B 973c195b8fccd1c080665b65ffd47f8fe110118de9c541d5dda383e51e4dbcc36f77eeda6af5c774f4570a7b839190130fe95559fb3148e9937dae19dace6331 SHA512 05a86e2a583972d02fb3cfa26b017d44600831b6ed1415769d7cc7344357f484d34228b1593de2cfbfcce302611c0c22f045ee9fbd7fea76d8ae0b4ccd28d6ef
+EBUILD umockdev-0.16.2.ebuild 1201 BLAKE2B be7b56f78d70fd045a42c8301e5f826337078a88b7bed5101365fdbbbcb5d35e629613c4b01e96d56f75fc4ebe054373165c81f0ca24170e34b8565a60314fd8 SHA512 eba2fc3f6be4157c814d0ac65ecc0b4b440ab07833f9211db5fd90015118e0140301865efc0a20c42298dd0aeb2a9b9c583b288887518c984227276c294b4ea0
+EBUILD umockdev-0.17.6.ebuild 1143 BLAKE2B af1e7ce8e0adee72f52fefc186b2c920fcfe681153d0ad288c2a1c8dfa0695569f8b1280a5369f6b95301b36cfd68a1bdaa61ff34a3154f903c551e355ea8624 SHA512 22fe773dd3be79e64eb45130b8852e4f305c4005c99d96dba3238ef6bed00ad1cf4335042ea8296031161b9d669e3ea0f6ddf088cbf62959d694b60167e4f835
 MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
deleted file mode 100644
index d3cb4cd12c44..000000000000
--- a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib python-any-r1 vala
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/libpcap[${MULTILIB_USEDEP}]
-	virtual/libudev:=[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=dev-libs/gobject-introspection-1.32:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
-	)
-"
-BDEPEND="
-	$(vala_depend)
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/umockdev-0.16.1-Werror.patch"
-	)
-	default
-	vala_src_prepare
-}
-
-multilib_src_configure() {
-	export VALAC="$(type -P valac-$(vala_best_api_version))"
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test --no-suite fails-valgrind
-}
diff --git a/dev-util/umockdev/umockdev-0.16.2.ebuild b/dev-util/umockdev/umockdev-0.16.2.ebuild
index 0a5ba10bef1f..8a03c752ee5b 100644
--- a/dev-util/umockdev/umockdev-0.16.2.ebuild
+++ b/dev-util/umockdev/umockdev-0.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/umockdev/umockdev-0.17.1.ebuild b/dev-util/umockdev/umockdev-0.17.1.ebuild
deleted file mode 100644
index 47599763fd6c..000000000000
--- a/dev-util/umockdev/umockdev-0.17.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib python-any-r1 vala
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/libpcap[${MULTILIB_USEDEP}]
-	virtual/libudev:=[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=dev-libs/gobject-introspection-1.32:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
-	)
-"
-BDEPEND="
-	$(vala_depend)
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	vala_src_prepare
-}
-
-multilib_src_configure() {
-	export VALAC="$(type -P valac-$(vala_best_api_version))"
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test --no-suite fails-valgrind
-}
diff --git a/dev-util/umockdev/umockdev-0.17.3.ebuild b/dev-util/umockdev/umockdev-0.17.3.ebuild
deleted file mode 100644
index 7a53f924c567..000000000000
--- a/dev-util/umockdev/umockdev-0.17.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib python-any-r1 vala
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	net-libs/libpcap[${MULTILIB_USEDEP}]
-	virtual/libudev:=[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=dev-libs/gobject-introspection-1.32:=
-"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
-	)
-"
-BDEPEND="
-	$(vala_depend)
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	vala_src_prepare
-}
-
-multilib_src_configure() {
-	export VALAC="$(type -P valac-$(vala_best_api_version))"
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test --no-suite fails-valgrind
-}
diff --git a/dev-util/umockdev/umockdev-0.17.2.ebuild b/dev-util/umockdev/umockdev-0.17.6.ebuild
index 7a53f924c567..7a53f924c567 100644
--- a/dev-util/umockdev/umockdev-0.17.2.ebuild
+++ b/dev-util/umockdev/umockdev-0.17.6.ebuild
diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest
new file mode 100644
index 000000000000..1b534a93b8e3
--- /dev/null
+++ b/dev-util/unicorn/Manifest
@@ -0,0 +1,4 @@
+DIST unicorn-2.0.0_rc5.tar.gz 3808762 BLAKE2B 02a77c46e075f67df04a9fe0b5474df9f6a6c154778de3223c6ed3c475bd4658abd7b57d351a63cfa7ef5ecbadbee12a6151957b7b47b4f6741b5e4581d13c4b SHA512 3b5118e378872a50d3aa0dca01cda69b0e7b3875da7b03c1708963848c71818dd1e120df8796acace661c6b4d63813b9acc8106ce3a94c0d40c3b50677fbaacd
+EBUILD unicorn-2.0.0_rc5.ebuild 1838 BLAKE2B 4e7566680f4627892114a61f016b01b86bb9fda097af89e5a2bd234251f5b6cff7a415ac13db9dba1cf47a2c18ef2e451db6d1b4788bb21625bcb6ea394b4d07 SHA512 1b71931e7d7e621bfbefd7e42584f08667b37204dff1cc4836fe665cc40eeff606a9fc17eab38cfee9ca5290546dcf95aa4e4e9843418c83ccdd23a42c8a1126
+EBUILD unicorn-9999.ebuild 1838 BLAKE2B 4e7566680f4627892114a61f016b01b86bb9fda097af89e5a2bd234251f5b6cff7a415ac13db9dba1cf47a2c18ef2e451db6d1b4788bb21625bcb6ea394b4d07 SHA512 1b71931e7d7e621bfbefd7e42584f08667b37204dff1cc4836fe665cc40eeff606a9fc17eab38cfee9ca5290546dcf95aa4e4e9843418c83ccdd23a42c8a1126
+MISC metadata.xml 465 BLAKE2B 939a9adeaa9402af97d46bf8c19dddeb6d732de7c748480650bda37b0320de9666e1f537b23618310c1b2d85abb3f9d5fa0d62156b2d159ea77adaa456496fb9 SHA512 d09ee2447dd71ea02ffa1b18b23e1529c9506f8418314c7fb068b76d8dab8689a777940d4683e5cd574736dd185bbdff2cbbc79b372eb02bb061798490952a9b
diff --git a/dev-util/unicorn/metadata.xml b/dev-util/unicorn/metadata.xml
new file mode 100644
index 000000000000..ce9705eab55c
--- /dev/null
+++ b/dev-util/unicorn/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>mario.haustein@hrz.tu-chemnitz.de</email>
+		<name>Mario Haustein</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">unicorn-engine/unicorn</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild
new file mode 100644
index 000000000000..8687e522b5a0
--- /dev/null
+++ b/dev-util/unicorn/unicorn-2.0.0_rc5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=${PV/_/-}
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{9..10} )
+inherit cmake distutils-r1
+
+DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
+HOMEPAGE="https://www.unicorn-engine.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"
+else
+	SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0/2"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+# See bug #832337 re Python deps
+BDEPEND="virtual/pkgconfig
+	python? (
+		>=dev-python/installer-0.4.0_p20220124[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc"
+
+wrap_python() {
+	if use python; then
+		# src_prepare
+		# do not compile C extensions
+		export LIBUNICORN_PATH=1
+
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${1} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# Build from sources
+	rm -r bindings/python/prebuilt || die "failed to remove prebuilt files"
+
+	cmake_src_prepare
+	wrap_python ${FUNCNAME}
+}
+
+src_configure(){
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DUNICORN_BUILD_SHARED=$(usex !static-libs)
+		-DUNICORN_ARCH="${UNICORN_TARGETS}"
+	)
+
+	cmake_src_configure
+
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	cmake_src_compile
+
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	cmake_src_install
+
+	wrap_python ${FUNCNAME}
+}
diff --git a/dev-util/unicorn/unicorn-9999.ebuild b/dev-util/unicorn/unicorn-9999.ebuild
new file mode 100644
index 000000000000..8687e522b5a0
--- /dev/null
+++ b/dev-util/unicorn/unicorn-9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=${PV/_/-}
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{9..10} )
+inherit cmake distutils-r1
+
+DESCRIPTION="A lightweight multi-platform, multi-architecture CPU emulator framework"
+HOMEPAGE="https://www.unicorn-engine.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/unicorn-engine/unicorn"
+else
+	SRC_URI="https://github.com/unicorn-engine/unicorn/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0/2"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+# See bug #832337 re Python deps
+BDEPEND="virtual/pkgconfig
+	python? (
+		>=dev-python/installer-0.4.0_p20220124[${PYTHON_USEDEP}]
+		dev-python/tomli[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-60.5.0[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc"
+
+wrap_python() {
+	if use python; then
+		# src_prepare
+		# do not compile C extensions
+		export LIBUNICORN_PATH=1
+
+		pushd bindings/python >/dev/null || die
+		distutils-r1_${1} "$@"
+		popd >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# Build from sources
+	rm -r bindings/python/prebuilt || die "failed to remove prebuilt files"
+
+	cmake_src_prepare
+	wrap_python ${FUNCNAME}
+}
+
+src_configure(){
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DUNICORN_BUILD_SHARED=$(usex !static-libs)
+		-DUNICORN_ARCH="${UNICORN_TARGETS}"
+	)
+
+	cmake_src_configure
+
+	wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+	cmake_src_compile
+
+	wrap_python ${FUNCNAME}
+}
+
+src_install() {
+	cmake_src_install
+
+	wrap_python ${FUNCNAME}
+}
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index d51a6e4237a6..da6b0103f590 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -4,5 +4,7 @@ DIST encoder-1.2.2.jar 37529 BLAKE2B 0e61c679db8c559005de726c8fc358cc5f04ab51b35
 DIST flightrecorder-8.0.1.jar 500815 BLAKE2B af9f024e7199e7f577e75b3d40f40a3e65f8e98be768415e5832aa6e1ffcfc9ecc391ef4d3fa515411d6d3ed051f35579656bae8cf8e1aea2023d54b072c84a0 SHA512 08c98ed3444b396e6e1ae0f909378c56e2ce04741f7b7ee83e39ae8a0699802709a5419f29c3a7bd44a11caba984071ef4f0554183fd5260ed28741edd191809
 DIST lz4-java-1.7.1.jar 649950 BLAKE2B caed7593dad078fcaf3853a4dffbd540d7e5a3298b13092dee4b82a70359494584b9901da600239d65e9930e7a769adf1a45eac85033f8ca0cfcaef6a3b09544 SHA512 ff48daeca92c5a7657aa9c7fe41c5ae75a5fa0aad05c655bacb64a40acfe93ffd3d40bef16544614ce8a38db3e1df177023101773f6f7c1d32031413270e42d2
 DIST visualvm-2.1.1.tar.gz 36390828 BLAKE2B 127d4bec9fe47e66950485f5349c3c46c0e4f9576498cf4afb2459617223839a2c553267e2bda8137322dfcca8282c090a13ca2adde026eda4fd8038b05e5b10 SHA512 dd9879c2ed5c62cfd60f58355fe580526757db002feea9a013df1095b119931f7951ac25f08000300b6c3e7f4f27772e57b2ca30721fde70e70ca663456da2dd
+DIST visualvm-2.1.2.tar.gz 36393559 BLAKE2B ba925ddacfb1474f47d0ab393c7f8f14d18e12ef25aef82efd59a273eb8464d8758e0cc82cf41238b0356546dd03fed319b8c04366c4037fa99251d358f5e1c2 SHA512 f324bdec570f050c3df3d047cf9ab9e8565ed95150d1bcb5d86166aa221d0a3c55a2c3cdb345ddbf42b9cef35cb6a21033ed24fd203c0dbb67d2f8dc2b5f2960
 EBUILD visualvm-2.1.1.ebuild 3010 BLAKE2B bbe02f4a2aad1d5176513c4457d805d3641a2856679fdc5eccc46be29dddeddb6ffe7d694c14f61905cb797a6802afd921ede5791cb1fa03d579696afaed23db SHA512 a0b4f16743f33526e9e95903174a244a03a4681ed1c898fa6584cc538b0086dcc00cb9fc649a27068c23cb0e4cbfc6593bef4c1ffebee3e89da3aaa82429aada
+EBUILD visualvm-2.1.2.ebuild 3011 BLAKE2B e507a0d44fff3d4e28e1cadc706455d241c7588fb88e40f338fb3900fc2ee4c83d5d4ca4bb59f566c446be3e3169a270414db9fbbd5968fde95d9c93fa78123f SHA512 0dae4f799b2732c277eac4662190d8e2c888ef9a3ac2fac0bd0bf4ee9a6b36ed2addc472e6f07703db1845f3dff5133b331d247ff6b43e4a3f8236241b86c803
 MISC metadata.xml 317 BLAKE2B e5f32379a40e3c2180df4f3ac4e7ea03a7dbfe69b1cb6537c1693262cc06e6334959abfb68f888c588fa933f60e85f137355bb57ff769107dfe805595d1a3ad1 SHA512 605d7206793c3d865547b69f9715305d46d433d18096b886b362d2d86adf4eda894c23af1819b6af95423fbe2a37781d1d100a9df9f15a01942f66c73dc2fa2c
diff --git a/dev-util/visualvm/visualvm-2.1.2.ebuild b/dev-util/visualvm/visualvm-2.1.2.ebuild
new file mode 100644
index 000000000000..cc0781758a8d
--- /dev/null
+++ b/dev-util/visualvm/visualvm-2.1.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+NBV=124
+NBT=21062021
+NBZ=nb${NBV}_platform_${NBT}.zip
+
+inherit java-pkg-2 java-ant-2 desktop
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
+HOMEPAGE="https://visualvm.github.io"
+
+# Netbeans plattform is already included in the main archive this time
+#    SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+#       https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
+# The extra jar files are not present in gentoo atm so bundling them
+SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://repo1.maven.org/maven2/org/openjdk/jmc/flightrecorder/8.0.1/flightrecorder-8.0.1.jar
+	https://repo1.maven.org/maven2/org/openjdk/jmc/common/8.0.1/common-8.0.1.jar
+	https://repo1.maven.org/maven2/org/lz4/lz4-java/1.7.1/lz4-java-1.7.1.jar
+	https://repo1.maven.org/maven2/org/owasp/encoder/encoder/1.2.2/encoder-1.2.2.jar"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=virtual/jre-1.8:*"
+
+# it does not compile with java 11
+DEPEND="
+	virtual/jdk:1.8"
+
+S="${WORKDIR}/${P}/${PN}"
+
+QA_PREBUILT="
+	/usr/share/visualvm/platform/modules/lib/amd64/linux/libjnidispatch-nb.so
+	/usr/share/visualvm/cluster/lib/deployed/jdk1[56]/linux-amd64/libprofilerinterface.so
+"
+
+EANT_BUILD_TARGET=build
+EANT_EXTRA_ARGS="-Dext.binaries.downloaded=true"
+INSTALL_DIR=/usr/share/${PN}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	# unpack ${NBZ}
+	unpack "${S}"/"${NBZ}"  # archive is included in the main archive
+}
+
+src_prepare() {
+	default
+
+	# Remove unneeded binaries
+	rm -rv netbeans/platform/lib/*.{dll,exe} \
+		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
+	find libs.profiler/lib.profiler/release/lib/deployed/jdk1? -mindepth 1 \
+		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
+
+	# link in downloaded jars
+	for file in flightrecorder-8.0.1.jar common-8.0.1.jar lz4-java-1.7.1.jar encoder-1.2.2.jar; do
+		ln -s "${DISTDIR}/${file}" jfr.generic/external/ || die "Failed to link file ${file}"
+	done
+}
+
+src_install() {
+	# this is the visualvm cluster
+	insinto ${INSTALL_DIR}
+	doins -r build/cluster netbeans/{harness,platform}
+
+	# configuration file that can be used to tweak visualvm startup parameters
+	insinto /etc/${PN}
+	newins launcher/visualvm.conf ${PN}.conf
+	sed -i "s%visualvm_default_userdir=.*%visualvm_default_userdir=\"\${HOME}/.visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" || die "Failed to update userdir"
+	sed -i "s%visualvm_default_cachedir=.*%visualvm_default_cachedir=\"\${HOME}/.cache/visualvm\"%g" "${ED}/etc/${PN}/visualvm.conf" || die "Failed to update cachedir"
+	echo -e "\nvisualvm_jdkhome=\"\$(java-config -O)\"" >> "${ED}/etc/${PN}/visualvm.conf" || die "Failed to set jdk detection"
+
+	# visualvm runtime script
+	newbin "${FILESDIR}"/${PN}-r2.sh ${PN}
+
+	# makes visualvm entry
+	make_desktop_entry ${PN} VisualVM java "Development;Java;"
+}
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index 363743d7aeda..130771c7feaa 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,6 +1,6 @@
 DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
 DIST wayland-1.20.0.tar.xz 225188 BLAKE2B d607610ad8b30b6b3bbfc3945679f698030f271766cfb72425f98f170a96469fb085fb9a746a866b8562d7f452c844e61ad57f634dcf365474c7d050b76022e9 SHA512 e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215
 EBUILD wayland-scanner-1.19.0.ebuild 898 BLAKE2B ab8daa932983ac49f4814a55c91efb2469b5d0dc04e1f1ed5aa75d77b219ef97281dea8bec9ec19dd46abb8b02e43f87b61d2725c76e2575130f83598b2c7146 SHA512 9517e36eabeb6638030adace3322dcabdcdae0a31f17cfd54a835f11dfbc4292b37d66335fa4e69391370d2df123518ac4ac05edb6ed48c97ec0483fa57d86c0
-EBUILD wayland-scanner-1.20.0.ebuild 992 BLAKE2B 062da3e7fd8b79c1a431a3b147df8c116abb9697dbd9441d67e961dc328af3bfff76a18871a3189db7c6319f3afeb2ffba176394ead46723e5574c0041a52df7 SHA512 5bd8eed70c9ed9ee6d2413dfff9a69c544f09cfaebeda605fdb9e81684a8d319bfd9fdba8587e23f2529fd5942f4616988adb98fd9c04cdef62e6b77d7c862a8
+EBUILD wayland-scanner-1.20.0.ebuild 985 BLAKE2B fc5e464fc483834f13bfed0a9ba44b1d1461756ef21ca230163c2167353b730db664708f74c76227cc53406374985ebba88271cb189e080027c164098f868e10 SHA512 e663d8f9079213692e93e7248b436701cd955fc5649724b4b30c16bf5a07038dde372bf59479faef2fe5d487c7ecf01e6cfd4632fc6d10b77c8e0cea28cbce31
 EBUILD wayland-scanner-9999.ebuild 992 BLAKE2B 062da3e7fd8b79c1a431a3b147df8c116abb9697dbd9441d67e961dc328af3bfff76a18871a3189db7c6319f3afeb2ffba176394ead46723e5574c0041a52df7 SHA512 5bd8eed70c9ed9ee6d2413dfff9a69c544f09cfaebeda605fdb9e81684a8d319bfd9fdba8587e23f2529fd5942f4616988adb98fd9c04cdef62e6b77d7c862a8
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.20.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.20.0.ebuild
index c0f4e25a4339..c340a188e8c5 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.20.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
 inherit meson
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index 4621847ffc79..d8b73ff27ee1 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1,4 +1,4 @@
 DIST wstool-0.1.18.tar.gz 80595 BLAKE2B ed90fc5c63ab5d775dfb49ddacc6da6e285aeb5078cf471c0d504659a9e322fde27797e4d05fd56dff4b9958558200cf05e46cf7ae71fd1231ab63048e668808 SHA512 fda9c679183c605048ed024a57b07fd2d9b644978a3e4ff89c3716b74d8e4ba0124779bcdf88a75fdbbf47c765b7ab63db7c84a55a6e1744fc6f955649590c48
-EBUILD wstool-0.1.18.ebuild 1435 BLAKE2B cce676217e08bdec531eb15ff9ca203cf9e983dcc2876b4c60f0dbf5c8a18c22dbd9226e818758a01164d6a49fa7c9d184d653ecf2eb93f2f18bb38ec30dcddf SHA512 bb18b857666e08828835c8bb94cfab06c1749490a0f12078f4aeed753b61538165dd89c008ebec03a6c7fd5cce584417480a5d7b5dbc5139cd23ce6789ff569b
-EBUILD wstool-9999.ebuild 1435 BLAKE2B cce676217e08bdec531eb15ff9ca203cf9e983dcc2876b4c60f0dbf5c8a18c22dbd9226e818758a01164d6a49fa7c9d184d653ecf2eb93f2f18bb38ec30dcddf SHA512 bb18b857666e08828835c8bb94cfab06c1749490a0f12078f4aeed753b61538165dd89c008ebec03a6c7fd5cce584417480a5d7b5dbc5139cd23ce6789ff569b
+EBUILD wstool-0.1.18.ebuild 1256 BLAKE2B 94a2e2aeb7134b290741cfde5d1802332489ec0af3a5f3792fcb3e8a5ae0625f457b8d9f63b447bd08f006bdbc7648b1a30e8c87d2f87e3cd605e952990e5c94 SHA512 02b08b0dd6cf15db7de57f8f942b2a60b91d9ea844a179a605ba8200aee4cbb4cc1263cb95b333411971f10f21a0d7a34a3025fa898ebaa8d381e2e52f870427
+EBUILD wstool-9999.ebuild 1256 BLAKE2B 94a2e2aeb7134b290741cfde5d1802332489ec0af3a5f3792fcb3e8a5ae0625f457b8d9f63b447bd08f006bdbc7648b1a30e8c87d2f87e3cd605e952990e5c94 SHA512 02b08b0dd6cf15db7de57f8f942b2a60b91d9ea844a179a605ba8200aee4cbb4cc1263cb95b333411971f10f21a0d7a34a3025fa898ebaa8d381e2e52f870427
 MISC metadata.xml 330 BLAKE2B 621e47f88d4d67ce9b72775dac0e6066b1f56e0683585e72f70a820ed655c80d76fa4c451e9a5ca179d176c8fb9ab29a4949c26c2cfbf97ef31e4c767c8960ff SHA512 fef9cedb34e14f5fdbbc9e244d01c82f953fea9b299512352c11d9315d1748b8ffb63469caf1e00a0122b70f8376593e6a58ab20928865f35a57f511eb903634
diff --git a/dev-util/wstool/wstool-0.1.18.ebuild b/dev-util/wstool/wstool-0.1.18.ebuild
index 48cc34f6d138..643dad95a575 100644
--- a/dev-util/wstool/wstool-0.1.18.ebuild
+++ b/dev-util/wstool/wstool-0.1.18.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/wstool"
-fi
-
-inherit ${SCM} distutils-r1
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD="yes"
+inherit distutils-r1
 
 DESCRIPTION="Commands to manage several local SCM repositories for ROS"
 HOMEPAGE="https://wiki.ros.org/wstool"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vcstools/wstool"
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
@@ -25,38 +22,32 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
+	dev-python/sphinx
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-vcs/git
 		dev-vcs/bzr
 		dev-vcs/mercurial
 		dev-vcs/subversion
 	)
 "
-BDEPEND="
-	dev-python/sphinx
-"
 
-DISTUTILS_IN_SOURCE_BUILD="yes"
+distutils_enable_tests nose
 
-python_test() {
+src_test() {
 	# From travis.yml
 	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
+	git config --global user.email "foo@example.com" || die
+	git config --global user.name "Foo Bar" || die
 	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc || die
 	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
+	bzr whoami "Your Name <name@example.com>" || die
 	# command to run tests
-	nosetests --with-coverage --cover-package=wstool || die
+	distutils-r1_src_test
 }
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index 48cc34f6d138..643dad95a575 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/vcstools/wstool"
-fi
-
-inherit ${SCM} distutils-r1
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD="yes"
+inherit distutils-r1
 
 DESCRIPTION="Commands to manage several local SCM repositories for ROS"
 HOMEPAGE="https://wiki.ros.org/wstool"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vcstools/wstool"
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
@@ -25,38 +22,32 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
+	dev-python/sphinx
 	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-vcs/git
 		dev-vcs/bzr
 		dev-vcs/mercurial
 		dev-vcs/subversion
 	)
 "
-BDEPEND="
-	dev-python/sphinx
-"
 
-DISTUTILS_IN_SOURCE_BUILD="yes"
+distutils_enable_tests nose
 
-python_test() {
+src_test() {
 	# From travis.yml
 	# Set git config to silence some stuff in the tests
-	git config --global user.email "foo@example.com"
-	git config --global user.name "Foo Bar"
+	git config --global user.email "foo@example.com" || die
+	git config --global user.name "Foo Bar" || die
 	# Set the hg user
-	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc || die
 	# Set the bzr user
-	bzr whoami "Your Name <name@example.com>"
+	bzr whoami "Your Name <name@example.com>" || die
 	# command to run tests
-	nosetests --with-coverage --cover-package=wstool || die
+	distutils-r1_src_test
 }
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /dev-util
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)