gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-util
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
158 files changed, 1262 insertions, 2319 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5356903f8917..1ee4d3c21513 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index 7cb4d02fbb58..184c1f8c9d51 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,5 +1,5 @@
 DIST bats-1.2.1.tar.gz 62685 BLAKE2B 7ac54c8955375571edf7b303dfe9228a384ca5ec06986b9ac3c368e5b855456b2a3291cb3231f963dcd9c1bd5178f06fcbc8c81bdeee82b659561de072cccba9 SHA512 632345e6d83ed930dab23abc03e4797769063bb049ae1bb99e3102dc1e93e5111144ddc61615d05962f7b5bbf72d90ce19a324faf670a3d6e4ce7ab508b0db29
 DIST bats-1.3.0.tar.gz 78392 BLAKE2B 5dbc87ee87aba0b001d25f1304939604b1682603fb0d2fae19f852171e8bd76f1a6c262b661a373aeeb9b79818eae3387b3e4d6bcf4f0f95b87dc2430caf029f SHA512 47f67681b380a70863805691eca39532af76670b7bba2406293c58f95cbbe3dade4f792177ee00d8ca72684731efb6db2c1ca8eeabe2fa48359e81c257f95b2c
 EBUILD bats-1.2.1.ebuild 817 BLAKE2B c7a757b7e60ed686a34b566e3c1c8755eede522afe3cc5b4a289097e5f490e6c274af3602e80147ebe0e5e54f307e3f54f86801233602269b68f74dcbfbd2bf0 SHA512 aa5c90cfb0a42f1f64d57e0bced092cb2b9cb51597161e15517f9be9ff98eedfe9b038760ed03f3bd373b9b60fafd9980d8d84f1b34f63ceace33e3fa0960566
-EBUILD bats-1.3.0.ebuild 810 BLAKE2B f8d0e14431c65d7aaa3e2a76e749f749f14c6b14edde00c1c98a2ad3605b8f07d933db365ff9387d4939529e41f37056b08cbb2ae7fe8958dde099b781853cbe SHA512 620116401fe1d831669c93317fd04a45db787be2d2dc83a66718e95c0b5e5471536f4050551f12fb6e1435b4bdc95fda2ff00485f98beb6c1de4b0e79e231307
+EBUILD bats-1.3.0.ebuild 807 BLAKE2B 0564de4f00562b8d05e7135a38a645a7795ed68ef7125a3cf4bd9bbece95e9ca682b0f57e25d629fd69f8e03f5b70cd004a0767b90e6aa675282d6964e4c8185 SHA512 8c4864cd19796ea92926fbb918c7b2635562216226ac913a856332f0d38194b4cf7f0331fc36e75f8cbf4ce5976a4c9d2b0b81aaa6a407ba96cfde8cdee8e06c
 MISC metadata.xml 959 BLAKE2B cc406ff1f1902059d614efb8ff9742348c4518403c38dd4f4bfdc78f56dd5b620a79e12cae4fe7f2e4084caba34a68026583be38ab2eeb676907deb180088256 SHA512 e3b0bb9b821c9f93ef85d9e5707402b8401e1ca9b4d68b26e63884a9bdfba56d7c65068fdbc2817726ab470b16a27541dcfbc5b0e91857f67e2784de57231b66
diff --git a/dev-util/bats/bats-1.3.0.ebuild b/dev-util/bats/bats-1.3.0.ebuild
index 0cc0631f5528..dec3ecfe24f0 100644
--- a/dev-util/bats/bats-1.3.0.ebuild
+++ b/dev-util/bats/bats-1.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 DEPEND="app-shells/bash:*"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index a42d616817dd..dba2e06fd030 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,15 +1,8 @@
 AUX 60bcc.env 32 BLAKE2B dbbfb31408af7f3375b02981113d81d71075d339fded45db24b2168baa9f3ffe51205447c12eb9c3f06188fd32db591f21bce41edaff473a40b10320067447cd SHA512 a040c762df54a0218fb3fc4a6609b0e924003be689eaff629fabe69e1ed224fc38fdaac377624944718e5b174ac413edf3730cd0a228bd73bf8ef8678e97d73c
 AUX bcc-0.14.0-cmakelists.patch 444 BLAKE2B 3832bdfe3fdb3946889fb614c3f89220dae7b319329ad45649edda0f7c9cbd8c8e90ce200c6f7df4913c3eceb0cc729e83d90b7dcc8af991e3f59b5a772f9cc8 SHA512 05f2c50e7daabe9118ea4e6dfd6d8dc155bb0311fbb2fbc491c2740d6f5081cc95ec7cb8faf19751eb161bcf60d30be87e0b6c88d032bf88ecae48af5119e0df
 AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
-DIST bcc-0.16.0.tar.gz 4124285 BLAKE2B 443077ffd5ad02e34d28a86ee64b8ec52fa4a18696295d58e87aaf2aeb833c394047cd0d87b3bf1da52d5512b889f8873b788e8141bdd91c9463e27cf30a1ef6 SHA512 50d09d6d02335a63d7c01c22f16a706584f231ee16973a80df5b640c31b8e25775da13a2bdff9e57c04c7f6181bb8c46cf3bd11c1e59741234024da71c7f6cdb
-DIST bcc-0.17.0.tar.gz 4166410 BLAKE2B 6833c7a58ed9e99b58bf147dc499ba7c7c113961ff5c21a3ac388abab8caa01dc2a67378899e26050460c4af851a5ddd8747911bda7c7b405dfcb6df29981f85 SHA512 32f27bdd3d8f3e850e59011bcf662b91842b1dcef94d118a0662ffda3b2c48c97a359d736d01f6d06afd74e3d7a4efda4966c71a5c9146b2076d4fba087a85cf
-DIST bcc-0.18.0.tar.gz 4171881 BLAKE2B c5bdf70965e16f0391306b004b4f51b370e7de3d061c8c318f25de478bdcb0c4dc083ceb00e19a66115e31e4c3da63e3b5dded750d44d56985f18bf87eb7617e SHA512 9d3e4c60c6415d40fe803bab44d4372028c210a084e3bff87a71771f06810bbafebe10760aedce9fff704c51235f71ff20458942fc1e67d0b83988ce57cfc493
 DIST bcc-0.19.0.tar.gz 5171216 BLAKE2B 72f0364106f894f21990865209b445eaa9640c00a27060cef220418be87625150cdc8062168dacd1370ebd01c99c2d49853869b518a3a07bb601720412b9a970 SHA512 b6180462a45c768f219e026d8a4b43424b7cad4e07db8101725bd2bc31ee4de117774c0ad8d157502c97c1187057b45c7a491e7198ac2c59e6d56e58797f4df3
 DIST bcc-0.20.0.tar.gz 5193274 BLAKE2B ea78004d114e8187d82d6e58bf2c8e17d93b96a651a5557dcf3c405dfcf5ed0df3a2147f35d1b3831aa5aca5c1caf59742026740bb6da02dfda7c1dd7ef8161b SHA512 fa7c50a4fc64846ad798b6652101aa414cda53d08779cf48bd505191189cb23da2838f7511e700d59e086d35216f4e3bc9867b614738061630984dff3c4576dc
-EBUILD bcc-0.16.0-r1.ebuild 2191 BLAKE2B f37dfbd934c348952e18081c9a5226c6c3f22a0969eff3e735dd382a8a405d3d6ab6d21f7a93e99eef5586a93997f599f57c98ea31320adf0da27ead682d3eb2 SHA512 4c548079b4be151a5b3586bd0fa54c8cade52c1bdc86db44dd87466b1872b4a27a2d22224105319075597a55a19972028df3b3207545edb85e9f1ac3aff69d9d
-EBUILD bcc-0.17.0-r100.ebuild 2256 BLAKE2B 3f34b29173d23710d5004de36d5ad3daf1104e8bf37383c60ad7cf35a1b9163d4ebe10cbdadf6892d1498c841990cebcc0327fa56fb3d2c306f9890e9545b8ca SHA512 8e24201f577b7590dad0800eb46bb178fc129c83f1414e4553018654226ade53e393af432ec1ff13eae501bea1ece06061220abfc09ece852732f3d62446a099
-EBUILD bcc-0.17.0.ebuild 2149 BLAKE2B 9d95a1516f37660cb20e8d3fe7994d9d4aea9a202341d63729906f357fe220b8d4d8d74d720241ad6dce4fda1652b891f884e6c9d5d3aee035908fe1c8ceff8c SHA512 b00a2d8163ace6b5f6007e5b46c13173a6565c22a5d08815ddd5c28ff1dfcb07527c9eddb7cb6fa26501e77a11c0fce216c458b7477bcd7508b62319c8abbc78
-EBUILD bcc-0.18.0-r1.ebuild 2257 BLAKE2B 1ba922ba577d5fc96eb16a48973d3ea210c3ea95f1bd0111d44a54f113a37564598a6f7af92ddac52e5cce8b8f1f21d45557746e9f1a6972c86563cfd4d3d63b SHA512 242ee80534c9ab6fd9031160f57d9e0de7588c7102e9bb297378e7614c1c12b5333bcbae2cda0eda612460640862a956e5649ca697fe619680456deabc72c32c
-EBUILD bcc-0.19.0.ebuild 2257 BLAKE2B 1986a93182278d985f0d97959623705136f420c2bd44f3523719cc118a8cd121e3dcd771a60356553d413958c1e4d4d8401f4889d1898587f7db86c40a03f277 SHA512 6a97eb82c9118f3a1f2b53272f76c41191570c85513e36818071d229fcd55eb80db7d8fa7a205b5dd55c661d1239f5b42f14c38fc9334df1f70507cb705c7d55
-EBUILD bcc-0.20.0.ebuild 2257 BLAKE2B e1a2fe2fb590acc67bc2d99978af7d62ebc71ffd37567c198ca32f82fc82c2e1abfc52ce5121870d0732e8e8a7c94a9b3efe21fca89e3bd8abc461353dc53bde SHA512 adc85ee7d708d5350843bee4e32ebf2004aab572e2a213a77b13ad921e1beba80dc757b6920917d46c084fca1798d79a3bb3a2003c84634c6e05c05dbcde55a6
+EBUILD bcc-0.19.0-r1.ebuild 2258 BLAKE2B ce5df0ce4181d14c1836e52ea25f40d31cc3776cb823540c839b6890854859aaf08eb78e229b9ab69066a40157955f1a6eb68c566a499b842d520b091ce917a2 SHA512 ec0faa3ae0a97e31d6424c621fa5166929f98a0fdbc13aef749bce6e5beb98c4a765f8db67a3554f8380fd82de89db9004824990e4a9deba1a2bf4e616eb0cbc
+EBUILD bcc-0.20.0-r1.ebuild 2258 BLAKE2B 329dd78d04cc25a380fa4421a1553442e8084af2a615c160b06354e92bbef5003e2283969872eb608216443135848b397c9e15a78ade1e0d50a6849f2ce17035 SHA512 138bc254388898b03ebf0d17b95651753f6c08e5496e6b0306ad2380ba343333d2d32169f0851e2121e51d57c733574cde9557b6cb31e73e5023dc45bb870e3d
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.16.0-r1.ebuild b/dev-util/bcc/bcc-0.16.0-r1.ebuild
deleted file mode 100644
index aae8cb730d43..000000000000
--- a/dev-util/bcc/bcc-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake linux-info llvm python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-libs/libbpf-0.1.0-r1[static-libs(-)]
-	<dev-libs/libbpf-0.2[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-12:=
-	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		$(usex luajit '-DWITH_LUAJIT=1')
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_foreach_impl python_optimize
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
diff --git a/dev-util/bcc/bcc-0.17.0-r100.ebuild b/dev-util/bcc/bcc-0.17.0-r100.ebuild
deleted file mode 100644
index af2c0ec78f88..000000000000
--- a/dev-util/bcc/bcc-0.17.0-r100.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake linux-info llvm lua-single python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libbpf-0.2[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-12:=
-	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
-	lua? ( ${LUA_DEPS} )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_foreach_impl python_optimize
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
diff --git a/dev-util/bcc/bcc-0.17.0.ebuild b/dev-util/bcc/bcc-0.17.0.ebuild
deleted file mode 100644
index 64a5e078b6b3..000000000000
--- a/dev-util/bcc/bcc-0.17.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake linux-info llvm python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+luajit test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-libs/libbpf-0.2[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-12:=
-	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
-	luajit? ( dev-lang/luajit )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-		$(usex luajit '-DWITH_LUAJIT=1')
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_foreach_impl python_optimize
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
diff --git a/dev-util/bcc/bcc-0.18.0-r1.ebuild b/dev-util/bcc/bcc-0.18.0-r1.ebuild
deleted file mode 100644
index a42cb9e0a1dd..000000000000
--- a/dev-util/bcc/bcc-0.18.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit cmake linux-info llvm lua-single python-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-
-SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+lua test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	lua? ( ${LUA_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/libbpf-0.3[static-libs(-)]
-	>=sys-kernel/linux-headers-4.14
-	>=dev-libs/elfutils-0.166:=
-	<=sys-devel/clang-12:=
-	<=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
-	lua? ( ${LUA_DEPS} )
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			net-misc/iputils[arping]
-			net-analyzer/arping
-		)
-		net-analyzer/netperf
-		net-misc/iperf:*
-	)
-"
-BDEPEND="
-	dev-util/cmake
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
-	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
-)
-
-# tests need root access
-RESTRICT="test"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
-		~KPROBES"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=11 llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	local bpf_link_path
-
-	# this avoids bundling
-	bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
-	ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
-
-	cmake_src_prepare
-}
-
-python_add_impl() {
-	bcc_python_impls+="${EPYTHON};"
-}
-
-src_configure() {
-	local bcc_python_impls
-	python_foreach_impl python_add_impl
-
-	local -a mycmakeargs=(
-		-DREVISION=${PV%%_*}
-		-DENABLE_LLVM_SHARED=ON
-		-DCMAKE_USE_LIBBPF_PACKAGE=ON
-		-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
-		-DPYTHON_CMD="${bcc_python_impls%;}"
-
-	)
-	if use lua && use lua_single_target_luajit; then
-		mycmakeargs+=( -DWITH_LUAJIT=1 )
-	fi
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
-	python_foreach_impl python_optimize
-
-	newenvd "${FILESDIR}"/60bcc.env 60bcc.env
-}
diff --git a/dev-util/bcc/bcc-0.19.0.ebuild b/dev-util/bcc/bcc-0.19.0-r1.ebuild
index c78faabac7be..c331a015d805 100644
--- a/dev-util/bcc/bcc-0.19.0.ebuild
+++ b/dev-util/bcc/bcc-0.19.0-r1.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
-	>=dev-libs/libbpf-0.3[static-libs(-)]
+	~dev-libs/libbpf-0.3:=[static-libs(-)]
 	>=sys-kernel/linux-headers-4.14
 	>=dev-libs/elfutils-0.166:=
 	<=sys-devel/clang-13:=
diff --git a/dev-util/bcc/bcc-0.20.0.ebuild b/dev-util/bcc/bcc-0.20.0-r1.ebuild
index de2211fe25ce..5e202f2d11a0 100644
--- a/dev-util/bcc/bcc-0.20.0.ebuild
+++ b/dev-util/bcc/bcc-0.20.0-r1.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	lua? ( ${LUA_REQUIRED_USE} )"
 
 RDEPEND="
-	>=dev-libs/libbpf-0.3[static-libs(-)]
+	~dev-libs/libbpf-0.3:=[static-libs(-)]
 	>=sys-kernel/linux-headers-4.14
 	>=dev-libs/elfutils-0.166:=
 	<=sys-devel/clang-13:=
diff --git a/dev-util/bear/Manifest b/dev-util/bear/Manifest
index 8135bbf05436..d17f2b279ed1 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,5 +1,7 @@
 DIST bear-2.4.4.tar.gz 50347 BLAKE2B 73fa332cf97413e55c588f8830806a26c6905299af902c6cf1f39fd576c6261690239c1b502b28b5a2aa24e5ca521c3f1dd58aacd60e00ece4fe1840f5656155 SHA512 4ee3fd5c846149029fe9e4104e2a0d0e318a15215aa80fc5dc376e22ebea510384b02d4d62765495343cab537bacd2b1b0130c00246e081feb4e543761a594e5
 DIST bear-3.0.11.tar.gz 118678 BLAKE2B 209d904a84363a87e566798dcd65ffed96cdbf3d2e753af8dc2706adb995d2999bc112eabb88db28791cbb245c373eb330cf9c20d3d886bb2caeb5c01150e65d SHA512 6d362aede911a8ad35be30638a698579582ca5de770a7c3199bb205046f08f355387099261b8d857188d526ab62024f78e3d06a225734c5f9acca03e5dfea1ec
+DIST bear-3.0.12.tar.gz 118937 BLAKE2B 4ed41693a92583091b8510dd1ade55a3e5c897825205e59d9e9810aa63e5f17c5049b3b3de509665143083d44aeb6d85c63d944041bb36c6b1d842d0308d88f0 SHA512 e45e842793e9f5f2cd6b13a9795c2b6753c2fffd516e4af9f0362644c9d0952a2b0e505a4a9d53e9a1a4aa063d7368c6466367a78fececb70582ec7c4e8d7f10
 EBUILD bear-2.4.4.ebuild 1638 BLAKE2B 26435a94e41a295c629ca64a62f726a1ec58be5e85bcfbc312a2f6cd75d3232aae1e6854ad3415e99dfc369ce0e4a1ed0ff9e1b413332d24102015a2d1592d24 SHA512 c7d5cd603d219d8a1f764c728fdfb476b79b500b3db6c5513bb91397f88d4b5f46d4b16903834b93fff38f1fad243bca7c0c10d8893f2ce6238ac24847402e94
-EBUILD bear-3.0.11-r1.ebuild 2071 BLAKE2B a133a2e37f574d2ad1b060023becf5277f3011a7d54bad2d389b146ae3ef08f2a5d55ad93d2bd1c4e2778d9c44d6f4cea403ece918e111e19d3261ee9bde5a77 SHA512 562c3d1a8c4bded4cb8f29cefdc06dcef5665d40bf37c7f097c848a01b29df8c7bde0d905bc2e11dc20fec291963579ddc4db6c24b8679ffb5935b3f52c43764
+EBUILD bear-3.0.11-r1.ebuild 2092 BLAKE2B 78d02fa040a3b65d218fee784dbd321257fd6380c7b48e133f6121b8f616771b29aa2fecb7c44074f688d11aff506a63fd93259d4ef6d774bcf0e04bc8ddabd0 SHA512 9d842751d1452f3fe79e9e76aa776e6b4395200b1028ff0d0c2050a7092fec98afc4a2bbc1d461d4b6c36e372a0942e1998f7c82bb8d97e48f9be74cdeaa4175
+EBUILD bear-3.0.12.ebuild 2092 BLAKE2B 78d02fa040a3b65d218fee784dbd321257fd6380c7b48e133f6121b8f616771b29aa2fecb7c44074f688d11aff506a63fd93259d4ef6d774bcf0e04bc8ddabd0 SHA512 9d842751d1452f3fe79e9e76aa776e6b4395200b1028ff0d0c2050a7092fec98afc4a2bbc1d461d4b6c36e372a0942e1998f7c82bb8d97e48f9be74cdeaa4175
 MISC metadata.xml 914 BLAKE2B 791cac2c9a3850bc49848ec8f6ff889a21802ddce6937783afccdda45045b3861f0c79e44028ea6df18f046c5fc1b6ad89ac1a940afc9e4d6607507a12933382 SHA512 a7b29ce47f3c9d91f2ba5d1abf5975d64a9229619737b75d38d54b3bde860a47a859e6de7a959ad67cba21b2a0ced8a9fbaf508c02cace63c4090afbac2005ba
diff --git a/dev-util/bear/bear-3.0.11-r1.ebuild b/dev-util/bear/bear-3.0.11-r1.ebuild
index 86011aec51e5..9f97558920d0 100644
--- a/dev-util/bear/bear-3.0.11-r1.ebuild
+++ b/dev-util/bear/bear-3.0.11-r1.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	>=dev-cpp/nlohmann_json-3.7:=
 	>=dev-db/sqlite-3.14:=
 	>=dev-libs/libfmt-6.2
+	dev-libs/protobuf:=
 	>=dev-libs/spdlog-1.5
 	>=net-libs/grpc-1.26:=
 "
diff --git a/dev-util/bear/bear-3.0.12.ebuild b/dev-util/bear/bear-3.0.12.ebuild
new file mode 100644
index 000000000000..9f97558920d0
--- /dev/null
+++ b/dev-util/bear/bear-3.0.12.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake python-any-r1
+
+DESCRIPTION="Build EAR generates a compilation database for clang tooling"
+HOMEPAGE="https://github.com/rizsotto/Bear"
+SRC_URI="https://github.com/rizsotto/Bear/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-cpp/nlohmann_json-3.7:=
+	>=dev-db/sqlite-3.14:=
+	>=dev-libs/libfmt-6.2
+	dev-libs/protobuf:=
+	>=dev-libs/spdlog-1.5
+	>=net-libs/grpc-1.26:=
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-cpp/gtest-1.10
+	)
+"
+
+BDEPEND="test? (
+	$(python_gen_any_dep '
+		dev-python/lit[${PYTHON_USEDEP}]
+	')
+)"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${P^}"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	# Turn off testing before installation
+	sed -i 's/TEST_BEFORE_INSTALL/TEST_EXCLUDE_FROM_MAIN/g' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_UNIT_TESTS="$(usex test ON OFF)"
+		-DENABLE_FUNC_TESTS="$(usex test ON OFF)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if has sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=sandbox\' detected"
+		ewarn "Bear overrides LD_PRELOAD and conflicts with gentoo sandbox"
+		ewarn "Skipping tests"
+	elif
+		has usersandbox ${FEATURES}; then
+		ewarn "\'FEATURES=usersandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has network-sandbox ${FEATURES}; then
+		ewarn "\'FEATURES=network-sandbox\' detected"
+		ewarn "Skipping tests"
+	elif
+		has_version -b 'sys-devel/gcc-config[-native-symlinks]'; then
+		ewarn "\'sys-devel/gcc-config[-native-symlinks]\' detected, tests call /usr/bin/cc directly (hardcoded)"
+		ewarn "and will fail without generic cc symlink"
+		ewarn "Skipping tests"
+	else
+		einfo "test may use optional tools if found: qmake gfortran valgrind"
+		# unit tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearSource" ctest --verbose
+		# functional tests
+		cmake_run_in "${BUILD_DIR}/subprojects/Build/BearTest" ctest --verbose
+	fi
+}
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 58dd7c6f0c19..6b816c0aff00 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -10,5 +10,5 @@ AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83
 DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 EBUILD boost-build-1.75.0.ebuild 2058 BLAKE2B 42e8c169a139c01463c809b4b1d3bdb1293a28f0c375751e2fa6cbfd432aefddbe798d5f62bc795ef0a656e13a11a5623cf68533fe8bf0a402c12c26181179ae SHA512 d3640a4dd60f81acff16e6125b23956ab0bc4530f25cb51a5af6d7c7986776533dc3876620774b0802de927bc8ee3e35eae7eeddacd30a67257a9ff641cba47f
-EBUILD boost-build-1.76.0-r2.ebuild 2167 BLAKE2B 8a2b79f7e3bfc2378b4a7e4208c0f5a25c6fd348a0199be7d98414b05706c60c3899a586d91cefeb47566d5ec3567e1c5f3bce1d27c60854a018097ef9f74620 SHA512 51abd473cd35b56c7a152d963b81e37f764008015ea15b60b23d3564f78c9521e694bea7145a2b9af5411a54c93d46c2a63c52347ff264cfa46bf57e3c455348
+EBUILD boost-build-1.76.0-r2.ebuild 2161 BLAKE2B 7cef4e8837f6c404675340049e3c4d057b8bae7f67b5e04b8d58585f76f80c34c32e9dea3e296d06740a3f0494ba4a29c2950cba6020b495007ce5fa8f5176f4 SHA512 61b67a72b771afb9d5ce7a8dc33916cadb8cdb7d8ef2287c84a31372f8e0f3baf44f0db0c9bfcffcc8f5cee8b9c8030ba53128ef92ddacc21ef8470340b995f0
 MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.76.0-r2.ebuild b/dev-util/boost-build/boost-build-1.76.0-r2.ebuild
index 4d5d365bdbfc..d26f3a2bed8d 100644
--- a/dev-util/boost-build/boost-build-1.76.0-r2.ebuild
+++ b/dev-util/boost-build/boost-build-1.76.0-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~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 ~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"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 0c5b912ab652..db2b08a700f9 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,7 +1,5 @@
 DIST byacc-20210109.tgz 873282 BLAKE2B 3f856bfba00b692ecc5fd297582ff594873914552d522be5de78bc74c0c52a7e0b7fbcdd31e209e7269d9e00e2449cf7162ac5cd0a1f2060e051f8fca2171460 SHA512 95eafe81948fee1839fed8fff71d65c23d85de02af51672c118b2eed7c680f0dd300cec54cf366a248307c480844edc66a027575b29e20ef2f71f3c243ad5202
-DIST byacc-20210328.tgz 874281 BLAKE2B acd0fb0ebd99987ad5e823391e5186cedc64a9a7b5a1088ba42ac2c1a80d98d86f47c7626af5294853026a2e6bd4aeeca7b39b1a39527c170f118e33c021eba7 SHA512 fdcf98976524c1f37710cf9551a357ebc24ece94dd2bd10501d4fafb914a7ab4847926b99647e387f22a3d3206e6a4bfc14a4c41115702382fcc1d6f688f9dae
 DIST byacc-20210520.tgz 878173 BLAKE2B feecf3708eb6269c046043bff7f3ca40f4d4240e1849283e970dcf1c2f665e8c43f46ca4913a332987b7c9883fea68947953c28bf3f8fc983ffe6b7a4d804c17 SHA512 0b119efbe8748f9b5959926c36ac006174d99deb7a9c84ce97b7b80a01d197dd4d1004788dfed87bc492410a354b06f01b848b8da20ce0f64466c527c091bf48
 EBUILD byacc-20210109.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
-EBUILD byacc-20210328.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
 EBUILD byacc-20210520.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
 MISC metadata.xml 355 BLAKE2B 10160435379a759071cde21a0195dbeaac5783119695a9d9b092090158c429d01280d2442d351e5dd8a6368ff11566f153e02abc07d81c19ace1838f1943a09a SHA512 b0b39011f45894df952d34cd75ee087fd42a77aeb5a0e60e4201fb404781d77c4a5a82d2492712ad0ac2a2daad029a19c1284f7fc8f624c2ed47fd0b55d680dd
diff --git a/dev-util/byacc/byacc-20210328.ebuild b/dev-util/byacc/byacc-20210328.ebuild
deleted file mode 100644
index 556684fdc8ae..000000000000
--- a/dev-util/byacc/byacc-20210328.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="the best variant of the Yacc parser generator"
-HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
-
-src_configure() {
-	econf --program-prefix=b
-}
diff --git a/dev-util/cargo-ebuild/Manifest b/dev-util/cargo-ebuild/Manifest
index e6efbde42c28..3c491bd5a61d 100644
--- a/dev-util/cargo-ebuild/Manifest
+++ b/dev-util/cargo-ebuild/Manifest
@@ -169,4 +169,4 @@ DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0
 EBUILD cargo-ebuild-0.2.0.ebuild 2723 BLAKE2B 2c971c4e997c8dcdf14ac770b58172f509fb488cee9ce23599964725762d7f0dba7c435e3e0d5163e1c3448de83be949dcc2508deced0774b97713c4b1a62ce2 SHA512 ccef06000bcfb7b08ceed1edddb08945d36c04ecc5317543b8d3f83bcc7144afd2eafc8cc3b30f0808d27a819faf46df3892e0814bcdedabfdfb2c554015d6c1
 EBUILD cargo-ebuild-0.3.0.ebuild 1296 BLAKE2B 7ef1f0e28e2eabe61298cf8f5400cb7b8172bfe0d16ff6f46e68d5b407ede061fc5c952659af1c3bfe2be552d03c1e4f5063a7e027d7c2f69e0308cd2ea838bd SHA512 bd5343845a3b3f899ba5437ace79f95ca8e229fbf400dc93f3cc2cb0be04e100939f86def690ca36b5b9654a0721a4049282e42fa61fc7890966d25f6f3896fd
 EBUILD cargo-ebuild-0.3.1.ebuild 1376 BLAKE2B 767c8e784eaec455a9e54981953aa01e099536c8e1f29acaf71be0daa8a2f923dc771fc1b6693c11a94eee6fd0131a4f229a748a31fe9e179d593602e91b6277 SHA512 571bdfe5035575d2b50167fb65efc7079c034c4f7a7394a37aedc713f547d3a94dc79838fe9f3be6a6f514c9bec04dda94516a8c860dc288a79a901a7339fb11
-MISC metadata.xml 331 BLAKE2B 1fafc9c1b14b8c365a91f02ff7941cffe5e7d97253f74160943a7fba64341f1399cd5daf1da8f3fd1d7a9dac3d0def483fbcaefd7c991ab64de7e4707e636f6c SHA512 e664485c069f1b2341376dee14c76e2ff99b2897837ef8242a9f76106ba4e4d5edc4e8a49b379dcb3848bd65560e68a0c881b005572d526f14234bbafd29dd14
+MISC metadata.xml 412 BLAKE2B 752bf35b06842a5b4866834ad9b2966b9a61541b6467b4bacc63cb49231c71156bd28815440db8c03bd88cb14bd1e1b8b19738ea9ba780963868cab820f52405 SHA512 77d8773b4aa0d674e6ca07406170c8b8d113be61cd27e03293f2a1ea46289a5a69b0660da5b9b1a8c78e1f3c2461fdb69a8f0f41d49ae8160d1ea181ba8a0982
diff --git a/dev-util/cargo-ebuild/metadata.xml b/dev-util/cargo-ebuild/metadata.xml
index f4074b3f98aa..3495d28435f9 100644
--- a/dev-util/cargo-ebuild/metadata.xml
+++ b/dev-util/cargo-ebuild/metadata.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>rust@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">cardeo/cargo-ebuild</remote-id>
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 619ac867d6ac..30b605508907 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,8 @@
 DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39 SHA512 636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d
+DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
+DIST catalyst-3.0.19.tar.bz2 621000 BLAKE2B 162367363615fc83ce8847bd21f5f1b1e6e6e7ae90c65f6e58af6182a00f14d1bd26c7b994d984517447744b84bd7fbf9e865724a36316dff2cc294dab80685e SHA512 e375960f4b44d616112ec200278c20a9ee3597de04adc87e692b164dcaa3eb7cd4951b41a094c062a500d4920b375ad9750918b4985120ac71e97d118073020e
 EBUILD catalyst-3.0.17.ebuild 1998 BLAKE2B 19e8fc43f1322c3a24de6f07afd62693cda7680e5af7dbf443a893cce089a94c38b3dbe76530f801a67d5b33a5580edeb4681210f5d71e3a6ecbb7b273a1c70a SHA512 9414c001dcf2770efb5801909583dc0d044b6e376465509bb7ef7a3e633f2c9edff6e2c31aa4a8d3027530c9ac6ddf590153cbbc4504a1fbd90b23c0619f4109
-EBUILD catalyst-9999.ebuild 2291 BLAKE2B 5136e382f805c1abd1c8a7944bf3527a3c754000ce6e288d7e98bb85e50463286380eca57ba8cd96ed4c628d15cfbe88541cd5feb52632fac3f7982826274be4 SHA512 acd259cee286cc736338a0e31d2eeb24868d212a56322214417cabcc9aab2b77eadd5b07741e89f3f3fb46fe3eec62fd20ac15c5de791db9cae6eb0a406ad48b
+EBUILD catalyst-3.0.18.ebuild 1998 BLAKE2B 19e8fc43f1322c3a24de6f07afd62693cda7680e5af7dbf443a893cce089a94c38b3dbe76530f801a67d5b33a5580edeb4681210f5d71e3a6ecbb7b273a1c70a SHA512 9414c001dcf2770efb5801909583dc0d044b6e376465509bb7ef7a3e633f2c9edff6e2c31aa4a8d3027530c9ac6ddf590153cbbc4504a1fbd90b23c0619f4109
+EBUILD catalyst-3.0.19.ebuild 1956 BLAKE2B c9311104723c53a42590411650ae5b426991cb3c60c26cd936375533ae647ea5d2cc30e21b3377bd686e0539cc37b5b0b90adaaf7798ed95be3945ff214b80ab SHA512 78efb616458a8533d53537aebe934685ea5d818c8df066dfa504c70e4cb988eb123f0c41c676bb9463a765c9cc611b418f93feee73248161603a40eb9038acef
+EBUILD catalyst-9999.ebuild 2177 BLAKE2B 33a8c3f97e7cb4e7b8a56487eaf6a5d83cc2ba14e703a9bf43f3ca37e6dc035ad7d08406ad9112b5ebbe20361348bfd3e2e95d2857b22c6870b920ff8ab3baab SHA512 1dc17150656538bb6d6cfd1c058565ffe9f6d1ecd4da99542454e5c7f3f781f9dbdd59df36fe1ad587f46d0ab1b1da9b01559d11b2a4b600face3fd684df2404
 MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild b/dev-util/catalyst/catalyst-3.0.18.ebuild
new file mode 100644
index 000000000000..5793fe90faef
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.18.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+fi
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	<dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	<dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	iso? ( app-cdr/cdrtools )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild b/dev-util/catalyst/catalyst-3.0.19.ebuild
new file mode 100644
index 000000000000..37a0f189aa71
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.19.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+	app-text/asciidoc
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+	app-arch/lbzip2
+	app-crypt/shash
+	sys-fs/dosfstools
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+	amd64? ( >=sys-boot/syslinux-3.72 )
+	x86? ( >=sys-boot/syslinux-3.72 )
+	ccache? ( dev-util/ccache )
+	iso? ( app-cdr/cdrtools )
+	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
+
+python_prepare_all() {
+	python_setup
+	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# build the man pages and docs
+	emake
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc; then
+		dodoc files/HOWTO.html files/docbook-xsl.css
+	fi
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 989f9cf1c4bf..173090ac993f 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -30,7 +30,7 @@ BDEPEND="
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	<dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+	dev-python/fasteners[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 	sys-apps/util-linux[python,${PYTHON_USEDEP}]
 "
@@ -46,28 +46,22 @@ RDEPEND="
 
 	iso? (
 		app-cdr/cdrtools
+		dev-libs/libisoburn
 
 		amd64? (
 			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
 		)
-		alpha? (
-			dev-libs/libisoburn
-		)
 		ia64?  (
-			dev-libs/libisoburn
 			sys-boot/grub[grub_platforms_efi-64]
 			sys-fs/mtools
 		)
 		ppc?   (
-			dev-libs/libisoburn
 			sys-boot/grub:2[grub_platforms_ieee1275]
 		)
 		ppc64? (
-			dev-libs/libisoburn
 			sys-boot/grub:2[grub_platforms_ieee1275]
 		)
 		sparc? (
-			dev-libs/libisoburn
 			sys-boot/grub:2[grub_platforms_ieee1275]
 		)
 		x86?   (
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 8ab550de702a..669f6bf0da8e 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -5,5 +5,6 @@ AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b3
 DIST ccache-4.2.1.tar.xz 431484 BLAKE2B 10bb0d1e263e441d91c2dfcd2b2c89f64dfb10b4c5aa66012c388fea2c99d8488538e84b5cef86abf0c9f9aaa0a562b7c7be8a9d4a4073ae3c046e7fe28b7eda SHA512 46bb760ddad5999c5bdff4f3ce6e405eb2018c4a591ad76ba3dd7921b8bfd59a257d992d285e38d69aaf86537962602689175b8741894094819775eec9493b77
 DIST ccache-4.3.tar.xz 433508 BLAKE2B 6ab48aa587b4dc86020e3b0f722003dc5c03709626e143a1d38506b6072f9963fc76e89b6d18128dfc28035bf8d24e46ea44f219db69a1b3a294416f0b023090 SHA512 ec082de95ea8b22154ce1e67e0a0fc28266cfb71f382205f7eab14e6ac1c7841027d063041131832b3227d833d99ec874e90df238f35f433de4c381566931c7f
 EBUILD ccache-4.2.1.ebuild 1655 BLAKE2B b3cc038828f86dbd2d8060f5d13a197c399e7b99d0c0fcf4a82fbb498c212a9624fcb023f481c628a123fd1e2237689b1b094187c5fa1caa98aeca38c9c870d7 SHA512 0adb9fe19611bd373870e85d889b2bdaecb0fe6b11c40f3d48add1ecdca99c4b6beed5b151c685eaf13f0b11b0988bf870525ac23e3f78c865565f84e1aba156
-EBUILD ccache-4.3.ebuild 1662 BLAKE2B 3747ef40e6edd8f35a9c2760200593bb93c222b5864f9edda872413f1f54393b01402c675a7e39280786d32f87f2a798286f6ab6c14993a366d76c6e7548eef3 SHA512 7538e49273de477d4bc77b8db6e093c5c222d59c5c25383677195399a89bce281d64014b8631ab107c5af05c04aef69f6872a55631fecaee3a81b36d957b5921
-MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
+EBUILD ccache-4.3-r1.ebuild 2017 BLAKE2B b1d1697ba86b583246404c35d2a06b13ca4e12b17a095e425899309d803934b4522fba8c207d88de1737c14c6d2ec763b200b46f241789a9e649c08485bdd41e SHA512 210e3baef35396a2a647c115b3dc7a7bcf0d675134edda1b6cd0e5d8240f9af82ac209fb79164a86f9dbb7d40f07089b3aac03a94c5b00d32734f8f4ea34b774
+EBUILD ccache-4.3.ebuild 1655 BLAKE2B b3cc038828f86dbd2d8060f5d13a197c399e7b99d0c0fcf4a82fbb498c212a9624fcb023f481c628a123fd1e2237689b1b094187c5fa1caa98aeca38c9c870d7 SHA512 0adb9fe19611bd373870e85d889b2bdaecb0fe6b11c40f3d48add1ecdca99c4b6beed5b151c685eaf13f0b11b0988bf870525ac23e3f78c865565f84e1aba156
+MISC metadata.xml 538 BLAKE2B 5d70ae3ee732e530a300eddb61097898034fd227dbc9f9b7d1a86004c755b247f3d7e23737e23a68028fa35d07d9fa76a940bbadcb2e279e80e297d0562fe169 SHA512 1688d981f12ab344da5a579da421675dded7bc1a1e7db5f784f4ab757c630a012e377802aff6b30a59d1928ec0f026d9a60a7d84e9eb0593f1de02b980a7d86a
diff --git a/dev-util/ccache/ccache-4.3-r1.ebuild b/dev-util/ccache/ccache-4.3-r1.ebuild
new file mode 100644
index 000000000000..1410477f616f
--- /dev/null
+++ b/dev-util/ccache/ccache-4.3-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static-c++ test"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-arch/zstd:0=
+	dev-util/shadowman
+	sys-apps/gentoo-functions
+"
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+="
+	test? ( dev-libs/elfutils )
+"
+BDEPEND="
+	app-text/asciidoc
+"
+
+RESTRICT="!test? ( test )"
+
+DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+	# mainly used in tests
+	tc-export CC OBJDUMP
+
+	# Avoid dependency on libstdc++.so. Useful for cases when
+	# we would like to use ccache to build older gcc which injects
+	# into ccache locally built (possibly outdated) libstdc++
+	# See bug #761220 for examples.
+	#
+	# Ideally gcc should not use LD_PRELOAD to avoid this type of failures.
+	use static-c++ && append-ldflags -static-libstdc++
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_CCACHE=OFF
+		-DUSE_FASTER_LINKER=OFF
+		-DZSTD_FROM_INTERNET=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+}
diff --git a/dev-util/ccache/ccache-4.3.ebuild b/dev-util/ccache/ccache-4.3.ebuild
index 3f58044c6822..afcecdc6d9e4 100644
--- a/dev-util/ccache/ccache-4.3.ebuild
+++ b/dev-util/ccache/ccache-4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
index e27519ca728a..f673d3c58361 100644
--- a/dev-util/ccache/metadata.xml
+++ b/dev-util/ccache/metadata.xml
@@ -5,6 +5,9 @@
 		<email>toolchain@gentoo.org</email>
 		<name>Gentoo Toolchain Project</name>
 	</maintainer>
+	<use>
+		<flag name="static-c++">Avoid dynamic dependency on gcc's libstdc++.</flag>
+	</use>
 	<longdescription lang="en">
 		ccache acts as a caching pre-processor to C/C++ compilers, improving
 		compilation time when recompiling previously compiled source.
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d7f6297d4961..bb9bf30b5b8d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -11,8 +11,6 @@ AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551cce
 AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
 AUX cmake-3.18.0-filter_distcc_warning.patch 842 BLAKE2B 8c9b02a251d118f2ac31fe417e10750e3f4b911891723b0edacea83bf2b6220f121e02c299655cd49ae5a019af8a747218f81d6ece6cda41aeb57d24f9385277 SHA512 91b795225313270449d6da12baa818382da4f6937795303c5cc894f3f38f03cb88d8fb3b774fb0b8ab9cf5cd344ebeda3d83f48ef8474093a8a0268d8f342828
 AUX cmake-3.19.1-darwin-gcc.patch 433 BLAKE2B 72fb716af3d24d2723a06f0c2351d16af215cb64effa46bf404d8e00106ec80297b34b3d7f787b191e3fc08e1d35c515b6d2d527213285de91cb1f4b81272cb2 SHA512 a732f6f22e4eaab747cf80eaebb4fe5624aec893fc2bbb782f86d8377d3eda365568f091dd2505e18798fa8147f13adda0fa5cb0687c5c427a65bdc7cb957ff0
-AUX cmake-3.20.2-boost-1.76.patch 1921 BLAKE2B 5590aaf1083792806767bd7ada6d7a97c6c5fd6a4bb17d211589dae1a32d238d7ac98df983eb6a24a7a3277253a9d93e8eda1a237d2d7e1113dc4a7b74df258d SHA512 0f77f0350c296cf98e9f14425e3c822360dcbeda8c4ead5d5e3c2c75d3110fed4bf7df81f1cdd56f18c70a17d6f302771b1a67890599938de62a6716b7ba1eb7
-AUX cmake-3.20.2-sphinx-4.patch 937 BLAKE2B 433693ccca65d8f389bac738217efaa79e8ee2dc6d498df7aea63b6f26aa198ba8923f4c172907b0e6a5a384c2498671e97fcd5850cb1822858d571225eb16a1 SHA512 22215383e98d90cda79396ba9cafbfaba10c43138228d033a89544c5190e4e415fecf541115169f9c062afe6b95ad42b2678f0afefe3af16aff8a8c711558a49
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
@@ -20,11 +18,11 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
 DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
-DIST cmake-3.20.2.tar.gz 9438694 BLAKE2B b1e1c091047d5ccae77d64ffda8201cfa7661f09fac2aceadfede8be09257cebdc8c2536f10ced82c700fd87174979344489fa6ab1b460e3ddfc41325ca6f19b SHA512 675a92f84b437169aee86dbfa59715671b9195ddeffc6fea83c7803a70abe3116106ad0a627b9e4bef326bfb2a10fdf624ad341fd9d3d08e3d8a69c271cd2b32
 DIST cmake-3.20.3.tar.gz 9440009 BLAKE2B 25098305b2fb9d719ffd3a25936207d98901651a6d9c6fe0757d4da3619274021025d7ce9f78b3813826c8b52347f12321db905083839d3882a2ba85a294561c SHA512 ed2b8b04c759c4f7c5c363be33bf08e6677c710c1f937050a378ab5539136b919531e1c927b117b3d8d68d4bb613de8d92a3d4d50f3ab3bc98355febca779a1b
+DIST cmake-3.20.4.tar.gz 9440363 BLAKE2B b04cf6e41878b8626b13516ecbe9d27f0fe801437342217389b739f1549743be10620e06aa521de4ab7b1dcb8f0a8208bf8b3805cca54ac782c320d938c8d9b0 SHA512 f53902a917b8d7b949af305afed3b32fcf981c5c647a77ee7a3bcae1bb5620381a1eacdac4b86bd7e5ea0a7806ec5fbd9a4f4853553f78db4d41d7dd2867c99f
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.18.5.ebuild 6070 BLAKE2B 24ab19a092db23bbcbf3d8f1a87e21cc8f17575e8eff885efa81c3fb0161204f8f821bda04ac819fbad5f73936db8b2bff38b688252a9bcab30a7df002adfc71 SHA512 59b479102626d771fbf66f1dccc011e33ca5e3d77bc37f291c6e28fbdf998b7b5853da56875345807714b85a1e95c7b41fe2f5e98f6486191b1c80d6962697c8
 EBUILD cmake-3.19.7.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
-EBUILD cmake-3.20.2-r1.ebuild 7140 BLAKE2B 7f72a4516fd9f0456698b7f444dc148c3e0b2f6c9c06a63fd9be92873012032c241fcadcb7e4ae1abcf50fb478d136ec095547ab8aeabe3c2d0cae0d46a439ae SHA512 004c1f323dc8a1dec2f9b5c237c636adee77c5dd4aeed8b515ae06fdd9dc61df5ceb8f307b72e2040a99ffd9d7946658ce1fcefb9fcf4b81394256eba757afc9
 EBUILD cmake-3.20.3.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
+EBUILD cmake-3.20.4.ebuild 7042 BLAKE2B b60e9f4a8bcb96c74db8e221b28f49d7a641cbce8ca954af4f2ea93e118c68b6d6028bdab91ea7907cd87238f7d2f85862866f607fa738674315a0d51e069b70 SHA512 b95e61889cf487d3f7977b740a5857f2c4130ae8c843e2b74f38ebede2bcd3f9d9a1fa7311058c65d075eddea128e3390eb55b5f9068a57142c357290413b74f
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.20.2-r1.ebuild b/dev-util/cmake/cmake-3.20.4.ebuild
index 627ca4f7a027..b1cc1455ac6c 100644
--- a/dev-util/cmake/cmake-3.20.2-r1.ebuild
+++ b/dev-util/cmake/cmake-3.20.4.ebuild
@@ -70,8 +70,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
 
 	# upstream fixes (can usually be removed with a version bump)
-	"${FILESDIR}"/${P}-sphinx-4.patch # bug 789375
-	"${FILESDIR}"/${P}-boost-1.76.patch # bug 791712
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch b/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch
deleted file mode 100644
index 898f8a75d7e0..000000000000
--- a/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 79be37b94e7353ec056e6343ba293ce1b60627d4 Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king@kitware.com>
-Date: Fri, 7 May 2021 08:51:40 -0400
-Subject: [PATCH] FindBoost: Add support for Boost 1.76
-
-Update the list of known versions.
-
-Run the command
-
-    cmake -DBOOST_DIR=/path/to/boost_1_76_0 \
-      -P Utilities/Scripts/BoostScanDeps.cmake
-
-to extract dependencies from the 1.76.0 source tree.
-They are the same as 1.75's dependencies, so just update
-the version check for warning about newer versions.
-
-Fixes: #22167
----
- Modules/FindBoost.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
-index f8887ad2be..d31f925cb6 100644
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
-@@ -1350,7 +1350,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
-       set(_Boost_TIMER_DEPENDENCIES chrono)
-       set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono date_time atomic)
-       set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
--      if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.76.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
-+      if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0 AND NOT Boost_NO_WARN_NEW_VERSIONS)
-         message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
-       endif()
-     endif()
-@@ -1622,7 +1622,7 @@ else()
-   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
-   # _Boost_COMPONENT_DEPENDENCIES.
-   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
--    "1.75.0" "1.75" "1.74.0" "1.74"
-+    "1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74"
-     "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69"
-     "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
-     "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
--- 
-GitLab
-
diff --git a/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch b/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch
deleted file mode 100644
index dabe39e0b376..000000000000
--- a/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bb9c69ed7052614546d34d98a9cf1218e4a45bdc Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king@kitware.com>
-Date: Fri, 14 May 2021 10:26:11 -0400
-Subject: [PATCH] Utilities/Sphinx: Update man page config for Sphinx 4
-
-Sphinx 4 by default generates `man/#/foo.#`, but older versions generate
-`man/foo.#` as our install rules expect.  Update our Sphinx config file
-to tell Sphinx 4 to use the old layout.
-
-Fixes: #22192
----
- Utilities/Sphinx/conf.py.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
-index 5def681dc4..c383828bd7 100644
---- a/Utilities/Sphinx/conf.py.in
-+++ b/Utilities/Sphinx/conf.py.in
-@@ -53,6 +53,7 @@ for fpath in cmake_manuals:
-     except Exception as e:
-         sys.stderr.write("ERROR: %s\n" % str(e))
- man_show_urls = False
-+man_make_section_directory = False
- 
- html_show_sourcelink = True
- html_static_path = ['@conf_path@/static']
--- 
-GitLab
-
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index ef5b10b57524..b1fb97161976 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -5,4 +5,4 @@ DIST colm-0.14.7.tar.gz 3110831 BLAKE2B c8be14001e8dc3340f5c55fbf8140b86237ec946
 EBUILD colm-0.13.0.7.ebuild 536 BLAKE2B 63e79a820fc90b689337ae2d4bf23c008414f40e2a731322be6585c154bcda1c54ef7445d3df7ef398f92979c6a77bdb144c9e6714bced9799be80b9115baef3 SHA512 a5a414ceb658cf09730b8a2bfb3c5cc99506f998034ee9131c3ee2b7ee29b362a5053f1ff55991336d31685cd65b8f1c2f76f71456ccf51a198596f07782208d
 EBUILD colm-0.14.6.ebuild 1227 BLAKE2B f359b302ce4345f5d86a20b2ce22298aee8ca519f7348db7201aeff9753346ae5df1e7d8f9388593a426e986ca81c11d58562d889994eb4f4728c5d6b11b8ac3 SHA512 894b7733416e4d7293ab7cf294845d87d92548f5d897865c383b19aa7de65abcdfcfd6dd44e5050cd79ebb22a817f47d2bc0f0b77a848b0debdd31d6e717cc07
 EBUILD colm-0.14.7.ebuild 1290 BLAKE2B b57f17bdb8d9640ef7982b963ce8134417b9304bc1d7a78bab29399302b3cb8add5710a4ba3cd820ce10134a451a2db3087cb2dd8ec28363e406946cb8287fe4 SHA512 c9cb61a20ad63618a30807d6e4e610fa9056f36d6a73c5f43c2e342b3b83802b402617d5579496e902d229bddebde1c42f8be70eaf9c977b25772226db7007aa
-MISC metadata.xml 332 BLAKE2B e0956073a0eac90ffbe6c682e223262351704d19f4ab914435d5751b88386b8197c72c5a77e6eefa410b009b8da4a479d9eede17a26f7faa5f4baf94ae6773b2 SHA512 cc81ab9d4d382d80a02de1073fb5f9a0f793cc3df7b5a11bbba63d5a9727c282e88365c265256d0452f5627a2fcd41551e02ab395cab1be9734765d651b223f6
+MISC metadata.xml 252 BLAKE2B 323a806a1835a9dbb966b4257d22c4f5a168f09aa7a32d795fe0a7beba83b2d1441d91cee89b2ffa81f84077667a360bc54323ef69d84c5724f59383c15066c4 SHA512 2218696694d0749b13193d7ef6168ab43aba15c9f39f98f5faf306d80205684f84c207eb8d3dd65d70428f5d8419b4feb94d87feb62922a8532d18d4045b2e80
diff --git a/dev-util/colm/metadata.xml b/dev-util/colm/metadata.xml
index eb7ab1205961..a7f162b7c028 100644
--- a/dev-util/colm/metadata.xml
+++ b/dev-util/colm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">adrian-thurston/colm</remote-id>
 	</upstream>
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 6558b8d8b765..89aeb5846b9c 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,3 @@
-DIST conan-1.28.0.tar.gz 1135799 BLAKE2B 774f980b489bc2ee7973447829ac2f9062198ec85a1129e3cfcf34a490b969cb5c04546a8918b542bc15e429d75d8e7fe3bc29f9cd5c6cebb6f7270a921a47f2 SHA512 1366f37d774bcaeadaf27f459d9a3889424a21ad14cc0e59f978ccf77a2d4e1f3497e98533e325fe086735b9bdaee64fd2df6c228e62d7577533142ab28401c8
-DIST conan-1.28.1.tar.gz 1138639 BLAKE2B 91f277b88a2069efa3ad5f6209279888b4ac8cf5c359b7933ace6cc08c8b61a868dc8f7bb6a817fbdea378ce175229c91c9defb750326e2a5e31c4d6d528985d SHA512 b8eb4fe34b1614ebcb5e15bd0a827c5949e8588c6a04380632858e68eb4172361c96305154cc5a630254ed6236d7fd82e3a2c05962e312af3cedba41eac0a6e3
-EBUILD conan-1.28.0.ebuild 2463 BLAKE2B a7783520d53cd295fcf3ceeecc1f81c3eec33dfee2c00ae031e5fcfccb6025100d3c8e5606dd747560e466da3bd121c25594d442fc58f03a45a31e915a6a1910 SHA512 1cedc6f6ef4326d20c10eedcc43ba5646f352d494c094842ff00612778edc30f0b11509c229f2708c6ecb93ba333c8ce0e25b874d4421e2ebe79952acdc88d60
-EBUILD conan-1.28.1.ebuild 2490 BLAKE2B 89d467c461604d9636e771e5ed2fc06eeae74e835028e760e1977f31d7206141b8a06721a70c36b60d74014a88e50ec3e656cfed395acf740d15833b675648ba SHA512 b9ebe84ab7326f0ff432926763304c35ce7e394f0b590f06ea674d5a9c1c2784cf4430b7d32e4280e3bb732a72790c26fd62284c6d7b9ed5f3b8b0efbf542538
+DIST conan-1.36.0.tar.gz 1283280 BLAKE2B 024b94debd899adcc561713111494a49822cc721b3da022c34c5625454cc5d80ffdcc2ce6375ee4c719fecc2b0d4771191862a83b74613019b680662304c6761 SHA512 d1259a83795877bd9730e735a5cbea9457b3160d0f358e46a672fcd20c794feb2fa24970efdddc4ca1be8f1299db45793cf5bc7724d259bbf4f8f6a0e502f5a6
+EBUILD conan-1.36.0.ebuild 1871 BLAKE2B 5e815fa2ee82eecb8ab594846eb0d0c896aa9e286b8c6b19b9e490f39bf6ed9eaded3fd77491e8d66d85d6073abd6689f89e6ddd1637e8dcec4704d696cc8585 SHA512 2f7ed222ed5f84bebd75ef897652e42a545b0f14ce799e06482bd0cf8ca643bac78d0910815d9f7dbd6cb4aaa991792bf59dfcb188015eb16b403a20b49d78a3
 MISC metadata.xml 769 BLAKE2B 912e435ff8d086998d1bd865a7162d5a99d3a0ef37ee7d6fec986cd9b01cb2c391d2cf1f0a51ee4fccfab5ef779aa03d65858dbe008e6dad3e260f90d2f6ee54 SHA512 5730a569221578910854ed135c963a6fa60cca712e48818cb7fdf97da1d57fa83f64ddad9b4ae994b6ec6d59071e98526fc6a905d43f7088dc1ff99a586b95f1
diff --git a/dev-util/conan/conan-1.28.0.ebuild b/dev-util/conan/conan-1.28.0.ebuild
deleted file mode 100644
index 1b0a14cfa2e8..000000000000
--- a/dev-util/conan/conan-1.28.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Distributed C/C++ package manager"
-HOMEPAGE="https://conan.io/"
-SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# overly strict requirements?
-# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
-# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
-RDEPEND="
-	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
-	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-DEPEND+="
-	test? (
-		dev-lang/go
-		dev-vcs/git
-		dev-vcs/subversion
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		>=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
-		dev-util/cmake
-	)
-"
-
-src_prepare() {
-	default
-	# Fix strict dependencies
-	sed -i \
-		-e "s:six>=1.10.0,<=1.14.0:six>=1.12.0:g" \
-		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
-		-e "s:distro>=1.0.2, <1.2.0:distro>=1.0.2:g" \
-		conans/requirements.txt || die
-}
-
-python_test() {
-	nosetests -v conans.test \
-		-e test_ftp.* -e modify_values_test.* -e test_pkg_config_path.* \
-		-e rpath_optin_test -e test_variables -e system_package_tool_installed_test \
-		-e virtualbuildenv_test -e scm_test -e test_git_shallow -e tools_test \
-		-e test_environment_nested -e devflow_test -e shared_chain_test \
-		-e test_toolchain_linux_0_Debug -e test_toolchain_linux_1_Release \
-		-e virtualenv_test \
-		-A "not rest_api and not local_bottle" || die
-}
diff --git a/dev-util/conan/conan-1.28.1.ebuild b/dev-util/conan/conan-1.36.0.ebuild
index 1d9e06b6f8bc..a90e3576695a 100644
--- a/dev-util/conan/conan-1.28.1.ebuild
+++ b/dev-util/conan/conan-1.36.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
@@ -37,22 +37,13 @@ RDEPEND="
 	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
 	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.7[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.8[${PYTHON_USEDEP}]
 "
 
-distutils_enable_tests nose
-DEPEND+="
-	test? (
-		dev-lang/go
-		dev-vcs/git
-		dev-vcs/subversion
-		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-		>=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
-		dev-util/cmake
-	)
-"
+# Try to fix it if you're brave enough
+# Conan requires noumerous external toolchain dependencies with restricted
+# versions and cannot be managable outside of a pure CI environment.
+RESTRICT="test"
 
 src_prepare() {
 	default
@@ -62,14 +53,3 @@ src_prepare() {
 		-e 's:==:>=:g' \
 		conans/requirements{,_server}.txt || die
 }
-
-python_test() {
-	nosetests -v conans.test \
-		-e test_ftp.* -e modify_values_test.* -e test_pkg_config_path.* \
-		-e rpath_optin_test -e test_variables -e system_package_tool_installed_test \
-		-e virtualbuildenv_test -e scm_test -e test_git_shallow -e tools_test \
-		-e test_environment_nested -e devflow_test -e shared_chain_test \
-		-e test_toolchain_linux_0_Debug -e test_toolchain_linux_1_Release \
-		-e virtualenv_test -e link_order_test -e test_version \
-		-A "not rest_api and not local_bottle" || die
-}
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 24deb369da2d..9321a6437882 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,5 +1,7 @@
 AUX test_cli-1.7.2.patch 579 BLAKE2B 8a77388ddac5bf4aaf1f2f3d950318a8f3af582df9bca9004a6701c7347ff81abea25b0c33586153198906358583a2acf8e17b20248ad98215c44411739df581 SHA512 d5906423db6cf8254c411a5f33f4f0c6b9b2760bace1db5e131ac8ec47b740d5b78feb7caa450efcec6cfb05997ff8038fb9e3fff81585d9b64b455b492e5a52
 DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1a5293330b8162da0f31895b0c3a58a4e0f36d66bee3da328a6b0a59fb5bd917a2f3f6fcf7772a4c63db5cd0030caae SHA512 15cc145f143b4cac6e78b12e1c29e191d0c1c96b0187db05a4c8aac18310a5cb31d912073674ef4c01727c9b5a3b67f8c508842cb625db338b4034faa52a4a4c
+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
-MISC metadata.xml 329 BLAKE2B 6c2335992c9d68c7854c593e8f1290bc3e967706fac92fcc365d12f7813dd5490d8ef5921f0e1e61d0c13fa9b1b43ec20c8e7d95fd1ba926ffd7cf82bfaab4aa SHA512 0d318a3a6a0ed5b048d9efa5dff3e5c447ed3545997cffaf1d494898b3d35144dacd2cd9fdb8fed3adb1d39d9621b23734d04b7f6026256a891c3b1c501681bd
+EBUILD cookiecutter-1.7.3.ebuild 1288 BLAKE2B be50638acc321952653b32e5f1b4a501292b7ea86acfb9effa062873b0ee460e3d926812c5694ca0c0ac675f6c61afe0007a82bf1c5d3ec8b615e55436267696 SHA512 3b3abc4e126172c7ef354cf60f7d519775738e7f2d742611ac24fb01588bb11d633c10bfd02d1467146c1f7e58343c8ab96fad09508aec2833885ee44f211c1d
+MISC metadata.xml 448 BLAKE2B 8b1da3b9426a697368f2fe27dc7f703be31f91a56e22cb481ac9d9bfe3825e0f903fc2b090893ee3c198aefa40f329bb520c15392ca853c58f007c2cc8b19bf1 SHA512 678abf4897103b1da004221ab3d7b4ae2c29c5f89a580b9a869ab547ca49eaccee175aadaa57677d5ced915f32755bf3c88226cf07c2ffebca65bd54398127b7
diff --git a/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
new file mode 100644
index 000000000000..b808d44faf12
--- /dev/null
+++ b/dev-util/cookiecutter/cookiecutter-1.7.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line utility to create projects from cookiecutters (project templates)"
+HOMEPAGE="https://github.com/cookiecutter/cookiecutter"
+SRC_URI="https://github.com/cookiecutter/cookiecutter/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	<dev-python/jinja-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/poyo-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-time-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+DOCS=( README.md HISTORY.md CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}/test_cli-1.7.2.patch"
+	)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/recommonmark
+
+python_test() {
+	epytest -o addopts=
+}
diff --git a/dev-util/cookiecutter/metadata.xml b/dev-util/cookiecutter/metadata.xml
index 7877307ed7c6..6f48334d456f 100644
--- a/dev-util/cookiecutter/metadata.xml
+++ b/dev-util/cookiecutter/metadata.xml
@@ -5,6 +5,10 @@
 		<email>cedk@gentoo.org</email>
 		<name>Cédric Krier</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">audreyr/cookiecutter</remote-id>
 	</upstream>
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index a0b7d28455de..5c5eb0a58d2c 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -5,6 +5,6 @@ DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4a
 DIST cppcheck-2.2.tar.gz 3561406 BLAKE2B e436de4bec5412a18f013c8557a966c28c14edcd07fbb80eb53a897848d15f32afc180798ea1a074742f896b15d4020755c104b87dc8f82252121b58a92b92dc SHA512 d766187a69d6aa839e072e3c0ed44009621ca8492504257288ca2f49774f705a1ebcf2957f0801ac6eab2ffbdd845e9237f1213f85c6d0fcdbf16b1e7c690327
 DIST cppcheck-2.4.1.tar.gz 3761646 BLAKE2B 4c791088621f989e2529c92de38a73676fc3394e8cac72822596f7a75594283d0983693d693aa903a3ffb80bc0e1e20e71b55db5682d4d01c135ed77b2fc2e3c SHA512 8fb1ed5faa0071fc69405b7eb5b41e9f94b77d097158ea0d4f5e4da8a5087b9d1ab7bf37f8dc73d00096d3d2494aeb431af8029f0d4f1e2085f5b9b72bdc2d09
 EBUILD cppcheck-1.88.ebuild 2343 BLAKE2B e669f6356fd39c2f736c1a5f9131b9757592db79a6bbe231d053ec5dade9fd692b6fd084b086e219f99a400309632a2c35281866c1b92bd029b926fde510f07c SHA512 c4c390e5dc1f6d1c484b1d016973fa7bf114b165b451413d95b85b46e3af878060da6b1932709157963c67d2666392818111761159845681c165bbef203204e3
-EBUILD cppcheck-2.2.ebuild 1703 BLAKE2B 1e1f847145c2aadc055b883831e85c841c2ba0a298914c577f5a742770593bca36326f7a18f63c12fb293e7aaf4e19bfa10778d9b32314bacb37c62ade437e65 SHA512 db26782ed3215d110a9419763aba386e742ccb74b791aad5136a8e147570b93db3713badba01a04dec434d957816f938e3c912a8aba5752a2d24ce2ec3bdce7f
+EBUILD cppcheck-2.2.ebuild 1702 BLAKE2B b00b67bf679c6e7f3cf8b3f6e735ed22906a230c18af78a8742dc13e683a5afb285bdb37c1411166b941ea10147d19d8d6894d9b2e931075f893a77f4c12e1ae SHA512 42dbe570713326485107184deade6972c9f328b735cc07c1e1a2ecae407a73cc0cc3b9944dada6cd8c6988f3c0dd42e6ceb8f8301a0664e1959b2b27d955d4e7
 EBUILD cppcheck-2.4.1.ebuild 1767 BLAKE2B d00753321c8fdd0ca9be2ecbc97b0a1cf802395fd084b1c5eda17b27193f26e241d2398aa32988e809e4e8c8cb00d09bfbff2c157b7aa96b92fe85aceab4114d SHA512 d981a44eccdbb90891f7d7b409f46b2b2e586e196dc6d88aa8038e497691a7d6c9fa2bbc611e7dc25c6c6d4b26cc876df3f71dcb96977a2436677f6991198081
 MISC metadata.xml 490 BLAKE2B 63b66d1ab0e87f0dd53dfaec62c4d17c1e806ddf2208df30b1a5fcc0f198ca343afa5a39ab55d92a3b4ac3b0143c24ec5c161afe23982c3c5eaca2050621c776 SHA512 1db095c4b258ccea938d6e4648aca9c3a165a123a703311de95f1743f641c5860cd1dd0369e6539efadd270b9f82f25694f504c34129cf55c74b323ffb3ac3c5
diff --git a/dev-util/cppcheck/cppcheck-2.2.ebuild b/dev-util/cppcheck/cppcheck-2.2.ebuild
index 4014a57d6c95..692cdedf480c 100644
--- a/dev-util/cppcheck/cppcheck-2.2.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 sparc x86"
 IUSE="htmlreport pcre qt5 +z3"
 
 RDEPEND="
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index 8e1bac4754f6..cc3cdc668b15 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,3 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
-EBUILD cram-0.7-r1.ebuild 554 BLAKE2B 652f40c2f0195faa2cb30e0e56490ca694729a17e0e1d29596c3abeab03ec28f1e3c3c56ba82d8ad0bec69369e764443690420203eedcecc5c49e93c0d2f790b SHA512 bf4a36e750073cbbdf3830750c8156efbf09b520fc21562c410d486865b53b57fab55400fc77c06773732d5979cb55045eedde6bac218c4a54b40d79c3df5a96
+EBUILD cram-0.7-r1.ebuild 561 BLAKE2B 8e526c8987ce8fd81d88e8dc8b5ec02d4f35a4bda141cc823ac8479e15a0b25cd4aba71311d1e7eeeafead87aa0b29afba30380024b8b3d7ae356e424be81129 SHA512 926a0ddb18c75ee18f829de724d6d96685ce7f871f5ebb97fe249c8b89a7c05556a618220905acff20b361dccc8b2087145366ac8f9a38a6f1d36911c1ca7015
 MISC metadata.xml 598 BLAKE2B 3de84be62941f1e475f58c77c6c3290a3247c930d36bad6b181ec2e78ea81b3faf2b1fa4ad4ce9d9975c99b623bb6eec03ee0ccf5c74ff5444f80058e099c0c5 SHA512 f3982923cfa384b00fb9b0aa8fe0bb9cbcfae40f43b248432f22af4a2cfbf29dbf327ebb26267991b47a9b1327e057ab9202061ee21e9a543a1cac9f5c82d342
diff --git a/dev-util/cram/cram-0.7-r1.ebuild b/dev-util/cram/cram-0.7-r1.ebuild
index 5b94073cd0a4..1422f2722a7b 100644
--- a/dev-util/cram/cram-0.7-r1.ebuild
+++ b/dev-util/cram/cram-0.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv x86"
 
 python_test() {
 	distutils_install_for_testing
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 0aec9f94ca4f..c814819e5347 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,4 +1,6 @@
 DIST debootstrap_1.0.123.tar.gz 78175 BLAKE2B e507ee76817eef20cfea4e37eaf893f8e64acaa791806ebd55bec97b8e60eb3c59b68bfe5e6023dc6e73706bde2468db46b84f0176ec46d086c3ea9423a206c7 SHA512 3b23f61528d4993750ba22b8765c10cfb9695793177017d9e4faf546da076be6660c5d6e0d1bf30bafe14f6d70f886190d3ec42a0057b895f40e860475eea794
+DIST debootstrap_1.0.124.tar.gz 78498 BLAKE2B ae3075c6eabc1c76fea370ac5781ca0343b0912e03c086f02c011af10ab4c51f2503743705bc0dc52bcf6afeccb97f167802e2034f2182a8c7bb6148fb5d4e0c SHA512 bc028f7fec85b35a5f826044d8aff22b6fdf69e7e2c5f5c95e4b92327bcffa6411b5b21869833d10fb1f70316271149470921ad4310d61fdd3c73b65bd8009f1
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
 EBUILD debootstrap-1.0.123.ebuild 1180 BLAKE2B 69b348fc2fdf6e8e9b19094a96e07417715aace7acaf2b2de8887db50b5edd011ed2456758f800598c3d8dcf3cfb2717bbcb2d5b396b2df1a100e79bfa14cd13 SHA512 a3836cba0337a00133d31ecd93bbabb11976e35dc1a057ed31cec1f2d027cfe0b691cf678074f2b7208ba2519e83fab72144d6fac72d0e3df20f5771d4087e6e
+EBUILD debootstrap-1.0.124.ebuild 1186 BLAKE2B 94f390474378525a9841a835cabfa949c93cc49da839ba506311556fa71d2b77c72aca3544321e76332189095d85695148887f8224ff7286d1f80a5fa84a69d8 SHA512 db1877100e1460bfa858fa7fc6a715dfa8e2ebae0e74d0eb08fcd117138d4599ab7dd491196cd74c3ea3be0bd79a237ad7c2e846151b8f80bc5c40de9209c78a
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/dev-util/debootstrap/debootstrap-1.0.124.ebuild b/dev-util/debootstrap/debootstrap-1.0.124.ebuild
new file mode 100644
index 000000000000..4cc27d3d8911
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.124.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+DOCS=( TODO debian/changelog )
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring (--keyring=K), please"
+		elog "install app-crypt/gnupg"
+	fi
+
+	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+		elog "To check Release files from Debian or Ubuntu, please install"
+		elog " app-crypt/debian-archive-keyring or"
+		elog " app-crypt/ubuntu-keyring as required"
+	fi
+}
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 17afcee18db0..30779383acca 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,5 +1,3 @@
-AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
-AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
 AUX 40.0-optional-introspection.patch 1163 BLAKE2B ce50a6bbb920610be1daa723383e1fd464aed84f3d01911e1f85b50adf1f44680518a15e896b351271a3c3ac5500c2fbe148392fe90191f0ed37162faacded88 SHA512 6f874452379b76ee0ef1b402a7bd706e3543cf10b9033e5c5c0d1e153ce8d845e75056d10b1f451fc4ffe2073a7157ab492416d9c76eed44e38d00d919ddbd57
 DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefea2c85229092be57c98f96459c33ab0fdf847a7135fa1b329c76edea71f7da0342c6673a828efe26298d26bdf SHA512 b8dd5fbb12558845f7f5794dad56ef0ffc1dbd60d5a6a28029dc8acea241e8deb1b68cd0abe9d620a512931a1c5f6db12fc594cd4597758c8d4904fb64e6ade7
 EBUILD devhelp-40.0.ebuild 1787 BLAKE2B 623ca0412768d8c04bc8637bf95e5b4e6d708fedf1f3b7d58ae4dcbf6e0c1b05065ef86be30405df3655648c0db9078815dc9a39611f330b64dfabd6beab23bf SHA512 af0d7acdb175458102553ab2006c505d36d5bb11657b3bec012eb36c55e45534958dedb775792fa0b954bf0cdab2f469e9aa024c57d157d18dc2e3c1e28c1340
diff --git a/dev-util/devhelp/files/3.30.1-optional-gedit.patch b/dev-util/devhelp/files/3.30.1-optional-gedit.patch
deleted file mode 100644
index 09e4405a50e0..000000000000
--- a/dev-util/devhelp/files/3.30.1-optional-gedit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5bb00c3748741d585d544c96933a25bd399736ed Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 22 Mar 2019 19:47:49 +0200
-Subject: [PATCH 2/2] build: Add optionality for gedit plugin installation
-
----
- meson.build       | 4 +++-
- meson_options.txt | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index a0def09c..2d1d3e0a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -155,7 +155,9 @@ add_global_arguments(supported_warning_cflags, language : 'c')
- ##### end CFLAGS
- 
- subdir('data')
--subdir('plugins/gedit-plugin')
-+if get_option('gedit_plugin')
-+  subdir('plugins/gedit-plugin')
-+endif
- subdir('po')
- subdir('help')
- subdir('devhelp')
-diff --git a/meson_options.txt b/meson_options.txt
-index 2eaa7ff9..8fdb5a89 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,4 @@
- option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
-+option('gedit_plugin', type : 'boolean', value : true, description : 'Install the gedit plugin')
- option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
- option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
--- 
-2.17.0
-
diff --git a/dev-util/devhelp/files/3.30.1-optional-introspection.patch b/dev-util/devhelp/files/3.30.1-optional-introspection.patch
deleted file mode 100644
index b5afa8a2b874..000000000000
--- a/dev-util/devhelp/files/3.30.1-optional-introspection.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3434481e901a0ffbcba9817e4c0641ca8c19275a Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 22 Mar 2019 19:44:40 +0200
-Subject: [PATCH 1/2] build: Add optionality for introspection build
-
----
- devhelp/meson.build | 2 ++
- meson_options.txt   | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/devhelp/meson.build b/devhelp/meson.build
-index ea217895..f88fcb07 100644
---- a/devhelp/meson.build
-+++ b/devhelp/meson.build
-@@ -123,6 +123,7 @@ PKG_CONFIG.generate(
-         requires : LIBDEVHELP_DEPS_STR
- )
- 
-+if get_option('introspection')
- GNOME.generate_gir(
-         libdevhelp,
-         export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
-@@ -139,3 +140,4 @@ GNOME.generate_gir(
-         include_directories : ROOT_INCLUDE_DIR,
-         install : true
- )
-+endif
-diff --git a/meson_options.txt b/meson_options.txt
-index a10fc603..2eaa7ff9 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,2 +1,3 @@
- option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
- option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
-+option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
--- 
-2.17.0
-
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 1db95b54dd90..a4d983b58131 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,5 +1,5 @@
 DIST dialog-1.3-20200327.tar.gz 547962 BLAKE2B b335d8b57d9a9f3a7e303aa3b2c64736007b66618a79c79368d9dba20a8123813cdeb7d0643bf7c6d147314963ff469b6e41d2378fe9181081fa543f0aca50f2 SHA512 c8c7ccd86fa189a2b6739320f59f127512e53f908ed257280099f8c45754da98d2095835d0c14090cd071af0ed6e8ff95f9938f5ca8027b0b7001c7fd746fe59
-DIST dialog-1.3-20210509.tgz 562432 BLAKE2B f3a36d01f85516eb7297643158d02585bb62d4e54e90784218f0f9a825d7011093ed9c784bbdfd9c466b96b054ad44c23f97115599018befd449398678c78c64 SHA512 338ea8ee1bbbc44f0d8f511c5c87b246ea242a287346dd27e490d4854fdc00e9b4241d2ef372f131ef7152ebc2429d54c6bc1eeec0f89a6476e0a05f2683c64c
+DIST dialog-1.3-20210530.tgz 562950 BLAKE2B 2aa33c4e2568f91a08d173c3a02d0d64f3b02127e70fc942fa76904fda9bd929fcb19b5254874199fc00e873e7dfb18365beba04350e80939bea5d75d8df8438 SHA512 8f39cfa5f3ba70795927c261861bc55bde668d68d3b45559542cf980e1cfabefb3d1ebabc91715e29a4a9ffca5cdb6affa640ed155539692c868942f6014e7e0
 EBUILD dialog-1.3.20200327.ebuild 1180 BLAKE2B e78b39cdfe37a0e49cd2db3299e5688802e692cb264842d7414b9fb1318117bca20e144137ff452feba85bb8c649e53691cfb010ad852efb1d8e49b56f356d2f SHA512 ec810cb43d692cec37720782c8c664923b0326581c1292f118e6bf061d7425b2e4a2bb4223d21315a3e5c9d6d30d9537949f4464d6445474343d47d655c4f190
-EBUILD dialog-1.3.20210509.ebuild 1313 BLAKE2B 1da46bfe37b8d0c8521c5f7e9c8ca9029229a9b44c6f1127e305e33684aad557232e2cd79c385a6b2af55a073feb0718afca621119be3283943b5641fcf155da SHA512 53ccade7ec7c6bd674e323f5b2c573ce3687e72681a3542141bb9c63188f3f4800e8849a2b2bdfc9e89a600f8deb8bd0d056cb9903984223edf5cda3f39e274b
+EBUILD dialog-1.3.20210530.ebuild 1278 BLAKE2B 0e73dff8c4dc885fe29d3d690cc74aa649886886b0136a68b731ef670873f56c94afdeef911dca9e56cf15ec6ba3eb04fe0a8fb43d7251bfe7ab556bab453fbb SHA512 354b361948c8768e45f1e16ca3a1f047ba01d0c97f252ee0fa1466e9b00627ae5d140c3022c350e7812617b3f92a70d4511d34ac060bdeb5c63a3eb1a04d6874
 MISC metadata.xml 460 BLAKE2B 2a2b2180cab325004ef2543c1e4cde0d98ce338beaad156c6b114f0ef49b3d726ad8f85974a681b596e8c68dd2433aae64ce38d8b47e0d52441bc1581bc35149 SHA512 f1c8215f8865105bba71efe5516742f694988b4421a3ea3ec07569f5e40cb50caddfe478c2bd5bae1b0579316fb7fc3ae361d19c3b33c6572e31239d927b3fc6
diff --git a/dev-util/dialog/dialog-1.3.20210509.ebuild b/dev-util/dialog/dialog-1.3.20210530.ebuild
index 06eb24055e0c..6bc6e9d5c9d0 100644
--- a/dev-util/dialog/dialog-1.3.20210509.ebuild
+++ b/dev-util/dialog/dialog-1.3.20210530.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${MY_P}
 LICENSE="GPL-2"
 SLOT="0/15"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="examples minimal nls static-libs unicode"
+IUSE="examples minimal nls unicode"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode?]"
 DEPEND="${RDEPEND}
@@ -38,7 +38,7 @@ src_configure() {
 		--with-pkg-config \
 		$(use_enable nls) \
 		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
+		--with-libtool-opts='-shared' \
 		--with-ncurses$(usex unicode w '')
 }
 
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 3e517e66fbbb..179a2e12a137 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,3 @@
-DIST diffoscope-175.tar.gz 1590841 BLAKE2B 86d6c910c60d1d472a7131cde8b5b506901ee0a838e96105194d1a8da167203a204c81076ccb06a47401338a90a0f7f49dabd13aa9ef100e88759336051e6b2a SHA512 950e5539a2d2242619426cbc3790a50f30119df2bbe36e5a03c63a9e01c741a0c529b0bd25439723064758c4c32cfcc621f67f7e0e0867071bdc47a7844ab097
-DIST diffoscope-176.tar.gz 1590912 BLAKE2B aac3ac90e4dfc23aa137cf69c6323419bdf29e9b9212b0aec9cd77c2325cb97c2f2e9a752dbe1171e7d6bf36999d45a9eff52e43735ede496575b05b5bbf7b87 SHA512 3e91dd69eb485f8b5005af91f7cffa7c05c08cfdc786af4fb6cbca4a79332b3e59c3faf98e34729ce2f231ca44161f002d93ea50b7c2ab2fa2ebde182c37b829
-EBUILD diffoscope-175.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
-EBUILD diffoscope-176.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
+DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
+EBUILD diffoscope-177.ebuild 2583 BLAKE2B d1e590de5e1a9dcc0091863a74c983fa1bcad740fdf685c41c1f7f348c4f7fe614741365119eb1f2ebf60728c8ae108b22fd9a31e70aa0b35102ff1c222c63c3 SHA512 ea98891d82ffbc6ec9b1d3e992b5b1306cf23c300d85f8df56d265a1868d2f67c8f38b2db31e49e470fd852e501f5db9718dd9b1690ad582d88e5a8b1c0e0122
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-176.ebuild b/dev-util/diffoscope/diffoscope-176.ebuild
deleted file mode 100644
index a189ed464d44..000000000000
--- a/dev-util/diffoscope/diffoscope-176.ebuild
+++ /dev/null
@@ -1,73 +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} )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/diffoscope/diffoscope-175.ebuild b/dev-util/diffoscope/diffoscope-177.ebuild
index a189ed464d44..9ae8834c67c7 100644
--- a/dev-util/diffoscope/diffoscope-175.ebuild
+++ b/dev-util/diffoscope/diffoscope-177.ebuild
@@ -71,3 +71,19 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
 # Presence if filemagic's magic.py breaks imports
 # of dev-python/python-magic: https://bugs.gentoo.org/716482
 RDEPEND+=" !dev-python/filemagic"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local exclude=(
+		# test seems to use different tarball
+		tests/test_presenters.py::test_text_proper_indentation
+
+		# needs triage
+		tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+
+		# needs triage
+		tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+	)
+	epytest ${exclude[@]/#/--deselect }
+}
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
index b43e32d4d242..30139f399f14 100644
--- a/dev-util/distro-info/Manifest
+++ b/dev-util/distro-info/Manifest
@@ -1,5 +1,3 @@
-DIST distro-info_0.22.tar.xz 29104 BLAKE2B 88eab833ea34de9e62f858e1fb9acfb94efb60114d2213b8bbb77a440c114dbac70a1707d1469113c1a98ea94d953ffa36480c132c294fd8e22b816a444b25e1 SHA512 b9d97e469b9173651c1816f39cc2315622b46f1579cbaba29c417a51417425e90a45283e83c7efee35db78621df08997f5395c8c1b0259f69e5cd91dee65793f
 DIST distro-info_1.0.tar.xz 30908 BLAKE2B 8355e54919d83d09d3eb7983a35151f0e4253c62eefeccf4d1e614cef0bb7cecf466007c7789749c145674aa30324423f9977a26695d5de537f80d5eb069f371 SHA512 2d84b5845ff4e7ce8059fe83e9d64a380d6732e0e85bc889c948068579d27a86fd31f8e6b7d8cc256f4ff4631cd0ffd480835bf290452d3bc28469f5b3be9ddb
-EBUILD distro-info-0.22.ebuild 1968 BLAKE2B 9c2e9c64077fedc8dbe4be14065189e6cb429857b6bcdf1d7f015fdefc0a3003c5e4440313099581975a2773290fbf1adcea9908e55f37f2d7e38231c3a4e6e8 SHA512 52c783c7292c7a1545673117883fea87011a9ccffa270a53f6d459dd49835e0e75c53fe5dbae5351083a878dba18d0fc6cf861ff205b7dc34e62642d02cf82da
 EBUILD distro-info-1.0.ebuild 1989 BLAKE2B 7db23cf154f0d6ce2b3d25964785c22e407a2c67f83c8e360f7bbd650a65dd09e43c66f472c306834afb2559969e8ef6bac8541b0e87625a804d0a2e52d1044f SHA512 a34a1502ad6bb72330c1c410486c05184a400b5bf197dfbf72cb746c34e01687c4619825376e00a3ce2999c9bceb272a934798a5926d84052cb3b5fbeb8a1dcc
 MISC metadata.xml 397 BLAKE2B 4d9ba102aaba8fd35794cd064553a45edc66b0b845fbcd5660ad11c66fc1d7435423f79edb021da9e44683d2a157ca3cd057cc51e660ca824f6b75c6b4adf8bc SHA512 fafafc81fdef8bd5d2c4e2c58996be3c1c78d169d28ebcd493813f3aa84cb058cdd81d660ae9e1c7711df0f5fd0b0c9e7536538c15dc3ec015e152a79897cef3
diff --git a/dev-util/distro-info/distro-info-0.22.ebuild b/dev-util/distro-info/distro-info-0.22.ebuild
deleted file mode 100644
index 63314fd48a0c..000000000000
--- a/dev-util/distro-info/distro-info-0.22.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_OPTIONAL=true
-
-inherit distutils-r1
-
-DESCRIPTION="Provides information about the Debian distributions' releases"
-HOMEPAGE="https://debian.org"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="dev-lang/perl:=
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${COMMON_DEPEND}
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	test? (
-		dev-util/shunit2
-		dev-python/pylint[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/distro-info-data"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-
-	# 1. Gentoo do not provides dpkg vendor information
-	# 2. Strip *FLAGS
-	# 3. Strip predefined CFLAGS
-	# 4. Point to correct perl's vendorlib
-	# 5. Remove python tests - python eclass will be used instead
-	sed -e "/cd python && python/d" \
-		-e "/VENDOR/d" \
-		-e "/dpkg-buildflags/d" \
-		-e "s/-g -O2//g" \
-		-e "s:\$(PREFIX)/share/perl5/Debian:\$(PERL_VENDORLIB)/Debian:g" \
-		-e "/pyversions/d" \
-		-i "${S}"/Makefile || die
-}
-
-src_configure() {
-	default
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_configure
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake PERL_VENDORLIB=$(perl -e 'require Config; print "$Config::Config{'vendorlib'}\n";') \
-		DESTDIR="${D}" install
-
-	if use python; then
-		pushd ./python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-}
-
-src_test() {
-	TZ=UTC default
-
-	if use python; then
-		python_test() {
-			esetup.py test
-		}
-
-		pushd ./python > /dev/null || die
-		distutils-r1_src_test
-		popd > /dev/null || die
-	fi
-}
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index ec8dd245402b..3ebc80a153c1 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,4 +1,4 @@
 AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
 DIST dogtail-0.9.11.tar.gz 132832 BLAKE2B 9004216a3d96714e9bd524e6ffaad7892a3630c97b61293d9784bc04df353f3c09e6226f92329103768a38c55b7eecc5f23a1aec0e6cd4baf8012892bb7d5cb7 SHA512 b5880386d9952b3aceac95d8b7a4f5e8293b29a629019e7cc3aa57e13b35a9cfbd0fd2a9db5fed80b2ebf7225a1a05c7388a67da91b310434833b4c6efd02278
-EBUILD dogtail-0.9.11.ebuild 1343 BLAKE2B 416004736b1fbe16fb366264f3c16c4beef578b0fdad98783ccaedcb356e1b9f54c5ef45e1680cc73c3aeae8608dc62211a6755db8b19c070fbc7a892213c755 SHA512 94e2bb98930586b8bf5aae0c6194138f622478a3fcacb1aa32a138540f902d046cd5a4d6e2e76833341c2586d621afef0fccc507598de419237a12a91bd3da57
+EBUILD dogtail-0.9.11.ebuild 1350 BLAKE2B ad347ad74b3f7421a63a5a153f0c1112ff8a67266d195e7368995119b172650337e18025bbef72329a2d778e0a38b6ec4d8722e29cabc47f43e5a99a50c190f1 SHA512 7de8b0058cf2505e37653fda7c2aab056067917021ed320282bc0e85566d814220cc18ca6de3e7d8a0b0a9613fab06e5bdf9e1d84bf79a946a67edc3777ef83d
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-util/dogtail/dogtail-0.9.11.ebuild b/dev-util/dogtail/dogtail-0.9.11.ebuild
index 89c5bb69956a..90994c0714ee 100644
--- a/dev-util/dogtail/dogtail-0.9.11.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/${PN}/${PN}/raw/released/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/dput-ng/Manifest b/dev-util/dput-ng/Manifest
index 58d49fccdff0..cbc68667fa5a 100644
--- a/dev-util/dput-ng/Manifest
+++ b/dev-util/dput-ng/Manifest
@@ -1,5 +1,3 @@
-DIST dput-ng_1.28.tar.xz 85276 BLAKE2B d205d15aad1b81dcf2cc0b765c9724b21add32df39102b63502d99e5da73aa95efdf66e94f6226105ab2ae97a4bf8c43963784f3ddf2d03217ab5023a7a98f22 SHA512 cfd4a6143b33f29eb32b88972a204ab7a6c2f062299c76167434322ae5d6d2cf8654c5b4d1e96db90dbffe372a04e2a7691694ecf46787c7743dd9ac2b7b317e
 DIST dput-ng_1.32.tar.xz 86280 BLAKE2B 7e195eab4f48d77968b866185e337f2b51113f7e11cfa4929d47e79082c2fa866af2c8394c50816b650f865db9ef244775618a05a6b398090366d342a45a3db7 SHA512 596247eecb2dce080cd6f3cd1ddb1364cfa00fc3048081149e4d6dc35822aee10fa10ec25ed91154b477a909cc29dcf17cb38ccefa649f40eb70c16e0a575b2e
-EBUILD dput-ng-1.28-r1.ebuild 1879 BLAKE2B a089ff7d09249df94644d9895d1758c3522034f953f3b67c5cb0a1ad5e1fb16d6dfaed04466a386b97f18489f3ad64eecb4e94769a89a8e34eb178261e69ebc0 SHA512 90effe3d5955c3efeb248534ccfe60ca0014a2420a6ecf91b1bb4a25a2d367e241f3bfbf124a95d3b7126b1ecb629e871be5407bef3766be67c844fbb7958497
 EBUILD dput-ng-1.32.ebuild 1887 BLAKE2B 1bc7632022db9a31432a0e0aff656dd85ed98285e5bba4db7f396fc5f4932df74257bd3def1e254b2f5fdd56aba0988f9901925cd88040636d58ba3c961d2c3e SHA512 d3821e7902422740155533c50f24751427c0518f4a1af1417683ef9b470c9aa999e458333dd3d98a0bfcfa4d4266cb0367162ace06f51c60914c679dba3b29f2
 MISC metadata.xml 397 BLAKE2B 4d9ba102aaba8fd35794cd064553a45edc66b0b845fbcd5660ad11c66fc1d7435423f79edb021da9e44683d2a157ca3cd057cc51e660ca824f6b75c6b4adf8bc SHA512 fafafc81fdef8bd5d2c4e2c58996be3c1c78d169d28ebcd493813f3aa84cb058cdd81d660ae9e1c7711df0f5fd0b0c9e7536538c15dc3ec015e152a79897cef3
diff --git a/dev-util/dput-ng/dput-ng-1.28-r1.ebuild b/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
deleted file mode 100644
index a9423d3858f2..000000000000
--- a/dev-util/dput-ng/dput-ng-1.28-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Next generation Debian package upload tool"
-HOMEPAGE="https://people.debian.org/~paultag/dput-ng/"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
-		dev-python/paramiko[${PYTHON_MULTI_USEDEP}]
-		dev-util/distro-info[python,${PYTHON_MULTI_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/python-debian[${PYTHON_MULTI_USEDEP}]
-		')
-		dev-util/debhelper
-	)"
-
-# Requires missing build-essential package
-RESTRICT="test"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	mkdir man || die
-	for file in docs/man/*.man; do
-		a2x --doctype manpage --format manpage -D man \
-			"${file}" || die
-	done
-}
-
-src_install() {
-	local DPUT_BINARIES=( dcut dirt dput )
-	local DPUT_ETC=( metas profiles )
-	local DPUT_SHARE=(
-		codenames
-		commands
-		hooks
-		interfaces
-		schemas
-		uploaders
-	)
-
-	distutils-r1_src_install
-
-	for binary in ${DPUT_BINARIES[@]}; do
-		dobin bin/"${binary}"
-	done
-	python_fix_shebang "${D}"/usr/bin
-
-	insinto /etc/dput.d
-	for dir in ${DPUT_ETC[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	insinto /usr/share/"${PN}"
-	for dir in ${DPUT_SHARE[@]}; do
-		doins -r skel/"${dir}"
-	done
-
-	# doman incorrectly treats "cf" in dput.cf.5 as a lang code
-	doman -i18n="" man/*
-
-	newbashcomp debian/dcut-completion dcut
-	newbashcomp debian/dput-completion dput
-}
-
-python_test() {
-	# test_configs.py failing
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824652
-	nosetests || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
deleted file mode 100644
index a9be909fc100..000000000000
--- a/dev-util/dwarves/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
-DIST dwarves-1.20.tar.xz 688728 BLAKE2B c57f390f7e1d20c861a4acb8cd7fe238a3f7c3f2d915d96fc051dba2587942e8fabfa4f524d18555c486863fa02bc4ab63d90e90d477f376dc5e547aa36cccac SHA512 306bb74c498527a5a9bdae4d304e90511336cab627d9acad5237d93cbb48efe11dbca4418c540fa03e3ecdd168ce224cabe9fd2f6fbb50520d0dd17741c80817
-EBUILD dwarves-1.20.ebuild 1024 BLAKE2B e0a14962d98c00a5e2cb51355b2872665ffc085c4038074975860269e927a65fb0f0d05cf1f2553a10042ed50d0de5c1efc8a0ced01e4baf7a37b03ae88c8e52 SHA512 df1491907d9d5a56fc41d1277b2921d48fa8da9c8864ac52d0989888c3165e0a3ee6645fcff3d86bb948777c058b685eeeb83671107a2a57064db752f32db096
-MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index 09114fc8aa11..f6c80b82954b 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -4,5 +4,7 @@ AUX elfkickers-3.1-CC.patch 434 BLAKE2B 964201ceb6f0a949dd33f8f1b1900044c3a11183
 AUX elfkickers-3.1-create-destdir-path.patch 620 BLAKE2B 97cb8593a14405aba7ed766323272559c140258aec9dbdf04781d75f5b185790a2f5a7cf11511ab80eb0ef224bca43c8c6bbf7971f982484f2c4ec6fd6a3ce9e SHA512 63805893f21f7b4688c4363fa0e9fdd721ad14a03e657ca73b80850726c7c3178fc538005d5e8a47746f0496aea2b9899a39b511dc73556231141a02cf46d281
 AUX elfkickers-3.1-respect-CFLAGS-LDFLAGS.patch 3246 BLAKE2B d8e476486df9ca8178aca6bb42c3f93b271f2132fedf793b71f1f216ab57e4e05fb299a06ff0f47e0626d5067ae44c79b3b96b41fb40d40a935bcd24596272b7 SHA512 fc44d407d1cab8e26af3a7011d82a8f236ef330d881308c28ecc0685e5e8e11b3477ed67c59284ed0905ddd5d62e76f88b99ee4b27dcfb2f5d188f0318ebc1ef
 DIST ELFkickers-3.1a.tar.gz 101709 BLAKE2B f4e32be84bb05d0f5823fb09d60596086d70f726312285ce847b79ed7f08eed936cf72a9eff92123c4fecee9e4748a83363a05075a29d04490bd02701d53bc59 SHA512 a3ec3c1d5062c67e0108a04ea9a7e9d88d1e5090af887544be756f3269a28950d1211908b74da287d82975dada4a6ea30686b5a3cffa203b9ebf835a5c13d408
+DIST ELFkickers-3.2.tar.gz 108555 BLAKE2B d9ed0c6a2a782e7178480436d526674661af1f625788a28c8e41b97cabb1412f083b492fd36778de17ded7d123003dde878a45af9a63cf7c1e7bff860dc3a0d1 SHA512 ea8b274030880579a44149a1c093e0dce2d9889729f5b4bf1a998d97a78f9bb3cf3fdec807eafda964060fd464a44d4992b35a397737724f7f95732186b8b3ea
 EBUILD elfkickers-3.1a.ebuild 913 BLAKE2B b7f61c9e063fbb00036c562a95fb37a7b66277771f9e3c3f75bf26430fc3e6d2dd938f8abc28957877cefd4a6022a18fa360bc258792d8a2f76012e11b78177c SHA512 1f81e2a5dbf70b0df0a6d33bbda4fee861793e775c55f98aad917ac0bc2c61e2f0b41be0b9ef11e2afd55a1cee688c8688855f80b2a3f529159675edab643786
-MISC metadata.xml 657 BLAKE2B 81a73ead5e1fee87a15c34c14135154148a9bf3449d8d7160bc18427edab55caf7d1916943bc8bc0e42f402031d8753c5102f504e191904f21b37996de36d24a SHA512 4519d4c439e25c4c70dabe91740ea572f084f4756cbf471f346d4bf0c85226f7254fbc9744ba32bd168885b238950d01de99bcd1baa7f24939b94daba41750a7
+EBUILD elfkickers-3.2.ebuild 874 BLAKE2B b4eba0df24576c0eeba6245db67a48669996b79f983e695a49110d0483bfb316f41c41187c0077cadec9e2d4abf17e37bbae11187d96c094b778421d4e8d6f13 SHA512 4be5d4174f8bc7f49a226bdcbb384bfd3e10b8a4e0be8d66c84d53c339064c420cb3a871b537302c4f2f2e5b307f4d1204c5938601e0a8276343bfbe76b7ce59
+MISC metadata.xml 738 BLAKE2B 88ca2a9b508d2d7ef1e48759bf5a6e69a59a8b8acb865947681c81ff9908988b355d654f72423aa3fdc8e093f48e0c49a4adb5d95922ff05f6b8d5eee4c07d98 SHA512 849d80d1d21c7af91ea107753c8c2c92675d88fa298ed5d7629a3b71e4b11662b9a4472bb1581fc6b38b5629058f287ce668833c34e654ec348d0d23590ebf13
diff --git a/dev-util/elfkickers/elfkickers-3.2.ebuild b/dev-util/elfkickers/elfkickers-3.2.ebuild
new file mode 100644
index 000000000000..eabb5ab6febf
--- /dev/null
+++ b/dev-util/elfkickers/elfkickers-3.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN=${PN/elf/ELF}-${PV}
+
+DESCRIPTION="Collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
+HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
+SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
+S="${WORKDIR}"/${MY_PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="app-misc/pax-utils"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-respect-CFLAGS-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-3.1-create-destdir-path.patch
+	"${FILESDIR}"/add-freebsd-elf-defs.patch
+	"${FILESDIR}"/${PN}-3.1-AR.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export AR CC
+
+	sed -i -e "s:^prefix = /usr/local:prefix = \${DESTDIR}/:" Makefile \
+		|| die "sed failed"
+}
diff --git a/dev-util/elfkickers/metadata.xml b/dev-util/elfkickers/metadata.xml
index 2305405b9c6c..05b8ed4a9793 100644
--- a/dev-util/elfkickers/metadata.xml
+++ b/dev-util/elfkickers/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Gentoo Hardened</name>
 	</maintainer>
 	<longdescription>ELF kickers is a collection of programs that manipulate ELF files. The main purpose of these programs is to be illustrative and educational -- to help fellow programmers understand the ELF file format and something of how it works under the Linux platform.</longdescription>
+	<upstream>
+		<remote-id type="github">BR903/ELFkickers</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index b6c993fc13ab..77066c1812b4 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,5 +1,7 @@
 DIST flawfinder-2.0.11.tar.gz 256777 BLAKE2B e2aa109a0cc435da7a8ba5f40b5dc6474e27ec340785c0070fce4a648fb5a186f6f0f5ab4e53c8e06c91fb1cb15179ecdb605a7f7477968e4d5595fc46cbd7c8 SHA512 4236da49914fa6317eb2fae1b3fd7ba08aa96a34bc5245bfd15b6532049193cbd0367bb3620e32252ce71cdd1128bec4b20c0e88b02c55d0ede1bb5bb091ddeb
 DIST flawfinder-2.0.15.tar.gz 253677 BLAKE2B 5c4a0e21e0a7f144382c6ca25f713aef9bdb413d4bb5a73f66632ef365f55c75e755ab59cf92fb54dc2d043c8b88be8c28d5f5fca36df6795dabc00313b839f2 SHA512 12b637bae789ee86710c7d6ee203b811e78414ad5d173730bfffe3ea783a76ce999878c57ddaa8019744cac6bf94967663fd9fd80769d7a24b0a79d23c0b0d9d
+DIST flawfinder-2.0.17.tar.gz 259899 BLAKE2B 03a3cf425eb9f2cd2a8528d574c1fd9ed1d00e4dfc5f47556f7d49db041432d311e08754220eedd8492bb6d747ed31a0da67eed5f878ede207b1118e3db5da9a SHA512 8691e561e634d6562d43fca9ac8c505b62435ac368c1b038b84eabbf60628513a0410de60b53592567d07a9552b97112ff8406ddc9aba3512a3b07846d28a8c6
 EBUILD flawfinder-2.0.11.ebuild 782 BLAKE2B 73c59c1af865aa768a8b9c8202de9b17f67ba7a53a4ed5dac79db2b5165f45cf790d7d54d1499a995396447fa5c786a26211d5541040ee7de4e6d6a60509673c SHA512 7dea1626824336d141020c1b4ab286863a19ae6231ab49e56357ed9057c433c5723ac9853fa2ff69665cc506848600f4d0ca049a19fba90bb537e2f1bbfdf330
-EBUILD flawfinder-2.0.15.ebuild 781 BLAKE2B 6d468c360c1b0cdb57a6c39806de80a2ac0b626e19d92c293532b57bd9d354642c37ea70b84742554b14f218d9fa2de2636ab9837cc82cab7b6078012f082c09 SHA512 69dcd37e29618c83c4bbad6f0a931a52216d9bcbe8f94f24deaad6ba8adad8e8c03b696c37da8a6a3ecc4ee003188969b1b911a54b9b67beba5de6a6646439cc
+EBUILD flawfinder-2.0.15.ebuild 779 BLAKE2B 49f2d5e6085500ce54f59da74fb11c3024cb92dfc9fac2ef0204fef38491559cdf6fe8cca01928ed08f8b22e21b093ae74fca7555a2d43054b7e039837f6782e SHA512 16c48a4a0220dbf91d53565e312b253cb4b6d0bb5249191058459add21e302eab6b002246514d9c7a717abb79064f3dbae6126c287fd1e3136146821cf43f04f
+EBUILD flawfinder-2.0.17.ebuild 781 BLAKE2B 6d468c360c1b0cdb57a6c39806de80a2ac0b626e19d92c293532b57bd9d354642c37ea70b84742554b14f218d9fa2de2636ab9837cc82cab7b6078012f082c09 SHA512 69dcd37e29618c83c4bbad6f0a931a52216d9bcbe8f94f24deaad6ba8adad8e8c03b696c37da8a6a3ecc4ee003188969b1b911a54b9b67beba5de6a6646439cc
 MISC metadata.xml 483 BLAKE2B 28c5e9484510661e7b29519fe4311bea3cee9d5197a749c38b71b7a06363201e77b3bb34fe984175befd900ad7e8342d2694769e14d61e92b14bdbd095bb83d4 SHA512 b3cf7b35c84c7a35f140a2385c25e6a186b21c9f11f871af4295ce11de6123a71215efdcd0c4c665a8911de509b58bab5ba13c35f7e4af2909698fbf08213a7a
diff --git a/dev-util/flawfinder/flawfinder-2.0.15.ebuild b/dev-util/flawfinder/flawfinder-2.0.15.ebuild
index 9305ed78d86a..b05accd76765 100644
--- a/dev-util/flawfinder/flawfinder-2.0.15.ebuild
+++ b/dev-util/flawfinder/flawfinder-2.0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/flawfinder/flawfinder-2.0.17.ebuild b/dev-util/flawfinder/flawfinder-2.0.17.ebuild
new file mode 100644
index 000000000000..9305ed78d86a
--- /dev/null
+++ b/dev-util/flawfinder/flawfinder-2.0.17.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Examines C/C++ source code for security flaws"
+HOMEPAGE="https://www.dwheeler.com/flawfinder/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i "s/${PN}.1.gz/${PN}.1/g" setup.py || die 'sed failed.'
+	default
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	local DOCS=( announcement ChangeLog README.md ${PN}.pdf )
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 646f2490c69e..297affc4522c 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,13 +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.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
-DIST glib-2.66.8.tar.xz 4845548 BLAKE2B 8def5a2970f1df4782c93a1736d9ebd83ff1faebbfadd508e6ac58aa1d28a88a0fc7f504cc8006c2623bb656ce15d2dcb9e9188042daccd55adc8df0319599ea SHA512 d9d1bee82409bdceb14ab6008508f1abbb6eedfc22a35b1635d381594ee43c4ee9a1569d46bebe5b0b6d9fe7c629079f75660c6fa8f3b85a1dbca304bc6a6205
-DIST glib-2.68.0.tar.xz 4938804 BLAKE2B abbb06e9be3198ea79a42862bc0b71a40e87de6e4d49634458a6dd883d19c23d9e1a314b7820ea8eae230b24dccc909fd53b0e73587738e2341ff6f116e40cbe SHA512 dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
-DIST glib-2.68.1.tar.xz 4940260 BLAKE2B fcf3a2fa2420ea3df13025d7a7e136862fa4cb6aa4f64a1af9fef7187d075db70deddad13ebde56b9032940437dbb311e9658bf112fd3cae8d8313d252ad2d87 SHA512 f705cda6f1b4b0acc5fe8d21b60994ca0ec6de39c6722f4f01cbe0ece30eacb7271d3cb29067e638e0204a3cefa2df1e535f273b72330455e185b544cebc2ab0
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
-EBUILD gdbus-codegen-2.66.7.ebuild 2191 BLAKE2B dc3dbf7ffb3cdf9a0bb7473a425abac8057bb7363e9e2bb76676e041a0feeef563ac24fd42fd0d949de89094bb17c176aa4e6f07c40bbad85ec1b1b82027be65 SHA512 15d0e33bab22e8533a77b2a078d1d54e6022ac6c188ab812273077f93230db777a8b6cf6d0ed5fd2ee8d57da291fb2e1cdec7f63c45d193903949ad909144b34
-EBUILD gdbus-codegen-2.66.8.ebuild 2196 BLAKE2B ed9777f0512004a0f95f123d1a7c24f2c506f8f1631a5673f6a56d3007b10d481a0ab37170ac81c596e14a838e3a207b7b79bf0eedb3ee028c7c0dedd5d3001c SHA512 79ea0d9ccc03eaf8864b34b9520b16e93669ca7faf2cbd904b1bc4f8384643e39c5a90df1be2c3132f0f85b348ebc2019dab2685de294ed7ba07134be2c6669b
-EBUILD gdbus-codegen-2.68.0.ebuild 2199 BLAKE2B 425de5185936d4dd0db3a77109fdb5a019044d7d0a7343978bb40031f56b6641511632a42bfa521c6bb732fdc6c1f8829e8a884f8572b8a0cd706209ae20768a SHA512 9f5748bc80d1849f4e7adb5b1995c43ae15c413af5f371fc25f2a33559536fb35d0e927e0e93d6fa3409fd2814cc3353d943fe54eb7fd541c909d46ee276d7f6
-EBUILD gdbus-codegen-2.68.1.ebuild 2199 BLAKE2B 425de5185936d4dd0db3a77109fdb5a019044d7d0a7343978bb40031f56b6641511632a42bfa521c6bb732fdc6c1f8829e8a884f8572b8a0cd706209ae20768a SHA512 9f5748bc80d1849f4e7adb5b1995c43ae15c413af5f371fc25f2a33559536fb35d0e927e0e93d6fa3409fd2814cc3353d943fe54eb7fd541c909d46ee276d7f6
+DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
 EBUILD gdbus-codegen-2.68.2.ebuild 2182 BLAKE2B 741ec8a0d0b2d882043adab8f0e1226c6aff3414ab29b8b4ec8e321fcba5cbdd242e02e8a20d6538c3b7fca3672b2f5aa6d44f09debbce61d6442a377e78cfa4 SHA512 4e5ae6e7b0afadf83abee18973a71e0c0801f8cfded55df24baeda5bc182222f77935eb4a44cd881d6271c14f6972be097e9567c956a152ef15bef967922093b
+EBUILD gdbus-codegen-2.68.3.ebuild 2190 BLAKE2B 76ed4b80e4192e59b7f720c08c3dd989b80f44164f0700b3cb95433e99a1079082496479a975d19d10a3753999ebdc891c67f1f4e89e9a0b1f0175d1f2480db1 SHA512 6b1e79b3c796a6481841635cf0f287717949f0262bf031c0417a68b0b93fb603139b29bf3105f2a5d5c83b4a390f4a98311eb2a325299cb95c991c1fd2fc7b12
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
deleted file mode 100644
index 8edc360f90f7..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.66.7.ebuild
+++ /dev/null
@@ -1,73 +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,8,9} )
-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"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	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.66.8.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.8.ebuild
deleted file mode 100644
index 62fe5ab69a2b..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.66.8.ebuild
+++ /dev/null
@@ -1,73 +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,8,9} )
-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"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	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.68.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.68.0.ebuild
deleted file mode 100644
index 360ef3bb2a3b..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.68.0.ebuild
+++ /dev/null
@@ -1,73 +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,8,9} )
-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"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	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.68.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
index 360ef3bb2a3b..f79468dd48ce 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.68.1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=no
@@ -16,7 +16,6 @@ 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"
-IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index 65ec3bde6203..5887e50ca9d6 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,3 +1,3 @@
 DIST gi-docgen-2021.6.tar.gz 1253449 BLAKE2B 8eb115c8554d122c0caf11a9d56ed423e4764ff3665cebe0f5d5c7eecc2df2c39885e213254bc2f7ca252ea8aa2fc57795497e43d348ce892515bb7c9a2fbb34 SHA512 cf319d30e82aa3dc84af106aeb2aafb9623225445773e7017080d2530fe03975160a233a0d60429eb2b420c17e329712b7f2321615ec4d63a5723b162606eccb
-EBUILD gi-docgen-2021.6.ebuild 890 BLAKE2B 44286c6f21f25b7cc2cb7c62aa3da4ad68e8753205444dc198052643b094ed9e1125e1e421d397dca9bfde4f0b627b4c711453d693632f9d5ff5dd00e132a5f8 SHA512 1d9da4e0a661cfd2a86b489392c96caf05155044d10cda5af0f3e93477dfc76209e17b59789531325084fd33b5e13c9636116878b1456927b4da5a7dbb3b1209
+EBUILD gi-docgen-2021.6.ebuild 904 BLAKE2B dfc1f4647ba5ca2ab7114bee289fdd0e23031d6d59bd15896f2c6fe40507f64595fac194b2c43c507607de1d309d8933442177475b9d6649387aa53e698e9001 SHA512 2da11140070f01623fd7416d507e903d9adb4ad8e0572990c806149585f002acab61be402286117752cbe07e0a84b16844e1254c7ee73ee91c895008d5d561b0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gi-docgen/gi-docgen-2021.6.ebuild b/dev-util/gi-docgen/gi-docgen-2021.6.ebuild
index 05b15ce4b452..f30962aacda9 100644
--- a/dev-util/gi-docgen/gi-docgen-2021.6.ebuild
+++ b/dev-util/gi-docgen/gi-docgen-2021.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 32b16e025f92..f3dac0feaf3e 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,11 +1,5 @@
-DIST glib-2.66.7.tar.xz 4844892 BLAKE2B 2d128e8c933a8c5bd27734e96e50244f27c29199823e2185e8cfa5b4bbc0ca23f761c9de275c9941672eb945e302178b3cb4b5bd577f375ad953a97dddc70e34 SHA512 f6e6cc0fe2ab4a31a623bf9a1e63f833783e044e7ed55b66a84fc0cbf1410eec233fe0e226abb20aac0e40167a9624bf5e65197f9eed879da1293af44408d530
-DIST glib-2.66.8.tar.xz 4845548 BLAKE2B 8def5a2970f1df4782c93a1736d9ebd83ff1faebbfadd508e6ac58aa1d28a88a0fc7f504cc8006c2623bb656ce15d2dcb9e9188042daccd55adc8df0319599ea SHA512 d9d1bee82409bdceb14ab6008508f1abbb6eedfc22a35b1635d381594ee43c4ee9a1569d46bebe5b0b6d9fe7c629079f75660c6fa8f3b85a1dbca304bc6a6205
-DIST glib-2.68.0.tar.xz 4938804 BLAKE2B abbb06e9be3198ea79a42862bc0b71a40e87de6e4d49634458a6dd883d19c23d9e1a314b7820ea8eae230b24dccc909fd53b0e73587738e2341ff6f116e40cbe SHA512 dce0660476d67d7736c00861f4c3c267723f39032f582d1b2c17660a4939eeccd97e975da61b5be49e6f54612c6d5ce592aa7bdeacf4ecc75f3b38358da94a1d
-DIST glib-2.68.1.tar.xz 4940260 BLAKE2B fcf3a2fa2420ea3df13025d7a7e136862fa4cb6aa4f64a1af9fef7187d075db70deddad13ebde56b9032940437dbb311e9658bf112fd3cae8d8313d252ad2d87 SHA512 f705cda6f1b4b0acc5fe8d21b60994ca0ec6de39c6722f4f01cbe0ece30eacb7271d3cb29067e638e0204a3cefa2df1e535f273b72330455e185b544cebc2ab0
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
-EBUILD glib-utils-2.66.7.ebuild 2360 BLAKE2B 3db2c371486a8e6a6d5db678b6a54d165060a11288fccb4222f6eb27c5cb631c7e764d728b9fa91f0959373198a0de7e704ac6a804a58d144632b49098f8f548 SHA512 8f9c6c8b629c541d154640695efd1c887d2d0a0e19415b18808e8a50a0dc4cbbc68592f84b02813385a88608be5fc2510f3896da9ede6e55e2980a784a857618
-EBUILD glib-utils-2.66.8.ebuild 2365 BLAKE2B 8ad4796258da73ec89f89f8d51c6a967663b27d236a74bb581acb73243abbf594a88d9cb906860d2d7f44ec380378fbf0e13209fc6c23980b49b9e3563239923 SHA512 71271446d5f5814fcd0f814ae31b6e0fe1cd5cec278e3cc123bf6cb4c57cba209b8c5c8ad639ce256e4062e420c698ddb5133ebcd2dc9411297a7c0798f74cb4
-EBUILD glib-utils-2.68.0.ebuild 2341 BLAKE2B 78a030119ec501c297e6dd634fe6c1dfee4671d0ab888d78785fcdf13b19c5aaa6f858f80462f5c3ee3843bf50aacf561b6ce801f1f396256b7ad434739eb43b SHA512 1257e090316395ba66f203a510b98ddbe4d926b52c1fc7cc9fdf0784170f628adf1b4e4f1e90727b80e7758106221ba736c201f5c8873164f5667029252432df
-EBUILD glib-utils-2.68.1.ebuild 2341 BLAKE2B 78a030119ec501c297e6dd634fe6c1dfee4671d0ab888d78785fcdf13b19c5aaa6f858f80462f5c3ee3843bf50aacf561b6ce801f1f396256b7ad434739eb43b SHA512 1257e090316395ba66f203a510b98ddbe4d926b52c1fc7cc9fdf0784170f628adf1b4e4f1e90727b80e7758106221ba736c201f5c8873164f5667029252432df
+DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
 EBUILD glib-utils-2.68.2.ebuild 2324 BLAKE2B 14053ce23924b454e18751045fecaf44fab2ddfeae9c92c94d51c4330c4e8e011481fdf36f0d3900f2df8db8fe6300df4b72fd806ddef79c0513e84dcdd18bbd SHA512 e9d496fd828a32ef852877913fbb1fc855fce580ed135e175644220429a4d49421278e7f6e4adcaf1474ed390284d287b3eb00ecbac37e6d585beaf70d6d641b
+EBUILD glib-utils-2.68.3.ebuild 2332 BLAKE2B 0f54cd1381a48b546ee77599660d40a83f605c29c43a713d7908b416f4933345a46ed186762fc05f8fbec59dffb6bdcc56c926d7e70996b3ae71b5cc1621235b SHA512 0fcf59511090213835d203d12d150070ffb6e3432f2e6a99fe32198a4a0088f9934e81f4033e13dfba3ce8e7a730417b9a4a6c56a722b6cbf9ff92654395328b
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.66.7.ebuild b/dev-util/glib-utils/glib-utils-2.66.7.ebuild
deleted file mode 100644
index 49e929118d26..000000000000
--- a/dev-util/glib-utils/glib-utils-2.66.7.ebuild
+++ /dev/null
@@ -1,65 +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} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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}
-	!<dev-libs/glib-2.56.2:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.66.8.ebuild b/dev-util/glib-utils/glib-utils-2.66.8.ebuild
deleted file mode 100644
index 629fb5bcbe9c..000000000000
--- a/dev-util/glib-utils/glib-utils-2.66.8.ebuild
+++ /dev/null
@@ -1,65 +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} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 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}
-	!<dev-libs/glib-2.56.2:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-"
-
-src_configure() { :; }
-
-do_xsltproc_command() {
-	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
-	xsltproc \
-		--nonet \
-		--stringparam man.output.quietly 1 \
-		--stringparam funcsynopsis.style ansi \
-		--stringparam man.th.extra1.suppress 1 \
-		--stringparam man.authors.section.enabled 0 \
-		--stringparam man.copyright.section.enabled 0 \
-		-o "${2}" \
-		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
-		"${1}" || die "manpage generation failed"
-}
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
-	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
-	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
-	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
-	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.68.1.ebuild b/dev-util/glib-utils/glib-utils-2.68.1.ebuild
deleted file mode 100644
index 658e4265ba74..000000000000
--- a/dev-util/glib-utils/glib-utils-2.68.1.ebuild
+++ /dev/null
@@ -1,63 +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} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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.68.0.ebuild b/dev-util/glib-utils/glib-utils-2.68.3.ebuild
index 658e4265ba74..8bdd1b9a92db 100644
--- a/dev-util/glib-utils/glib-utils-2.68.0.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.68.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 GNOME_ORG_MODULE="glib"
 
 inherit gnome.org python-single-r1
@@ -12,7 +12,6 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index d119ce385735..f17a1f15b10a 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,6 +1,4 @@
 AUX gn-gen-r4.patch 1559 BLAKE2B b92f487d4153ebd885d9cb1ca6889ca52b5afcccdb9a781fae568b861152a2cc3d9e61d5c406c5365311337a131fa99447528011af511b7aadd0975f692fe85b SHA512 b286651983f94894faf992da12a1ed51776c8207275e1b1e1776d0caf83615b02cb3d57198aec8b3736944b9cb8749028f79ebc7a700dd30babf122cfe5884d3
-DIST gn-0.1726.tar.xz 663480 BLAKE2B 26920a1594e9cc664293efaeaa8725568b78ecc1f2ac8c9a3cd27333e5fe89f1fa5bdee9e42c408f3c4a7cfb630e79220926c5694e31131d3e7627be49b5d6b2 SHA512 3e93ba02f251386c4aa320a45b8a045c2a1fa686a8f170455f3c06bb25b1a628c44530ae2e56bcbb2ff4b2a84dd065d54dde90955a55a325a8d219acce69ec2f
 DIST gn-0.1807.tar.xz 682644 BLAKE2B 5beb3c03b0ae467cb98eff2069ef6e4355cba56c57e2717139b698fa563efc404dd1cf0b3fd196f432ca3a13b0402e895b46407cb90bc16b63963710fd5be060 SHA512 82f468e389d08a46e582f816d056813af9bfc810ad0bd84f02731c17c0e2c6140a62e827b8a3c5f89eef467f9bcfc2e88dd7aed325a7955d8584e753fcd09103
-EBUILD gn-0.1726.ebuild 1264 BLAKE2B 836da399eaa9b6afa964e6e6a32725f489a889911bc4ac111be33293e5f094272bec0860dfcf5b9af4e167b3eee8eaabe4a6653c2db9e424c335840f30747d46 SHA512 3a4a843d46af57aa9b6ebddb5ea97f5f84080bcd9de3c4df783517ddf4e965c7f5fa4ace01f7970a1bfb6a2993fedb26e0e20767812d6289d4bdfedc0c9c614d
 EBUILD gn-0.1807.ebuild 1270 BLAKE2B 8a5480578e8d7e7fca80018f33416ecd0b50fc5ef07ae4b6a230df73f1aab351c8fb094244ea2ecda1fa923d42ba9027d7c6d385ceb5b1d42eed037eb985d65d SHA512 314b48cfbdf1a7a73baac2d8e7e141bed9d740d7a75f9c7ebae372230c86f5bff6e1f288be248517f0473381ab95aad7805f7dbd83cc91f50b9da3ea8cd0093d
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/gn-0.1726.ebuild b/dev-util/gn/gn-0.1726.ebuild
deleted file mode 100644
index e21fbbb7c4e1..000000000000
--- a/dev-util/gn/gn-0.1726.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit ninja-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
-HOMEPAGE="https://gn.googlesource.com/"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
-IUSE="vim-syntax"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/ninja
-"
-
-PATCHES=(
-	"${FILESDIR}"/gn-gen-r4.patch
-)
-
-pkg_setup() {
-	:
-}
-
-src_configure() {
-	python_setup
-	tc-export AR CC CXX
-	unset CFLAGS
-	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++
-	echo "$@" >&2
-	"$@" || die
-	cat >out/last_commit_position.h <<-EOF || die
-	#ifndef OUT_LAST_COMMIT_POSITION_H_
-	#define OUT_LAST_COMMIT_POSITION_H_
-	#define LAST_COMMIT_POSITION_NUM ${PV##0.}
-	#define LAST_COMMIT_POSITION "${PV}"
-	#endif  // OUT_LAST_COMMIT_POSITION_H_
-	EOF
-}
-
-src_compile() {
-	eninja -C out gn
-}
-
-src_test() {
-	eninja -C out gn_unittests
-	out/gn_unittests || die
-}
-
-src_install() {
-	dobin out/gn
-	einstalldocs
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax}
-	fi
-}
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 31c75cdea35a..78388eaa1e25 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,3 @@
-DIST goland-2021.1.1.tar.gz 544517245 BLAKE2B 2c7e11f6a3fc4ca779d4273befe93d89c53aaa06a650b4181295c2f74d0679ecd8ecfcb44a6394a6173ec3b7379d57df671ef54c0af4b75d90443c4804f2d6af SHA512 53b49984c3d5ecf7c9497a6a958656c26beda122987442cb7a37a95ddf1514ec5d31fcccb3babb5bfe394bd636231901a34dc9a1a25cc861a8be86d1db02fd16
-EBUILD goland-2021.1.1.ebuild 2503 BLAKE2B 65b09fe6619840071b7c1db9f239f7d3bcb392279467b7796bab1a2e4921ad62b42223a84449754ea19bc115feb1ccc95af8b8dec4b7d7b0e8d43fc4376a7890 SHA512 0101e3fe3e5d6987ac89094e30e023c562ec916dcc087f2df77c385f16438bedb844885ebdc3d7064e2a57522f59a4273a4611b64c3eb2775434a8afd567d9be
+DIST goland-2021.1.3.tar.gz 544674162 BLAKE2B 82ad057177129cc41facc704c3021221b2b4e7bd3e8ab11252193a1bb4663313c9b450786f2915a28678ae75347ba6ed6be54b79aae9ccb38f0aa3eb97190353 SHA512 d58e25af05351471d1ee43e34decd2d692d3d194c017d5392b4a1fe4255f4b2c5c7373ebce880020ef4759adf73dd1ac6db200149c7a486180ff944747909fff
+EBUILD goland-2021.1.3.ebuild 2503 BLAKE2B 65b09fe6619840071b7c1db9f239f7d3bcb392279467b7796bab1a2e4921ad62b42223a84449754ea19bc115feb1ccc95af8b8dec4b7d7b0e8d43fc4376a7890 SHA512 0101e3fe3e5d6987ac89094e30e023c562ec916dcc087f2df77c385f16438bedb844885ebdc3d7064e2a57522f59a4273a4611b64c3eb2775434a8afd567d9be
 MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/dev-util/goland/goland-2021.1.1.ebuild b/dev-util/goland/goland-2021.1.3.ebuild
index 86cbae508305..86cbae508305 100644
--- a/dev-util/goland/goland-2021.1.1.ebuild
+++ b/dev-util/goland/goland-2021.1.3.ebuild
diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest
index febbbf661c95..ee2972760464 100644
--- a/dev-util/gtk-doc-am/Manifest
+++ b/dev-util/gtk-doc-am/Manifest
@@ -1,5 +1,3 @@
-DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3ed703341cce56efefba439eb8595877297b76085c6a57d3d76710257153040b8f895d6dd6381502e852e6b82e93 SHA512 18620f0164382849980938103a9243abc35ea5a2628258f00e096e16a698b598d0c7fe80a1739fc689217c59a648c728a014bc672a92346c65768ebf89675b90
 DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab
-EBUILD gtk-doc-am-1.33.1.ebuild 824 BLAKE2B a9fe5302cf2ea6a5b2277b72b495daef83067de3221e82674cbc8553ed72e45f1d9667b51d3db7f377364536b07f7eb992ce3a820f50a4135ff68e1c81ebd6e8 SHA512 eea98796da90c30189c5a4a8e04939940acb7a4b48fdafe92a2aff1b7ea04d0819b87badc4f80d3833672234deff0b103a39c35a7d99c8eba58636b5c723d4cb
 EBUILD gtk-doc-am-1.33.2.ebuild 824 BLAKE2B a9fe5302cf2ea6a5b2277b72b495daef83067de3221e82674cbc8553ed72e45f1d9667b51d3db7f377364536b07f7eb992ce3a820f50a4135ff68e1c81ebd6e8 SHA512 eea98796da90c30189c5a4a8e04939940acb7a4b48fdafe92a2aff1b7ea04d0819b87badc4f80d3833672234deff0b103a39c35a7d99c8eba58636b5c723d4cb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
deleted file mode 100644
index 303d509eb38a..000000000000
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.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
-GNOME_ORG_MODULE="gtk-doc"
-
-inherit gnome.org
-
-DESCRIPTION="Automake files from gtk-doc"
-HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="!<dev-util/gtk-doc-${GNOME_ORG_PVP}"
-PDEPEND="virtual/pkgconfig"
-
-# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071)
-RESTRICT="test"
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins buildsystems/autotools/gtk-doc.m4
-}
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index 3fea2b6adbf7..de247a5ed8d5 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,7 +1,5 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
-DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3ed703341cce56efefba439eb8595877297b76085c6a57d3d76710257153040b8f895d6dd6381502e852e6b82e93 SHA512 18620f0164382849980938103a9243abc35ea5a2628258f00e096e16a698b598d0c7fe80a1739fc689217c59a648c728a014bc672a92346c65768ebf89675b90
 DIST gtk-doc-1.33.2.tar.xz 507852 BLAKE2B dea3030060ecec89433fe3783dfacc2f58373780c49560a48ab1a32bedfe888692183de8396c92414255e4c8f537358cbc373fd307638ab8e7dbfd9ae44de58f SHA512 f50f68ab6b4bc59f55e84b49c1481f05700171cbf79eca9ba8f3a142a30a4ba88fe096983ebb8d117a9ef8bcea40934674096683d956f5c54cae457d31f651ab
-EBUILD gtk-doc-1.33.1-r4.ebuild 2614 BLAKE2B 1127986051ad200315fda01178dbeaa4c2e0e34f41dbb5bd90faf34617cf025d40a84a8dc1e4c2ef2547144e1986be72581b2d9e02f2f6190453c2bc96ec6e8a SHA512 133ebb7029320a7929e99037e04a7999aed12b144a53299141ac5c810adce32cf9833d28f964ebffd871c41113af9080568df6280eb3347d414a28a81b3f2570
 EBUILD gtk-doc-1.33.2.ebuild 2614 BLAKE2B 1127986051ad200315fda01178dbeaa4c2e0e34f41dbb5bd90faf34617cf025d40a84a8dc1e4c2ef2547144e1986be72581b2d9e02f2f6190453c2bc96ec6e8a SHA512 133ebb7029320a7929e99037e04a7999aed12b144a53299141ac5c810adce32cf9833d28f964ebffd871c41113af9080568df6280eb3347d414a28a81b3f2570
 MISC metadata.xml 490 BLAKE2B 9b4d27b146f567501af858fd704d7713e8eea66caac0b5878d685814b48825f4222a6286acd3a8ec4d8e698ace318c52c74e301dc8eb3eec41bca3d83d24a130 SHA512 0d33e970b5924c264711c8a77aa966ff8f1e6cd2695d34088c0f9af825cd72603173e07e39fb6d6bd22098d76c048b3dc03dd83916b092f2c68c58f94aa95b7a
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild
deleted file mode 100644
index 18c12d44b238..000000000000
--- a/dev-util/gtk-doc/gtk-doc-1.33.1-r4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="GTK+ Documentation Generator"
-HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
-
-IUSE="emacs test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.38:2
-	dev-libs/libxslt
-	>=dev-libs/libxml2-2.3.6:2
-	~app-text/docbook-xml-dtd-4.3
-	app-text/docbook-xsl-stylesheets
-	~app-text/docbook-sgml-dtd-3.0
-	>=app-text/docbook-dsssl-stylesheets-1.40
-	emacs? ( >=app-editors/emacs-23.1:* )
-	$(python_gen_cond_dep '
-		dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/parameterized[${PYTHON_USEDEP}]
-		')
-	)
-"
-BDEPEND="
-	~dev-util/gtk-doc-am-${PV}
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Remove global Emacs keybindings, bug #184588
-	"${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
-)
-
-pkg_setup() {
-	DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs.
-		You may set your own key bindings for \"gtk-doc-insert\" and
-		\"gtk-doc-insert-section\" in your ~/.emacs file."
-	SITEFILE=61${PN}-gentoo.el
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Requires the unpackaged Python "anytree" module
-	sed -i -e '/mkhtml2/d' "${S}"/tests/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dautotools_support=true
-		-Dcmake_support=true
-		-Dyelp_manual=true
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-src_compile() {
-	meson_src_compile
-	use emacs && elisp-compile tools/gtk-doc.el
-}
-
-src_install() {
-	meson_src_install
-
-	# The meson build system configures the shebangs to the temporary python
-	# used during the build. We need to fix it.
-	sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die
-	python_fix_shebang "${ED}"/usr/bin
-
-	# Don't install this file, it's in gtk-doc-am now
-	rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
-	rmdir "${ED}"/usr/share/aclocal || die
-
-	if use emacs; then
-		elisp-install ${PN} tools/gtk-doc.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		readme.gentoo_create_doc
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		readme.gentoo_print_elog
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index d376bab01421..bc7e2a6b7b1e 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,5 +1,3 @@
 DIST howdoi-2.0.15.tar.gz 27545 BLAKE2B 204d7e3ddab07e24ccc08964c3880477743970502423887a2360079606c832b93d1e8fbcec237b77533c2e21d4a35af08b9418d5ce62f8b2ceca70ee844c21ff SHA512 e0b3faf1cde78d35a23e11070b3d73db7468bfe79ec8f71b2370681d3dea1bcf1a313594fd1e4f21aa62035460e5c31509ff683fea3e0e35e9412b173ad874bb
-DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275
 EBUILD howdoi-2.0.15.ebuild 684 BLAKE2B 9f7cb5189659a41a8f1cc416557a676bdf309253390f801a43653bab3edfde6cd0f9b40452cca0943b9904fcf1951a0ea97ab31d984cbefd722c913f39d40bf8 SHA512 b3660bb4744592976f51a12f814d3c8c1d92581f20a5997a3cc582f8b5f053877fa59b9e64fd43a33dbeb9c662b6e8a84cf0ede02e12113f53290e5b14066036
-EBUILD howdoi-2.0.7.ebuild 693 BLAKE2B f3349a11696b95e0cfdee1a19b9589d487bbd762c2bdf034d0c41865413908b52bf0db1357ba8fe612db3ea5e14a6c63e14b090f763eab8a2ae52b07d2fed09b SHA512 99fef66aa24ea1ddc962d9637a79691b215bc86633ef16359bc2bed9b1b39f4298bf8974fa643e88fb9d42220a4fa4ee6214e0ba1e98ef55e8043b6e527db01c
 MISC metadata.xml 367 BLAKE2B cad999effcfe4ba7eb7fcce4efa22b7cc1bc501c01f28c647c8d94fd560645b96d25bc89703bd43c8f5a969606f9842e14f955bc7ace46fcff0333469843e62b SHA512 eacaf9118ec14ec50c3f22d0abf5deafb42ebbcb3bfbdb87f01c6908983b36c6c837b13f903c0cdd7be3137d9c999f66d7983157a7ec33685d08d608096f0e27
diff --git a/dev-util/howdoi/howdoi-2.0.7.ebuild b/dev-util/howdoi/howdoi-2.0.7.ebuild
deleted file mode 100644
index 7f0d6beafd7b..000000000000
--- a/dev-util/howdoi/howdoi-2.0.7.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
-
-DISTUTILS_USE_SETUPTOOLS="manual"
-PYTHON_COMPAT=( python{3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cachelib[${PYTHON_USEDEP}]
-	dev-python/keep[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 54cc7551bf76..c66605c0a977 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-1.1.211.7142.45.tar.gz 652283495 BLAKE2B 601111752b8bab9bc4988c6f5f12a841cd46a2ce504772a82968a094f471566f9cd6f15731c30dca6d332e74fbd3cbeef026d05587fee9ad65ebc3c5921656ec SHA512 ccfb941b074f04701bb9ad3a4e4001582fac268048bb07ab7958b5f18b10f2385e0a242d518f525e2550b9da901a052653cee6147edf6559fab1978b8dfe6fe9
+DIST ideaIC-1.2.211.7442.40.tar.gz 650671989 BLAKE2B f4c585fb4ccbcdf3bef5ad18e7a26a76703ffdaf8a3e2f4625aa084fb1185835b1d2ad12f013235b09b7dfb986ec0f6fb1fa189c3113a6a3180d814ef6aa1167 SHA512 5d9ef9fc5ca95455726326616d3a9eb75559dc58a1aa5335287f873c17b77b944c3bf1503b32c8ec0b39e23efcf6bbab68825901b92a7db15030e1747af64561
 DIST jbr-11_0_10-linux-x64-b1304.4.tar.gz 201507596 BLAKE2B aa83f396dd37a96c769806c3f95a4c78bcc31e9c8eda047903cbee932a84029ad7133fc03496a248c017795ec45ff42f30f3860780a00d9d766ac7b262019905 SHA512 0de75baac30dad42927fa0cef3b78dc183f4dd317f8426021dd51cf1288680bbc65ed934e867dfa3ca9397d9bd5cff4b4d6896eb4878323c8b0aaa2b39d33d82
-EBUILD idea-community-2021.1.1.211.7142.45.ebuild 4161 BLAKE2B 83f0a55bb39c19e5ec15d07b65d7d853d3e922269945514fd05813bcb576595e3959fb0095dabe680b558750937d2334c61f156b5aa7b2945aee0f7d5fcf576a SHA512 2c4493cfdc58e23237f5de7c724bace15d566a4025e590dfc954e2342c6a4c6cf7af4f1bd1ddde62f8e4bad06cac472dc59377545f8142ab4c2eb202d5dba6a5
+EBUILD idea-community-2021.1.2.211.7442.40.ebuild 4160 BLAKE2B 87751186ef5f7bbc93359e38dc7595c8750a8c79a1db73b5f8f32a9c6263cd2354b49bb650f0c792781d657c039f4b9a64b9b9594c8c98a55f17421c769f4026 SHA512 3aa439f1e85a5789cd943ded4f83eaa46e0b62b882977ca0badaa3a76fa4fbed151e76ac6436dfb25b98f88612f91d24516adb4fe851c1a1288cf9604106a0e6
 MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03
diff --git a/dev-util/idea-community/idea-community-2021.1.1.211.7142.45.ebuild b/dev-util/idea-community/idea-community-2021.1.2.211.7442.40.ebuild
index 9d686a4fb000..743e9e574dfb 100644
--- a/dev-util/idea-community/idea-community-2021.1.1.211.7142.45.ebuild
+++ b/dev-util/idea-community/idea-community-2021.1.2.211.7442.40.ebuild
@@ -12,7 +12,7 @@ MY_PN="idea"
 # ( jre 11.0.10 build 1304.4  )
 JRE11_BASE="11_0_10"
 JRE11_VER="1304.4"
-IDEA_VER="2.236075331.371301151.1620596360-682219170.1619910833"
+IDEA_VER="2.23517177.257203969.1622674002-682219170.1619910833"
 
 # distinguish settings for official stable releases and EAP-version releases
 if [[ "$(ver_cut 7)"x = "prex" ]]
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index 594dae0027bc..193ac91f0f90 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -3,5 +3,5 @@ AUX 1.1.2.1-python-3.patch 5273 BLAKE2B cb2be2f11021d61f998d228d26cfad956ec3c6d1
 DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16 SHA512 ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4
 DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
 EBUILD imediff2-1.1.2-r6.ebuild 771 BLAKE2B 68df3929d880653a85a89528010aeec48043b4951b56c25d2e326e3f1ad29d2775d3e8ca213fbff5ab12f060ab58fab0d8c0ee4072c324c510d6863c8b929900 SHA512 b36d89729319f60d3f2a79c990f974da60be2b67621af2d85eb9f8f9b501620bf67f308481f1d25ff04cd09753d6629119c454c878a2f4dc4437e89030e8e4f2
-EBUILD imediff2-1.1.2.1.ebuild 796 BLAKE2B 23aed7033f68c4a254d57ac5f40fa6327f8cf6ca1033388d46bf73d9e12c198b4484eda34f226147de9e82102ebbc898864e6d46cac821f6cf1e67a1ad649694 SHA512 6adfa99837e2c7db132200ad70d989e4c01155eefb8b5756be9e93523552ab2efd4dd3dd4bc4a9d4ce50114d6aa50f5bd4c58c4959924d526d4c50d14ebe77cc
+EBUILD imediff2-1.1.2.1.ebuild 794 BLAKE2B a12eff8797ead4c2427623816ad21dd3b7b80ef7b3cf63f5647457524718e11e477f8752cbcdf38f023978cdbada63e9181ad62c0421607dcc1f6fc201c6489c SHA512 8e5605d7da2bd37f611e49d96b4e6e37b775cfb26c0773567658ad24324209721c464f2a2591d55252276320fa78a46954b2b21abf4ad6784f94000610124aee
 MISC metadata.xml 270 BLAKE2B db96fa7275398e582ba29ef0506116343ffb732fb9f4885311a7ebb5db977382dddc2e9d05c57f53f87e2961dd8bf768336f7c7b8bb5e80ece44969bb1c7dbee SHA512 650922039b23e4a7727a2a4123577d872000f6fbcd303b45801ad9e00dbed3326aab1d69964d18c1f36779b91011016a8009157d04757f4a9fe777e6b01734b8
diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index 464fc4d97d24..ea0b4c610181 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/jarwizard/Manifest b/dev-util/jarwizard/Manifest
deleted file mode 100644
index 16768751687e..000000000000
--- a/dev-util/jarwizard/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jarwizard_250_src.zip 169540 BLAKE2B b4fe55b2f9ef8e1ed05a2823b9a2fa5849f241b7a41f921aecb2aad43297e1d2a47fc1a33897813e8078d438b11a16b5c7242a1acbef4e08c8cb82d03ab04a5c SHA512 8d40cecd339e8e50b58c2c78a3c53b712275d95393d8ace4799b55a7f66f6e2a4bfd3348f92d6022d1d48c6edf17117c2b1bb1defc55e73fbdcf541907eeef1f
-EBUILD jarwizard-2.50.ebuild 682 BLAKE2B c948226c4489a78e68594a275e8a9f096d29543e456812685879f2b5c70bb264d36d42b4d109ce8a0aeea2f6ec771da7a50b6480b958a209b4500924a14aaba5 SHA512 b4008de8c0f28fb87e8c15452cd42110acd10f39d0ed4019f5c7889f07e7a00ca52c3dbce3931ea202843c075e758d3d48fd06875bb83dfc3dba4c61ce159538
-MISC metadata.xml 315 BLAKE2B 7f29647cc44b98eff26b0fa5b83e2b23c9090dcfd0664b39ea83d455ff11227461ce57720c32a82f6e12fa3d337edd01ecf0e415ec311c40f3064fee281f0f66 SHA512 91e4126398b25c29af33c39af19f08f2eb8069c7595dcd752b347b4db0d232e4315708d2baf92f31f6ad7805f279a96b10891b73de53c0cc9331a0e9a404f82d
diff --git a/dev-util/jarwizard/jarwizard-2.50.ebuild b/dev-util/jarwizard/jarwizard-2.50.ebuild
deleted file mode 100644
index d10d098ad575..000000000000
--- a/dev-util/jarwizard/jarwizard-2.50.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Takes the hassle out of creating executable JAR files for your Java programs"
-SRC_URI="mirror://sourceforge/jarwizard/${PN}_${PV/./}_src.zip"
-HOMEPAGE="https://sourceforge.net/projects/jarwizard/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	java-ant_bsfix_one nbproject/build-impl.xml
-}
-
-src_install() {
-	java-pkg_dojar dist/*.jar
-	java-pkg_dolauncher ${PN} --main JarWizard
-}
diff --git a/dev-util/jarwizard/metadata.xml b/dev-util/jarwizard/metadata.xml
deleted file mode 100644
index 6c9274348332..000000000000
--- a/dev-util/jarwizard/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jarwizard</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index d9140f371697..285055295e7a 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,7 +3,11 @@ AUX jenkins-bin-r2.init 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e2
 AUX jenkins-bin-r2.service 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
 DIST jenkins-bin-2.277.4.war 70918017 BLAKE2B 990222bedb5ad58e8a00f29194b0f201395545fa70af22485a88c55e0898abdd218e501222689abbdf5cc8f4f3dc32dae7e54198b43a8c46172501017018eea6 SHA512 eb635bc0767c242063e88aa6f91a6daa8fbf23f74333f2dd73535a7ff3a4e690e3a456fba2e92b44ee883378b783896f8052a1b26536dac5954d74a62a63597a
+DIST jenkins-bin-2.289.1.war 74253062 BLAKE2B 142ef28f6d0e0a5445de3d758137b7a46e35e347cfaefdf88e3140afbdadd0499f4b900f16ebee9632ad0d66c0895f7e0905abeb997c1c4467839b53cc9f4027 SHA512 4d17cc0b5099231f4468a2160b8d174f9602930be9c8bf59a0a0ababf6bf0cf6ddf7e727add19f2dc04a5a6a538f53761a97d250745cb8c787c11a347c1908a6
 DIST jenkins-bin-2.293.war 71937427 BLAKE2B 26d4bef9860df513d95900404909a3342183ee0c131a9319fb8a637f2a59be5867737ba476d156fb092cdd8c97f07328bb4a13e2f0bde700cae00d755a8851ab SHA512 bba17be80e8cbd9cd81b08e6df1fc142b7c944ea3998014211c6f0a2f6bb10e56278e2ecc2c800f0a0455b352026f7405f956545c78258d8ae225abb35fd0787
+DIST jenkins-bin-2.297.war 71626854 BLAKE2B ebfbd8beef01a9fa9f5be608d2287cc6f3e021b9d4f620bf9206b30334602502fe78836fe70d5a672f7e9b985b39bda79bc85fc592c018887a73ec999c81e270 SHA512 bb7c78d30409696483ce50a14ef68923e8c51969df9ff5d20efa1f550ef9f0204aa96c23e2737ae847d554d879e4bb3f2e546b4fb0714afcc9401e8cb84a1824
 EBUILD jenkins-bin-2.277.4.ebuild 1106 BLAKE2B 804133edf4915210670994a35ba872924ba74b5627a64ea10373230eef31dbd350de7b6fc108685b05fb43f55b522c3e4d5418f61f727d262071c2234e09171f SHA512 50efe3ce97debf73fff1f06c97a5747cfc0e2e105cd27470c99958216b1db1ffb544171ae8baf1080b59178b6118af9fce7c348d67a61eed9945c462b3833700
+EBUILD jenkins-bin-2.289.1.ebuild 1106 BLAKE2B 804133edf4915210670994a35ba872924ba74b5627a64ea10373230eef31dbd350de7b6fc108685b05fb43f55b522c3e4d5418f61f727d262071c2234e09171f SHA512 50efe3ce97debf73fff1f06c97a5747cfc0e2e105cd27470c99958216b1db1ffb544171ae8baf1080b59178b6118af9fce7c348d67a61eed9945c462b3833700
 EBUILD jenkins-bin-2.293.ebuild 1099 BLAKE2B dbfe00baf90085bb5698d8177b2aed42707e30a8b10648b09f32b996df9368a6cfaab778efd20fc40dc0932acab808c96f1de298688bb1826a52f1b8f6c17701 SHA512 c52d261e0d89664065376ae28961aa43ba2d6b6d2073792e3c1cf4b8e7603fbfe0c58d6ff887e2ae0e70cc29bf0e2ef2d072460bc40521cc4c605419ef8ce7f3
+EBUILD jenkins-bin-2.297.ebuild 1099 BLAKE2B dbfe00baf90085bb5698d8177b2aed42707e30a8b10648b09f32b996df9368a6cfaab778efd20fc40dc0932acab808c96f1de298688bb1826a52f1b8f6c17701 SHA512 c52d261e0d89664065376ae28961aa43ba2d6b6d2073792e3c1cf4b8e7603fbfe0c58d6ff887e2ae0e70cc29bf0e2ef2d072460bc40521cc4c605419ef8ce7f3
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.289.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.289.1.ebuild
new file mode 100644
index 000000000000..10778d0c4f4a
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.289.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="lts"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.297.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.297.ebuild
new file mode 100644
index 000000000000..6272140cb584
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.297.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
+IUSE=""
+
+DEPEND="acct-group/jenkins
+	acct-user/jenkins"
+
+RDEPEND="acct-group/jenkins
+	acct-user/jenkins
+	media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S="${WORKDIR}"
+
+src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}-r2.init jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}-r2.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index ef2d7bfeaed4..277f9e0ffb16 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
-DIST meson-0.56.2.tar.gz 1794847 BLAKE2B 350427e2ff4b4fe688220ca6279ff3361e1b2c7c573e1e0185ea9014fda73bc68929256073fe05855e3403638257e26477868d0a5683a5b91f6a74ee55a01f0e SHA512 3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514
 DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e
-EBUILD meson-0.56.2.ebuild 2338 BLAKE2B b50d254d2b52de7478c1480bfca34e9eed952e02df08e57964035a035e33c6dda033d8b50bad9301e79e537ef6a3f1ad7f666083c7e46b8584b7711227938c6d SHA512 d5abc3288b6d4261d3dffa318448d7e61e35781124ddff30527781863cd0b84f5944bf13fb0361af6c690ad627cdc5ec55f35ab50ba58c1699ac4e67add71f5c
-EBUILD meson-0.57.2.ebuild 2338 BLAKE2B b50d254d2b52de7478c1480bfca34e9eed952e02df08e57964035a035e33c6dda033d8b50bad9301e79e537ef6a3f1ad7f666083c7e46b8584b7711227938c6d SHA512 d5abc3288b6d4261d3dffa318448d7e61e35781124ddff30527781863cd0b84f5944bf13fb0361af6c690ad627cdc5ec55f35ab50ba58c1699ac4e67add71f5c
-EBUILD meson-9999.ebuild 2346 BLAKE2B 759d97034364081f55be457b9e8a31a51e30a87de26f9e7bd86dd3bc8ec8b0e99a0c6bd7f306c404b716e8b968debaf8a79c83c511832c06001e4f8a5ee0fd26 SHA512 b27c8176ddac2ab83b684190cef83d28cdd32ea7bf3fe4591a42d568766b1badc4cd7e046e8e80283d47f98f46216c53e5914dedad6e343a4f414fcbbd4a8dee
+DIST meson-0.58.1.tar.gz 1896205 BLAKE2B d42e04b262c6715ba2776f64d2e616016381303b07e609c804becf72db2ebd8ef08030c969f43813b2072552cb76974b2ed84f2da6d6c809ad612169d580395c SHA512 64ac1a9bcc642fb6d37c4b677d8b7db16d821f852f927a980d3fb1c149d680b7ff2c8d03676c6772666d46a33b6ce8674220433d302fcd92d13d9818558d6453
+EBUILD meson-0.57.2.ebuild 2303 BLAKE2B f05ddd144872cd4a01891b089af2adec6e53bd6bf69707557dba5f7770385062d0111b0706e328aa5b21fb2acde9efb136221fbd651828ec16e902f5b7c878d1 SHA512 5bfdeeb4ed0542917ae6bc1780e06ff7733c1e03b9c1fb8816d6ffa26fc18b843008a3a32aa5ca1e596d219a0a7fdcf2984e9fabeb34f7ea793798239ab46653
+EBUILD meson-0.58.1.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
+EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 423 BLAKE2B d5ccfb020cc6bd4c163a6807d27528e6035ef59d0e0a7122c0a194da25126408ed5d5a1d97effb6e7e4721eaa20d15efb2bccb48db4215c3c5609cdcb58938ef SHA512 88f01def35adfd916e55aea1abf8234108338f1b692c1702e64b1fdeb6354f50965651e741b347cf792cd9ae90897ee4451060115d757af6b6235469f8d9aef0
diff --git a/dev-util/meson/meson-0.57.2.ebuild b/dev-util/meson/meson-0.57.2.ebuild
index 20afc602e2bf..718d9c7fe89c 100644
--- a/dev-util/meson/meson-0.57.2.ebuild
+++ b/dev-util/meson/meson-0.57.2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
diff --git a/dev-util/meson/meson-0.56.2.ebuild b/dev-util/meson/meson-0.58.1.ebuild
index 20afc602e2bf..e2a175666ca3 100644
--- a/dev-util/meson/meson-0.56.2.ebuild
+++ b/dev-util/meson/meson-0.58.1.ebuild
@@ -2,15 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+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"
+	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
@@ -81,6 +80,13 @@ python_test() {
 		# '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
+		# autodection. 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}"
 }
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index cb12aed28c93..e2a175666ca3 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
@@ -81,6 +80,13 @@ python_test() {
 		# '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
+		# autodection. 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}"
 }
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
new file mode 100644
index 000000000000..863919703723
--- /dev/null
+++ b/dev-util/pahole/Manifest
@@ -0,0 +1,6 @@
+AUX pahole-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
+DIST dwarves-1.20.tar.xz 688728 BLAKE2B c57f390f7e1d20c861a4acb8cd7fe238a3f7c3f2d915d96fc051dba2587942e8fabfa4f524d18555c486863fa02bc4ab63d90e90d477f376dc5e547aa36cccac SHA512 306bb74c498527a5a9bdae4d304e90511336cab627d9acad5237d93cbb48efe11dbca4418c540fa03e3ecdd168ce224cabe9fd2f6fbb50520d0dd17741c80817
+DIST dwarves-1.21.tar.xz 910480 BLAKE2B b6dcdaf008a7714838904b0bc1050e6af4617e00e168f45a3f1a5d4611a05c898182f3395b2f10478240e05c22ce82a3a7381a1ea7ab41684e3b05ea6e73620c SHA512 69f510025f5790a004c356546f7d92996ad84c4ff1636876b48f1c7d81bf66c83da70f11a1912d65b46f81bea79418782021396a018e74baae5cad9221af14e1
+EBUILD pahole-1.20.ebuild 1083 BLAKE2B e9871955c4cd61088cc6786d49f9dfbc452452b20642a3cd41c5e80dc06202c4f06440e9ff3c9932b2adb3c42810f77a140e3ef3272a99cd992b7c68c8f2fc3c SHA512 25ec68471c69b006ee099eb6cfbc4cad24fa939d08e41ac2e0d513d54487f9cf591a55b6d3fb06ac686849076b3a9466b176d045f0caa24a20b6a2dc19b67e4e
+EBUILD pahole-1.21.ebuild 1086 BLAKE2B 0b2282309ad6c03460139dcfc7a7c6e40f47c8412f2e859be4bd8903b6675ff8bbde5866004c80871ec7050eca1fafba48d357ff7c3b4dd0828d7aac8363d25f SHA512 bc23ebca73cb1614f98e06e84cbb8846377ca55768adb3bfc527681cb5fb217463e972e24decdeab1802fa725da89e6caa78f1ce9df55a02a17ddc4cc580a412
+MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/files/dwarves-1.10-python-import.patch b/dev-util/pahole/files/pahole-1.10-python-import.patch
index e308ac6e2788..e308ac6e2788 100644
--- a/dev-util/dwarves/files/dwarves-1.10-python-import.patch
+++ b/dev-util/pahole/files/pahole-1.10-python-import.patch
diff --git a/dev-util/dwarves/metadata.xml b/dev-util/pahole/metadata.xml
index 28be736073c3..28be736073c3 100644
--- a/dev-util/dwarves/metadata.xml
+++ b/dev-util/pahole/metadata.xml
diff --git a/dev-util/dwarves/dwarves-1.20.ebuild b/dev-util/pahole/pahole-1.20.ebuild
index df4c7825b90a..40eb52fc5cdc 100644
--- a/dev-util/dwarves/dwarves-1.20.ebuild
+++ b/dev-util/pahole/pahole-1.20.ebuild
@@ -20,8 +20,11 @@ RDEPEND="${PYTHON_DEPS}
 	sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
+MY_PN=dwarves
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
 if [[ ${PV//_p} == ${PV} ]]; then
-	SRC_URI="http://fedorapeople.org/~acme/dwarves/${P}.tar.xz"
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
 else
 	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
 fi
diff --git a/dev-util/pahole/pahole-1.21.ebuild b/dev-util/pahole/pahole-1.21.ebuild
new file mode 100644
index 000000000000..6e645bb8300e
--- /dev/null
+++ b/dev-util/pahole/pahole-1.21.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit multilib cmake python-single-r1
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+LICENSE="GPL-2" # only
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.178
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+MY_PN=dwarves
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+if [[ ${PV//_p} == ${PV} ]]; then
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
+else
+	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+fi
+
+DOCS=( README README.ctracer NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-python-import.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
+}
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	cmake_src_install
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 73c8dbd3ea48..061d5859be78 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -3,8 +3,8 @@ DIST pkgcheck-0.10.0.tar.gz 453555 BLAKE2B aeb211619f400b729a9f5e7e1ffa787c33c1c
 DIST pkgcheck-0.10.1.tar.gz 454051 BLAKE2B ba0e91fee539d0a41c27da08c91e1c65078eaebea33b8254cbad38d49feb91a4aa490992a5d88bd96ce0570d89f9f8343d0ff0a2d7368f09d55637b2597aad6b SHA512 044067928bc1c1280a95e785def80e6ebb289e0882f9a61b18d1d75ddc22c4f7eea1da4a4621fd5a598c3e7ee75ece2adedb936086f3c3cbc92c23ab93419215
 DIST pkgcheck-0.9.7.tar.gz 453478 BLAKE2B 486bae68af1757fbdb4b109b34cea836cb6dee258d4e53b4c3818c1aa6194da86e7ee339335ac6f2a1c2fb89a547f46658fadd88706fa807a9fdce2bb82a5c65 SHA512 e8fc02997d558af1e8e89a13130076b4db59e9c2a8ea383d0dca9a57375dae1fb315619593178d67c89d30e7b16810905694c838ea4ec608eaee195fa4797569
 EBUILD pkgcheck-0.10.0.ebuild 1507 BLAKE2B 70f6f537fa953ec59c3ed9b0ea017bec0fb7c569e6006b066e35a2b2b868a4e75da078c5bd60faba16a9c80f8e011a565366e611b9202628f073a27fc4e47aee SHA512 07dbe05c8d6a60d411bbd2d07e890b914c85703e024822ad7b6720818d15e6843ea05f95bfeda54b3f4c1f8db96948d25e719bf5d415082ad9c038a0403c50af
-EBUILD pkgcheck-0.10.1.ebuild 1514 BLAKE2B c0f86e1bdc8c9c74babe33395234bb6c12e6bef221c8bcf8398d406441b1455bd6d671e5db7ec1a9757cfafb733e6a70c2a6e617d60ba8e533ad63a97858f810 SHA512 3da204b82c34dd3b0d8bd73c842dcc1541cdcf1c29c5a89b29d1ea73e60506e970d2520a9d45194fc303fbf5994a391483f39cb3796afdab2cf3a7ef993f65a8
+EBUILD pkgcheck-0.10.1.ebuild 1507 BLAKE2B e9faf1f21afbd8a9846f54cb795083ecdc48853e47e171b9cbb9e7a9e668a3b09caaf1870a31830d33488c4841e04c3fedfd8c2b1219cb391f74c981dcd999ae SHA512 0b1b30f6e5fea0bc8175206903e90ef60e65d0456fdfb14448342abc811e4e9d0333000e8cd6fd79974e22803673f64349cc8404c1ed8dbff4e3f54b58ddf3b2
 EBUILD pkgcheck-0.9.7-r2.ebuild 1544 BLAKE2B 7bea3bcebc9b0397682d6ea9c39798a59857ea9276095548927e6fc6f09c606e60504b7a6ebba401fd00c55238489211889744b6480e559b897d7824fa33bbd7 SHA512 1de34366c44024ea677d6ae3e41a2a71819490d22a7f0813307f790ae3f3b019daa07d259ebc2ffe39121588dfc3a9183f46cbc7858d1c17e631ff2f6668bc50
 EBUILD pkgcheck-0.9.7-r3.ebuild 1604 BLAKE2B 0e6042b6fe93f617544b08d728eb1bbc4217e6e1b675c4069990c02f99937c9ba5668a68f3b5b595c688eddad5a47a96140f58daf9ca94a803eec7b933dd874b SHA512 6a3dd00c5158e8d004a002e820dc4553294c6faa2759ed672dc91f8664725bf6e7eaca8c1f7417a6d232566fe6031dac8df045307beba52137d003d8a1b76b28
-EBUILD pkgcheck-9999.ebuild 1514 BLAKE2B c0f86e1bdc8c9c74babe33395234bb6c12e6bef221c8bcf8398d406441b1455bd6d671e5db7ec1a9757cfafb733e6a70c2a6e617d60ba8e533ad63a97858f810 SHA512 3da204b82c34dd3b0d8bd73c842dcc1541cdcf1c29c5a89b29d1ea73e60506e970d2520a9d45194fc303fbf5994a391483f39cb3796afdab2cf3a7ef993f65a8
+EBUILD pkgcheck-9999.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
index 1d0d90fc9dd7..13158257ef31 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 optfeature
 
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 1d0d90fc9dd7..9a255efb0571 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 optfeature
 
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index e85f3c11d1b7..ec2d3668087d 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,8 +1,8 @@
 DIST pkgdev-0.1.2.tar.gz 32579 BLAKE2B 42ecd7403dcb49b256539e12c22a6bca72884bf55139c5f0972961fbebf4f976dedd3a4fac1186cc1d5af62d339ac7dd3eb20106ff1dcc7b8c264e1c4c53c3de SHA512 c224a054612fd6caa9c66855be9bb5ed439c3ac2abf5b32c4ac516d87fa4e345fc8bc328aa74b4fec44d7fd319322bb42af48f6dfdfff941e3b819a75b9fae9b
-DIST pkgdev-0.1.3.tar.gz 35226 BLAKE2B 7e22331b39bc2b31a0492842d91b3389217ccf3e017796d239364888d691bb7f9c443b12f8a8019f3774276fb9f492a054e27b76cc447ebcfa584261b34e17dc SHA512 b64addebe81995968b4cca04de2d2a5ac63485b76744bde8d2f1b67a0207259712cf72fe76440a6c18eeb580c9de9fd594f48f08ba4870675efbc8c830751993
-DIST pkgdev-0.1.4.tar.gz 53247 BLAKE2B cc89f6637bdd0df230b47b30233415c2c2e55ea3dccd7134e22614b16c0ce8c95302c9edb5f64ca8b1928ddd2f678006d6bdf8c6241deb5d95dee6f6ec488dfb SHA512 60a23e7e3c0974677ebfcda4d709ad6dc15517d02f4190f318f61aeb0ceecc5b2bb8c663542313c3423a1102099d880a683e6623de1afe3c30bc92d59821d632
+DIST pkgdev-0.1.5.tar.gz 54386 BLAKE2B 1e3b87cbae263dba5dbb46f6a5df95d1f2b76382e52bff10a445abcf9af7c965cadd6e0134c3cfdb550fcdd9c96e0f4f40f3f4d6d9097913ef3ba9f309885b98 SHA512 4617f5f2e15bd3833debf76fdf02cdb9bc10e27285e18ca5958e197ab89d7392731a7f5e3846e92764d90b643f38eb1834c8d0a724e934f623edd1675a705b9e
+DIST pkgdev-0.1.6.tar.gz 55644 BLAKE2B 70c0c040ca277b108515d6c3fcbdecbf7ee20963bdc2d19218855a8261830f1509073e5a09d0daf6ccb6a276dd19401c9266d74e5c5c0b60ceb234a63779f38e SHA512 5f274d0ddbff0535862827e3e97d3378cc53c3fa2528e35ac4ef8c4bc3215de4eac2b62b2f2fc1c499f360a0594fecdb722613592ac86d01bef3f6abfc522c1f
 EBUILD pkgdev-0.1.2.ebuild 1543 BLAKE2B ae64288392fcb57bb88cf1d5c11e83775f1790eaee84c8b8e417bb433fcf2d30e0daaa4f121b29e78b89cb2d627c0be5bff3e8f54b0b36178eb95f60a53f01fb SHA512 46e59fc344abee0e4051e5ebea9029442aa41ed810fa3bd0344a24f00344bd59df33328fd6e50c34b1b1f6b79493972eb5d476f5ecc9f0764c3ae08387df6f14
-EBUILD pkgdev-0.1.3.ebuild 1544 BLAKE2B 8f0059a3183279fd485470b9534883c3d82e0812d48bde533910e82d4b607e57859a4048ea60ccccd16c0737569efe59a0a191dd35846657e4bc570ad637cc26 SHA512 9a0b801eeed80915a23366e12aa3d4ca81647fa1999f72deb265448fef40e60f6b35eef0f1688ba61507ef0ecad1fe9cc7dc7e0dac420d2f4a5db5ce66d7df06
-EBUILD pkgdev-0.1.4-r1.ebuild 1559 BLAKE2B 0b3bf7f6063afa1c9c7ae29b7992bf6fccfdc1ac2206792719c3e5eb94a1d6c87b6cd54bba0b20e0cc541b8a1daf5b905ab1705bf078f3bace4e65fb5e2734ad SHA512 58b304e739e9a818c927d358584451f029b6b54670ba6de3f7ae69ad0147e870eccfee49a20e8ac0ed1e0d7e494af9ea05ca08d044925fcf7ba42efcb9f0e71b
+EBUILD pkgdev-0.1.5.ebuild 1559 BLAKE2B 0b3bf7f6063afa1c9c7ae29b7992bf6fccfdc1ac2206792719c3e5eb94a1d6c87b6cd54bba0b20e0cc541b8a1daf5b905ab1705bf078f3bace4e65fb5e2734ad SHA512 58b304e739e9a818c927d358584451f029b6b54670ba6de3f7ae69ad0147e870eccfee49a20e8ac0ed1e0d7e494af9ea05ca08d044925fcf7ba42efcb9f0e71b
+EBUILD pkgdev-0.1.6.ebuild 1558 BLAKE2B ea3a783859224ee8a89a34e96d63a8bd0754918ede96126df4875bed41d25f2813bdb09659d542466fa2023c534d7623b27157a28b63070f9a971bb95619337b SHA512 8d275b3d06f53eeff7d0714c1a7dd7b2b5132a1394543f16ce32945c3d4de45509e30476770f291f6c5803b45b0cb3bc53b3a80bb73c0907945f85eb52c8f207
 EBUILD pkgdev-9999.ebuild 1558 BLAKE2B 8441109b90fa8543b4d8f3beb57340b0de8baa6588844ed7f3fefb31ef560b19af5813f5a42d036da9242dad0caf5c4bd6367634a28b692fee5d2f4deebf6a18 SHA512 a63dbe4563d93a1961cd4a0edd29c32fe2acf73cc79b72e653e37d9879db06644812a6a56ac77e8590c3ea12c26fbc14833be79be908b9d2002c9a008213060c
 MISC metadata.xml 318 BLAKE2B 857b4e6e454663321e0c8f2b9083246459e751c4a1b0c7d900935274efcb63e82379e66984639e41a1adddb32cb995d4ccc99e910f76f3bf19d543d82520b1ef SHA512 40feecfb7907213bad0ee60f17e748aebbc4df381f59bfa47f3a5c9938917b032a37dce6650be4d60e695c17356290a7be984e1d235d219749b11d73d2fa2f6e
diff --git a/dev-util/pkgdev/pkgdev-0.1.4-r1.ebuild b/dev-util/pkgdev/pkgdev-0.1.5.ebuild
index 2aac0526b81f..2aac0526b81f 100644
--- a/dev-util/pkgdev/pkgdev-0.1.4-r1.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.1.5.ebuild
diff --git a/dev-util/pkgdev/pkgdev-0.1.3.ebuild b/dev-util/pkgdev/pkgdev-0.1.6.ebuild
index 63531217a6a8..8e9674781d59 100644
--- a/dev-util/pkgdev/pkgdev-0.1.3.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.1.6.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x64-macos"
+	KEYWORDS="amd64 ~ppc64 ~riscv ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
@@ -32,8 +32,8 @@ else
 	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.7[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
 	"
 fi
 
diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index d4ac497c397f..8a5bd512a479 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1,3 +1,3 @@
-DIST poke-1.2.tar.gz 6772669 BLAKE2B 9b3c8c425145be7c93c32f7931f7aba04ae3704920603f8301b8af31cce49ae12c83a697e74f7cec803508bfd165b7bbb1c5a859ce95a791d291528c31b24245 SHA512 70a4b8749ca53e255df76ca32cc401ba58d5bea2ee1c01730dadfb1d76a6c286f44137805c801e0f1e520c59306568a87efe56d44175ec0510954f97b640d331
-EBUILD poke-1.2.ebuild 981 BLAKE2B f8832e1bf8533caa2636b076b0bf3ba9d42b2c3fdde0f411609c337b874afae0b8c367caecd23546c2f0c198dbb06e2ff1e239f7d8f6c08a3fad664241bc3847 SHA512 821b8837f1d07aa245c0a02acda9aa9dc4b098860049f5a315df0d7e78f3dddc4bdb9e134f03b42ce01321c17250cd662cdcb2fe3f1c9311efab4f12889f6921
+DIST poke-1.3.tar.gz 6703563 BLAKE2B 7a1127d668b094f08d88fbbe1650a4604d91e4417e8bf7e1199757b6a829694d514493e1b71eb86fc56e894eec8f0ec2255784b76a3f3440af1f1671d851751f SHA512 74749c589daf17533807248febc54818445df193f4d25f665ab62f1c57be133c7f063da3b099b8af5544f88eecad79b10ca29d9d1ef18921035c0aa22e563773
+EBUILD poke-1.3.ebuild 981 BLAKE2B f8832e1bf8533caa2636b076b0bf3ba9d42b2c3fdde0f411609c337b874afae0b8c367caecd23546c2f0c198dbb06e2ff1e239f7d8f6c08a3fad664241bc3847 SHA512 821b8837f1d07aa245c0a02acda9aa9dc4b098860049f5a315df0d7e78f3dddc4bdb9e134f03b42ce01321c17250cd662cdcb2fe3f1c9311efab4f12889f6921
 MISC metadata.xml 373 BLAKE2B 5a16b41a8e507a250ba57aa741890c395eb484af1535229199399f68d62da619298d10583fd7b8d454139765526307ab3f0486814a5ccc22f32eae413e2f4abb SHA512 a74066509b1ac23992121781cb2befa222e250467e9d54ee1cff7d5e7cf5df81d86a44b0eef3768d22c0105f8f1136843f54ef1f5111e1ed8f3659f9eba1898d
diff --git a/dev-util/poke/poke-1.2.ebuild b/dev-util/poke/poke-1.3.ebuild
index 3683b23922d1..3683b23922d1 100644
--- a/dev-util/poke/poke-1.2.ebuild
+++ b/dev-util/poke/poke-1.3.ebuild
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 148e21e8ebef..f26de4bc9f79 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,8 @@
 DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
-DIST radare2-5.2.1.tar.gz 8302475 BLAKE2B 2edfa30d15214ac4dac6065349c808b539619413e7a100459efd5bf74e95c2483edb1ec13de8387d3a7dcfe25a2922ee377c37f4781c374df04e63fe98910b7e SHA512 c744f5c8fff163022a7a9a913fe34dfa0dee0d9ab3b18bd4cc038c2d487dbfeba2f1523aa12a3166a2c22c45bcc71e802fae101b72fc2e6adab96b522c0de17b
+DIST radare2-5.3.0.tar.gz 8498461 BLAKE2B eabee04f347a71cefac4dbd3516cb3161b6e4f1f831285039ece81981121a058d3b39224c68afd4cea38fea2d99b23e770210ebca6b01e73c21882e80de757b5 SHA512 f9d5ffd6f39efdcd447c2bc65ad3129576292a11942c99da8d0c10217621a6d1db72baaf7badadcbbaf75c54be0439a9257de4f56d47cefdce457ffb08167ff8
+DIST radare2-5.3.1.tar.gz 8500461 BLAKE2B 8b29e81c90f477e313f5d14dea707f3e8d47c9abbe1f9ca2c7caef98a85b38a5b5e37a31063be289c55fda041e10b8403895f863dd602091ab5307213605260d SHA512 34c96c7c863fb8a59f1d03539375d5b8f31f6021dc84ce943daa163d8a0227bf3156963cc187c366790abec4381da6aa987248e76570a498cfcdeb982cb2ffc0
 EBUILD radare2-4.5.1-r1.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
-EBUILD radare2-5.2.1.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
-EBUILD radare2-9999.ebuild 1635 BLAKE2B 70e132b2d36bab7414ac66b0b1cfeced89880124cd21cd10918db62768d9969b17a81ed8b75ca97f72a97a9260fa350b56cbb65540c2af4a5a007f7938c5947d SHA512 4dec2c92cc02b4523530135167722502da12eef6aff1bf571e2efbfb2c4633170106131a980ea1c94153f5212a6cf8adc0fdb396a60d87d0230dcf8ca24b3691
+EBUILD radare2-5.3.0.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
+EBUILD radare2-5.3.1.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
+EBUILD radare2-9999.ebuild 1654 BLAKE2B 1f5a47aeaee48b973a25ce3aaa2d45e8eb8c39bb57cd0dcdd18a2dbb2d1e459d754681e8cce8692e53ac34b8c046f893a54a2679dd64cc6b83a411e9fe5d0521 SHA512 6b9deb4ef3e1cdae53a72a7d9ecd70afb32aa0e45808ff8ed2a89d2ca792180bbbfe2a03d61a937d228c086bd338fc8baaae163930c83d14314a0fd788bec80e
 MISC metadata.xml 375 BLAKE2B 16f6bc4a1322225cd5188b2555418ba9e64e4cd2b2afc98226a9f4bbfed59f5da1d4495fc154f6ac254e9e5f48d8a9669176391084c6f62d0f04fbb02676a726 SHA512 225a2e358254837ede6e6bba6298fdc9cf5d8fc9dddb7201b094424f62d3ba7fd54b57cc9dc6c1828163f3df50b0bdceb51de30271f4b6e8963b190893582124
diff --git a/dev-util/radare2/radare2-5.2.1.ebuild b/dev-util/radare2/radare2-5.3.0.ebuild
index a5b8b7c3cfd6..470b4d0d33f8 100644
--- a/dev-util/radare2/radare2-5.2.1.ebuild
+++ b/dev-util/radare2/radare2-5.3.0.ebuild
@@ -28,7 +28,10 @@ RDEPEND="
 	dev-libs/capstone:0=
 	ssl? ( dev-libs/openssl:0= )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
diff --git a/dev-util/radare2/radare2-5.3.1.ebuild b/dev-util/radare2/radare2-5.3.1.ebuild
new file mode 100644
index 000000000000..470b4d0d33f8
--- /dev/null
+++ b/dev-util/radare2/radare2-5.3.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radareorg/radare2"
+else
+	SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND="
+	dev-libs/libzip
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib
+	dev-libs/capstone:0=
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	# Fix hardcoded docdir for fortunes
+	sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+		libr/include/r_userconf.h.acr
+	default
+}
+
+src_configure() {
+	# Ideally these should be set by ./configure
+	tc-export CC AR LD OBJCOPY RANLIB
+	export HOST_CC=${CC}
+
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		--with-sysmagic \
+		--with-sysxxhash \
+		--with-syszip \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d ${d} ]]; then
+			rm -rfv "${d}" || die "failed to delete '${d}'"
+		fi
+	done
+
+	# These are not really docs. radare assumes
+	# uncompressed files: bug #761250
+	docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
+}
diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index a5b8b7c3cfd6..470b4d0d33f8 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -28,7 +28,10 @@ RDEPEND="
 	dev-libs/capstone:0=
 	ssl? ( dev-libs/openssl:0= )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	dev-util/gperf
+"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
diff --git a/dev-util/rbtools/Manifest b/dev-util/rbtools/Manifest
index 09dd4c8aed8f..c79098347ae8 100644
--- a/dev-util/rbtools/Manifest
+++ b/dev-util/rbtools/Manifest
@@ -1,5 +1,5 @@
 DIST RBTools-1.0.3.tar.gz 206634 BLAKE2B a058e9f501e5139fd550478dced02883f4fe49e3cfd9da961dfa53dd9552dee59e6a74d873f259ea3ce05884cfb0bf3e1a83d7ddcb696a0dc57139346ce81d91 SHA512 2462da124fb70df05712626451baa0294e82171bc860fce7dc0ddda7bee4ba6749d387c873b08c50f6936c539a13cd15c33bb02b7fd0f69a38c56723e24acbc8
 DIST RBTools-2.0.tar.gz 229078 BLAKE2B 23a0c9e9241a6d989044a4197ed5812d81d43b10195788c7754265969166f654af5fafc5ac027f1cf6e9d00bdd7938455beef6719380e09eacf219fa13bc74ab SHA512 aa773744365fcb5bd2ed5413684290c1d794c8bc76f9f9d0fb9400ab1e2baa1b647db85b8992dfea3e3bffe7ee87f2d735b1e6d5385d621d011be62a64d8890b
 EBUILD rbtools-1.0.3.ebuild 736 BLAKE2B a9d814798d48f8cdb3d85f2785b4063482a95840260c1fd179088fd705541f8f1f11b89fe21acdf44791c8cd7dd3810f907248b51116d592807ca0eba2d21845 SHA512 19e3ca18693bfa872f066ebf56ce6ad2c65135ee637a472658b20ec84d84edec46bbd3877055dec93b9ab99c876bed5821018e88b44c90afea97d28eb2976643
-EBUILD rbtools-2.0.ebuild 740 BLAKE2B 924395c9e001a6e0f85b5b54d03e994ea87565b5113cfcdec49100a5d9b320b74c790ad5dc14a2efe32c83e594254207a1dbe0c34f738592b13b6389edfb91f8 SHA512 edefc527adc0499c7a75845502c1e12252b33e86d3b075084ebaa6459ed58f37c98813dbc74ea4764a74f37c908ced2efdcc8502a1e161172f8082148dc6574b
+EBUILD rbtools-2.0.ebuild 738 BLAKE2B d88fb41903444f565e20c78ddf05b73a75526f6b87f113012b40469f4983d80bff471ddd265c716875246d895df19476bdae8236f1b95aeb6f74117bb9b65070 SHA512 be221d9bd604c9f3780352d51ecace526779277354a8209235520c775f56d0b06ef402b50d34c9f3a719ef722f1db9ee4543642c8c56fc8b4e7528ab3f55033f
 MISC metadata.xml 217 BLAKE2B 92b85ca7d657eea200ee74bdafd4df6885c04b125bfdfb86650e2e1066c858aa8623f8b2a362780a200d7e33076129c9aab38a12f189c82d5ce1a9ae81257195 SHA512 1b17a615b7471a1e46b4c291aa7ff84348628ec0c3603e21db1994eb1e82ae28dc7e97321de022ccb7e4d2f411f4e7bcef5a79e93a4229126b9b58fb5d503478
diff --git a/dev-util/rbtools/rbtools-2.0.ebuild b/dev-util/rbtools/rbtools-2.0.ebuild
index 5d384595ab29..8b5dd2fad303 100644
--- a/dev-util/rbtools/rbtools-2.0.ebuild
+++ b/dev-util/rbtools/rbtools-2.0.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/rizin/Manifest b/dev-util/rizin/Manifest
index 1ec6253615f3..cd0ec42a06b8 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,4 +1,5 @@
+AUX rizin-0.2.1-no-rzpipe.patch 432 BLAKE2B 77e959797f22ea6d32e6742651710ecb042bfa6bf00efccaedcd3d60a6f75c0bdb42128261ffe068d8cfaeb6d7abacef6ea114ffb9061ca365533a1fe2120c34 SHA512 7a03664ed99ea7f9cb214b566e2a74a0aee1ebfa643552ce90f4e7fb60e779628ba75c4cf34ffc3cc45b65d1dd8959d400a9af16bc49d7cc26f1499670ddbaa6
 DIST rizin-src-v0.2.1.tar.xz 51439132 BLAKE2B 3ce048c5e93afa43b33bb7c36e7f7a96734886a44a67339c18b36de84b6e3dd015aa49fd048815bc7cb26a39bd3c44ebd00227fdb0c3dc9d9f07ff2ff1f1948d SHA512 4d0a68971a8fe1de3860f8ee18197606f59c22d4c24f3fcce691c73b45c8fe8c356a9b411604e9c3d4e5bb01f695b6ead32cdc217134eb4ddfec76867c16c327
 DIST rizin-testbins-a80fd0d56d538d07a05ef01e29c8cb430a4f9d72.tar.gz 119214206 BLAKE2B 33916d466d77aaa0aeb6b221529a570a2bd2ad07b59b45967d75a84e3efbbc8ca3b8fff9cd88d61598b4e785ead2f8bc58eb7c1cb31007c27e497d80f36e4d2d SHA512 9b01a63ff281ac19b427e715d669e6080c4afdfd777ae762c30537c59bd2cdc2865adc1b34ccb61430b172e54995375b48bb35fd88f098b6a9839e9f3669fde4
-EBUILD rizin-0.2.1.ebuild 1940 BLAKE2B 6184cfd36d6493d157bc7ac4342f1056d6067a9e81a01289a937802e54291d6a8447ce58ca1f20571a26f8581df0597775c7e97de712d507e42779e438de716d SHA512 7752b4c408b340409d847905b19d53d1bdee062b1fc6b361666d6f2664fa3322a23755c051a90242efcde3df032f2fcad6ab5c00e9b343bcb7661d8b4c694fa8
+EBUILD rizin-0.2.1.ebuild 2002 BLAKE2B 9d2e43fca7f6bbc2d4dfbcd30e082a40632b32d073633e1d290fe1f5dc48e7f22f4ff9ab26b24bd2b726ad55f3fe7a5a6d9be092088a2a52cd01d19e481b0aef SHA512 7e066c1b1a4c4bec91a70990a338ca03fd2ea346842bbd70806f1bfde387be2d7efe64a3fa1099b792c4205c91298c09144eb8e41ad4cc3815df9479f1a4977e
 MISC metadata.xml 459 BLAKE2B 90d71202d4ac6732aac13f9b1e36b485682fef7381b52b20e904c6f502bcea0a12b2001c0b74e82e0924f29ae9e3c21cc4ceaed2a1e54a2218f8e25d23d5ce20 SHA512 0ff5f7f10ee319340283ed838f371c13943b78b2b57ff2be8cdf6203d591e952a610eabf4266111a89d9dec865b7043d27a6d9ae6330940d1573733d00ecbb8f
diff --git a/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch b/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch
new file mode 100644
index 000000000000..3e7a6cc70c17
--- /dev/null
+++ b/dev-util/rizin/files/rizin-0.2.1-no-rzpipe.patch
@@ -0,0 +1,14 @@
+https://github.com/rizinorg/rizin/issues/1192
+--- a/test/unit/test_rzpipe.c
++++ b/test/unit/test_rzpipe.c
+@@ -30,7 +30,9 @@ static bool test_rzpipe_404(void) {
+ }
+ 
+ static int all_tests() {
+-	mu_run_test(test_rzpipe);
++	// Disabled in Genoo, relies on `rizin` binary in $PATH:
++	//   https://github.com/rizinorg/rizin/issues/1192
++	//mu_run_test(test_rzpipe);
+ 	mu_run_test(test_rzpipe_404);
+ 	return tests_passed != tests_run;
+ }
diff --git a/dev-util/rizin/rizin-0.2.1.ebuild b/dev-util/rizin/rizin-0.2.1.ebuild
index 7f58bcca359d..f8d2d2dd1bdf 100644
--- a/dev-util/rizin/rizin-0.2.1.ebuild
+++ b/dev-util/rizin/rizin-0.2.1.ebuild
@@ -29,13 +29,15 @@ RDEPEND="
 	dev-libs/libuv:0=
 	dev-libs/libzip:0=
 	dev-libs/openssl:0=
-	dev-libs/tree-sitter
+	>=dev-libs/tree-sitter-0.19.0
 	dev-libs/xxhash
 	sys-libs/zlib:0=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="${PYTHON_DEPS}"
 
+PATCHES=("${FILESDIR}"/${PN}-0.2.1-no-rzpipe.patch)
+
 S="${WORKDIR}/${PN}-v${PV}"
 
 src_prepare() {
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 835913b82ef8..e6ab0997e9a7 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,5 +1,5 @@
 AUX tests.patch 886 BLAKE2B e631053ce6ecd6419cf88ca952d28a225229d248f52f6f600bb9865cf9760dea01e4039401b5039330aa6776ae18e1fe0159c725ee5f1bebcc1fd73248d37209 SHA512 87f7ca16f7b7f781ac5a2173ee4a9a6ed1baa2d9583d740d0cd46590d41a5781395fc5fbba185a20cac5cae0a1f967abfc205a67bce3487c0f82b04b0c08600b
 DIST rosdep-0.20.0.tar.gz 310881 BLAKE2B f81275e6b88de10b1bd080feaa97a5f870aea6f4bfa7d8ccaa788df01b5b43890f99fee3d2bdbf7dda811745a89d54aac948201a218dd32d56f2ed49eefbdaf8 SHA512 f464b4a1bd3ef437f4ef0ca55eed873125c537aed793b22e99dcdfdeb078bdd3dc03cbe75b67d6ba7b29c7390b893f85c436fb90fc339a26dca338e8652db917
-EBUILD rosdep-0.20.0.ebuild 1622 BLAKE2B 7fb877e6799c37eea92e7266acc5c84dcc927ec1090edd743ae1a9a2b5785f01cb89cd35991e58b2a3a91be967b4946eb0fd7688784bfd89e9903e45a784408f SHA512 2346d2036c08e20955514a1311988b410b359e1f335ce78828b2194be8820e6f5fef48eaa1a8cebd997938507c64be916abe97f45030ab8ac21c6808c1c277d8
+EBUILD rosdep-0.20.0.ebuild 1609 BLAKE2B 4c00b9fa66bb080f651154342ee5b5be37bfc39475486baa46cdadb60d4ee1cd3244a2d5b7df4243e8a4b4336bcd51ead94caea145d86de53fe4611a160387c2 SHA512 0ca03af2b33947a00a8256b9c5f7a11e74c98958a61c1ff91cd8797659df78946750e04c2d714fb9d02edd993f6694a78c6b93b7d3b337123da532edf3b9a633
 EBUILD rosdep-9999.ebuild 1609 BLAKE2B 4c00b9fa66bb080f651154342ee5b5be37bfc39475486baa46cdadb60d4ee1cd3244a2d5b7df4243e8a4b4336bcd51ead94caea145d86de53fe4611a160387c2 SHA512 0ca03af2b33947a00a8256b9c5f7a11e74c98958a61c1ff91cd8797659df78946750e04c2d714fb9d02edd993f6694a78c6b93b7d3b337123da532edf3b9a633
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.20.0.ebuild b/dev-util/rosdep/rosdep-0.20.0.ebuild
index 3ee0c0796991..dde1899da88c 100644
--- a/dev-util/rosdep/rosdep-0.20.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.20.0.ebuild
@@ -17,7 +17,6 @@ DESCRIPTION="Command-line tool for installing ROS system dependencies"
 HOMEPAGE="https://wiki.ros.org/rosdep"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-util/rustup/Manifest b/dev-util/rustup/Manifest
index 78ce6f2cfafa..8002c2e1b49d 100644
--- a/dev-util/rustup/Manifest
+++ b/dev-util/rustup/Manifest
@@ -1,19 +1,15 @@
 AUX symlink_rustup.sh 2581 BLAKE2B 3bb410b287db19e3876236b811d97ffcfc959e11ed5686940aef19272fa6493c24a48b1e4c4c28559ec6f072c4c2514e193241b74b54050dac3b6e21bbe7ba85 SHA512 fe1336549dfa8978d805f6a76cb734ec88b7d06647c9e80ea6b5fba9c8906868c5aebcfaaf52df17d959d8e44451e6449b8a960f0cdcc699e4d07760b91fcadd
-DIST addr2line-0.14.1.crate 31201 BLAKE2B 52564dd603a9c02694ea41bafc91bf20aaf6837321407d2fdf3e7a0db9f92726c73735fb7d8424295bda9db016d319bd6ab1b3ffcd79df60656a0524006732eb SHA512 f665deccae566ec2754cd43fc1d8fc05db11320af54d0561a612faad769234e8b3b8c0235f90f86027a4db9b7ef2915c86398005c949e2c096fac8e53f3f441e
-DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aes-0.5.0.crate 87133 BLAKE2B eae0f752199900c274afb47bd700167d9185201a5341e6bdcc014fb70b51bf304ba7cff3a69c9d35484220c2e91ff879edc579da2532dfa81fe6874bec61b037 SHA512 e0ac02f3e0b3b5279f741e0ad391c2a4440d3570ccf732d69db1257ee4a841914db6fce0c889b1d8a8bcd067715549ecc01efe3156fcc1141fde9413a7be4f38
 DIST aes-soft-0.5.0.crate 94026 BLAKE2B d6f2ac7233be9931b4e262d0a341e443e8ab720647643add0de8936aa6ba6f836ff86c8ce8512a0d55fdf8d804204fba1ece39a163a60541507bd18e00a8a652 SHA512 14303f08394119f25a9d3460e5e6cce8277d4e6871bd83b2abf17fa26c62e6abba8b47ede1633aaacaee3616d793725b6b3cb18a606e8490e4c8ab28d91d5248
 DIST aesni-0.8.0.crate 101630 BLAKE2B b20c3df90d881b87e18edb295a5ed210faa60c45f07d9f9cc156084f501f3ea89e2dc919f404e70b85d1f828d3a83b79b7e0ebccbdc32727f7b66e0e0387519d SHA512 205f572b5afccb5460d0a268305d7dada10935e297b9e9dda4651cc809f6b94f2817ac6d866fa17e0db93b32c7f3c4bf7a5b34d48d5b45c028116123ccf32d84
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST anyhow-1.0.38.crate 30417 BLAKE2B 168c6692fa669e90bba848bbb830fcd18ef2e2359a6f0f6b0ac8a20666b9c8416ac79e20d1b31e7230e261284502ede8091adc6b8cfdb462e8c4ad57a2cad651 SHA512 3f6229fd9d284053f348f8180f9b1f1c1f1b711b733ff9a331b2f16ad6dd0c46a38ec17c8c8257981209230ba769b7cce349b64bb7f6f8ea6150ab9d6e483b8c
 DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
 DIST async-compression-0.3.7.crate 58367 BLAKE2B 3256e0cefb302acbf9905fc9b61686b8f1f5d5910081a15712dd33473bd832daa62cf783552cd6713c99c4e49ef18fe207ceb57ec5e0156c9a77cec4c2ab85d6 SHA512 234d9769e69be6406eb1d755b5a17d525dacc1e36ead6edb2a92a944c2936c4f0cb38e8219d605b84d933233a2cd2d825955fa87777f56ce537461614e50fa7a
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-0.1.7.crate 12158 BLAKE2B 4120306f0f7c1cc0cf8d1d994c080cbf42e4b107cb51af910504c8c8d264289654dad23a0c6b9eb28d888157e5a68ef2460c3d38537ae9d5e9bf73b66ffc3015 SHA512 667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST backtrace-0.3.56.crate 73377 BLAKE2B ef13597495bc655bb01ffe3d5724ef487d48dce598d9522c737c694ebed1f4c78d8e6bb1b80c817409ec4eb8c99b4835b254ee92a2c2befd1cce2034d0b3567a SHA512 0baf075eb3a964f27306863c19a2961121b52758b58d12ec7dfb508fbae2f3136e8be21d2d9f63ca5b54d4e9db78d9cdbe65fa27b31c42b65c182ccd79a0d7e6
 DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitfield-0.13.2.crate 16479 BLAKE2B c34f150e135579452d5b6e13bac0fb4a3a897219660289c861646330f7050d19a10d041affe8d250bf314c35eb19ee519b1fa0dd12eed94a93a5e904b95380d9 SHA512 5ed9ad97913828d67b19d5f10a264592f4c03aba8e4ea791f7a20e61da79066daa1d5ce678c822d8f6f1d065a65a3aa6afec23980abd1da38b44dc6cbb96166f
@@ -25,7 +21,6 @@ DIST block-padding-0.2.1.crate 7672 BLAKE2B 26f682717c908886fc54606950697a01e999
 DIST blowfish-0.6.0.crate 16125 BLAKE2B 580f1af618652ca2bb5d7dfda74f129b5950882f9416c151d4968c50bdad6ebd4560ca1c9786e09a868212a06d32e72ae9d9ba631c697a8e650e40bc1cca4cb0 SHA512 ab617c0764964af9ead0fba9862cb5b250a7fca83695f2644f2f07d6100d6701730cc6f4c5f6ec73380973ce78576ba5bbf285d3ee6525548418df247806cc5e
 DIST buf_redux-0.8.4.crate 26608 BLAKE2B 32698d29b357c625ab663730cbf7717b91200a9f980d3c9107ceb5f8f83ca7f2514b9b5c7fd2b229e8490832dc78291db460fb7fba130cd61cdec8b42c33a483 SHA512 709095a4acadf032143225740343840d247b4dc130968e36447260343294b134af780604eb8214b9e6dce924e13701dcf7a9c7291340c3393a9334c8aaf5454c
 DIST bumpalo-3.6.1.crate 133836 BLAKE2B d67f19bd68e87c1c1360c77df2cd9b11e66f4db3ed5468463d266d2ce187006f2b2117f647a9c331838b8ce6c50519db2f9645fbce190ade2c10a0284b29fa06 SHA512 0d923bda2c98bae60d8ca09d63dc12b67c8fb5addd4a675e27b619bb41b36d3dfc0742696fb53e5fa538790814cf2401d15b110216daf49e5a2ce046bd540866
-DIST byteorder-1.4.2.crate 22148 BLAKE2B 4fd246d80ec9e0abf41a0779668d8b383098206eacbf7e16ab94a4aac39858471742934df41e20084f976a738154a97f642bebe51cb871afb2a50ff2cbdbf943 SHA512 f6d2bdc3fb456b3f7a99358a987bb593be027b47b06b896938a30a88d36459ec4d28be166ff8fea9b1ea468d95ad387488cc6aa8f07d0723d6a2a7d43e3617e8
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST bytes-1.0.1.crate 48142 BLAKE2B 3ffe07c5429d7d2df821c04325b8dc84b343c634b4699e9c08b07181e741c06233a0501d987b95f513be57ac169537bd0812defd118305e0648ef41f6802d19a SHA512 885d3229e51c0deffe06824e81e8a016e3244106e7ed382a721a938cd2e69fcad7f5e757f95cb07ee1be83de04fcf98f9774f8f2e07aaa9a1ff068eaabf2fe87
 DIST cast5-0.8.0.crate 38519 BLAKE2B 0e43d05d157945751c1990f2f9d914776b2297510d4f23633d2d8371efe763a02934b7df081da18546a717760b31c1030d1bd550708714ccafb008522c4c30ea SHA512 08e98f176b883c8c5636c418ce9514e5496ab56bd9d4fc84f01342628760ce744bb8aff41f8b69f787290d8f8ed3b755ad23a8ee37eefa225115db589225beca
@@ -37,7 +32,6 @@ DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5
 DIST circular-0.3.0.crate 4571 BLAKE2B 4e40382b5d7df5162993e307c55981c72de69689927c257a40e6f85510c398c897e0f99962e52d466f0d6dcf869ea181cd24ebe459d4a6a32edbe08997f00fd1 SHA512 531ecc0f996188d3479c36c808f66f85e9d9a9ab462ed56a2f957b99c49176e7209067eda679e8497c2fae9421e36447ea4e770905781204172f0d8492a5b22b
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clear_on_drop-0.2.4.crate 14416 BLAKE2B d5392d9b361cfd734ae0d4a364c10f70a1f95121df353472696de4d907f3ae98fc7d12eeba0d8096178988dbf3bc5484f5e655c403252d10003a5c1492dcab1f SHA512 45d33bcdcc5cbaca852b626f9e6af1b63e019a56d7b299b92c429504075ae4dc279e686085eb7bea243857bcc98114b4fa05c91dd6128250528863d114554a0c
-DIST const_fn-0.4.5.crate 13107 BLAKE2B 00a90cd0087060f2d4fd279ae8a771913d6be6055d0c2365b76eddf55d294ce203d1dc7eab907890a96379c910f08fe9456517671a9ba48231f54bc411fb75e1 SHA512 6e41e2d5b185178ea0b7efe8303b7a3a532d3c7d7c7c4c9f093007c81edef2ed5ac8d456da167247b53a128c12ba3a6e1c32497ca11b7c5cb1b03ae37c7c897c
 DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
 DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
 DIST cpuid-bool-0.1.2.crate 7173 BLAKE2B c94598ab349d87a0859112433d6fc31e46eb04ec8c0edc7ce1f15a31f9f3857f93f067c4ae35e648bf2bd4f54d1ef37ffc1507b5d6eec8c3432636c589d1d8c2 SHA512 7907fc4ec0d5ed370edde0655c8223f0df6ab06c2c297c7d3bdfa958f601550851331e777065b4fe21f01f46610604e91ea2e20aa4b4147f441319224f69597e
@@ -45,13 +39,9 @@ DIST crc24-0.1.6.crate 2378 BLAKE2B 11fee3c15059ae82dd5bcd3153127d2849929ef7df98
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crossbeam-channel-0.5.0.crate 86811 BLAKE2B 9af4384f2b74d202971f1967887cfd0e71ddba9a6456ffbdfc80bf192d527f61242239d2eb6a0d9dcbe47be22eb414736976e6b1840c021610d96a3bf03c3d18 SHA512 838b433d48b84f1fea020a1d1324e366e6cdae30ef07396140f195afc45b8f705de6347d949b68ce1ed0708fe533ffaa2cfdedc9d2e6288a7325c188ccde9aa2
 DIST crossbeam-deque-0.8.0.crate 20756 BLAKE2B 6bb602547cb0ca65552a9b981502221f1d3570422d22c867f654ba677e5c95aa5f81ed0022a498d3408c3f69291e1805b49fcfbfaff0d9a6075b75be3bf926ea SHA512 4efa73dcb9ef40b841039d24ffaf9bd7c63f8c0233bba1e0728fd5558702b4ef0af117543834c527335e99384d3c80d56293e891c9d94440f51f454b1b90c399
-DIST crossbeam-epoch-0.9.1.crate 39561 BLAKE2B dedbd19d8aba2c19b844a10323ab488f0dffd5a8ad041cd715a9b1d6d14da343c0c680f6756736501ae420846a5d19bf5aa7bc7142daa39fee901e97f28bb557 SHA512 63d03e71013f7ffbc7b7a8ec5fe478323e7cf679bd126f03980c5e0790b57f5c48ce0ddb5e9c7ece31bd7380a944c1a1d462a9a1bf0126f9851e549739d8afc4
 DIST crossbeam-epoch-0.9.3.crate 42766 BLAKE2B a9f458d912dc247bbc8d2172792e06992ae4b51f588a7cb5a4851c6d7021b428c8225ccf07f0e4597e3e9585cf7b860781c1829d6269826893da3cddc2a753a3 SHA512 f68e1957018f7b88440492403b6812403312b7252e0e873715a2a970a4c9d2647174a19853d1533451ff1f568ac7df2deaa614f342d695c613053b1a3d5d1ef1
-DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
 DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e43bbd6c8251b5a2f9fd574522539814098b17da03ac5222177332042303f129e0c2729db6bc80e8f76bf4b097d973d4 SHA512 2e89ceea586873e957a31b510f8e8cb0c6675def32ea6b9a9483166b47f69c1ad448a79d897796883b696bf77cb0fcb1d0ac28ee779146f6500ca9a54aa7b4fb
-DIST curl-0.4.34.crate 84129 BLAKE2B 94397213cbbfcad521bddaeeaf0b8e394223b72871cc9e0435edd4e1ba078a18e64e830f835c436285163512801408f33c64cc497c059d08d1edac1527aae923 SHA512 50250a3d5bf5b3fa899089a5452e9cd1dbb6553647ee52c0df4fb5837878131c4bfe84cf912e6cf5ede945e94906952051f4a2c4ea140cfeb41a91efb36f61a2
 DIST curl-0.4.35.crate 85012 BLAKE2B 11ab2e14e425caf91c4c42650f68e1ea5fe5edf6759b10e66718ee2c603056facd8dd00da4acb3124669fff3c8af366bad4f163b5477c28be0e9329ca188e7a8 SHA512 255f4f8d7ed2c0a4f4f9b32b3cbd6e9f20f299bf5379e084d884107836b108f4df31b3f8ef5ad3731e7209ee5eca63568b6d3b68a0e7cdf24d83d36b80bc23b4
-DIST curl-sys-0.4.40+curl-7.75.0.crate 2907247 BLAKE2B e1d53ee25e3b2f8cae645029b07707203b28c498aaebf1d0399e0b5da0fa293a9c6977668680067d16aaa659567407fdcee0f2518d7ce9308d0f6664b78749ad SHA512 193cc153836039dcc5748f70eb2ff004c672d2435334aa7f1fb2e45839ec2b679085ccad1efe85cb3babe54ef34719c251376c3fea364d0f02f513cbdc90239f
 DIST curl-sys-0.4.41+curl-7.75.0.crate 2907738 BLAKE2B f165531da074c856e8cb6725f55b1d00f6dcabf2756dab59c35fefe193b25aeb11dadcfb7f7a5bfc986d8983ffb360637ca76cc937b8559f5da6c15a019d7244 SHA512 34bd579b80135d72c50edcedeab88b00dfd7a5aed62f4eee59ce3fbbeac43553bdeb87d5cdb513bb8c6c064a64552443fad7c02501a44b840ad35bcf22cd4179
 DIST curve25519-dalek-3.0.2.crate 503545 BLAKE2B 9153d1bf551ac30f43c3e20ece8c50c98445d570378a0ec80aedfbbaf09df201f1d31f5c37e2d2cb3cc08f5a70411b92bdca4372dc7c413c6d1b004fb5ffa532 SHA512 e259f73460bbfd7cc418151963f58406636c197f9d9de0e22de5b77e9348ba09ebfa184a882157497e3b24cdc21c2be9d90d02d79277e575083ef2ca7203afd2
 DIST darling-0.10.2.crate 17620 BLAKE2B 33d1fc3dc10fc971ea304efe5bf8084843241ca9c2a89e54e7c5227e53b1ad86749bd8693989ced6bf17805001909033aff92d600e7169a02dccf009fe60a88a SHA512 b312a74e577cb2f889315ae42513c7f26597faff306a40281189be2101339661772016a5e197466bd85ef94c275e811adee1b7c0772458126677d1998ed6fb15
@@ -69,63 +59,45 @@ DIST encoding_rs-0.8.28.crate 1368577 BLAKE2B bc10eff55063286b48590c3100841c7319
 DIST enum-map-1.1.0.crate 10082 BLAKE2B b25916b68d8e395892c35cb5362a71834fc1e1e1ad304e0edb5a6b9760f0ced3a32621f1c6327edd8bb7d33c6508e333384a89848cf1b60d42cb72d95f21a4f7 SHA512 4ecc34d14d2f39eb3db6440052f019c4a0874d3890d8c25f38e11384c69350b70d05a50045f7791d4a9afba96faa4fa4e0c2ecbd91cebf18097e3ab87f824ba2
 DIST enum-map-derive-0.5.0.crate 2042 BLAKE2B e70c6a0c8e48a6982eef383bf5eb4920707a7b5c0e3c8b3e760b62bf51ec5516f0cf5d05da2fda044f1e6bc112c321abe6b5338aeb5895cbc9c0e2850233b081 SHA512 a94c45095cb96b45e79c3bae6492158b08c29386f8c03bd7d9093bc65d836c635667cdc081d1f501a5d35ec81d122baad4702301985e44f5bc1ac08db120e1aa
 DIST env_proxy-0.4.1.crate 11256 BLAKE2B a8e3e4f8366a9a578da09903c1b1e9ba2c4e37700ec5600814c8a1dbff740a20dd6147bc1fbeed385137ce734477c734ba370fd6a824c64d571da374554370e5 SHA512 333232b0217eab986b4616061b1419e24fa95b55d6f58cbd3e6a8a280b1f8b6587ce5ae30cfad570e7cebb2327352c18b6a8ab27007dd870073308127d2cfe00
-DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
 DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
 DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
 DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
-DIST futures-channel-0.3.12.crate 29527 BLAKE2B 1b8b74a399aa97689b44e09b35fd190f4856a9a0e0c4afe8bebeb16d5ae8eb4c80d157b7aac62952fd2014d6e6e0836ba9625cf6b7e2c018abbe8ea309c50ab6 SHA512 338d252042a040e1f8c4678457a95b2488922008d5baa94d0dbdcd7902e5d678c7d7a9c32b81c40d701a7793395bfed2a66bee820efad49a9062c73e390c005f
 DIST futures-channel-0.3.13.crate 31089 BLAKE2B 051e50bffb13b5bf13b7d972aded2530db0dfe0769b1d59719d3d02ff2e0fecd4cf4d76db5ddf67eb0f71c43c64e9abb4a82e0556e9b88d463e8f5c157fbdede SHA512 e2ba7d3ad3963d2d6aa86f1a74e2fd6f12e339dd42c56df187b2c8dadaf85c2282056925b5fbfbd08429979f3bd017efd9f71d6962a3577bf8d8633b089cf855
-DIST futures-core-0.3.12.crate 13813 BLAKE2B 466fcaa45b874b4346868bb353296082ee0ec6f18b3c5b241b7783f7eeba2e68d7b0527eedcfc0cdf4480820c0ec2d751b241a2478fa95339170bdce83665def SHA512 392d99ca0b8d45399b2b4fbc61c0591f9ae0c0a37f7aefc7d567cdb38c91d8336a6ca9592421ee8aebacea819a7442c2cf5391157b32bc5c0faa347a39f6d7a2
 DIST futures-core-0.3.13.crate 13835 BLAKE2B aabbbd83d26ebe974d31d4cf0a8db3faee7a902b05cbad2cf85907528d70d5d9a0c57ba006b243357dd45a0c7b053ca7608224550da3dc5cb9b86cca1efac13c SHA512 f5a424fbf6984633740a05fe6f9ea0741d7433e9a34f2e360377391d1921f8a4ade756b543bcf165f8cc45e286b59c0d2e8242f86809926898fe4390895ed37f
-DIST futures-io-0.3.12.crate 9070 BLAKE2B 7e3e1aede1d1118217ab0fa2fc71fde2e238017d404a875bdf24e74c5ecd3751d446a8bea74b191b17b80fb5fd3e379f509ce247d3c91b1c9df1fd69e11f78b3 SHA512 dcf3dcb30a97fc7e6fa708c2606d90d45ba01f3426629d3b77aac20d31611cd8903bf82ebdaa4e336cae40f047df2f581c59c2ddfd92d4c41c1a59a003c856b1
 DIST futures-io-0.3.13.crate 9059 BLAKE2B f2e6586b50827b12e27a181d6e8acd501dfa587facc37e31dabd015fb70fbdac0a959ef2802e15a5a223179daaec050b45c6c87408c93b5e2f6aa956d27f4c06 SHA512 56353b9f5a6ee5d3f6a5edc0f031248b41280d60ca9108d196e106aade750c8acaf864cce6b4490faada917f2fc6eea919a49ad68a6bef039a88ef88a381a4b8
-DIST futures-macro-0.3.12.crate 9680 BLAKE2B 708d58040a5f4f3bc5212947299904cd46fcd1f2fc7f943fb005ee08aae2b6d0582ffb210678f39e5e492ef9b4c8f4953ae3838b5061e2f6a9f9a850c61e2f3c SHA512 1bc8d26f4d71f6faa8175ec5a11f27588d882a2b719607690e35d37b8509fa0d65619513b5be1cb0560c8d0e1c45e72ccf8e2967fc03f0ce313d7ffa7ebfc5d8
 DIST futures-macro-0.3.13.crate 9683 BLAKE2B e96b0c047dce0a7123c19d85fbb6e5a073ef8c547ecce48aea5ece04b96d597ea84bf5109c173f3d28802187e3124441b2ec2264c5103706f51a6d634cfc8906 SHA512 11b39bc563bac0cb993a35909270b1c3d62daba1ee5876d2cf8259d1dbc7f26147c399a0dabaad50c7f0a6d0e4ca50d456684ade64cedd009c093c9cf9fe2b38
-DIST futures-sink-0.3.12.crate 7659 BLAKE2B 3af9cdead9871be471c2e30ad68c98be19f959dc0964d98d7f8d66f0f12116d484b0660bf39e629b30d7e4ea14a26ce4ee22a58b555addead043436c8d40c04d SHA512 495dab9914fc5f27e97c63d365df229aded672fd9fbd7d65625148c861fe380d902faaf56380129be3828d65b0e825b4b98d30bf3713515dcbea93562363353e
 DIST futures-sink-0.3.13.crate 7660 BLAKE2B 59877d01be11bcc51b2df4560643287edafa8b319468d42fa1968e8ad42e65017a4884443058e3d6a8ada7e4e7f205f0a522d27ccc0fc36779d17dacf499bc89 SHA512 befc8b6979dc36419fb1c41bde0d8e7cdc66100b14cce54b1ca3d2a676a595d2c2b856448110f1b3e64b2a043b17a5c2304cedc650b41d1d807b9cbaa2380cea
-DIST futures-task-0.3.12.crate 11063 BLAKE2B 4d4d832ac27d453ab39b353aaf95ffbcf6d8a5994219e3574a25aaf996e7f90ef79dc961c1e71bd9f6cd6ad27b42b3c421fb094a7791906c1cd0f8c13decdd2a SHA512 0d92c5d32b1e939f324ce44f1e3b8a8407d681e9200ac0f41f44d4621768f6e00185a51d087af6923898c0bdbb2f9a553f4737f5a7f57ec1478572b0ecb82049
 DIST futures-task-0.3.13.crate 11118 BLAKE2B 84986a8a9c4ffae6b65821d35e63c1574e87410710e8255766c46a6f8f58b5c3d7853d6eb6103f5932b9108c6d4e00c1429a0e469b26371c7e524ff7d14d3814 SHA512 2989781a67a5fad9b7e9320155d01829fe5f2b04f2a2958ba20eb2ba51734b5d1ead3d3abd7ed5051478aefd3938c682e30d87a16a108546a812950ae50363bb
-DIST futures-util-0.3.12.crate 137448 BLAKE2B f6cd5cd4ec781f598c18830b6de2448762c43027b1d2607a0cea0b2614909a0c525ba815f4b3d2e4b7c2da517e279a88b9468d43a3bca8c18dca1a1fccb3eb67 SHA512 07f987cd6992f50cc96f2e639853bca2d208ffe25807a987862c5e8b62c2657c8c3169ea34f9337a02c59e6208b0fb4dbce44f7c231cad8f56ca173da05b9598
 DIST futures-util-0.3.13.crate 138948 BLAKE2B bc19faa2167da4cc2612cece11a99352111d8b74eba9c3701b5e5c6a2c2c9e6f61a3707a58132836d7f55cc7e98ae8ecca84220c2d7421d3254772fe6438e98e SHA512 75db6170eef5ed4f29a0512053ac01baa6aa30dd9f5b6152cd27150cf47eb83f7fa3e4a737b91864460e3d90b1b2ab36895dcb1802b2806252483f4f58a8cfca
 DIST generic-array-0.14.4.crate 28916 BLAKE2B 41adcb738bb316d17967e029a829dcf7377427977309b010c2f2e365f16306b44991eb5f65698782497f614b129b14cad11bfeba2ae19b45efd117114492517e SHA512 34ac71fee2cd50ff786d39b4abacd9e090a8598baf4dc36ba5fecfb7171cd8e4f58e5360cbb0baf02a87eea26b7dca85b35555b82bbefe06635d2fd38f7b8b40
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
-DIST gimli-0.23.0.crate 702175 BLAKE2B 9acdb3afc092e43b25a11639407eba7258d25e6dd57c1f1aa18d17ac7c2ad73b422f85d850947498deb3ad8c1b8001077f9b636f7c1c11a4215b957c990483f7 SHA512 b5dce7b563ce7b8dd6cfec5258793323d370f217779d0d57265bbbe2b1eb2704dbf0f25c189ae6e9079989b6ac7d5341e10fe49457577e482a3904c745c89b5a
 DIST git-testament-0.1.9.crate 9610 BLAKE2B 55baf44278ef3d8a5cbc2b422939153c8d5ceb7f33e342eac40888c2a1948d504db2b8a280e94a2c78fa953908e0b84b01e49688ea9eee2878a6501dc25793cb SHA512 a93a18ed37cee65c48f67c467895fcac92ae36aeec02f6b704a78d44a7e9789d6725c321eab67bf04460d6fe2e7bfb86e6e263c008694d35463490600f2e38d0
 DIST git-testament-derive-0.1.10.crate 6854 BLAKE2B 446b54c7d64bbcd5799bed6bd2a337f2f3612ec0c50490eb9a47b0dfcf33886a6f2aab8702be0b517befcff5728ffc723eeec09b3d6cdb82611340f94e8c7bdc SHA512 01ae8909a66eabe7e6012f8c32274e19291d76c36b17cf37f98bf590d9208897a2cfc11c4332d956beb198fc6c8c16da038b0e5ae7e57268e8e4fa661836f49d
-DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST h2-0.3.0.crate 155662 BLAKE2B c38ea7d174e8b1f1ac901de643f39b2d706336e2a644fd5f0ff5a8c9ea6d5e7fd536625370d28da0200138b8dfb6123ff0c3e8baae710e632fc519c4cea4a2b4 SHA512 d34aa8271df83d847cbb73869abe13ae7242769c1f604c3a15094baa9fc2dc5179c28c010098f86638057f413dc2ce2189e35292c0d6370c392298a1d4defd56
 DIST h2-0.3.2.crate 158590 BLAKE2B aa10bcb70279be4034b6eb6e9084578c0da3851025f6e45f13ae5785c6618d00db021f021784448228624ab43023d38a49c3b51ab6a3917231446a078eee069e SHA512 0b85b011ddac37dd7f3c7b7b36a453418fe63632e77f163ac32816d58b9537b28d49e31fc2e117bca53970ac613e67d0093374bcf57c0492b8200d3b8b27d39a
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
-DIST hex-0.4.2.crate 13385 BLAKE2B fb185e0888736515b8c1c4c00f831f1a4a7b2a04bc0262c80bb2425563b3ca8059fadeff8660ad738bcbb522d432dde98ed6b14aa1fb8c03cdcfec6ae282a55b SHA512 b37504fa6e41caa77c924b24893a7b505330aa8c39501b3ac283fbdffa9af2b89ccb9ae004ff415af1c813fb3da222dba62f17bb3b6210a259661e2312d099a5
 DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6
 DIST home-a243ee2fbee6022c57d56f5aa79aefe194eabe53.tar.gz 10281 BLAKE2B 283ea853ff98658507194902b501cc0c6438bc2dde1007f579fbaf92917b906e5b9ccb322dc4d34fc01e08809d24194db10ea9c5177c0593ffc94bbfc934353d SHA512 39343c2c05adbbcd6a4a581abdddfc2801d9b052894b1edf3df304526045252b9b16b93c9db4fa248f308b762084cc7b97c3163c47d0ae4776b96be155836985
 DIST http-0.2.3.crate 105044 BLAKE2B 09fe8f34e326833490d33dfce68faac450b7d29b374a38de1b8c19c652d9fe85078ff890908e775d5a2c91e322cc96e1685d7fbb1f778fd5cc662734723dd383 SHA512 55a5a19489b263b5703c7acde376d67fce8be3c563c3ca5c6a2d0c6f0d7987e3bc869fbf6bdcec18633a256fd02e8b87aef2a6675aaa2cb55a4dcb60b13e3483
-DIST http-body-0.4.0.crate 5325 BLAKE2B 4596f077c862140d350d1d47e496dab1830a8b86a91ef51ffc1be8b1f17bad80deee6908611bea515ab6c32a3b094d3fc0eca1a3ed9c893b2134e2e2f0afad9a SHA512 35c3a0df114b2f06fc9e2153cfa4e75ebe8e2fb8b2b682736519f290d738991c9e413e19ce058bdbf7692143d7a38f2e571985239a4e15414eceb1a73de86a41
 DIST http-body-0.4.1.crate 6792 BLAKE2B 462329c293946394b5bcf5deec9ab13a9afc34beaeff85bd7bc9cf23e09f0903d4d1921d648a732ffbb9a5d2893f1c1dfa3478ffd375d840cbaee2c803a971cd SHA512 1c26d924feb0a7f713e5726d51158461849a4b273881ae4e53904e284488f31b01e941a3a4e9ed6e07b5f248a8e476fd6bc4038706aaad31d8489fa14d5e50b3
 DIST httparse-1.3.5.crate 24018 BLAKE2B cda285741546f46ff297c8b866f3b107f683abf474de559966ec2bf6be9b0292463831583273fd97d8ef90693c2ceba4756a82d0020ff366e47e8b95e621f82d SHA512 80b73562c99cb82341f400bb2e66a70eed0c02826749fc545f56c97e33aa6634a26d358f0d381596428bf57eb1fd7d5ea0c4f2bc233e915105e03771c11128b8
 DIST httpdate-0.3.2.crate 10768 BLAKE2B b435d0a530fcab46496a921a565c3ad8654cb39ea038bc942c8fefab8dee2576e9b157f203b376e80a10690650c1c899eaa29e5af75888c8998b07d5d049fa97 SHA512 5cb56c85aac5acc0e9e2c72fe0913d2faaaaeab10a15c0479407ab779494bd81f8e3fc9675f5990186a34689e841427e83723a87a91a5204ff57188e89be98ea
-DIST hyper-0.14.4.crate 158482 BLAKE2B 99eff9b280412077ddbee0b9e672739cb13db6ccb2267721ca44cd4c9028a8198e28ccf42dbe843ed37e618431ffdb9793dc7abfbd1d3a8bb6d631868d47a498 SHA512 8126f88ae81e9e85c7035b94c8abbcac5664e6178f6ca470985b41824dd255a307ea90cb9e55a85329c1fb6597ab9fd1a44b12bcfc4b65e1bf4eadf8cb568b00
 DIST hyper-0.14.5.crate 159835 BLAKE2B fe391cbf2fae775f9488073ef0caa713276b24674b462935ef26fea34a5b650c97a5a3633851d17875ee65e20e76887a28e82664b23a6f7a4e2e911093cb169b SHA512 dc71ce2521dcc751cb814d44ca4e7d637a0af0244b156acd3497a6eb9415dccd4b4a9cef1a5c7873bc4794b96626b281f8adbb64ab28c703cd2e9935150c7222
 DIST hyper-rustls-0.22.1.crate 26718 BLAKE2B 69bdc6de6ee9058a3d782be27147f4856421f7e0ac6509d9e94bc955f4f392e0c9e904d2745868a6cddea060dec7b33f230d0eff17432ea513e1c8049d1f2cb6 SHA512 90c9b430276b553bfb771fd67f81eb5b782b7c5ab009eaf862c26ca330befa75e61f8d890078a9e5510ee6e1774d7f8def146d0a9ae92141951a59e1d94ebf41
 DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.2.2.crate 271070 BLAKE2B 3a07d53ea832d53a2e99ed3345d748b6299f6b4e6d4c33de17fd5ed70b9a46727272c9facf1bbb79e2981a4ad1953cabeb53d71cefcdc2a1e9e9f57c4a9f0d22 SHA512 71be89a626b087ca3a33576857799c15634263e2bbe43290750eaa6b074088cb6b54b3f778930e3dcc796a883daf662c0935178d4f096c751027bbe727124212
-DIST indexmap-1.6.1.crate 49644 BLAKE2B 605929e1b6b3473171fb2af7500d769783d7e3872244800c107664fdd7decb7603bd3657ba208d3022a931fc499bb2c2e6b8aed85f880d3ed1deb827dab70703 SHA512 a859cf4f2db46fe753aae0562ba6ea32dd529789a29784324e82b03f64f42a4f302789230ac298860513b1cd8cb238b7a150f6f865d342d606fcb7a2787f9a03
 DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
 DIST ipnet-2.3.0.crate 25031 BLAKE2B 064888a6e37ec67f70baa4d571708a9173cc788921260511d8092a0e32982a0de4cabfbd28e17da812e1a50249e2106e82f95981163a0bbe71158b1bbca4158b SHA512 ff77e4ca8ae0fe1a8e9969e8e131081a092b258f64a7211d550d3338ece61dbbed499786b5e97a8515c33797e8cf41b4e38d7832e0d1b18584b0e5231c75a22c
-DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
-DIST js-sys-0.3.47.crate 67063 BLAKE2B c4c6f0bbc18e6ca8fb01ec052e1f897c69a4fa1276afdfc84d9b0f030ebc267022d5e397ea5e95cbab3e4e62c4b12b51756bc7fd93439ed0c9be506f5090e077 SHA512 28d4d16059421862db91789d9401486708a1e1c32f45717bf18507bc38ae8b52c40f9f7a26fafeb11c335ccf49b552d95225462f6246982a02eb3f2123c8a6b8
 DIST js-sys-0.3.50.crate 67123 BLAKE2B e31d81932e8c219524aca9159013e3e7e24519f154e6789b9b5e23de7da0b89e7ec5bf3f949a28a87a0a9671831d619aff1b84ed0b2011ddb01668b110c4d9b7 SHA512 961f1e2949ae8e662aac866807b2522537ed8756caaeaeca2be837329d6b684dd928aca1a7da9dbc402388625c54177dbc6b8141a1efa4087c78a3240d002d87
 DIST keccak-0.1.0.crate 5849 BLAKE2B 7795f1f9918d8723eab2b4e6dd99c371cf90e43699154356052fabdd1d4736765c13ccdfab51baf63088676d521ea674ef1b742f0ea8613049f0da2c46df4be8 SHA512 5514a50d52979ed616290309cb27d17fd1521ee89ff51131fc2cd2ab38bae2a22f00749b8de2ab75420d557c7400b4f59a9bddaa532efffb22a5fed5fbcdf65d
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.86.crate 522986 BLAKE2B 2643f7e71952c3c806ba02d3d9160963433115ce53fbb22189c6368813380a0403c7fb51ede36b4781ad0a609e02c57f2622062bdd536725a5c65a6f7aac5fd0 SHA512 b5a0c94b3717a620cb47b27d2f3bbfe04fce475c3e2feaab8bc4b14c8aaee190d47a61f0dabf26ed9e525e96e6aa611f4dd29b16e13b678898f88352d86c1b74
 DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c14309eed4c98a56be97aab6512d6b8b7574fdbf5a453f1400c9120eeb12e4f90970819f5c19ee544a975f5 SHA512 e82bd56c282b7473de50ec730646ae64384661e533f78b19bdd737d7a637cc93ca6f4e0b576d901576413a48d274635b917ec4b0c5144b5196155b04015ca94e
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
@@ -134,14 +106,10 @@ DIST lzma-sys-0.1.17.crate 764176 BLAKE2B e596bdcfc1fff4d34b6e02ce75452986801afd
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST md-5-0.9.1.crate 15494 BLAKE2B 25218518792be16223f78ab0bd81284005b4a65defc538fba79dd3dc99c7d80dbc8b8ceeda51dbea4851bf1da86d3f66fb64dcaea86b5486a235c43719a3dc3b SHA512 300723a785c7edad2a9abf18fd9f8f9a40ba54676b394cb5712894d1170cc48199a0ca9ccd3b525f82832d5b33413c2565a0c079b6dd08c63d782f1a91fc3e0b
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
-DIST memoffset-0.6.1.crate 7706 BLAKE2B 351e6ff24a61b1016e7749571e1e66dae370c58746baf00b4688bb1e2d8c88621aa6f135468593bcd8ba30acf2c097d06a0dd7243eb06b9825e3fc1ffd31ea52 SHA512 74d081af00b7e442198b786d79e4ef35c243d2e78347ab9cb50e127569aed3fd77b47b95df6f361a716abce27c8cc6cb1dfa12c92b0b2208b21f9eb9527b61be
 DIST memoffset-0.6.3.crate 7697 BLAKE2B aae9b5dedf06680bc597825653c08bcfaef6429a8367c8dbb58df7f09e91b166d04a231f28856af592590eda0e255a947294e0b8064d7651f490e44e4d1e748a SHA512 5afd2f9a282e9bbc60da1abbf911a3b4480ab975c04c565149dca8a36e9975b3262023b73c67d9dcf80b2eba3e8540aa2b91466d37a2504facb3f1eae98f52bd
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
-DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST mio-0.7.11.crate 86660 BLAKE2B c55020ecb53cfbff143314d0adfce7e5124f66004711df9dd5f95d18d89b994a13e61b4a12b19a482cc0232393690ac87fc7d56d7d431d85e6826c2f5822b56d SHA512 abcb2d29868ba749ffbf2f4eadd5c24ea80bdc7d62aa09fa0a70d9963e73fd5f603fb9b73410db5f72a051a153e0ef5526992aaaf1b212ff0e961bc31d107c63
-DIST mio-0.7.8.crate 85713 BLAKE2B c14fc89d2b4953ed1f8803bb02867aaba93bbd3f50b362057d79b92d45707f9806b2a36b7b323c70dd0548ceb02f3afcbf04aa6401ae9b42139512c78006de25 SHA512 3d70002ac05f123ab8628f882cce2cccdddd7dfef849f416e448b0302b575eeb5be460d5bd03b15f55140fea4770b6060e465f23a8dd5e1e86ea7a1033819cdf
-DIST miow-0.3.6.crate 24533 BLAKE2B 232aac1d3449f2542c8fc21c9796932f478a4317a93e505de2113c6d980bba2c03a06f74d00a3abac79b689cbfbb06b5a4fa0b6778c9866bb67053111ee16d8c SHA512 13ef93e0965a2c5e561e7252407a0db03dd0811d076f20a6174a5c2ee28c49f1c340688d0ccb913736a1cab1c764cc719b61fa670f9b707f619b70797cb81ebe
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST native-tls-0.2.7.crate 24958 BLAKE2B c06b2abdf77d9ecc7ef6dbb7ea2fb6fbb4e1eb782dfe8b9e44bb2fa799fc9f3800f3d865d2141d04533ec6679d84aa703aaf2a497db6b0f60544da1437e47476 SHA512 f646b45767b0aac208b840989a1fc09198e70cb5277c077ef8247d3f591631bed09c1d36cdf372e68ff3aa7da7c885c2307f8b0dfe2185839e15dd4e7dd8f143
 DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
@@ -153,34 +121,25 @@ DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d
 DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092bdd6e65b91c472967c006fb3cd6b944c4bef913465e39e6a2fd734ac2b1ce1f21b332b2faece823fe410b54340 SHA512 46b0e05c4f4587121ec300da51cbf02e04ee8f8441eb4dcaab5a2ccee3b40210f1badde56addf053fb876aed3749dfb5f01e757042573fdf99defc77fb265f3e
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
-DIST object-0.23.0.crate 203889 BLAKE2B 41dd20ad5b43b026d032b50360bcb1efff7aab471342da1ab787d820722f4374fef8df48eae722016893618f0e1af3014e42c56a57ea8792594b5fee676a4d6b SHA512 6352624a9071bef53e4b7209b3f8cd5168d54174962565d76f8eb9201dc84dc3b26f08c81ac954bc9d4c55032a022abb35d160817bb434ef27f76949290bc7ef
-DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
 DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
-DIST openssl-0.10.32.crate 199469 BLAKE2B d8dd269501a1991fb9ea27367a17674ec74265ea4281121aa114b18aebd821425d8cec43177f395542a1ee3227b1023d1bd4ca8c261ed194841e633d05735250 SHA512 dc37b5bdab49f6fab6c1b7610c89b5d9aca7a432f341bb10fb7c2a1132f42db63eda0c0bc4d82130e1bf3b521436fda1e0c1f9f1091c060621602384ea649962
 DIST openssl-0.10.33.crate 202638 BLAKE2B 717e9724117c8b16391b02d30f24a242f67087a53c61b3fdf623c88b3b6f22576cd726f24fcc04f4105bd985c16bdbd0b6a6f7ae1dc1d7dac5f7a44c68160039 SHA512 69f0aa67cf9beb2e66116e7d6a652fc64b0470fea6eae3ac6bbcddc8fcba8ce13d8a170dd990dae0524bd4a583e05588266806396f75a909851f9e124bc8f536
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
-DIST openssl-src-111.14.0+1.1.1j.crate 5085438 BLAKE2B a5944ce7d05d8bd93d95f290a0ae8d6bf0f94b6f047d502367f44afae5fa32c2663b30aa92ab2638c9939b476cc62f9c8b53fec635915640c19c10cc10fdb924 SHA512 954586457f4a22328c0d5acb9b841561dd65e8ffbcf7e16209be3482534413943328497fbf2ee22fdb80ff19c24754dcddcc54f251c5ec8005803f797670c14f
 DIST openssl-src-111.15.0+1.1.1k.crate 5087962 BLAKE2B 50a7528ca83e30434f14aeddbc83c434c74962faa106c597794a5c5a9d43d4c37de524f657cea9d3c87ca3f605bc59cde0273d64149954526ddffe96bb9c2093 SHA512 0adee57c5a9dc12b7a2c438f838a5d26286f9e885500708a6945a53c96708838071ee7a521e7dd9f18f5de59c5c3e66880ea99f64669daee442766471c8c2898
-DIST openssl-sys-0.9.60.crate 51509 BLAKE2B ae3a9396115f1bcf9896ea49b0144b431b92491c4731ab6ca83ee7c99c5a38a727b008dfa837b09d80689c1a638fb57628066a4d8a85b3bb539f5e2ecd6b918e SHA512 6d9ae277c73a4efc567fd34f23e424cf6107b10f71b7e6902361dc33f514cbc8702718060fcda31c60ff65571fa29d7ea468f94cd9b8e3b37e85611f1d5adab2
 DIST openssl-sys-0.9.61.crate 52010 BLAKE2B 4746fdfffb1f0cf626ff0fe93e3057bafd8277c6469f577e37370010d5267b0f9bde8a91279e9f8d0ca0b93cad2231153ca07d667fb3b7c8feb637a04dbc352c SHA512 0ef36b2483163af083465ba9e84586ac0c2068285a8b3f1ad1e6a2831361722132d1d008791d969be669ab1131500416852813bb431307a484c1a277b5ab9abd
 DIST pem-0.8.3.crate 9395 BLAKE2B 7d4cf8a8b3e55ca8fe39bc65c6616c5ea0f91bda666493688d98e06ea9fc3c83d0b0a1a10b4c5deff685efe2f9858f63fab765b82a1c79d1d5412a5e6a706dc1 SHA512 30421492b14ca94ad8bf7e3d80315f2cbc129fac18655f33e2866e4de20201f9b3e9109c273c5bcd7b45ecc0ccdb8f7e6d8ead07278890d1a043688752f572cb
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
 DIST pgp-0.7.1.crate 657889 BLAKE2B e22025e42ccb51ddd5eb32d77823fefe660dfd27dfff34f3bae2245887571f218d1d2e2e1ea324d187f9bed76d1b0e782b9e0d75fdd86f5bdacf3f566099f02f SHA512 413d5dddb435d7a6f2a64da59e32e6eeff49ed6b9718d99f7825b957cc26063191c87ac3dafa81a5a10026d06c8b115a9c18f872d767451a6d80a8f63d3e3c99
-DIST pin-project-1.0.5.crate 53782 BLAKE2B 8676c77bfb11cf184c5c57bee67912df613610d2599dcb582aa2da10ac8c899cb53283296b1dbc87088cf8d374acd6aa3b461400e74350401af74300ae0e1989 SHA512 ca9d1b26cbb8c54a1fe70b9d7bb42201a6ed6f6c3af27c8b3ae964b01be9df29156a79cd54e62e02a3ebe57af4d83b6d9a0bcf12ec924fbfe6d1719904cbb26c
 DIST pin-project-1.0.6.crate 53802 BLAKE2B 035ebb53abe0106994b7044973a2473c62a0d80693c47ba0d9d2f34d698ddfc838e52408093691d17070ad049a20c64c0828c53d7125b411514f1c48820b1b9d SHA512 3fc5d85e1c48d4b4df305e5f93266881a8f16835dab135e298ae9d0203fd2de0fb4cdce1c9df29243ed9e03fdc62eae8e553aacabb324a19237039093f9939a8
-DIST pin-project-internal-1.0.5.crate 27351 BLAKE2B c69ac995c79ad7589c86ffc5c41ba0fdda506f1b614e05005f6713e71c9c18e2f5ba3ecf4e3a99f5a7a7581b66ca587d40512b2302179692a36ee43557cc4424 SHA512 7cfaa8a4d38b191058e3942577a1a1260941344580bcc858ca7b0bc41fa02fa400dc348b8f9119fe89df3d92b96d6ac8557659d3a81cc1f7a3d7afce5f1dbf25
 DIST pin-project-internal-1.0.6.crate 27304 BLAKE2B e89393f4c23f91e070ac984ae7e19d44451f39cd34a6d2550cc7c5bd42b04db6189eed9b6b10fd1f21311aa922e5a1b312b44922368753ee656b8ea8c6edc7d5 SHA512 754216e5151742c6f957bc8171128af70ac6fca5f2a5fff2b0c3e2f7171113c19fe12740f9f711b83e012687df575e9924dc68e2979cef844597fd7cdb71807d
-DIST pin-project-lite-0.2.4.crate 22840 BLAKE2B 61c8e1a09cf892132499d76a9df2977445526aa27c4f3e5366e67f36551700cb9fc403fb765c4485de688285856151e06f9b26540422e1904659ab00a33866c8 SHA512 1bc1632806a0a463681ffc5d44cb4501a079801e01886fb8755f590f5b9de39897c5da82e137eb07403f32f1faf64e5dd91f5b4fc872c6bd406aae3bb6b6e26c
 DIST pin-project-lite-0.2.6.crate 25494 BLAKE2B 851a8388c3837d8516d98b561a3ae95b584e7b0e56cb04a300b45e5a97b4c81bde991a9625f42a596244f3f8638c26d6ddf46cdc7697aa24c823e991d0c107db SHA512 21b298896a10c2b21e481f5769a9ce557ec376819681599699f0881769d2dd378bd0bfdf7c43cc16eb521c48c67207e63373622fff84ff26da88703a57461461
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
-DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST pulldown-cmark-0.8.0.crate 106330 BLAKE2B bb59298b605993530e2363f3264c3ac1104ec57885c2dd183dcdf3aa9dc613999d24caeb86848ca3542544238aaa4eb49d5a6599d2fdef53af50b5dbead68e22 SHA512 396ade131c0a74cdfb8454e137e41c21f0b81b7cce654ba6ae9ceb132ba0fa0a467a190e6dd69cd7d59a267efbe83f008c9c8a5c9db47665aabc31a4bb9cb967
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
@@ -195,42 +154,31 @@ DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa059
 DIST rayon-1.5.0.crate 158037 BLAKE2B 6cb7f696e9c04d3aa6c3bf9c95690c2e259267024ac9701da5cd85c7d39b900a7e9e423e5b7602e108587a34c2519642ce1456dfd82fb13328ed3aba7516b569 SHA512 be15cbc7ad0fadb55e5640c78aa2eeac282872be88c5402338caad0a7ea604d2b8477648dcf7e453e22fbcdfefa915aa4bdbfa75e3d4f7a993fd8d85ed68395a
 DIST rayon-core-1.9.0.crate 63787 BLAKE2B bc5f930b1ce8e9fde03c01df7a53eeb3318ae24ac1c6b22e401a0b2359f4b9d6e419fcd41c7db33881c4ec29fbb844a44e2cff747d7dde2133668e733f8b6966 SHA512 d05b4c1e7bcb1c4e9238ab08bde39f08f069a08593084f041720694bae8bd524d1761766beb93e97784d7d541bde3e290446344fe129b0e10491405c1577366f
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
-DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
 DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
-DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
 DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST remove_dir_all-0.6.1.crate 7854 BLAKE2B 42d221f06c4d33a06b8cbf8705fbcea8113d3194f920f1c34f0ef00826a6ecf10bbab18903540f5005e3d448b256a9cdf59e009eab9a2c0c93d022b7b258e580 SHA512 ff22c03887d28e503725394d8b34eb6e118e3aa83d14429d8478b8440daf93874b3c5407d7918d0660b1dbec633601189e840a5fa57889028982187f5851ff66
-DIST reqwest-0.11.1.crate 128020 BLAKE2B 09e509b9cce48ae63f35f10a9502cafe6ad892cfb20847e06db525bb9826e44f0a519e9660933e60da0c7ec3ae1b42ecb5ce99d1ddf46badbaf483f47c93b066 SHA512 063b92ffb57dcc4d79a776a97b1cd2ed29c3ab686e49e3c1395589e4e2425154ab2eb7ad10785d1f904fdce4e50d8efe815f2bcc81a18d0d7e0a21af4898bae4
+DIST remove_dir_all-0.7.0.crate 9041 BLAKE2B ec298c4c6ac01bff3af5618ffa59aca535d74e06cbddf86c765318ded226c3fadb7f8277c572f173ae7d04f16c2b504375e400fa4e228d8747604860fb25660a SHA512 a4a426e7f3e9f4d3925809e22ebb61d06be04703ecabbc07aae80894458f29a146bc6aa6540ab4ac96c74a160a5520ea079ebb6ac6cca489ba036ece6678339c
 DIST reqwest-0.11.2.crate 129168 BLAKE2B 2e219d951874c90200150c678919fcb1e0dcdba2f90b34bd95587ca01376265c5c89e8937ae1db5dde41be579d781eda0b8e662f803412fc2d74d4fdabeefedc SHA512 cb5d2dc85d7a0eccbcfcfc11db3fda7647b5ce706ec33e63e7105613e47facb20ca82cd02f8b9fb44e98be501e4e59fba6d7434bc056ef58225c8845417018b1
-DIST retry-1.2.0.crate 8000 BLAKE2B fe5a6a0b6c642a09b0419814fabcc4df096adc9bc127039280070bcefe62601ccfc22f9c164c955b67f24cf5a11dddf4975df823b7fd17d694ae0a1f96ce6abe SHA512 7c8e81fe730182056d86b94e88130c3acc2962d2c7649049e7fdbb30f996904bbdcb94ba7fe8a91b4c68ec971d37acfc12804edff4b24e2cc6d5a020fedf4357
 DIST retry-1.2.1.crate 6406 BLAKE2B 5400edb6bda16e3174742b39c98132d8562bc5e59d5f71643a9ea146864b975f8857db8a745f212499640910c44b6de17bca8f2b5534344cf696c2db374d8bfa SHA512 db91d618ea5537da6049cff70eef6eb1299f34045455a2e0e0ca9e40c91d3886c566fe391e9050dd4d8043149b8469db4d9638a10535829a6bef81e3cdd25b37
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
 DIST ripemd160-0.9.1.crate 12087 BLAKE2B f2e0677b053cec4b93b1ba750e1a7ad603e2f4ff2f6750a659a7768627b1b30c429c91e586b61fe31531a5447d5f8d51cef1a874a8376df97b430a9629c11c7b SHA512 cd36d5b3224fd393f04b97a1f624ff190c3302ace497e37d040b5eb3a76c32cb413429de2692ae8706e62998ee82d82d13591c320b76825bf1b93ebbb3ab9ddb
 DIST rs_tracing-1.0.1.crate 4859 BLAKE2B b79dc0c0dacb963be9b96d534d1e051b7c9f63aecd85412ff530d3c6fe997241a3a2430431f7ba224f6dd56fad18d02959c466943af499887f2356a919937b81 SHA512 eeae1266a9fae1918ed38678a0e3d83dbb42779d0e5a82b3dd9b2329ba2fc18535783fd1c7c7f053f569d368f8444eb6a7d9127cfd7972d535ab3314535488e6
 DIST rsa-0.3.0.crate 40124 BLAKE2B 679de1ee93ce654c5ab442f1d8c12f91ecdfe3ee5e39ee2e31980acd333ef47f32feed30ab8dd1acadc1d88d9bcb24a6da872144394873be718201939d90fc48 SHA512 04c58f7d07babf108b7c30df94de359c413c26d1e9f044aa4782e58e4278fa2b448dd659820235f857f68e7ad428fa4fc90d69f549105b56ffa71d924b6b6a01
-DIST rustc-demangle-0.1.18.crate 19913 BLAKE2B fd0b955e9f552d5a3759dec05bf5f971d151efdb8098b0b3fba0ac80f0034c4891c575ba1247b04d1271fbfc8a1585f4a65200ff3836946aecae1cd653c7a1e3 SHA512 93ebaf7630c99b6c83712452aca26a42d9a173aad8ba7e85954f65e7867486519013aae1afb0006a0507fc3d6a4688df783ca091779bc0f316c5b8c4be95b793
 DIST rustls-0.19.0.crate 208339 BLAKE2B 55f627e2cd497d8fec205c3e5419804db23eea1b216aac606a136d4a53dd81fbcba8eb00a28c52f785cadcc3fe61dff839eb306828d0a924e3580c10d536515e SHA512 4c06462a67c5f6e5593fb1e747bdb2e35222e3b5512996051ee933e0cbfd3c376e30cc4bc692330b8678e286042240d096f9ec60fc484194c8fbeb9b48a8d886
 DIST rustls-native-certs-0.5.0.crate 18482 BLAKE2B 3bb991c7608afd7f06cc1ca2fb3a2f76b0f29224ef85557050f465eebd0cac90e286cea068208f8ea69692f8e803e89e9cda7b51bd23cb3da2287cdad215f3b7 SHA512 55ec5d034a4ca3fbff5255fdffd79c0abbcc9f767dffa18d48fd667c262f60dd67cd48c8aa8f1738e580a07e9a6bcb3375479b072d1e18ce6aaf8da32071ee41
-DIST rustup-1.24.1.tar.gz 689189 BLAKE2B 12b7c4c086bdfb422c609c471f14c2e309d019232eed16f2ec213d80235c3dfef1ad33787dd199e1968ef37757013b8c96b6da61f00f8737a984f350dd339cad SHA512 4d687cc686cc5166ac361ac22f861a4422681febc65afd60f2431e2bc2a2d199eb911390a0f57e8023033796d83747de1f83717e5532732d60c994d3422e3c67
-DIST rustup-1.24.2.tar.gz 691952 BLAKE2B 31d19fae2553b8d9b8248b461e8e27bc56c8f04b112f78c1c70facab2b120f17548909cf8b149b053f61583e5c41a6cabf3cbaacf877195fc58227210ed3b781 SHA512 1731e28e0a869caf781be980e91482f324e6bcd405bd0c40bc0457acb8825ffc3ffbb13439cce644330569057dcae3fe071e00cf86a3689ac6d8a439ce7e3a0f
+DIST rustup-1.24.3.tar.gz 695329 BLAKE2B 67655cb3c69b1d2c1052b21a25492ca2b6fa92654c8abb2176f254926304b9c1cc4ee98b73b9ea53287bb99502ec0dc6b0ec3ed912e5c42c9a54c8a679c5ca5f SHA512 43e85f1e653d451a2555a7ae9a3f47c4b9eb8e0fea0cd9cdcf381728ac933b56aaa25366ca2e1b12f20f9190b77d407a00a3f559ced6ad9c4f51fcef9efe67d7
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST sct-0.6.0.crate 28777 BLAKE2B b1e86bb40d30f8201e1fe94fbd4d5820754ffd6867815e4085bfbd710ea79712125207fd8c8d9a2bb73c5092a457890381e6f73867b1b9d1a3d37115657f0b38 SHA512 fed46a52834b90495a8bc37993ad0754f20fedef6db442368559594d7184a12b43e31a7d42a595b032e54f8aa535cae0030d9eccc828c9df2fb457267e782b15
-DIST security-framework-2.0.0.crate 54526 BLAKE2B 132382ee0dc0336ddc4b07417ef0613f44201d50b6f1ae6d6ae3cb1d53052521892bc8b4d4ad107071ea2c49a1d198b4f09b02d5982ca93eacef5d0e9139e9e8 SHA512 fa843a8638c7b4bc40041bff90cce422aec331a3b6c7ce8de32d2a817d2dbdf8689339a00236fc08d1669219ebbaf628be31693598b9574726ed06c22d3247e9
 DIST security-framework-2.2.0.crate 57599 BLAKE2B 2b35e52e8cccc6178222e7f85536ebee73f801b4a19661e8ae0ba303440b370dec664aca0eb2cdce3c7ef1da2c4b063554e565b0d5faaf2f9ff0929c4425f98f SHA512 33bbab6d82fe0669c9cb63778fe9888de045342640eb3d52806c4ad075f79720976e3f49c0f6af88b46518869c19786d16a602e109edfc7743c5beb5d6372040
-DIST security-framework-sys-2.0.0.crate 10518 BLAKE2B 6e616e6099883bd0a55f972a81c8eae90d39cba9b36efe5c5bc612866984cdcd088bbb89ea81cc9f5f6b2ef1acb81f12ea106d9afce38662304cc04039db8a57 SHA512 43222d67cb51630575e1861470c55950b7c96db9708d70e97328198d25c858a05dbb0a19e6513cf9341c26f1dbfe534c6ddbf9cf71c4c3f8dd47290f06ec3931
 DIST security-framework-sys-2.2.0.crate 11744 BLAKE2B 333f91d1f37ae4d6e85a073afe143339b2a6f7a46e3fbc0cb2182b3b3460ac3ec4da7db5726a2db15a407b15bc830d3093d89536641db66490117248a96d370d SHA512 639c267cc2f7529eb6c253f6908ac0681baca640a64efc97ef2b259c9d9db0d045569af2853d32ee2ad338f5d17334d3adeceb8587b77501ef462f7a890fda11
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
-DIST serde-1.0.123.crate 74379 BLAKE2B c6d1a0d833b50d1ec65f7c2439388eac08db6231e5f8d719582d545948b5f36f2a429338e12e33e4bdbaf439cdf25840e37f37470d993f6e80d8e5746e5c7564 SHA512 73d584193f1885561063d15c0124f0611f59ba60b14eb5df3fdfe9545e9e31a1a2afdb22b2a7dd4176ea0856a24352ca6d822e0bc779f0fbcfc41e545e27e823
 DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
-DIST serde_derive-1.0.123.crate 54122 BLAKE2B 9663f89cc23966d338ed1f952629276b4dd6a4c7edb8a3d9cc888e135752a7d5b748d55428566ce5ef98c11593dd45116f7aae0278bebd41b5e818928a414579 SHA512 ec80de18fcee0c50a4297272fddb54e111b580012ec79b7827ad8a4b9c02a621b07aa02070480cf89d6eafc1ed7a577d763c2657938f14c5b546d98e0df83227
 DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
-DIST serde_json-1.0.62.crate 114960 BLAKE2B 834ab58df2c57ea408d8407a57f6cbaa432ed9ba71decdd91241ed9531af7c00a8e95ef5f94ea5ea2fab1401fac3e2bd8b38d5c39aa2319f8b7a03845ab2a724 SHA512 eda305317c219fcb39a4e8ea0ddf3b24e5b86a26ab2f854ffba288a1d08439173dfe1a9fa649a159691e3d4b95e38589b0045ab7ad3033c294014a60063a4684
 DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST serde_urlencoded-0.7.0.crate 12489 BLAKE2B ef64d92d79b80521ffe90f18534d0a0f20834e692c708e3126d3486b1585aa228e3140be81984256f0adc71c764d5c2bb66b755b9475eebefcff67c952d42372 SHA512 2e49d1113a863a45235e4c5df3de1221398091c33b9eb5a806ea496902090f82d6dcf4f478f897ea54eea44f553fc20aeb2c1c124b81806b0704dd33d5650a13
 DIST sha-1-0.9.4.crate 13724 BLAKE2B 5b573e563832269c2962a7188df7e6b52916535bee2ac51ea60ca7b54966a43b32740cd4611dce94cae177e464cecc0acca5652ec68cf0f0ee27d148ffeff751 SHA512 f815f6a8f046cd51b33c0d91c7fe36997490e9ebf6e0c1fdf58efec18560d3aec665b4edaa9d2b702b2aab4667ac17891c620d17d24f8e26657d825ddef24ff4
@@ -249,7 +197,6 @@ DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e49
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST strsim-0.9.3.crate 10266 BLAKE2B d850a2d5199cdc2deae94c02a1934933e22b943750871c624256f3722e78878cf15750abdef6cb27a5acbbe95ed0acfc33f960305d08f942f2a4b066e93e2684 SHA512 8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51
 DIST subtle-2.4.0.crate 12411 BLAKE2B 32968997d71c6eab4bf2736090469afdb1adab3d2064afd1ab34a2711294bed1f00a715c2c748b25412ef9732c96bd132e20384019ca6bcc0a01ab602ec24117 SHA512 ffa173d6678879c382d9165ed8ac4480bfda2f03a451ff120767d90b2fa17ecaf234af15c2d153be0d96c8363de82f0be1fffb7770f3bd417e2567d146b61c86
-DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
 DIST syn-1.0.68.crate 231887 BLAKE2B 2e2547391fcd7a9854cfb888448eb89cdfd19ac20e9d909782ff11eb5bbd0b00717b3892199c2c88d005b8fda358ed10828a3f5a123a8d6416910d3b78971d5b SHA512 3023baeacb0164db641e809ac46fa48bdb8ff725e6c767764fa23552d53605dcad3d629f9c7a976a01ad7dd423595575d41c338223df5f7b72c417a97793414e
 DIST synstructure-0.12.4.crate 18105 BLAKE2B 8e7efdfa8681da8473903aa22e8cc55abcede012b29a91d65076042c89a21048b44b774ca5c3f788222dd32fa634ac20f58ce241eff610498cac19f659280d29 SHA512 ab3024644719c4afc9c06a4d3c499fd4934c104409d38197a46d62c9ce30414f88b3e7bcdd7f245cfd207489fb54ba41e5cfc1db94b0dd12fb01e9c00c861c47
 DIST sys-info-0.6.1.crate 14216 BLAKE2B 3ec8023c8ab62540f85df37bf2b689231dfc187079e643425375d2e2e89c187770f77b451ced1c427354357685fd3bfbc9c1fe64da262de735f1207dc92f17df SHA512 225ae4b703bdf252abc92119acb6d555bdb5985e53e973a044f8d14e38881a9e6f1ff42019d3eaa74ad92d4ba0a8f8a5bb7ef25fb07e823df005317db8453af5
@@ -259,29 +206,22 @@ DIST term-0.5.1.crate 39105 BLAKE2B 508ad7194a76c0526c750a2cab87f69d31cbad6a3011
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
 DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
-DIST thread_local-1.1.3.crate 13111 BLAKE2B 1ac2d9f6b9d5f685857cec0377f41faa2941614c9a0642b8c8d209590ce72c0dcf16f89b5da58d016b26a41e6103407811658a81217716cde0b0c69bc3939877 SHA512 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
 DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0
 DIST time-0.1.43.crate 28653 BLAKE2B 95fe69647e8d52784be1fd3457578896aa38279d00f51f1070eadab111d39450583c63854c73d4384f2e4349b0250f1c9bff9901529b776c596846c057c93335 SHA512 c3e0c68cab1ed2f33f41955f83e632c51924e4d3c1d22dd0c4ae98499e03f3cafde8b0c2d9e69b67a78d6e4055e464ee00d1ed6af5eb9fa75052405b43e24a25
-DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9aae9b8eab78c1584c904a6ac1a75511952b7f63eb953590b0b3a3c436296c13b6dabba11d279931ca769442 SHA512 de8de26bdb39d4b2255099b85c116a95b7f563f27549816d360a7cf68f04d3940745236aea4c73eeb86ed5427ae5f65d8936f0d60dae9b16076827134d77281e
 DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST tokio-1.2.0.crate 428628 BLAKE2B 0def4a42bfe1c1eef5374da93156e0fba9766ad197755ae38ba42d289f9a94f375fc4b16cf47e4ae6746810b23cc1183d2141e191f091a6990de3375fa0cf817 SHA512 8fdb1fd7ec1d406ab3616e6794633d95c7ac1432f1536cbafcaf91aaaba3b26f50466636e3121f065909f90a85fb64f91df831a405eaf2a17b1b30730f937365
 DIST tokio-1.4.0.crate 439130 BLAKE2B 78b9c6e3551c378c1603d8fc8eb2725d73c47ca37f118b77cb38de555a0b18c41e7ad0c627f9199c214c412ec3f20ac40a88e10b1874efae28a022f03ac11439 SHA512 5a5016482ac681c7bea248372eb013b2cd863530aba28065df0b9c3f604aa6b5f71230c39484feb2cf15207dd8a99d41ef81fd31f1286fa0b973aee9226fa923
 DIST tokio-native-tls-0.3.0.crate 20759 BLAKE2B 5073c5d93f5fa08170ffc76e21404b67100df5d944daa9cfe73420d4cb2409ca2617a0b1c25058a8b356b51fc4815972692aed7baa47ee3a11574a3109ce1691 SHA512 a8aa7586f15a3347ba9152497db84a098e751797c06df1a75d9b108689e14d6692b4efc6e5b49b5bf8f8fdb3bfc4f1157f56b3b0c9d9e753a8b31a61e65dfc4d
 DIST tokio-rustls-0.22.0.crate 22706 BLAKE2B 9ef76b96aaa10f49692581f7b4f04063729baaf3998b7e0a3d5700cd7613822efdc7fec334ec9d3718c700fbcbf572ee974e96bc3f79eabc774a801501b08ef8 SHA512 cac6c5ebbdb751721f881f6e4c21e1b34ff8aea84256e25f92cecbeb30b6db3a6b2d78b7eeca253179b78a94c9226aff23492b0311d81ce27470ce939e675d0a
 DIST tokio-socks-0.5.1.crate 16137 BLAKE2B 195c302b357369aabc9759709eed3369bce26d423d4349ee8c85e06dce8f985062e19e52f338d65fba76844bb56b1b36c4d501ef4079fc001aabd0be38dd783d SHA512 dc0ea053d11935646df436d19a653d18c7a495af1dd8dd0c02696dceabfa5b6e91f370072dae426848915f91c95f7c37a1f3835256e3e23b144b9380210fca2d
-DIST tokio-util-0.6.3.crate 65782 BLAKE2B 79d377f2b93570e82f3cc6df47b03a3ae26a6b7f7684b204b38fc20b1a0c21df780bd74f6db5ef4976b28e07b2a56d5368a402e754b6f79fe9b25cf7da8579d5 SHA512 1f0861cea7d3a42ffa0c7d8dbcb51bd4bcc2b2a1bf732678fed03785d0b7f54b45713907a7a46316e3ab91a6ef3356ad856dcb04f8cc9b47f403912c4253e23f
 DIST tokio-util-0.6.5.crate 71019 BLAKE2B c34c4d53754dd590e3b98000a12eaec1929e9c8cab05dc0f25dc449284f0f27ea661b39f94e25b6fa9918c27d4a528a70d4a952ae319fbae8ef64d4a1602bb7f SHA512 e31e295b2c92fec616ea3a2b61de9d85026cf4ead75cd193aff4ca037425238b4e11cf8cb3955353f63e9f03130ad3690c951fdd7bc1769b6e2efde75516c8d7
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
-DIST tracing-0.1.24.crate 66112 BLAKE2B fcb283e90e0a4d7b046eb1ae7f1c33ac3f56d67c1c81f2671387ec4bcd96030ced940bba509cfc824b15a16d2cd3479d1d60a16a3d33514ddd4df038bf4e013d SHA512 6eac3d081e79347af3491d340fe92e4b3bb78aa28d0c0cac0493bbafe82fb9b3e981b636c11fd4cf10ef262edb0d52b1f155c68884128496b08cb0f186fb1d17
 DIST tracing-0.1.25.crate 68011 BLAKE2B cde3a7835328b8bd04c377108f032a3718d9ec1ca3ee95d43df855af32ebc356d988705c01b64fd5725e8274a6da7bec822f9ff532159d9711c3c4a327bc6d2b SHA512 a9c48aa6abda26d7a7f26a1db3d4ea8b2b72bc69a8d6fcaaae21342bc802b4804a38691969959b1bb5bb7adf7d67380b09dde0196f65b6e49735be79e78385f3
 DIST tracing-core-0.1.17.crate 47774 BLAKE2B 6c13692d90ed3f84110c15a1834b5ca527cd950dd9a141b06ac2632bee718b67e46615e26567f58e4c3129b4d38abcfff515c6420c906ed4f957bacdeaadada8 SHA512 202fa2bf6999d1568f4ac4d92a2d29b3ea79b5d93bb57347927eda60c8d5b430b366889d45a4d5d22d4e1c46e62ffcc39b3091a91f79a26fd6b7827fcd7c230d
-DIST tracing-futures-0.2.5.crate 11637 BLAKE2B 2b23233705674cadf5dc8092d3990f375e780de2b9bdfcbfdd5f4bc9bd0f15a14c6bc8e36963bcd332e729b33b90ecd10b2250495e0657eaeb302e666313534e SHA512 8a437a029e18dcac3a3be7a3355a63e75432ff892316c9f2929c7557e3895b1bb5efb59a7588372bd9efc386b5cab54c2b382be99ef8fa643e66ae5656e506bb
 DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
 DIST try_from-0.3.2.crate 4264 BLAKE2B 13a4f1698e711981c183478b4bd4138cc90e8451000e56c965691e7d0be96e3cd7ae78aca891ae4a0d6726ef9a1d3beb26e4a4c18042b409a232a467ac36c11a SHA512 a619b8fefaf8c25037f1e2e7f8e64506144c8a7080ad930138fc3c4a2541dc7fc83ffd9c9a8c762ddd57028072cfd8dcb9db0c590e3ac30a4863f8d4fbb63739
 DIST twofish-0.4.0.crate 11490 BLAKE2B 5af970a08b8e7bee4f5fa0776a16c43c20614c9d2f327775ae6ab98dabe62891a7cad56924c57b980287e41e55394ffea3885a6e12b90b4981e619a520aee729 SHA512 da7db8c86fc36f66caaf05df2152d7d2f5556d47ee6d18e25420b3876dc293a561e5f85fdec5c13938df2aa55c1c6d3d2fc45b00ae0d15aa6ce057dcc003b8c4
-DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
 DIST typenum-1.13.0.crate 40238 BLAKE2B 5e5f9c8c60a4406c5a9a487033ddf7e8fd835bc255547e8b3f94c966e0f661f9b8a2f4a844661c00ee3c7e01f9fa109ac79c6bf53a064335c317dc9d9f8b0923 SHA512 0cd0b884509a5b4a252bed10309139350fce24b5d4bb887f4c0757ed18cb2481e331d7dc32fc81f4cabeeb5849e89ea5d92ea9815cb2985e5df4a022ac703de1
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
@@ -294,27 +234,18 @@ DIST url-2.2.1.crate 65434 BLAKE2B e9180c56afaf9dd781812b3650b28cee14a2330629e70
 DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
-DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
-DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca520235db3f38c7d4399a2a17b9cf599cd0811137df957f2341e75442d48483dc7aed6910f0eed7a78ddad37 SHA512 7e7af8ddcc6faed3e3d18384a000339617187b74b0adf111a02bc15fdb152c88007844d6fe6f35a47a13f3384a19ee4723b884623de7d45c6619d76aa6699404
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST wasm-bindgen-0.2.70.crate 159291 BLAKE2B 8420da36597a61cb293268f7cce742e1ab3f9ea990382af1c40e37f5b088d558ffa28814c8cdd9cad518246451cb9805d708c9fbe91ae8b6ee4fd2c666588944 SHA512 2cc77c540738fe454aebac4d23ad9b97ddcf867afc2fab8d92e1a995ec3db7126b9dc9153a3e47d048477cf15363d5242caee3064ba850780ad5d121368a7c8c
 DIST wasm-bindgen-0.2.73.crate 159293 BLAKE2B 3ad8a4221d5a3824d8c7788294b3b3b571ba4d676c782f7890be6f0f8acf5fc88166b8bf28933bb7511a388defa5ebd968b8fb8a69bdc424ff8ae64fddba1d16 SHA512 69b070d71df7b5539a9b45cb61704629cb917626e8e9f892ff684007647c36aaa04b7413f1f87eee7fffbcf28550b2d9e632c3747cd1a73a2a75043ea0849722
-DIST wasm-bindgen-backend-0.2.70.crate 25517 BLAKE2B 121690827f7500c19d4964b91fd69cc189e018f534e79a8462b69ef8a7c189ab0475e49a9689cbc4ce2ae082ac591567335a5a416675f0afed02aa14d68425be SHA512 22304a91c6d636bd721209c622ffdce4ed2646bb2c0b2433eaac61cb582ba59bee5ec0d08b4ed88695a8956b38292e646b8481cdfdb86de254e1b321a25308cf
 DIST wasm-bindgen-backend-0.2.73.crate 25434 BLAKE2B 63298c33497fac327ecf31f2dafa3681b906c8d0a873a80bce1282c53a6d63aa8b0d30b8962ecef1f9a0986ab481a41b79cba5b8180f48b084d04fb0c6ba4577 SHA512 853fd0e354aa41706e19de192c9872812072cc881520f8c81b94eadb0cceaa693855598380dcb7729c8c6125eb90cac440453545a5fff0e40714038c86ff2cb6
-DIST wasm-bindgen-futures-0.4.20.crate 14813 BLAKE2B 1e6d86bc6878701824cfb3ce1e605594a83120fd50ceab0a3cd31e5c2d4a3d247903cef330387321d061a5d575ef824cc324f12fbb80279218790928025e2339 SHA512 97fd5ad69a3b44a41201d93981c1c501a24dab4302c90643cebbdb7023e9e868c8b64b569d0f6907700cf1ac699d81694a3876d4e5689e8bbe77bed348e9890c
 DIST wasm-bindgen-futures-0.4.23.crate 14760 BLAKE2B 3b783c6056e7566197f68c9f18c557328b8a32a671247497999107052a3e51d2e616d5dd03f5399154b3cafd002b953dfc2850e9d018031b4d4ed3b940a09505 SHA512 344f2705a64f0618584c5a9ad0a026f156918873ad6fafbaf92d57b564445ab6d557d76233445ec263a18a0bb19b6be7d1d7710d3f83b25114ea1b621fe102d9
-DIST wasm-bindgen-macro-0.2.70.crate 11596 BLAKE2B ce91e20491ef421dbb4a87d1d775e55ca1cd6367825a7cbebe848bfe6af972bb4f514b62de949b8945da335dc57352b8f5c5fd0c6114498b195627f6455ff223 SHA512 b0deff7972a95472d4edec101c080bdd40e0c2ddbaee07f62093847f7e39142388b6f223cef75d71c2c7c90f1022e9ad3e797439c7d61200719b883707d9d171
 DIST wasm-bindgen-macro-0.2.73.crate 11545 BLAKE2B 481800c0c118048b29733a3bbe11ed5c816c1b5496b10b4142310d79ab6b825eb12280cf3c7304e768e6c8acd77105faa8574cf21afbf27810c9b7eac31010b9 SHA512 7ac842e68e6ba577b33df50ebe5c5fd250b1f4bc4e1ec1112be4fc806980d21f73f33612b14024626904a6116a8c72b83f2b7c5405fc111cd2164b4744f843d1
-DIST wasm-bindgen-macro-support-0.2.70.crate 17904 BLAKE2B 614121a2625eaaaa8303576cc3c3b05961aaa7c4ea0a65244f055582d8c22960d019e4afcaf7332f7ed7fc742a07ad654eb9848587f36270a6c7a64b9e83f4ea SHA512 a88b4650a05d28f1bf42a236b7f506450f3f84a215e363bb1fd434804bd73211ee7117a4fc07a6f4153aeaf8ad03737617aa29bc4072dd4c9f9a0f2c7fbeedab
 DIST wasm-bindgen-macro-support-0.2.73.crate 17835 BLAKE2B 8e18ef319106273d3f41e947bd1f5ffa7a91e04f713fd67fa0bb697579ae51bbcce75b48a91949aca8e64e6f52ed35eda6b49cec366365126115a9c30572281c SHA512 22e322840ebda05ffdd2f4ffd07745d0f24b928e3425c66425392560f8dd59b007f80d7c4e4a01dafd83c09d76953ecc2cd61d362219791ed88f7f4ecc56960d
-DIST wasm-bindgen-shared-0.2.70.crate 6729 BLAKE2B ae9f755efcb7efdc8aae9bbaa4809526ef3b9b03d0caee6bf673e739d268d7de3c40d395e8c78d4b021c18dd457bcfe038e4bb3d15e846d4446f5414819afa17 SHA512 f9ef2275fb3ef0c61d7ed84e72e820f5b607981e57e0ec042cddc631789533da87a36f717ab6ff7a5f1dbf00f809cb32ab593514aa5fcd586ca0e4fdf53c62c3
 DIST wasm-bindgen-shared-0.2.73.crate 6691 BLAKE2B fbde26dfb5f36474ed3e01f7254dbe742a205cacc85848b85efda09c22e1f9fdb464bd3b7a2c429b73e4f5f3095803e9e477cfb81d6bcc779c04c2602c465bb6 SHA512 d3a28e4bf42071496f2e48c3ba3134a06856be12deac79fe13d1e2e7da8018d5e7f220f4dcc02fdda9eddfc2d52ceef18cd180db7d2bcced44e88a36304f947c
-DIST web-sys-0.3.47.crate 648902 BLAKE2B a670816a41130dc1c5a202cfb7e60f281850be7916c825096a41e306ec2a221a443eafcc1a2e8d037697ee3fe564968974947fd29b026f6a565d0e542114aec1 SHA512 d8edc7e942fa3c97102dca51a2d398c616d96b7a9aba872f055e9e2dc00878f59fb7bf3c4975f527300bc7fc418f5da8a2f6ba8242a5e9f2edc445d391a47813
 DIST web-sys-0.3.50.crate 650100 BLAKE2B 448227dfbb6b91ab316ceebe554c9d9b89c397c25cd465f2e8a77560f185eb7308caf3b6052946e691d8fc22d6d382a0e3f164f7d29d873591ce17da792a993a SHA512 32afbfd3021c6cc4f228fc1762a4e29935373f4e7c572128723b508e6ab9588f3737167b91d5837e05a08c0bd182dd339c8f16b71e8a032f7e735cd619949d14
 DIST webpki-0.21.4.crate 58505 BLAKE2B 29a5fae21d885e90be8fa0b78a9b164f925e881431e79e9ea9702e8458242559c3f5b5535e04ff3ffb2018c1831b7dd685b5cdb5b9aa9942f6b9038c403da363 SHA512 667c9dc1c50a3d99aab53b6a9974f503e5c88f79012b3c94386a321761b96a74cc743a4e3b85d8314c36cef5ef01c2a2faffa80c773be1ba9680af4f21af3119
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@@ -328,13 +259,9 @@ DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c
 DIST xz2-0.1.6.crate 24512 BLAKE2B 47f260f4ce920bf8eff1446981672c9d877b4e5908fe20053ed15419e3cebd540fcedecf71ace32b25bfc5d6731092a565a2a8ac303ed21ae47460c1b3414833 SHA512 c0880b2bbf890e962b27efda6c513d1626332ff400dd08a9126a6e1d1375e0d0e3bf243b10df78e2397b611d0365b6526d96974c4ff332bb81edba71b6ebc811
 DIST zeroize-1.2.0.crate 15450 BLAKE2B 1f3c2688cf84d8bc22f777cc06673c29c9306b2c246bec67404729dac01570dd550c4ebe1f9cbd04c3d6a2711bf7106c45a34d01bb0ab7b73d3a15a65bf66eb7 SHA512 9bc0242824908909669e473029990a582efb884ce8f37d153d3a92083f64afe7b3bb26821dff8f39af74ea7935024d9414d458cf61c2e6291ca3611e896ae390
 DIST zeroize_derive-1.0.1.crate 8047 BLAKE2B c43d99d7f80d104ec43708742d2c13080a3b96d0b8ffac099f86c82bce33d263313a42ebec42ed5dbeaeac397d1717e6cf089980dd7934b1efc7228b737a5f21 SHA512 cbb7fe8d9ecb38c0f6fd11e491afa289cc9d8719f2460f4569816d7d55ec17fc88aa9a167aafb83809e2122481e016039b055e3bc4edfdeaf009fc0d65212dc7
-DIST zstd-0.6.0+zstd.1.4.8.crate 26159 BLAKE2B cd4323d0a9c30f73a35e6fc5d168973a3340203ab58a5c0f4224b392a455d6d8727dd694836f266fa25a6f5d5e244ef6706b3a9e2f5155d9e426aeb4b2492ae5 SHA512 0362e7aa4d1205dad9f9037b36b5678e9bd49a202822f53a7a4b34135cefa018e6590954b08fd3ffcbd0c607c85f00228aae8b82c03defca46229501ec376a12
 DIST zstd-0.6.1+zstd.1.4.9.crate 27005 BLAKE2B 337f69b51efa2289b31c041c7822916176512ffdf2ad785a9fd54b0a8693ddc13c2cb53be9152abaada7c3a3c38357159c1da207b85f92f950c7a08fef424ba0 SHA512 145373dd3c571e455579474c1bff847de44532b34e5f97e7c2461ac7094060fabdd1c88d8161a868f05bd75f07efeb70b020c60198479c5f6b16d5473abe8c7d
-DIST zstd-safe-3.0.0+zstd.1.4.8.crate 10200 BLAKE2B 26a6689ac2bfc101f826e6668a1c9dd588c610fd3fac088e69262cb4adae66108c85515380c0cf079628dea46369dbbc07800bedaf67255b8e12f41f75c0f2e7 SHA512 294e9527890fa0f74b6659e20436e67e81740ddc201a879a0ca9ec77964b543c50227db3be809b197ec9dbe7c31befef79867d698fa4e9966e6a0d1ad1b56bf9
 DIST zstd-safe-3.0.1+zstd.1.4.9.crate 10230 BLAKE2B b0b24a9e1df9f6ff3a810b774d178b6116c4949155f9e1c2ed04d2b8c7dd638c70b44b95f8305d9fd2a567ae3442904d720713e53dd96a0f202009cc487915e3 SHA512 9ca714ae45adb4421a29ccf8dbc0752d3c2b69e72b15cf6533064a5b1f016250b745fa469b9e7c5d0b24c50a0c46f1d6dd2683917b33cd80ebe80223eead0227
-DIST zstd-sys-1.4.19+zstd.1.4.8.crate 1881914 BLAKE2B 1c3ca362f0d63ac0ef234fa1722b0e786d67c528c4edabb0bfabc48b651d9b10d60f8a0999df1adf627c147eb2d0b25c7ab78de10e35ef79c2c7e5b17cfbd812 SHA512 6e096e5d2bb47e57c4553aa2b587698c88cf67f6cae4724fd85ca53450ec4bb414e3495c9354af1f363f8d22f9c9c7e0ebee62bd7f37dd321b7667c6d7721c30
 DIST zstd-sys-1.4.20+zstd.1.4.9.crate 1900796 BLAKE2B 1e7de5cd89b4d6f1fa65b28de41c63f5855cd349113bdd01b21b7c4c7d5bec3624f23f53508a9174d6415919f617f4db9e8a18af67c1344575ca9e9a5b3cd598 SHA512 71853b2aaeff3c0b2e6cd3bdabb21d10db3a299376338f5b491fca12432f322e96d30ff2c9e0df46ff084dcd2143315a30ff4aa702cebdb900a0cd9afcb49894
-EBUILD rustup-1.24.1.ebuild 7149 BLAKE2B 787ab91dd915c5c42400b4b2affcf186bc1f125675dee88df3f2bd43309c488e32e7888d00f01eb6f7025e337b3e5ae9a6d33c3e3b8d5d4e9fadca5356eb2d87 SHA512 f5536c9895ed33a7682093e8ac06822e70ec9086716c3e59b7ebc391de47f0b6238c96ffcf0a142168b5c79008f42e160a399c1f91c9d1fc99be703e189ca993
-EBUILD rustup-1.24.2.ebuild 7035 BLAKE2B c645490b99ae2fab6d989ca4a04d6703c08ab6f232ad5b4ae279143f527acd1758f19ac0548d44fead351fe8b97433e4e72bef46adf8252bc5e7b9d028b6d7f8 SHA512 e061b1c323e8ecf50aa5c71bfc9df75f9179578729054f7a121bbf2119f1def4e7136bbba156c7ed4d44711f60fdde4f8733e8453a85b32e2d29c4edee205429
-EBUILD rustup-9999.ebuild 2242 BLAKE2B c868714493121f255de0114d3333b33ed863594be2c5658de775c79c20e9914e1474e6cec40814412f6d8eabcf14723e23e63565ff623c443abc6cafceca2315 SHA512 001bda42f19d08670a7b28f3efd7f83aceeeaf52ba3f68cf9ae34f57e1626f1f203160696b9be5dcb7d8d1c71f148860515564e9a5be1136bb993d1ebd14f592
+EBUILD rustup-1.24.3.ebuild 7028 BLAKE2B 6e72388f25fd9949d6e2aec471e7488f0fd8becc37ab9cb8aabbb8016f798dbd74e7bbe39e76c6d7b2006ddbfa9be7bbf21a5ee7b78340f337b350ade4b5bcad SHA512 05005007d4bed10b309cdcbc86704bf9bd7b59371a0719352b0275dbc61c5a9b16fbb7af7072df46d2eb3975f97108c2cba4864eb92d08862143ab2625ebfbd2
+EBUILD rustup-9999.ebuild 2235 BLAKE2B b14c4292d60f96f1b23aec6ea666f7b9263c46187cf57f1a5f9a6e187e6b6c2400b401196e574344f6620cc4588e5f20e8547aa5e70c80b4b6accd99f25cf744 SHA512 ffd3e93f6b76350d0dd47615b5edb20cbe958463c411c9007b685a2d162b7686394cbc6534667a99188e08f12e525c3444c8b6c8414f438f06939934bf5f5408
 MISC metadata.xml 356 BLAKE2B e17235a7b0ea9156af7ba204f1693bffd96a42926df5241e158e67616a60101d5a554d882e3aec14eb41a53b411a762cb50ceae076e44bab6e0e361eee83c569 SHA512 dc4ec000b7f6d769dabb37210fd9515917feba7224cbd1db27013b0e0f27824cdf03c7310d0f64dd3a099bdc33fc65c29648e860011c98fc6c8e9b374a17e337
diff --git a/dev-util/rustup/rustup-1.24.1.ebuild b/dev-util/rustup/rustup-1.24.1.ebuild
deleted file mode 100644
index 06d347244cfc..000000000000
--- a/dev-util/rustup/rustup-1.24.1.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-addr2line-0.14.1
-adler-0.2.3
-aes-0.5.0
-aesni-0.8.0
-aes-soft-0.5.0
-aho-corasick-0.7.15
-ansi_term-0.11.0
-anyhow-1.0.38
-async-compression-0.3.7
-atty-0.2.14
-autocfg-0.1.7
-autocfg-1.0.1
-backtrace-0.3.56
-base64-0.12.3
-base64-0.13.0
-bitfield-0.13.2
-bitflags-1.2.1
-block-buffer-0.9.0
-block-cipher-0.8.0
-block-modes-0.6.1
-block-padding-0.2.1
-blowfish-0.6.0
-buf_redux-0.8.4
-bumpalo-3.6.1
-byteorder-1.4.2
-bytes-1.0.1
-cast5-0.8.0
-cc-1.0.67
-cfb-mode-0.5.0
-cfg-if-0.1.10
-cfg-if-1.0.0
-chrono-0.4.19
-circular-0.3.0
-clap-2.33.3
-clear_on_drop-0.2.4
-const_fn-0.4.5
-core-foundation-0.9.1
-core-foundation-sys-0.8.2
-cpuid-bool-0.1.2
-crc24-0.1.6
-crc32fast-1.2.1
-crossbeam-channel-0.5.0
-crossbeam-deque-0.8.0
-crossbeam-epoch-0.9.1
-crossbeam-utils-0.8.1
-curl-0.4.34
-curl-sys-0.4.40+curl-7.75.0
-curve25519-dalek-3.0.2
-darling-0.10.2
-darling_core-0.10.2
-darling_macro-0.10.2
-derive_builder-0.9.0
-derive_builder_core-0.9.0
-des-0.5.0
-digest-0.9.0
-ed25519-1.0.3
-ed25519-dalek-1.0.1
-effective-limits-0.5.2
-either-1.6.1
-encoding_rs-0.8.28
-env_proxy-0.4.1
-error-chain-0.12.4
-filetime-0.2.14
-flate2-1.0.20
-fnv-1.0.7
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-form_urlencoded-1.0.1
-futures-channel-0.3.12
-futures-core-0.3.12
-futures-io-0.3.12
-futures-macro-0.3.12
-futures-sink-0.3.12
-futures-task-0.3.12
-futures-util-0.3.12
-generic-array-0.14.4
-getrandom-0.1.16
-getrandom-0.2.2
-gimli-0.23.0
-git-testament-0.1.9
-git-testament-derive-0.1.10
-glob-0.3.0
-h2-0.3.0
-hashbrown-0.9.1
-hermit-abi-0.1.18
-hex-0.4.2
-http-0.2.3
-httparse-1.3.5
-http-body-0.4.0
-httpdate-0.3.2
-hyper-0.14.4
-hyper-rustls-0.22.1
-hyper-tls-0.5.0
-ident_case-1.0.1
-idna-0.2.2
-indexmap-1.6.1
-ipnet-2.3.0
-itertools-0.9.0
-itoa-0.4.7
-jobserver-0.1.21
-js-sys-0.3.47
-keccak-0.1.0
-lazy_static-1.4.0
-libc-0.2.86
-libm-0.2.1
-libz-sys-1.1.2
-log-0.4.14
-lzma-sys-0.1.17
-matches-0.1.8
-md-5-0.9.1
-memchr-2.3.4
-memoffset-0.6.1
-mime-0.3.16
-miniz_oxide-0.4.3
-mio-0.7.8
-miow-0.3.6
-native-tls-0.2.7
-nom-4.2.3
-ntapi-0.3.6
-num-bigint-0.2.6
-num-bigint-dig-0.6.1
-num_cpus-1.13.0
-num-derive-0.3.3
-num-integer-0.1.44
-num-iter-0.1.42
-num-traits-0.2.14
-object-0.23.0
-once_cell-1.5.2
-opaque-debug-0.3.0
-opener-0.4.1
-openssl-0.10.32
-openssl-probe-0.1.2
-openssl-src-111.14.0+1.1.1j
-openssl-sys-0.9.60
-pem-0.8.3
-percent-encoding-2.1.0
-pest-2.1.3
-pgp-0.7.1
-pin-project-1.0.5
-pin-project-internal-1.0.5
-pin-project-lite-0.2.4
-pin-utils-0.1.0
-pkg-config-0.3.19
-ppv-lite86-0.2.10
-proc-macro2-1.0.24
-proc-macro-hack-0.5.19
-proc-macro-nested-0.1.7
-pulldown-cmark-0.8.0
-quote-1.0.9
-rand-0.7.3
-rand-0.8.3
-rand_chacha-0.2.2
-rand_chacha-0.3.0
-rand_core-0.5.1
-rand_core-0.6.2
-rand_hc-0.2.0
-rand_hc-0.3.0
-rayon-1.5.0
-rayon-core-1.9.0
-redox_syscall-0.2.5
-regex-1.4.3
-regex-syntax-0.6.22
-remove_dir_all-0.5.3
-remove_dir_all-0.6.1
-reqwest-0.11.1
-retry-1.2.0
-ring-0.16.20
-ripemd160-0.9.1
-rsa-0.3.0
-rs_tracing-1.0.1
-rustc-demangle-0.1.18
-rustls-0.19.0
-rustls-native-certs-0.5.0
-ryu-1.0.5
-safemem-0.3.3
-same-file-1.0.6
-schannel-0.1.19
-scopeguard-1.1.0
-sct-0.6.0
-security-framework-2.0.0
-security-framework-sys-2.0.0
-semver-0.11.0
-semver-parser-0.10.2
-serde-1.0.123
-serde_derive-1.0.123
-serde_json-1.0.62
-serde_urlencoded-0.7.0
-sha-1-0.9.4
-sha2-0.9.3
-sha3-0.9.1
-signature-1.3.0
-simple_asn1-0.4.1
-slab-0.4.2
-smallvec-1.6.1
-socket2-0.3.19
-spin-0.5.2
-stream-cipher-0.7.1
-strsim-0.10.0
-strsim-0.8.0
-strsim-0.9.3
-subtle-2.4.0
-syn-1.0.60
-synstructure-0.12.4
-sys-info-0.6.1
-tar-0.4.33
-tempfile-3.2.0
-term-0.5.1
-textwrap-0.11.0
-thiserror-1.0.24
-thiserror-impl-1.0.24
-thread_local-1.1.3
-threadpool-1.8.1
-time-0.1.43
-tinyvec-1.1.1
-tinyvec_macros-0.1.0
-tokio-1.2.0
-tokio-native-tls-0.3.0
-tokio-rustls-0.22.0
-tokio-socks-0.5.1
-tokio-util-0.6.3
-toml-0.5.8
-tower-service-0.3.1
-tracing-0.1.24
-tracing-core-0.1.17
-tracing-futures-0.2.5
-try_from-0.3.2
-try-lock-0.2.3
-twofish-0.4.0
-typenum-1.12.0
-ucd-trie-0.1.3
-unicase-2.6.0
-unicode-bidi-0.3.4
-unicode-normalization-0.1.17
-unicode-width-0.1.8
-unicode-xid-0.2.1
-untrusted-0.7.1
-url-2.2.1
-vcpkg-0.2.11
-vec_map-0.8.2
-version_check-0.1.5
-version_check-0.9.2
-wait-timeout-0.2.0
-walkdir-2.3.1
-want-0.3.0
-wasi-0.10.2+wasi-snapshot-preview1
-wasi-0.9.0+wasi-snapshot-preview1
-wasm-bindgen-0.2.70
-wasm-bindgen-backend-0.2.70
-wasm-bindgen-futures-0.4.20
-wasm-bindgen-macro-0.2.70
-wasm-bindgen-macro-support-0.2.70
-wasm-bindgen-shared-0.2.70
-webpki-0.21.4
-web-sys-0.3.47
-winapi-0.3.9
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-winreg-0.7.0
-winreg-0.8.0
-x25519-dalek-1.1.0
-xattr-0.2.2
-xz2-0.1.6
-zeroize-1.2.0
-zeroize_derive-1.0.1
-zstd-0.6.0+zstd.1.4.8
-zstd-safe-3.0.0+zstd.1.4.8
-zstd-sys-1.4.19+zstd.1.4.8
-"
-
-inherit bash-completion-r1 cargo prefix
-
-DESCRIPTION="Rust toolchain installer"
-HOMEPAGE="https://rust-lang.github.io/rustup/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rust-lang/${PN}.git"
-else
-	HOME_COMMIT="a243ee2fbee6022c57d56f5aa79aefe194eabe53"
-	SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/rbtcollins/home/archive/${HOME_COMMIT}.tar.gz -> home-${HOME_COMMIT}.tar.gz
-		$(cargo_crate_uris ${CRATES})"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-fi
-
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-arch/xz-utils
-	net-misc/curl:=[http2,ssl]
-	dev-libs/openssl:0=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/rust"
-
-QA_FLAGS_IGNORED="usr/bin/.*"
-
-# uses network
-RESTRICT="test"
-
-src_unpack() {
-	if [[ "${PV}" == *9999* ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_prepare() {
-	# patch git dep to use pre-fetched tarball
-	local home_path="home = { path = '"${WORKDIR}/home-${HOME_COMMIT}"' }"
-	sed -i "s@^home =.*@${home_path}@" "${S}/Cargo.toml" || die
-
-	default
-}
-
-src_configure() {
-	# modeled after ci/run.bash upstream
-	# reqwest-rustls-tls requires ring crate, which is not very portable.
-	local myfeatures=(
-		no-self-update
-		curl-backend
-		reqwest-backend
-		reqwest-default-tls
-	)
-	case ${ARCH} in
-		ppc*|mips*|riscv*|s390*)
-			;;
-		*) myfeatures+=( reqwest-rustls-tls )
-			;;
-	esac
-	cargo_src_configure --no-default-features
-}
-
-src_compile() {
-	export OPENSSL_NO_VENDOR=true
-	cargo_src_compile
-}
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-	newbin "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" rustup-init-gentoo
-
-	ln -s "${ED}/usr/bin/rustup-init" rustup || die
-	./rustup completions bash rustup > "${T}/rustup" || die
-	./rustup completions zsh rustup > "${T}/_rustup" || die
-
-	dobashcomp "${T}/rustup"
-
-	insinto /usr/share/zsh/site-functions
-	doins "${T}/_rustup"
-}
-
-pkg_postinst() {
-		einfo "No rustup toolchains installed by default"
-		einfo "eselect activated system rust toolchain can be added to rustup by running"
-		einfo "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
-		einfo "it will create symlinks to system-installed rustup in home directory"
-		einfo "and rustup updates will be managed by portage"
-		einfo "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
-		einfo "before running rustup-init-gentoo"
-}
diff --git a/dev-util/rustup/rustup-1.24.2.ebuild b/dev-util/rustup/rustup-1.24.3.ebuild
index 467162e82212..8f48c04bead5 100644
--- a/dev-util/rustup/rustup-1.24.2.ebuild
+++ b/dev-util/rustup/rustup-1.24.3.ebuild
@@ -161,7 +161,7 @@ redox_syscall-0.2.5
 regex-1.4.5
 regex-syntax-0.6.23
 remove_dir_all-0.5.3
-remove_dir_all-0.6.1
+remove_dir_all-0.7.0
 reqwest-0.11.2
 retry-1.2.1
 ring-0.16.20
@@ -356,11 +356,11 @@ src_install() {
 }
 
 pkg_postinst() {
-		einfo "No rustup toolchains installed by default"
-		einfo "eselect activated system rust toolchain can be added to rustup by running"
-		einfo "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
-		einfo "it will create symlinks to system-installed rustup in home directory"
-		einfo "and rustup updates will be managed by portage"
-		einfo "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
-		einfo "before running rustup-init-gentoo"
+		elog "No rustup toolchains installed by default"
+		elog "eselect activated system rust toolchain can be added to rustup by running"
+		elog "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
+		elog "it will create symlinks to system-installed rustup in home directory"
+		elog "and rustup updates will be managed by portage"
+		elog "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
+		elog "before running rustup-init-gentoo"
 }
diff --git a/dev-util/rustup/rustup-9999.ebuild b/dev-util/rustup/rustup-9999.ebuild
index 36bc896f0bc2..4c042a9473f7 100644
--- a/dev-util/rustup/rustup-9999.ebuild
+++ b/dev-util/rustup/rustup-9999.ebuild
@@ -85,11 +85,11 @@ src_install() {
 }
 
 pkg_postinst() {
-		einfo "No rustup toolchains installed by default"
-		einfo "eselect activated system rust toolchain can be added to rustup by running"
-		einfo "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
-		einfo "it will create symlinks to system-installed rustup in home directory"
-		einfo "and rustup updates will be managed by portage"
-		einfo "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
-		einfo "before running rustup-init-gentoo"
+		elog "No rustup toolchains installed by default"
+		elog "eselect activated system rust toolchain can be added to rustup by running"
+		elog "helper script installed as ${EPREFIX}/usr/bin/rustup-init-gentoo"
+		elog "it will create symlinks to system-installed rustup in home directory"
+		elog "and rustup updates will be managed by portage"
+		elog "please delete current rustup binaries from ~/.cargo/bin/ (if any)"
+		elog "before running rustup-init-gentoo"
 }
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index e6d47d5bd0d1..311191101757 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,9 +1,12 @@
+AUX 06zfscloneopts 1467 BLAKE2B e515b70b7d105470a8b32ecd8f2d88446f039424a132215bb149e7716429efc7b726630de9bda9ff0cf197a8ba777ce2f0e14da1709fd89a9f50e88713dc3b1d SHA512 4026af077ebbb2aa4e123af1cffa5125e5b420ac79a13f7c1a510bd6d57dc4e5c439470396ffdf0701ce7a4009044a415bed6a460cf829364b3c48cd71edd37f
+AUX 11gentoo 1992 BLAKE2B 61e4396196b7c6b4695567f74c6f17fe24ab0152a8e57da136ecefa16d30e3127b94c701bc9ba0b923fa0d3aa5ab87811aed64c656d0aa475a37dbb884082749 SHA512 98f549edae1326840f04058442c07fc8e2af70811393c106bea84426c51eea36378b6a863352cc0b2aab8efd8e81b0e70c4d10bdaeda5f2a17f51fbb3ca9abf3
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
 AUX schroot.tmpfilesd 91 BLAKE2B f731cf3cb0037ec35f8144d2667f3a12fbfcef088454d165cfcdc63d34f433eb7abc9442917c0cccaf48b66cab028db0b04edbd9d1cb2864d257213fe54fd3e6 SHA512 381d715e2a1443d0115a6fa35cc7d43205a1dfa432f40e4903d944c219b8f5f0b076fb93c90c159f1f7edd5cf8a8766653a41e168940da92bae0b186c93eff96
+AUX schroot_prompt.sh 73 BLAKE2B d833a51c7a36ba45b672e1b7adc1e371c3641b53c74530abe7c21c4d3d590b59aef4ff86f33db5e4feef500e74aee9566cddaffba67c3798e202605c7fb90c22 SHA512 403145790845a1fcc49991c76c1bf76c5e38a6e86d8fa150690289f34660d7b02acb91e8ac24335975285437176e0d4f8d91a643a173962a9578938e7f0f4b48
 DIST schroot_1.6.10-12.debian.tar.xz 83636 BLAKE2B 0289848f7e64983c06f47a70346e06d7024722c643034ac24745fe4548311b893053ec28891f39264cb0894c12236f4e8523b70cd83553d1a7179cbfc63cbfa3 SHA512 77ae2d758593de505e9381e4800eb17a9e14fb949a5bdb07b9235671ae4bd18c668aa9c35a1ba6340af93b308b5c3798afc83f14165e4b19e7cebab92b83fc52
 DIST schroot_1.6.10-7.debian.tar.xz 82524 BLAKE2B 664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5 SHA512 ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
-EBUILD schroot-1.6.10_p12.ebuild 2957 BLAKE2B a5489b17883aaaac9fc5c3f619e5a724092768ef60415907f0b70c77c262f6a5ca1e244e4facf51beef185c879203c1de584aca8e71cd721087f6f600ed6780c SHA512 c2c8e873c26f63588ad6f45b2c8a7d480021abda6ffd29226e004506bc6b813dc2785d16403f048e80cece7ea01cd4f742bc62151a533328bc744a6faa6f71d4
+EBUILD schroot-1.6.10_p12-r1.ebuild 3505 BLAKE2B 7a57b2481fe1c47486b74e82fc442c7a190b7a615ca97e945c4fa98d2e0a65b3e88e517bc56470bd64e785bc1a0306b0101f6b44d25e17d8fec32ba54b6cf32b SHA512 457fa94d6f75850aade78766982d9da76e486d6cd843a8f765dae81cc792d93dd903be53020ceb1fe7d8e701715b7f6f624ed7f302d2975380c8ead2ba0c9c14
 EBUILD schroot-1.6.10_p7-r1.ebuild 2936 BLAKE2B b285e3f9241e8ca1998bced999d9e8c60cfeef9a6705bc48af724fed626a2db1aebb66898d4342751b5e8935330b9d0cdfe18ffb88f638a37008703d79b2cf3b SHA512 490bf8a58156f74f14a8407fe5fbbacdec7c9596b0918e37753e4261d914c9712877db564ac5faaba080658844419589f9b563e0389522fb7b0d5e3501bc370e
 MISC metadata.xml 615 BLAKE2B 8f6cde0f4bd1d00fed8330dd097b9ce0de021621af06aee3534e9cdaf79ae9353c27d831916d4e53ecfe11f264a3a9111001aff469471d75e1c51a04d55be4d2 SHA512 3ed685c418e1f8aa15d1a50e695aa71c2c2d48888a0b888a06d830c40a617a804d3c2c5f0f0ff14cea4206aee821239b63df273ccaf7452246112c931e6a923b
diff --git a/dev-util/schroot/files/06zfscloneopts b/dev-util/schroot/files/06zfscloneopts
new file mode 100644
index 000000000000..e66f0885e78f
--- /dev/null
+++ b/dev-util/schroot/files/06zfscloneopts
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright © 2020       Georgy Yakovlev <gyakovlev@gentoo.org>
+#
+# schroot is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
+
+set -e
+
+. "$SETUP_DATA_DIR/common-data"
+. "$SETUP_DATA_DIR/common-functions"
+. "$SETUP_DATA_DIR/common-config"
+
+if [ "$CHROOT_TYPE" = "zfs-snapshot" ] && [ -n "$CHROOT_ZFS_CLONE_NAME" ]; then
+
+    if [ $STAGE = "setup-start" ]; then
+
+        if ! zfs list "$CHROOT_ZFS_CLONE_NAME" >/dev/null 2>&1; then
+            fatal "Dataset '$CHROOT_ZFS_CLONE_NAME' does not exist"
+        fi
+
+	if [ "${ZFS_CLONE_OPTIONS+set}" = "set" ]; then
+        	if [ "$VERBOSE" = "verbose" ]; then
+            		zfs set $ZFS_CLONE_OPTIONS \
+	    			"$CHROOT_ZFS_CLONE_NAME"
+        	else
+            		zfs set $ZFS_CLONE_OPTIONS \
+                		"$CHROOT_ZFS_CLONE_NAME" > /dev/null
+		fi
+        fi
+    fi
+fi
diff --git a/dev-util/schroot/files/11gentoo b/dev-util/schroot/files/11gentoo
new file mode 100644
index 000000000000..ddf2df305c68
--- /dev/null
+++ b/dev-util/schroot/files/11gentoo
@@ -0,0 +1,61 @@
+#!/bin/sh
+# Copyright © 2020  	Georgy Yakovlev <gyakovlev@gentoo.org>
+#
+# schroot is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# schroot is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+#
+#####################################################################
+
+set -e
+
+. "$SETUP_DATA_DIR/common-data"
+. "$SETUP_DATA_DIR/common-functions"
+. "$SETUP_DATA_DIR/common-config"
+
+if [ "$VERBOSE" = "verbose" ]; then
+	VERBOSE_OPT="true"
+fi
+
+if [ "${PORTAGE_BASE_TMPDIR+set}" = "set" ] ; then
+	if [ "$STAGE" = "setup-start" ]; then
+		if [ ! -d "$PORTAGE_BASE_TMPDIR" ]; then
+			fatal "$PORTAGE_BASE_TMPDIR does not exist or not a directory"
+		fi
+		if [ "x$SESSION_ID" = x ]; then
+			fatal "SESSION_ID is not set"
+		fi
+		if [ ! -d "$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID" ]; then
+			mkdir ${VERBOSE_OPT+-v} \
+				"$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID"
+		fi
+		mkdir -p ${VERBOSE_OPT+-v} "$CHROOT_MOUNT_LOCATION/var/tmp/portage"
+		mount --make-private -o bind ${VERBOSE_OPT+-v}\
+			"$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID" \
+			"$CHROOT_MOUNT_LOCATION/var/tmp/portage"
+
+	elif [ "$STAGE" = "setup-stop" ]; then
+		if [ "$CHROOT_SESSION_PURGE" = true ] || \
+		[ "${CHROOT_NAME/#*_master/m}" = "m" ]; then
+			umount ${VERBOSE_OPT+-v} \
+				"$CHROOT_MOUNT_LOCATION/var/tmp/portage"
+			if [ -d "$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID" ]; then
+				 if [ "x$SESSION_ID" != x ]; then
+				 	rm -fr ${VERBOSE_OPT+-v} \
+						"$PORTAGE_BASE_TMPDIR/schroot-$SESSION_ID"
+				fi
+			fi
+		fi
+
+	fi
+fi
diff --git a/dev-util/schroot/files/schroot_prompt.sh b/dev-util/schroot/files/schroot_prompt.sh
new file mode 100644
index 000000000000..bd72f2ce5b83
--- /dev/null
+++ b/dev-util/schroot/files/schroot_prompt.sh
@@ -0,0 +1 @@
+[[ -f /etc/debian_chroot ]] && PS1="chr: $(< /etc/debian_chroot) ${PS1}"
diff --git a/dev-util/schroot/schroot-1.6.10_p12.ebuild b/dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
index d1292d3caaaf..0a4a39d4ed2f 100644
--- a/dev-util/schroot/schroot-1.6.10_p12.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p12-r1.ebuild
@@ -101,6 +101,24 @@ src_test() {
 src_install() {
 	cmake_src_install
 
+	# debian-stype PS1 for chroot
+	# checks for /etc/debian_chroot file, which is created by schroot
+	insinto /etc/bash/bashrc.d
+	doins "${FILESDIR}/schroot_prompt.sh"
+
+	# gentoo /var/tmp/portage handler
+	# e.g. portage.base.tmpdir=/var/tmp/portage in config file
+	# will use a subdirectory of hosts $PORTAGE_TMPDIR
+	exeinto /etc/schroot/setup.d
+	doexe "${FILESDIR}/11gentoo"
+
+	# support for zfs clone options.
+	# zfs.clone.options=com.sun:auto-snapshot=false
+	if use zfs; then
+		exeinto /etc/schroot/setup.d
+		doexe "${FILESDIR}/06zfscloneopts"
+	fi
+
 	keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}}
 
 	docinto /usr/share/doc/${PF}/contrib/setup.d
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index c11dc5db2415..4e7123c0432f 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,7 +1,11 @@
 DIST stripe-mock-0.103.0.tar.gz 567107 BLAKE2B 76dbc6bbb1d62ea68c30291fea894e563a426790c8928e7bc5a444eca8d48c8bcc23067459c1a249449af305a6809c70168918543087a1ef5e38cf7609421a7c SHA512 65ec61ccf94d1931389c4a16288dfac4d820a6fdf641cad1028347dfcb298aa4370d97d2dd4e468e17b8a702ce6b7611213b0707f1d5e37cd20aec46772e6a9c
 DIST stripe-mock-0.104.0.tar.gz 574936 BLAKE2B 681dcc2b02f5d4ca946024d1c049e499ce1c05c5a00653ca5a1af25325ce66b651e307df12ac0137fb38478332a8a04fb09ced39afa697a81a4afcc69a1cf314 SHA512 6d9c5fe5e5e83e8721ae441ae15e16594c690360a62934e825627add8acf6d58b0c4f52bd2c6d787c934fe0e974790b35b7c63d02f097647744549626b1708c5
 DIST stripe-mock-0.105.0.tar.gz 583483 BLAKE2B 8015699be4cd7a0c6e81c8f89cebe23fadb02904a175fef15c5e1fe156b01b001a03ba4b42ddffd453203142b1108d5981782d23e1369bab61181e0ef3964734 SHA512 539c3315c3e4896584a656fa3157ac69331bdaf2c77b6a7433b8709971e3b248fe89f1df3eab3f3178580847109460b86f975f0a378aef48ca3c29466b076f52
+DIST stripe-mock-0.106.0.tar.gz 592320 BLAKE2B 2154898ecb13516d11fe5188012829af5618a0520b19d6c3899c976ef719e5ddfe0a1bfe0c6787b9e51c695734d90e2297b8df6abc7d055a8d4df8e747d16b08 SHA512 30d5db6ace639435f0c97ce2ff38c02acdb464a09d5cf59a90ea3892b5f277e05ffb67d068b74739c2cdca3e73b2db74054079335bb28536c57457b46251bd6d
+DIST stripe-mock-0.107.0.tar.gz 592857 BLAKE2B 6fb58e6c38a04e443adf68bd30dbe16531abede29c104c617bd16f7fd9ce19b38bcd43df2b3fc21e9f8f5cf58a9e6413158f09a0e4746721e29180bfa8e5a26c SHA512 c455f18c242d15e20022fa17a99d4fb33ba93932d6983eb589b4e084b1bd2739a1db837ae70c4043cc4333a5a13ff4f4b16785a9ab014e556901fa975380e90b
 EBUILD stripe-mock-0.103.0.ebuild 582 BLAKE2B 3e5f302fe8efdfa19c81b51aa1f733c8695650a2ab7982ac737f67bf0005c4d94ecbe47c59c41ee81377d9e02671119e19e084ff37be10a555ea031d1951f6f8 SHA512 25771845d4987ba1fd2e4f49ec69825c59a36d0ad967ef258b149de7f53edc7ef7cd3198095b2684e7364e0f46d8a62beb653e6b088f14184ee5a6efed72d53c
 EBUILD stripe-mock-0.104.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 EBUILD stripe-mock-0.105.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
+EBUILD stripe-mock-0.106.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
+EBUILD stripe-mock-0.107.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 MISC metadata.xml 755 BLAKE2B 27b837f64385f50cf83e0bd5753560f5b6878d8ae5984c6e99deaf02138791e397e5755db1033ab3b4863f75edc90caaa91309247789ca54d01362178670d862 SHA512 bac1e56b0fb021b43712b31e98042f8a30cdc3f365ce928da35491a8261f04469c666afe8e21b82c9b3095b374ffc3312a8d909e4e24a87638b0de8551ff5d10
diff --git a/dev-util/stripe-mock/stripe-mock-0.106.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.106.0.ebuild
new file mode 100644
index 000000000000..05a7220e34b0
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.106.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_SRC="github.com/stripe/stripe-mock"
+EGO_PN=${EGO_SRC}/...
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT ISC BSD-2"
+SLOT="0"
+
+src_install() {
+	golang-build_src_install
+	dobin bin/stripe-mock
+	rm -rf "${D}$(get_golibdir_gopath)" || die
+}
diff --git a/dev-util/stripe-mock/stripe-mock-0.107.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.107.0.ebuild
new file mode 100644
index 000000000000..05a7220e34b0
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.107.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_SRC="github.com/stripe/stripe-mock"
+EGO_PN=${EGO_SRC}/...
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT ISC BSD-2"
+SLOT="0"
+
+src_install() {
+	golang-build_src_install
+	dobin bin/stripe-mock
+	rm -rf "${D}$(get_golibdir_gopath)" || die
+}
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index 74f7ac38f2aa..d5a92945f985 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1,5 +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
-EBUILD sysprof-capture-3.36.0-r1.ebuild 897 BLAKE2B ffcc34d5ba95dfeeed50f42634e7404905d6022600e79215e6008e8f200382e224358de100aae1f3488ba1951377b219ddd04d1a2bb616bacafa23e7657d9027 SHA512 8dd4ef1baa437e1b68a6a3e2399bb147153f670ad521a31df2b2ef783e4434c9bbead188891d621f1cf9a096072f8d9bc776665bd345900f5382045e0c154709
-EBUILD sysprof-capture-3.38.1-r1.ebuild 943 BLAKE2B 16e2d25430e0c5c412aa2e7036c9620925e30583fc90614c66c9a6ab39c1fbef4496b3edb3ead2ea73c7e1421b93a6104ccf0125c98739d97e1b1688b8f25dc2 SHA512 1f9786c23ba4699572a4926b4e178c1a0b18a8d421f60646b1f39b9ec07905840d0f5f7ca887c1b6605fb892d725dbbc4fde8e987732ca1cc721d8d00c6adc44
+DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
+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 800 BLAKE2B 41dfaec309c88fcb5a57ccdccea37654cdc2eab647468c63dc1538e5cf63337d62001e576e35ffc5fdc7c6b049af1d6a66830f04ddfd6ff8e66b120896d4eb1f SHA512 cd4f32df882d07dc5d68619028f7e3e1be635e3b952408bac904b45ead90efa0cca5322f0f4179ea873c37e1df8a8a5f0f98393005999c460ca997ea9df635cf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild
index 9eade9326177..7e9b683b3d3f 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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-minimal systemd
+inherit gnome.org meson-multilib systemd
 
 DESCRIPTION="Static library for sysprof capture data generation"
 HOMEPAGE="http://sysprof.com/"
@@ -35,15 +35,3 @@ multilib_src_configure() {
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
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
index 8675bfec8026..0c08f4b82662 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.38.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 GNOME_ORG_MODULE="sysprof"
 
-inherit gnome.org meson multilib-minimal systemd
+inherit gnome.org meson-multilib systemd
 
 DESCRIPTION="Static library for sysprof capture data generation"
 HOMEPAGE="http://sysprof.com/"
@@ -37,15 +37,3 @@ multilib_src_configure() {
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild
new file mode 100644
index 000000000000..0c08f4b82662
--- /dev/null
+++ b/dev-util/sysprof-capture/sysprof-capture-3.40.1.ebuild
@@ -0,0 +1,39 @@
+# 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/sysprof-common/Manifest b/dev-util/sysprof-common/Manifest
index 9508cb6e95b2..42717a10494d 100644
--- a/dev-util/sysprof-common/Manifest
+++ b/dev-util/sysprof-common/Manifest
@@ -1,3 +1,5 @@
 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
+DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
 EBUILD sysprof-common-3.38.1.ebuild 494 BLAKE2B 9508543ab0484eb5ed0348dfd83f8273554f0610c2bec17727b459030044885416fb9e22c9b7c20cec762a64f5239cdbedb185f87d85c23cdf7c972f9b7755bf SHA512 95862717922174ff70179a7f150432620990a4888c928707326d607500d14dad7a40e54f2385ace9e253738618dc09ce7b987c61ee07c1b5c916bc561b45f689
+EBUILD sysprof-common-3.40.1.ebuild 501 BLAKE2B 7d7ad07960402699d823c12288f578b9eade51153c1adf6d3f5d6030cc7cf088ed323a423700bddca5b480e3f9fee1d9846a812702e293df148dd85494de7a1f SHA512 7454af2b21bf08c02bc73bf5178124be47b72e590742ffa403c238239ed8d9b5afe39271fc1f8e469d517fb68e149335fd216655bba6822b81ad7a5b03a127a3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild b/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild
new file mode 100644
index 000000000000..96a57b010725
--- /dev/null
+++ b/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="sysprof"
+
+inherit gnome.org
+
+DESCRIPTION="Static library for sysprof capture data generation"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!=dev-util/sysprof-3.34.1-r0
+	!=dev-util/sysprof-capture-3.36.0-r0
+"
+
+src_install() {
+	insinto /usr/share/dbus-1/interfaces/
+	doins "${S}"/src/org.gnome.Sysprof3.Profiler.xml
+}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 699f41802e06..84225bebb69a 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,3 +1,5 @@
 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
-EBUILD sysprof-3.38.1.ebuild 2277 BLAKE2B 87bc003c5230751fd2b4d0e4e1f12aaf158a537782cd508b0bc6f41cf298e3086b9ef1db94ece81c583b30968d347f9c98a6d16b46bc91b699cac3a54844e153 SHA512 09c022e05fc883bc4a58087c6e82d086182d2f3d7df766792ebfb17a3a00b2a72112f6fda3de71942a18d6cc25dafb0f2a776ffc730a740067394ab52077c260
+DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
+EBUILD sysprof-3.38.1-r1.ebuild 2277 BLAKE2B 87bc003c5230751fd2b4d0e4e1f12aaf158a537782cd508b0bc6f41cf298e3086b9ef1db94ece81c583b30968d347f9c98a6d16b46bc91b699cac3a54844e153 SHA512 09c022e05fc883bc4a58087c6e82d086182d2f3d7df766792ebfb17a3a00b2a72112f6fda3de71942a18d6cc25dafb0f2a776ffc730a740067394ab52077c260
+EBUILD sysprof-3.40.1-r1.ebuild 2299 BLAKE2B 8c379c6f8ba046aa15121913147d66bbd8054c216c0dfa4a2b7f172fdee8a2df486f8f5ecd819e7d9a974512d6430819c94316e3085804aa9aeaac0740d139af SHA512 7230ff104fbd2220bf9f69ebec65e2809980454c49c6487093a483dcc24edeeab7c5e8a2ac2beab973a68c59e60b0f4f6aedb2471f805a815bcc97b3ae051d66
 MISC metadata.xml 704 BLAKE2B 0f16b3a4886ed687e5e889f9cacee3148f0ed4c80f5bc88c66217dcd7d411a0e900710d36e7e9a12995872f75b247f231fd1a085fe699a3b3d14d48e67e13dbd SHA512 247b92c056fe9b224ca5a096825223b883534af67bdd514dfa424460ee3b50cf7187bdd81fc70c64b1073477e7292f19d92d8d5112c1f27472f59e59bcae450d
diff --git a/dev-util/sysprof/sysprof-3.38.1.ebuild b/dev-util/sysprof/sysprof-3.38.1-r1.ebuild
index c26ba23434f0..c26ba23434f0 100644
--- a/dev-util/sysprof/sysprof-3.38.1.ebuild
+++ b/dev-util/sysprof/sysprof-3.38.1-r1.ebuild
diff --git a/dev-util/sysprof/sysprof-3.40.1-r1.ebuild b/dev-util/sysprof/sysprof-3.40.1-r1.ebuild
new file mode 100644
index 000000000000..bbcfc1400ed8
--- /dev/null
+++ b/dev-util/sysprof/sysprof-3.40.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+API_VERSION="4"
+SLOT="0/${API_VERSION}"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk +unwind"
+
+RDEPEND="
+	>=dev-libs/glib-2.67.4:2
+	gtk? (
+		>=x11-libs/gtk+-3.22.0:3
+		>=dev-libs/libdazzle-3.30.0
+	)
+	dev-libs/json-glib
+	>=sys-auth/polkit-0.114
+	unwind? ( sys-libs/libunwind:= )
+	>=dev-util/sysprof-common-${PV}
+	>=dev-util/sysprof-capture-${PV}:${API_VERSION}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	# These are installed by dev-util/sysprof-capture
+	sed -i -e '/install/d' src/libsysprof-capture/meson.build || die
+	sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die
+	# We want to ship org.gnome.Sysprof3.Profiler.xml in sysprof-common for the benefit of x11-wm/mutter
+	sed -i -e "s|if get_option('libsysprof')|if false|g" src/meson.build || die
+}
+
+src_configure() {
+	# -Dwith_sysprofd=host currently unavailable from ebuild
+	local emesonargs=(
+		$(meson_use gtk enable_gtk)
+		-Dlibsysprof=true
+		-Dwith_sysprofd=bundled
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+		-Dhelp=true
+		$(meson_use unwind libunwind)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	elog "On many systems, especially amd64, it is typical that with a modern"
+	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+	elog "debugging is still possible thanks to gcc4/gdb location list feature."
+	elog "However sysprof is not able to construct call trees if frame pointers"
+	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+	elog "for the libraries and applications involved in the profiling. That"
+	elog "means a CPU register is used for the frame pointer instead of other"
+	elog "purposes, which means a very minimal performance loss when there is"
+	elog "register pressure."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/txt2regex/Manifest b/dev-util/txt2regex/Manifest
index f637a140da39..221beee7dd5d 100644
--- a/dev-util/txt2regex/Manifest
+++ b/dev-util/txt2regex/Manifest
@@ -2,4 +2,4 @@ AUX txt2regex-0.8-disable-nls.patch 623 BLAKE2B 4a639d62b9535955638248ced1aa0437
 AUX txt2regex-0.8-textdomaindir.patch 656 BLAKE2B f5c1ad923105896c3743f7d7a1c8deb831f9a61eae4071a0beba40d002646ff47db6bff3f763d598dcfe9306d81fffc47c74db1639188cd561912871a667c6f2 SHA512 ddb9fe094b39639df0597f58b8431916f877e7ec2e8873c31b6c3e7e9065a48828a90292aa1e4efb180253be15d709003e4cfe51f2ca25ec9d518660840dd0b3
 DIST txt2regex-0.8.tgz 40514 BLAKE2B 938f8ec41ec1319d96928ed38985626d906788a8c2959661c2338104527a0ade3a72e4d7e13f17b2f6f9abc2589ff2aaf88dc99077bf2fd6a82a82d186efc580 SHA512 69d2a682471e3e35fbd0b2ad6f6ffab040803a17bda8082f3dd67baf3a03e7011cb20047940fb9403e180895a1258f720ca4d538187878c5989a1ec51168435f
 EBUILD txt2regex-0.8-r3.ebuild 889 BLAKE2B ee43a0b4c18c3e012ec530632c543267f28ce6a903ba2bef42b65568ad246abf3ec12e5d2b63bfd6a346109b6cd518649d8d3db69d2a597dd4c4e8837445f2bf SHA512 29d6f7c8a33dc786f6a15eb6a841c529ff083ed6964fbddcc5470416da6be466721b3d16f67a9d2a3432490543b5dc0914da4537fd3aeb3fa4e3fcd14a651380
-MISC metadata.xml 344 BLAKE2B 651b9be422dadc59659b2e27801d6413b181095d3921b086638765a965e0ca956cedf71e004dc63dd7d665f6e34fa2f627d69fc2bde658443ce6eaacc5750878 SHA512 b16ae2357ca3ea0aaa63733fc657cf348df2ff8dca5f4471c8a828c63b535f6c4b0b658935081e14c8e5f40affeea743e3c6028f8d673e1f037ab61e93278731
+MISC metadata.xml 407 BLAKE2B 1c3b012dfc09cf34ab63e4a2b98741760e726e2d0f05bab92e3157043e0287b12595c9b1791332f81c95fbfd12dcaf435d904324d77a565bd7122142b6540293 SHA512 a827a96fc62dabf0eefb8c1d6b90bdc61c6a4ce81cd1dbc458c8b97f347da3006756478773f4c032c487e5477953bf9e3c06102e2381a9619ff4bdecc59a6e05
diff --git a/dev-util/txt2regex/metadata.xml b/dev-util/txt2regex/metadata.xml
index 5228121b668a..d3e305c31d65 100644
--- a/dev-util/txt2regex/metadata.xml
+++ b/dev-util/txt2regex/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">aureliojargas/txt2regex</remote-id>
 		<remote-id type="sourceforge">txt2regex</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index e12282e6d436..13bf3ebf84e1 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -3,6 +3,6 @@ AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2
 DIST valgrind-3.16.1.tar.bz2 16262776 BLAKE2B 1c333c26827f7a8356869e8758da9dd6a7444642ac4f6377c84fdab8349b9cee1e9bf2cf2eb86043c4feffab342dd97da20e76d7566d0296189e6ea8483a8c65 SHA512 2a4173efe1b6facdd2f5c5ee8ed006704168eba1813736fccc8191d60363afd96197512cf42037e65f18d4ddd49adc74a54c47210df216fba3c46bf68ef0f950
 DIST valgrind-3.17.0.tar.bz2 16459075 BLAKE2B 96569db9bc3c25ca195a4caa64da6e96b9bff7edd82727fccccaa8307162e29f4e150386c7c9611152fc1afde609d0922aa84067957b72dff03810ee23045e9c SHA512 94de78942a7059e1ab84d1c0c0b8f3efd1c2d15c70b97bc7edc8136812778adb6f8187149d53a60a8c6a7c8b40534f9be5cfed0eb3c0c314545b681f950b108f
 EBUILD valgrind-3.16.1.ebuild 3700 BLAKE2B d9cafee6c49c3055d3dae53ca9702ead5c6c6380fd7ec4954d97e00b938616c4734cad17bdbabefc7d053e7606cc7350b79b1920eff960023ec507168f24cb74 SHA512 a1fa319bbe947b54676e7603d56c42b4af808bf93149e1b3a14ca837c33b747dc07161a41833c377b948099fed8ad8bb8f2ba664a3e9c3841a0f7171f0acef00
-EBUILD valgrind-3.17.0.ebuild 3706 BLAKE2B cd2e4f588afd417b9c70042304e5a6db83baa2d4b1f182f5bfb7636d4455e027366c3047f7f639ede0a9cef446cadf1893b9784eaeb734692fddc55dbc6fc7d3 SHA512 c04f648a07d6cca1dd196c7523338ee295ab504d561c84ef8154391fc5e6b6a72a43b132cd3615525937609bbb917df46d79c586c6195d99da22d9a3381476f8
+EBUILD valgrind-3.17.0.ebuild 3700 BLAKE2B d9cafee6c49c3055d3dae53ca9702ead5c6c6380fd7ec4954d97e00b938616c4734cad17bdbabefc7d053e7606cc7350b79b1920eff960023ec507168f24cb74 SHA512 a1fa319bbe947b54676e7603d56c42b4af808bf93149e1b3a14ca837c33b747dc07161a41833c377b948099fed8ad8bb8f2ba664a3e9c3841a0f7171f0acef00
 EBUILD valgrind-9999.ebuild 3706 BLAKE2B cd2e4f588afd417b9c70042304e5a6db83baa2d4b1f182f5bfb7636d4455e027366c3047f7f639ede0a9cef446cadf1893b9784eaeb734692fddc55dbc6fc7d3 SHA512 c04f648a07d6cca1dd196c7523338ee295ab504d561c84ef8154391fc5e6b6a72a43b132cd3615525937609bbb917df46d79c586c6195d99da22d9a3381476f8
 MISC metadata.xml 1027 BLAKE2B df13361ec401ce5e0bfa11e51378c432405bd296a874d8c71c26c9cbdf0171689e4b3134b5e05672dfc22bbcd6e2b6c74b96c47367725c209990d3e1fcc65e7b SHA512 da5bcaf596f2adaa552cc3b7296891b40be0bafec8a12695076ce8fbe660b8aabe70508eb02ab3fb66b0d9dd0c0c8615f430c1ee0ce3f3579732ea2406c8a778
diff --git a/dev-util/valgrind/valgrind-3.17.0.ebuild b/dev-util/valgrind/valgrind-3.17.0.ebuild
index 10a17a63d2e6..890f41044529 100644
--- a/dev-util/valgrind/valgrind-3.17.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.17.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 DEPEND="mpi? ( virtual/mpi )"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 52d2eb59112e..622777301cc4 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -3,6 +3,6 @@ DIST vulkan-tools-1.2.170.tar.gz 835063 BLAKE2B 5b7b9c9ea07b3a25d2b989a0981417b4
 DIST vulkan-tools-1.2.179.tar.gz 843725 BLAKE2B 0304f7672b5405404dca9b9800dd0927f3af0f17580f021bc30e651ecda5b5e6194971a6a95e30cce956d094cc8fbab580f0f0ecd8fa4c81a9bc15ced5ad92ac SHA512 227b5023c21720c94fb5583f0f6635cf2b9d8067cae02dc6f22f39a106bc0b3e569b2730a1dc4fd469fe0a5e5653167fdc56fe37852a1acfc38df953b4524dcc
 EBUILD vulkan-tools-1.2.162.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
 EBUILD vulkan-tools-1.2.170.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
-EBUILD vulkan-tools-1.2.179.ebuild 1881 BLAKE2B 252abfa8852cd7bc645b42ce55f0504729a3de0e3a1a39b2b816d35a0c990f979b00d852cee77223a37424f053db992d4d2a41ab325c3bf52f6da1ec05673d16 SHA512 4f64a3978ddc6a8f0984bcecb0aaa79eb410c11fe6741c80f5c712a8defbac80374ef4f183021f478de659094842ea93d6ccb3c4ce77978cdcbce601221284ea
+EBUILD vulkan-tools-1.2.179.ebuild 1886 BLAKE2B 9c2492531c87da11e3a5cdb6c9fd863ae721013392c867a0ab47f21a07b872e910d13c2c0147bb364dca8c0dca0bb59a2f31cbab9d48d7861427b2d2e43e7851 SHA512 314aa393ac36a75192062eac58ea3eeb3fbaa5d67565757db67cf30a674fa49cfe16a675d413cdcd0249d03b9e559a94a06ff46610c3cd28565f1a8bd699ff5c
 EBUILD vulkan-tools-9999.ebuild 1886 BLAKE2B 2afef23e4399f9547e7fd691ec1050473993ca0decefa62e56a1d5499663bc5071aaa680d0a743a4776993997c0adc5bc92587ad24dc0cce3ffa6c325a86b35c SHA512 1769b436f7e1a8d4c4c22a7f99d1c2884db790b0f15dcdd8dc4e7cb144796654c48cfa6a75ff413653a5a2bf974c142c7a1dc0e81804fd7968e8d7a78bf5fb39
 MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
index 14d7bb81d120..dd3ff96da94c 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 9668f5653008..51ba83d7d909 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -1,5 +1,5 @@
 AUX 4.9.0-changes.patch 2974 BLAKE2B 71163fce5ec3f62e174810f485a43fe0a329757004cd32050a949d6c809c156774b3b95ddd43b45bcb95e02eebc94f551de498d0bf856c90483205e907980d64 SHA512 6700d62de75063db08f23799b05ef867ae3f9b608f9b9774846cb98c2ad651ce22786496ccaa15ef2c4b923cc51adb13a4c2af0ead0f1672ce990ca7e8560329
 AUX 4.9.0-python3.patch 2402 BLAKE2B 9378a4613048891e6d4b461a9442ff7585dc9f137c03de417c62fad5edb78f138e417e35abe9283f33bcc7da884a2b2e885ebfcfa638c183c1521660af97c300 SHA512 68490ac9eaed522f81e51bc1a2bd98f93282f929587c8e865baa519faecc921192f9e751a5ef8099a5ab6e1e5523855ba4bf8aadb2656506e632cb97eff16839
 DIST watchman-4.9.0.tar.gz 3508045 BLAKE2B 413b779f02736442c371af1d9e18e5c84f05f9e9465c114dc4bdf79cbc1d823f1ad3167abef22818652a924ca2cb563c54d18f7599b987f579655d8a2b82162a SHA512 3c1222ba41383b26c2c427415e75abdb4bef5a95001438c3debe7cf3ca654944ecf08e432c5ad0aefa2a6554ae73ff0f6995e7f4ee61cdb2cde80f8378d3a704
-EBUILD watchman-4.9.0.ebuild 1160 BLAKE2B 0b161235121928f955ce1ec143340562b970cc3dcc869745a68ea7491ea813ac0f61880aec68d6f2c555c4dae8a369231fd0cac42aa44998ed190508dbf9da76 SHA512 d083c55765de1866ce247bce16e5b1f1ccb40281cfadba352f879fe94b129a7c65f1305fa44f174c53073483f9714ac77d7359f0589c7859eb1981db5a71aebd
+EBUILD watchman-4.9.0.ebuild 1167 BLAKE2B b0f90bd623f5e6d3ec81939e25b3f6dcd295b9f345baa0fd70fc2e62caceacd789145f071e4d737be27ad608d5dccd33764e01a185992bd9feaa17990e28772b SHA512 783f391bbd3133df2a0925aa185151d357a864fc0fab3b338417ac4ff46e2c75a774a10480e4c22604a844d11a0099b06ef18a4b11f9f7da21648b912de27da3
 MISC metadata.xml 702 BLAKE2B 5851e5a0ba81aa282d1a013ce5415b5f7415bb20a0e4da24a5d198908ddb8df4d1c96de7d59d5d354705b0ef4d8b4041cde467dc8d48eaefc614c87f77deff65 SHA512 d26e3f1e4cb84708dd1ff5c2de3c669c53c2916ab26379ef3cfec4d4ab0afb6fffffb3b53527e53d51fddec5b11ba777d74fa6932f3d98b054c73cedb2265f5c
diff --git a/dev-util/watchman/watchman-4.9.0.ebuild b/dev-util/watchman/watchman-4.9.0.ebuild
index 560131034a40..9cc31253bcf3 100644
--- a/dev-util/watchman/watchman-4.9.0.ebuild
+++ b/dev-util/watchman/watchman-4.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools distutils-r1
 
 COMMIT="8e0ba724d85de2c89f48161807e878667b9ed089"  # v4.9.0 tag
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
index aff82dd70820..616835476a72 100644
--- a/dev-util/wayland-scanner/Manifest
+++ b/dev-util/wayland-scanner/Manifest
@@ -1,4 +1,4 @@
 DIST wayland-1.19.0.tar.xz 456380 BLAKE2B 0f70bb02e890898c4763001884527067adb686abe9a2b9325badf1730d411d269c437037afc298eec8075eb1e3845f5b81b8ed3d702908388a54e7063cbea91a SHA512 d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef
-EBUILD wayland-scanner-1.19.0.ebuild 1041 BLAKE2B bb4bcd14432c7c64e7fb6be2408ff9f7c29301fda057d386c59e31cb4fac670812fe7ea90f697db9b4480849ff60ef07d8b594f05345f130bf14b9e86f7997d3 SHA512 2951bdaab11251d1d435428754586d4939c96d7484f260e57ae25320e17d303856389f94c805f394d2c0b353c80feeb49d1d3ca0ea4e232fe43353234c6cdc5d
-EBUILD wayland-scanner-9999.ebuild 1048 BLAKE2B a18ab822990665a586d1a6a61c6b2c458efb10a18993ea07b2ef654cad4c7f3101687dd83fb96c0fe3ef6c14c2b26f6ab9850a493dc2d770b321770de055c36c SHA512 4004be25df48935c51c70c6c403cfaa079123a054b28efe8c535008e5cee8b77abe19504681b7fdba2c80a7dc9eaa7cd1e9465196e1eccf7189521ccb57ee749
+EBUILD wayland-scanner-1.19.0.ebuild 898 BLAKE2B ab8daa932983ac49f4814a55c91efb2469b5d0dc04e1f1ed5aa75d77b219ef97281dea8bec9ec19dd46abb8b02e43f87b61d2725c76e2575130f83598b2c7146 SHA512 9517e36eabeb6638030adace3322dcabdcdae0a31f17cfd54a835f11dfbc4292b37d66335fa4e69391370d2df123518ac4ac05edb6ed48c97ec0483fa57d86c0
+EBUILD wayland-scanner-9999.ebuild 905 BLAKE2B 331d51a38154e1ecf329e876db8b3b47ea94cd480a214b1a76231127bf6a94644f2d388bd2ed8c30010535173182adbf11d98610e314dd87e2c92cd1c5c52b1e SHA512 ed4cfab969ecb5eeafbdd6f464d693b2c9390127bc88c98e5dbb28d2e3f964763f8f5fc2bdaaf3051e0c88be8c02daf07cf3dbfac04f418166e65f5ffcc1d9a0
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
index 65fd72ba7ef4..fd089bb57e88 100644
--- a/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-1.19.0.ebuild
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="wayland-scanner tool"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
@@ -35,15 +35,3 @@ multilib_src_configure() {
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
index eeb424d9d3c1..0e0f4d733eba 100644
--- a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
+++ b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S="${WORKDIR}/wayland-${PV}"
 fi
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="wayland-scanner tool"
 HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
@@ -35,15 +35,3 @@ multilib_src_configure() {
 	)
 	meson_src_configure
 }
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-util
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)