gentoo (valentine's day) resync : 14.02.2021

109 files changed, 1581 insertions, 913 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2372ddd96699..433434ce69f7 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 561039795c6f..51a5325c2cfb 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -2,7 +2,9 @@ AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951
 DIST android-studio-ide-193.6626763-linux.tar.gz 907569312 BLAKE2B 602170eea29e632dd5720ef364510a20056a4d98c61e77d5436a2f624a60e0cfa4e0533174613a74f359d8fdeb4e87489caeb5c34b292fcdc35843a76440a9a3 SHA512 7fba99efccdf3bbbfcbc94625aba3789b1bad0e830b2ac890bd681b9089e6789e87b2dbdc80c6ef3d8db2b2438678a8bb58aefb3c311f61f619042ab1ec9dfac
 DIST android-studio-ide-201.6858069-linux.tar.gz 926181537 BLAKE2B ed815f5565ef97ca3f4e1c6cbae3548c70ba94a94a7ae522102044ada31468f241db68ef3d1a1ce6acef60a1bc2e6cd7eba1375a1cebbf01c73063a3d85eb9b2 SHA512 b473e9573e21c666042befa17fde8fc9cb0d6ffd41513d64b74779815079d8971c66afcd1dda5663b503324d14851c4f24a454e5da97e2473550323c09919825
 DIST android-studio-ide-201.6953283-linux.tar.gz 926213072 BLAKE2B bdcca29e75348230c37a141423faf27eae75f299ded1abb3aad12605cb5be144c222d15b998ff16203a035311a6a26d8ae4ee28f337098c78377c5df4e7fcf08 SHA512 554d53596280aa96349ed0b3808599cf315c4f1a439ff57cd2368c6a68b57afac620b86d742c2f2ff72d718a62e33f4353202b3bc3671c0fe934cd8d79f74c0c
+DIST android-studio-ide-201.7042882-linux.tar.gz 925365363 BLAKE2B 337db94154a44ad95545b1f6ca48d9f95773663607ed2de415ae04ae80ed10670e9906b0bcac539d539455964a41c2af117557c4ec0af58b14fcbd175aa44197 SHA512 c7829df5296172613c8bc01d699c7581d27f7604e182143bc8ba4c8503771b4e290d16c4dd3498f1d5701eb8d54adc7a61b2a0967454d99f5ec2a10d697e5b56
 EBUILD android-studio-4.0.1.0.193.6626763.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
 EBUILD android-studio-4.1.0.19.201.6858069.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407
 EBUILD android-studio-4.1.1.0.201.6953283.ebuild 3658 BLAKE2B 854e2d4d191d541451993ff07948bdb0faa5a9599004f513df9c97e84a0d689009681a8882fd667e7153ca11c375186448eacf7ff38eff0d714fff758bf11abc SHA512 fdaa7cea293619b80b9e0deed2a77a6b33c7d29c51af2aff03bf25d350177964d871c8bbe22802ad9c7e49e4a4e2fd3abdd049b2a879e6b84e571f62e3ab0545
+EBUILD android-studio-4.1.2.0.201.7042882.ebuild 3658 BLAKE2B 854e2d4d191d541451993ff07948bdb0faa5a9599004f513df9c97e84a0d689009681a8882fd667e7153ca11c375186448eacf7ff38eff0d714fff758bf11abc SHA512 fdaa7cea293619b80b9e0deed2a77a6b33c7d29c51af2aff03bf25d350177964d871c8bbe22802ad9c7e49e4a4e2fd3abdd049b2a879e6b84e571f62e3ab0545
 MISC metadata.xml 313 BLAKE2B 623366c889e8b0d9c33a56fd3ca96156208db355e1549bbf8040a6839a953a82459b3c87e5a0f16f1d67ede403ee5a9e1747c445e855434f25d0f03fe5a6c43a SHA512 1c3e18bd57e48e7f65791f8904bcdde910f1d97d83e781c7c3815df6127aaac9063614e0a11cf7762059f762c4696e2b89ca446ffb9e631a2c85ff2b350e972a
diff --git a/dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild b/dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild
new file mode 100644
index 000000000000..c0c19c664875
--- /dev/null
+++ b/dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop eutils java-pkg-2
+
+RESTRICT="strip"
+QA_PREBUILT="
+	opt/${PN}/bin/fsnotifier*
+	opt/${PN}/bin/libdbm64.so
+	opt/${PN}/bin/lldb/*
+	opt/${PN}/custom-jdk/*
+	opt/${PN}/lib/pty4j-native/linux/*/libpty.so
+	opt/${PN}/plugins/android/lib/libwebp_jni*.so
+	opt/${PN}/plugins/android/resources/installer/*
+	opt/${PN}/plugins/android/resources/perfetto/*
+	opt/${PN}/plugins/android/resources/simpleperf/*
+	opt/${PN}/plugins/android/resources/transport/*
+"
+
+VER_CMP=( $(ver_rs 1- ' ') )
+if [[ ${#VER_CMP[@]} -eq 6 ]]; then
+	STUDIO_V=$(ver_cut 1-4)
+	BUILD_V=$(ver_cut 5-6)
+else
+	STUDIO_V=$(ver_cut 1-3)
+	BUILD_V=$(ver_cut 4-5)
+fi
+
+DESCRIPTION="Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="custom-jdk selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-java/commons-logging:0
+	dev-java/log4j:0"
+
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4
+	dev-java/commons-logging:0
+	dev-java/log4j:0
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/libffi-3.0.13-r1
+	>=media-libs/fontconfig-2.10.92
+	>=media-libs/freetype-2.5.5
+	>=media-libs/libpng-1.2.51
+	>=media-libs/mesa-10.2.8[X(+)]
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	sys-libs/ncurses-compat:5[tinfo]
+	>=sys-libs/zlib-1.2.8-r1
+	>=x11-libs/libX11-1.6.2
+	>=x11-libs/libXau-1.0.7-r1
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXdmcp-1.1.1-r1
+	>=x11-libs/libXext-1.3.2
+	>=x11-libs/libXfixes-5.0.1
+	>=x11-libs/libXrender-0.9.8
+	>=x11-libs/libXxf86vm-1.1.3
+	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libxcb-1.9.1
+	>=x11-libs/libxshmfence-1.1"
+BDEPEND="dev-util/patchelf"
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+	eapply_user
+
+	# This is really a bundled jdk not a jre
+	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
+	if use custom-jdk; then
+		mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
+	else
+		rm -rf "${S}/jre" || die "Could not remove bundled jdk"
+	fi
+	# Replace bundled jars with system
+	# has problems with newer jdom:0 not updated to jdom:2
+	cd "${S}/lib" || die
+	local JARS="commons-logging log4j"
+	local j
+	for j in ${JARS}; do
+		rm -v ${j/:*/}*.jar || die
+		java-pkg_jar-from ${j}
+	done
+
+	cd "${S}" || die
+
+	# bug 629404
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
+}
+
+src_compile() {
+	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+
+	# This is really a bundled jdk not a jre
+	# If custom-jdk is not set bundled jre is replaced with system vm/jdk
+	if use custom-jdk; then
+		dosym "custom-jdk" "${dir}/jre"
+	else
+		dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
+	fi
+
+	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
+	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
+	if use custom-jdk; then
+		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
+		fperms 755 ${dir}/jre/jre/lib/jexec
+	fi
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 55a2da80f137..7bbf7839d07f 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,4 +1,5 @@
 AUX android-tools-8.1.0_p1-build.patch 545 BLAKE2B 27b2adf298df89972eac73349118378c5210e9a1d4177292eff44a587627a9f16c8ad0eaca075b4f924e4e7733f73afc954ee10eeed3d465262102bbd012f313 SHA512 67d4f7a772ae48d23f253a385575203ff50d2559ba784832b177bbd9adbda614a7f868a3362e564af98ca840297213446a0c808b380e0ff7cce4cca78437f623
+AUX android-tools-9.0.0-limits-gcc11.patch 323 BLAKE2B a431febfcf8ffaa7a6f61c1c4b8bdf3dc9928d72350134b3b6046d150a4489fd5a2ba1ea35e76f549f04796110cfb1d6270cc83bb1614d3d5c3bb1550d912d3b SHA512 28ff8b1bd13b6d0410c6e8a338fdeb9feeeae7c2d1411967f81f1f73534a8a13d00378fbfad310c0abb589337d7fc4d5d62daa70a4d5a729502f40151c9b8148
 AUX make-tarballs.sh 3176 BLAKE2B 7438c5dc63c355f1789309b5e825373396788808223f64718da227066a3b870fdb0fdcc827d0dbefd56d8d72fa6740a8b8c64e75b58dcda1a79eddebb064f001 SHA512 aebcc6e6c336932b4c9770ff21bb2ee3beff6947a04e88904b6ac1d1475c0c1e0eb5ccd774d9cc07aef6a9f849bd8dcf5b344012cec9c9b595d1aff916fc30c3
 DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
 DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
@@ -10,5 +11,5 @@ DIST android-tools-9.0.0_r3-f2fs-tools.tar.xz 212092 BLAKE2B 32775e5b049bd2ff2ce
 DIST android-tools-9.0.0_r3-selinux.tar.xz 3202332 BLAKE2B 60a884eb1bd34fe5796f8fb33e5aefd7f9ffc85ac91784e0a8f0ca663010cf2222c80f4c419019b5817f9cbd8037ab78914e42417193e1b802a2682bb82c0097 SHA512 f0a77dc0ac91d434573370110c70529caabfd5f036c02ae5f1a4b2097e48324198d03ecdc92a622e1590012dd3f20f103384fed468f5e27aebcaf9315bb87078
 DIST android-tools-9.0.0_r3.ninja.xz 4244 BLAKE2B 14cea7523f22a7f4e02e93c32e4d4684e057abbe8e2b537b7e942cc27c13ea2aa13bcdb5c3ccafc261b8d7fc4b4cd4b9394e0970734b36111ccffbacecc5cfb9 SHA512 46956a608d6a9b93f1a035d6b0e153c476b55d4f8a2db4915b18ac9904a6d07befcbceb8e2e50054e7dbe2970be8539243134cd9722d2f2ec8a36a3153e03c56
 DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a
-EBUILD android-tools-9.0.0_p3-r1.ebuild 5079 BLAKE2B d12e984a370fa199cd665b76a38f34715c50e69b9b512d8d2b120d9149644104dcf57e8cf779329f6769997cb8195426a89d25f5b4a5e1325871e3c35290ed16 SHA512 53a5878d0f1ee4308dbfa246e4ba6cb688965fcb231bf8a586d64e68669d3d9906471d2f9815c4e0c03ca3d34a82b504281da7a4f4120964e90161f9befa5490
+EBUILD android-tools-9.0.0_p3-r1.ebuild 5135 BLAKE2B a11fd1cf1bb6c2455594dde183402c713597ff31dcf63b4216e9793035ab8546d0f34e2e82033da8f441ddd8f50ab52d793186674e96ed922b3dc86132db4b7f SHA512 19ade071b5e6c61b57ab2ff73a63fad78bd2494e9b0595b21712324fbdb67fc9e4410001fdb0d2ec0d912775aabb1e29d42994191f413ba35b4100d267f6cf2a
 MISC metadata.xml 714 BLAKE2B 2ec2b24289241323b1844412e6e0d1edf642dc3391171b474848ea376c51d420c98a4a0c094afad2dc1c7cf55b0efb744ca6a92beeed770d015a6380b07b85b0 SHA512 720b38485a7c248e6a9d43a7056e33a384fe7e295fc843c69e59d48350bb10d7d4446e6cc52b7c87e2b0322733553e16c9dda4e37104753d5aaceec5adf859bd
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index 3c4e5ba6b302..d5ba3b863325 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.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="6"
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	dev-lang/go"
 
+PATCHES=("${FILESDIR}"/${PN}-9.0.0-limits-gcc11.patch)
+
 S=${WORKDIR}
 CMAKE_USE_DIR="${S}/boringssl"
 
diff --git a/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch b/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch
new file mode 100644
index 000000000000..ced85fc8306e
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/764071
+--- a/core/fastboot/protocol.cpp	2018-06-21 02:58:42.000000000 +0200
++++ b/core/fastboot/protocol.cpp	2021-01-06 10:11:52.806586912 +0100
+@@ -37,6 +37,7 @@
+ 
+ #include <algorithm>
+ #include <vector>
++#include <limits>
+ 
+ #include <android-base/file.h>
+ #include <android-base/stringprintf.h>
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 844c43a7115a..6c6f9d986896 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,5 +1,5 @@
 DIST astyle_3.0.1_linux.tar.gz 172483 BLAKE2B 4c80491cbcc976aa38ff294014df0dc01b39685eafdac6989bea082b1f61120c3985d14ff6db9f76606bbe8da1aaa344c2e0c9c2999a014f5d54384c0420cf97 SHA512 3e8d617c0ec89682bfb076081bb63ae9d44e897de0c85d5109b28adbbfe0620d5dacf59a4bd96ac30a5a4fcb3be136758e9c6fe2c69258b37956c212890a7158
 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
 EBUILD astyle-3.0.1-r1.ebuild 2387 BLAKE2B a91a68c3161f8938a3c2be1f005d03e54d10755043b6c0aa69cec1af145136ef90fa388f37acd6aa625252b55d205cb52fba1d9cee4d7452a37ae7f480d00b65 SHA512 9865738112a2ff3c012f09da2cd8b73b13a9f981d1242eeb60e14b6fa4ae783961b0807a1fb56638415b5f0cb593a306a4958dab46115924dcb1d5179b8380a1
-EBUILD astyle-3.1-r2.ebuild 2390 BLAKE2B 15692c54446aabe0da016e544ffaa2d6b12fcd3b8f4ab876ff07691fab7467c6c21ae1a071068addf3066753ef8a9ac4dc94e904dca950ce341a983974383c8b SHA512 cc43f5a79ef763b6a9d77095337d4e376ce8b3f28428802d534814fefcb501ed14d3dc056b4a0ecc3ee050f6be95d5039d58cba364f9d1672872a388a32635ed
+EBUILD astyle-3.1-r2.ebuild 2388 BLAKE2B ee7e6eea00ab2be16d62a5759e30fcd81d275e3904d4f6e6b1baad6b3308decd7bf220bf3fc5b4146be1e56f7c18b454358c308263926efc7e66e4c5050e67f5 SHA512 e924ed3bde062815f99ab1ecd9f46cd252c5facb3e74e500f6c8fef4974ed3afa2c6fcb52917b32483421b497afea14142ce37f907dab3df1a79152b83e5f797
 MISC metadata.xml 753 BLAKE2B ddd9b5eb1eaf20f626bdb0b568c856f6e2bb548fff3b6271bd163d6b1f711e66635d2e3fd839c67421f92232a7a8c7343179a4a95e39266dcf44b91bffc0c2c3 SHA512 2896e9eb1f69dfcef21bbc4f622e0ee7e2a88ab882d1ed91623642d4b7ddabb3b9e4e060e1662254e40cd4cdc77f189dc6888dd509ca40633c1f197fb2e4610b
diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild
index cd5c2428841f..0b1355de77bb 100644
--- a/dev-util/astyle/astyle-3.1-r2.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/3.1"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples java static-libs"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index 282c8bdf189b..cc95962c9844 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1,5 +1,5 @@
 DIST bcpp-20150811.tgz 145969 BLAKE2B c7cdb21b6c07599c93c6f3fdf6ca4f5e825d4ae5f955e1c969d744a9ff2594bf3c7dcded1582dff695201f6e7e8ed57d5796883b63c5c57476c6601da6a49717 SHA512 a11462574bd87cf66dc50ce23f188d335480aae5448b527694791d4b7ae5cde27c0e0c0850dc8899b2b66198c37a434985c833f95f7f2d2d88a3b7dfe4ff34a9
 DIST bcpp-20210108.tgz 150080 BLAKE2B 5614b1e9957d63532ed6ba6d4588ae8b899201c363984bc99726bf48ae49ee9d16a71c407e3988fdeb715fef5e67343bc56c94eb1c8e977a14a6c2b08ee6668a SHA512 46a8fff766bbca4833c898d550ce4f0ac5e6ea64a2e05e63e4680186345a080aa30e54a4a5a3d22d47df8e8c8cbc4e738578fd59ec647d305c32a228d3b01e73
 EBUILD bcpp-20150811-r1.ebuild 903 BLAKE2B c12d2b5f335f5e0d247f14103366a52de0964e56f502d422e9b013dca58bce2c2d8a6194c69002397e4cde5f9a3243a99f03fcb146d02976b096eb61ea2228fb SHA512 9782454f880605021845b3635f4c873f2675f34a22533c43e590ad11f847a5432bacaaecb4aeaa35ada613ba2f37e2b538672bc3fcde99a3fa65167e23baa13c
-EBUILD bcpp-20210108.ebuild 906 BLAKE2B 2432fb0df017d703034d3fbdf36a94be9cd8174174afa564eb2ed7d24373203dec71cf07a9f38aaed56433ecb39f98db22b5ffd3715d38ce31ed4cfd93028215 SHA512 7928273e239a8f05f0433d08fe562ff6f27acf51cce29fe2fa359cc0db1db641969faa4dfe0a5b783062e24749124b3c8a4f84415790d45f3abcb59762117a3f
+EBUILD bcpp-20210108.ebuild 904 BLAKE2B 08572081987ce9581d3ef49da3893816a13aaa665d2ff8a6440ae862e194231292e9548c0dcd1cac4c1af778a433d9d16536d2f8a1bb7ff672bfe5f54c3dd5ec SHA512 4a260b5b446599ad97e97c9a0927eaf439f9755a1888399066efb14b8f168b304950404cb278bf023ca5638a68ce465f904667e864e66d3bacabea49decd44a5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/bcpp/bcpp-20210108.ebuild b/dev-util/bcpp/bcpp-20210108.ebuild
index 2ef7dd6cee6c..244592ad4d7f 100644
--- a/dev-util/bcpp/bcpp-20210108.ebuild
+++ b/dev-util/bcpp/bcpp-20210108.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/bcpp/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 src_compile() {
 	emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"'
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 49ee916e7960..7bc38aaae547 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,4 +1,7 @@
 DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
+DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871
 DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
+DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
 EBUILD bitcoin-tx-0.20.1.ebuild 2436 BLAKE2B f8bfc55eadddefe07189dde452ffb72139a7ce54d8fc859bd781dbba02118453c85abe5f47c5d517cbf266b046ec88e2baaf390eedff237612c0859e60aa9502 SHA512 5f2c1b325870bb62756b42541064ee4004cd514ef56505b1fae5d8bd2ed50201e9c774473443349227cfafa53254a131961877e48b7d6351c44adb7b660d2700
+EBUILD bitcoin-tx-0.21.0.ebuild 2446 BLAKE2B c04f503e39e10d324786aeecd92a6d1a45475a54dd0b5b43bf0b9d72d754676904e0add0836cfafc0306262ff4315ab9012bcbc371091a1635019069f17c7e23 SHA512 f82ae432c1f1ec94e166cf2618e6c1da82f2aff3f1ccc82ab5b2553769e4fa6759a517733a4b7bf07401f0b19966ca7e3e4462833aa8a97663da69a3edc22914
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild
new file mode 100644
index 000000000000..626c25324b4f
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="95ea54ba089610019a74c1176a2c7c0dba144b1c"
+KNOTS_PV="${PV}.knots20210130"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots"
+
+DEPEND="
+	>=dev-libs/boost-1.58.0:=[threads(+)]
+	>dev-libs/libsecp256k1-0.1_pre20200911:=[recovery,schnorr]
+	>=dev-libs/univalue-1.0.4:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/autoconf-2.69
+	>=sys-devel/automake-1.13
+"
+
+DOCS=(
+	doc/bips.md
+	doc/release-notes.md
+)
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2021/01/14/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-tx
+		--disable-util-cli
+		--disable-util-wallet
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-fuzz
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 30014561f1ba..63bcc5dbc3ef 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -2,6 +2,6 @@ DIST byacc-20200330.tgz 872217 BLAKE2B 870ac1eeb439c96875e343223925414115b500d5b
 DIST byacc-20200910.tgz 871242 BLAKE2B de0f63b9edfb9451e23d7693daaea59f2661305a6727cd8e986c2557e513ca5dda8f0008d05b5c8f35a153a309bc4b02ecd6f45219bb553f928c9da11b616130 SHA512 491bbde2d5b0fdf2ad57bec5080112ad7c12ce3830b5e14f2289092aad1addae6edd4698368a9c8d69219a95ae5fa47eb32a95a2625841915297972591bebea3
 DIST byacc-20210109.tgz 873282 BLAKE2B 3f856bfba00b692ecc5fd297582ff594873914552d522be5de78bc74c0c52a7e0b7fbcdd31e209e7269d9e00e2449cf7162ac5cd0a1f2060e051f8fca2171460 SHA512 95eafe81948fee1839fed8fff71d65c23d85de02af51672c118b2eed7c680f0dd300cec54cf366a248307c480844edc66a027575b29e20ef2f71f3c243ad5202
 EBUILD byacc-20200330.ebuild 596 BLAKE2B adb7eb7cb5d6c902850f1b451eb1c22b2d22bb38cfa18f64ad0445ab46a2fb2b440ca99aef7b16e60d56df8ddea63ac0c7b974283fd69960e0f0fa1f6690d694 SHA512 4cebf2976f97b5cc6efa053cda9d1467dea1aa1a1c8d56eabe3530758bffe718948a081e699f4d35ed80a56b6a1d7c1325f54b58935a1a461c2afb617a561e6f
-EBUILD byacc-20200910.ebuild 597 BLAKE2B 9c1360fd26055fe88c066b075297e576d13954964edc3b1936e8a1ac054ff3ad8b48049ebe5c18b615fd6a984180087b6b011a514ebdff7902cce415cd4edbf9 SHA512 e02f7cd0a7e27a8d4d788e52ae6485baea000526b56ebdde56816980922de717e5a5dc4ed0bbbff1de18393b81fb91f061005825822b40d248a960db50791fce
+EBUILD byacc-20200910.ebuild 596 BLAKE2B adb7eb7cb5d6c902850f1b451eb1c22b2d22bb38cfa18f64ad0445ab46a2fb2b440ca99aef7b16e60d56df8ddea63ac0c7b974283fd69960e0f0fa1f6690d694 SHA512 4cebf2976f97b5cc6efa053cda9d1467dea1aa1a1c8d56eabe3530758bffe718948a081e699f4d35ed80a56b6a1d7c1325f54b58935a1a461c2afb617a561e6f
 EBUILD byacc-20210109.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20200910.ebuild b/dev-util/byacc/byacc-20200910.ebuild
index a12f6b237a14..bb2ce413af79 100644
--- a/dev-util/byacc/byacc-20200910.ebuild
+++ b/dev-util/byacc/byacc-20200910.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 )
 
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index 52eeb17ac9ae..03a4d317b273 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -4,7 +4,7 @@ DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c12250
 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.27.crate 26395 BLAKE2B f510c352ba6cb6be2e20d40e176bd48f7bf39dff4a0be288f54da60346f2fcb9b6376a4f139fbe13a9178ec8feb58a28badc209814d6ed9d1decd7b327ac8a4b SHA512 ed880d594fa5d17f14abecee56f7b2742b9ceb744bf8548c99c0ac6f3880f761df657959ecf512d7d194f75055db668eaf1a8306876d596b471b12ccffb8c959
-DIST anyhow-1.0.36.crate 29083 BLAKE2B 62166679a01ba1a2935316efa74b97a990f3ad720cbe339abc333a8609462438ec0268c4f3e6f5ede1ec972a23ce982d8e5de057c3f76b3f711b1d1d1cba8fe9 SHA512 4128dade4fa361230581973809598556b188195f5cbd951f2be651cb9bdb9ce6bbc45e70e0f05044080b054524d379bf2661cddc85ca157f0b260c1c0b492bda
+DIST anyhow-1.0.38.crate 30417 BLAKE2B 168c6692fa669e90bba848bbb830fcd18ef2e2359a6f0f6b0ac8a20666b9c8416ac79e20d1b31e7230e261284502ede8091adc6b8cfdb462e8c4ad57a2cad651 SHA512 3f6229fd9d284053f348f8180f9b1f1c1f1b711b733ff9a331b2f16ad6dd0c46a38ec17c8c8257981209230ba769b7cce349b64bb7f6f8ea6150ab9d6e483b8c
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
@@ -16,9 +16,9 @@ DIST bstr-0.2.14.crate 345490 BLAKE2B 96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d9
 DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff SHA512 a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
 DIST bytesize-1.0.1.crate 7629 BLAKE2B c1f969f809abf5ac432e8590158781c26d11448ff0590647f2d60ad62d416a9f93e8bf1d5a650a40cac21bda90310c02f323bcc4fd1e2ee122de1588aff29352 SHA512 99a11059c27ed3c0279acafff1c0fa27fb7e5021876d2ad3a79ff8f31030fdc8a1b5969063ec6578499412804564cd3cb325c9198196bd4a078225a47179f605
 DIST cargo-0.43.1.crate 1119258 BLAKE2B b6ab277b4c06064fc7ba84f829363a5bcc2e484136b2f50f75354234f6114bd424d2f88952dc45c7f671751cd1ebff3ba3076c5cc648de0550d5ef1e122dc3ab SHA512 950e6f30643b38c90bddcb2be34f02c7e57da1e3f8afeb2f0f1037d93a877928064748339b40ca520ed045d36ef5c25a8bb3ad294316fe657368cfb50163f399
-DIST cargo-0.49.0.crate 1312720 BLAKE2B 700e677b5b2ec9567219bcb3103829542d459e5ef79a40093626cf056370176c68be008b741a21684661661cb079c085869e56bdaa21d5eb6cc0cd4b9884c6c7 SHA512 2590a4a71f756e5f614ec500be39c08c627994b6c3fff76c5d5c7fbe06bd7bdcd4fe1bb4971b54eb4d8b5b10780931fdbc1a410c049d97ee84b9eb8c2502a6ac
+DIST cargo-0.50.0.crate 1333002 BLAKE2B 6cc353a73d89d797b52905916153261f72ee1308663e3640ad4ade08a91d9d61316cc943628493c8890d0798603857f2aaec7d066c2cf86a68ef03c8666016c5 SHA512 f4bdcedf2bb4789887e27b635a365db419f4c4b9b65c31a28919a45ec5254b1fa6167e3d78598d73df95e31b6e208f9287ade64742eb98ef31cbf1016fe72d68
 DIST cargo-c-0.6.2.crate 19994 BLAKE2B fe2c9a8eabaf940082628ffcc481ff45640d16fd95e6e9dc8fa447aef13569db3257e73c81b1b0abea6a61aa57ca2a86eccc28f2a9ecad9bc698c6e73f9fa6c6 SHA512 430a5c96ee230419b79d80cd979d8baf59ebd93bbb75115c0c77dcffac1dc6b1c9bdf1e91fcf45619d3aca608f91573e854dd41921c1cc2a53655a7d7c7c8f0b
-DIST cargo-c-0.7.0+cargo-0.49.crate 28605 BLAKE2B 9d202186eecf8d42799338277b583cf2cb6efff1f98d22442070d63c57599bbe6201d20144172a210f7c1e2334a8e8d61c3c89e7113d2afd2f2b17b944a85d0e SHA512 d76147240b30811f6085dca040a68ee90d3304d38635bdb594d8cb04089050b687322a05cffcaf4dd32f6cdeaa355a983b8b6cb2843df40dc7cb3766b3df6342
+DIST cargo-c-0.7.2+cargo-0.50.crate 28412 BLAKE2B c3b3f56896d9be78518dedda8d49af6f90370a080ad3c42fd99c3f2f313e9bfd2fd39722ab617300c56aa3971a8a0a6b27e6c08087d99f8be168ac66817543e2 SHA512 72cf79ffb12f02188dc5bf12d656abba8c605c392832ff1f754eaf0caf72513d16d973ce2fdd2248179199b17578f14e0c4f38d90bff04e77bebb4698b3afaea
 DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
 DIST cbindgen-0.13.2.crate 160484 BLAKE2B 9c69f957305c3bd2c3056b45875dd2115309f01541bec4bce718f5d843dfb5b3bb6746474fe8149c42c194922ff618d9e3f6cfff13f7cf9069afb81d2da3e569 SHA512 2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66
 DIST cbindgen-0.16.0.crate 178160 BLAKE2B 45e6d3054582069abeeb6ac9cd54bfc25392eff48b84ae6d5f05f1a7d416caaa0194889c6ff0aa3090fe6eb844087f5ddc3a7be292d341f86c221d86d646e662 SHA512 aca6a783f4347bb977d115b5a1ae8c532b0cad1509a6ec0ddccb4d5f043c59de1242b4f1f4ab081b7ec04f67b5f137b614ab71374377efeb7b119043b47e089d
@@ -47,7 +47,8 @@ DIST curl-0.4.34.crate 84129 BLAKE2B 94397213cbbfcad521bddaeeaf0b8e394223b72871c
 DIST curl-sys-0.4.30+curl-7.69.1.crate 3006445 BLAKE2B 80c932b9e9d847258e2704a47af3edf028581a076df784b13e99af639bd9788c564bb8ed6b07900f5660a662817bb75fe3282c3ae2e2118fa26045871fed80eb SHA512 34d4e520d25215b35af150a217105cceb3934706c4170eb2e42324d352b6778e82bf23be3a3ea1cb73ff09d7c0bdd20548b6396d6b0ebe1cee4dfcb3c3c0abe0
 DIST curl-sys-0.4.39+curl-7.74.0.crate 2878786 BLAKE2B 4aa2fbafc3aaab6738c7c8433cdfbc3d1b7c0186ac630d0c097fbca7c1e5251c37b56a97eb78d0864fad281f3a53603bf11709f097ff092a90bb8ce1c9674a48 SHA512 ce13ffe129f62f9967f15d18cefbe9c9c38fb4ad2fea9dd8b736981199c89b7ef8ccef2d7411b0f007c44a81bc1a357014a363bd0e715aa9311a517b04e7382c
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
-DIST filetime-0.2.13.crate 14348 BLAKE2B cdb21f88ba00293c93f4831ec81b1c5468d6ca88fc58d3c3daa106c5476089df630ce6082280a77bf6da881dd95f3000f4abeb2469d8aad4d0efb6c3bdd80a2b SHA512 ba7d31b0946bc30782feee124dd904b4c3ba75d1bd81131e3bef06faeb019b51e7cc436a4fe86f3dc9615900fa27bce3f4965f13472ead173564054db8f6f786
+DIST env_logger-0.8.2.crate 32757 BLAKE2B c4f9cbb8b313bc68e2ce8baa354fea3c357d5b484cefc82390476efd49de8d4e84baef657289be5817b14d8fbfb4dc0885b134c3b0a842cc385653f1b149677d SHA512 b1df8ba5b67c9896ef637281d26fc00b22239647fe8489e44c27c10e935d6abbe3c39d90b7ada1151d1fecc5340ad9c8b04afb3534ae04ba47db501fa146fc11
+DIST filetime-0.2.14.crate 14358 BLAKE2B 7d50e71b5a556bc24a6bcf737ec07f185c6d6a2ba2717d91aaba71ec15d1981c47dd6010e5a4278f8996e05bd49d04f3481f0b9e3156a8ad1da1cf39a84796d6 SHA512 f2e6e41b8b705c510e1f1932451ab8a0acc6a4f84a7a21880c7e69639a6aace7c5ed4f694ebf47d04ae6ff227f8d6c6733f2c4bcb953088531dd91b37262e45b
 DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
 DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
 DIST flate2-1.0.19.crate 73768 BLAKE2B 1cdce9db71ace32d45b90774cc0804f4f663d1193687e9487ffcb8b8962006c680449dcdabd296e1b1046bb3dc2d910a11106f24debea5c63f757b471fc33fa1 SHA512 6e802f351085ce8804afad32d9502980269e2c03e2315349b9dcdbbb6895f61c89fbde822e31504eb00d94e665e1a8186ea3d128b5b612c61323494a8dd4332e
@@ -59,9 +60,9 @@ DIST form_urlencoded-1.0.0.crate 8412 BLAKE2B d65250a1d56cee26befb8733733ab67ffb
 DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
 DIST fwdansi-1.1.0.crate 8280 BLAKE2B 5c46e66a7fe25e02aaf42668853a0eea8ab3bbf9d160702770d94f8e6c4b3efcac9f840387516d1d14cf34271981ba095e3e0f7a5eb009b9d5837f94f8fdee3b SHA512 5f91a6fbc40b00a06abb6686cdc0389a837fea6513a9b9bde7cc4ce5cdb19c180ab21ecb5927c41a52c56675991ee10d127335c1f6d8c52dc7e6b30b32411370
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
-DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
+DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST git2-0.11.0.crate 158388 BLAKE2B b58cb940b2341acb458e0047a0758de26593a36f7dce30ae8386919dc50ef43a3094ed9ea834e9f141e9551491c1a5b7cb7cf93122f41283235fc75624d01cc2 SHA512 4625eb25e5e88c0f608917a5a6a574372942bde8697f9e2ac1a8198c263a89edaf42cae6738dc87343b1b1359f56462886a3551e9f41ac6c19837996340ebfaa
-DIST git2-0.13.13.crate 178908 BLAKE2B 8d7a556ee3368254261bd4bea23c02b407ffcc30991196064dbf23167a4479f50e2fd099aba2ec02bfea4c8c7f012d5dcc544c42f94573af1b5f20296717719b SHA512 f98bf48c925d75fdf4d661cc36a7416236ca3155a5b4f6d0a29abba484b9a48a947d92197470cad25f2a16acbfd2aa6f0d7836cde73480a42a0e50be734e0c96
+DIST git2-0.13.17.crate 181726 BLAKE2B be159d2f3602a65b133d6bdb3d949a48b34029b7a491961469d7a5a6dd8d471b0460ea53e802f69a216ed6111d0329e8a8ee29024af3753a185258f1268b5ead SHA512 5d95ff8d5c62df55b9995f2319dc350dfc9c44b90bb594f6b90df4985f8ebed50211e380885826251aa4e86eef1cfac99f648fba5f91cd4b725b0d05b3800fc9
 DIST git2-curl-0.12.0.crate 9340 BLAKE2B 231859e1358e7237e683c4d243f184170fbecb49f69eef611aa92c34afc7fa86801d1be7009e6e37435a6387339ae7f92acf5a717047ed37280e20133415c594 SHA512 ec047a4a11e49c4c4ba2f132b8e6f86e52cce85cb1eb5337ee069d39033bc85234f71a7990d3357de5cc190121c4ad4ab3562ad5aae13298d830e508e182e20d
 DIST git2-curl-0.14.1.crate 9336 BLAKE2B ac2338bcc95315dfbc1528e29fbe7e16a4442b2e2aa94350b0f7e8a5d643db60f901d99ac5689c1b242335eee78194449c64d3e7082a2f164b6b80fcf3100134 SHA512 bd1f074631f902c1affd167db0cbff329aa07b2a46758af97c71dfbb5308a82562efa2c42e21c5be63d7c93bc1052d688beb71cfe1588a4c2e9705679cec5a1c
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
@@ -69,14 +70,15 @@ DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e
 DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
-DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
+DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
+DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
 DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
 DIST hex-0.4.2.crate 13385 BLAKE2B fb185e0888736515b8c1c4c00f831f1a4a7b2a04bc0262c80bb2425563b3ca8059fadeff8660ad738bcbb522d432dde98ed6b14aa1fb8c03cdcfec6ae282a55b SHA512 b37504fa6e41caa77c924b24893a7b505330aa8c39501b3ac283fbdffa9af2b89ccb9ae004ff415af1c813fb3da222dba62f17bb3b6210a259661e2312d099a5
 DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST humantime-2.0.0.crate 17374 BLAKE2B 35f36b30d8fe3cb26f666dd57e31ab93924cf9d1c40d6c83cbf800f141c951634fcd641634a8f552baabf858303570bf8d1207e5455d5129f433d0c95b138c35 SHA512 5686246351af000cc38d10f65bd6cf3fe446dbedd75867f9bfc7a68c4b8183ccfc9e0cf14b7fa149d912acbfd9ff917d8ed5be3b5eab7832d23bf573a8e024e2
-DIST humantime-2.0.1.crate 17381 BLAKE2B 254f2bc0ea87123b49c22e95ff2218abb5f611918ae5419b960b472ce3402c5baf9d66c3a586b0ad9b10639473a0dcb660b8a8d79f86e5d6bd48768cc6aeb0f8 SHA512 c3cb464801fcbeea7c04e148cda2467386b7f008642d2641bdffab85784c16aa2708e847740772674d62b746c66d404e3b8307ebaa9c2df836fb58b3b0278e62
+DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
 DIST ignore-0.4.12.crate 51983 BLAKE2B bc0e8c263b8f128ce53761bd225249f08cc81c4301eb496c8503e468832f5dd8d93f5e0ffaa5b5590cda3ba94c3b861cbe96afc4d3cd309d1aa3030224bfebd1 SHA512 5e0afb4094ba87051dc5c545aa673bfe86fbed4dc33462f444992177d114b18400936a2a018c44fc19503951645667f16504144548753a52df3a9ebb167c0c72
 DIST ignore-0.4.17.crate 53056 BLAKE2B 734e74210f13e5ad08864cc8b143fb780383cd36048e78da04a0475eaa760867dd4a385b37fdfaff0c5aca946d4aab19c4901df0833271a3ba05887ea5dec9c5 SHA512 52380126bb46478875093eb39972949625e1d9ada6fac7148faeccc22807d8e2a1e41c34549e7d9f884fd3cd6dc3d42b47a88b5b6de1089d7e3ee8014b3aea35
@@ -84,22 +86,22 @@ DIST im-rc-14.3.0.crate 180179 BLAKE2B 6d41f9ba59c722b2c830e48f47b1e58a65888796d
 DIST im-rc-15.0.0.crate 182171 BLAKE2B 94605a89b9f375cc2e0a60f107db600ca57b7f342d1d686ed73a24d9e4851d790b71293b0b0440262ee45ec94defa8780c7611969fbbe36532b328964ef12c22 SHA512 4be0ad2ef6272d39b3305dcf50c97836839c4917163c030ff2a950fb16deb4eed0d3026f09743479b344f9f688419449e8732923ee1146aa655ff5aae6279003
 DIST indexmap-1.6.1.crate 49644 BLAKE2B 605929e1b6b3473171fb2af7500d769783d7e3872244800c107664fdd7decb7603bd3657ba208d3022a931fc499bb2c2e6b8aed85f880d3ed1deb827dab70703 SHA512 a859cf4f2db46fe753aae0562ba6ea32dd529789a29784324e82b03f64f42a4f302789230ac298860513b1cd8cb238b7a150f6f865d342d606fcb7a2787f9a03
 DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
-DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
-DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
+DIST libc-0.2.84.crate 517732 BLAKE2B dbffb14589552ecb7a6f610afd01feb94d3f5fbd44b5f03eb3f8ffd855d1e8eab4a397e3d40faa854c7ab364a65d11fc05118ecd401b5fe6a6972a82980259b0 SHA512 acbd268e02f360907c6939805973cb45f1f474f71a09efcad9c6a603de9c814a4912764c30ff8c929e06a544bf3e03eac08f42acde33a3edb4dac479f257eaa7
 DIST libgit2-sys-0.10.0.crate 1530695 BLAKE2B 1a46359e2a61aad9f3dbb6eca54325bbb8e39c99eff53b4877796b8007eab61801ef7ff9c7331352396c689b134bb42e2d50bde42bacf2eb7aebf97a75c8a272 SHA512 3e86cf98c01f33a242ff0117bebd1a2dfc33100ee00c46cf538d61eae56bda4b93d479baff186837d5b8dc1ba7fbaf1942287df0487a50ac23cc75efe3a1cf7d
-DIST libgit2-sys-0.12.15+1.1.0.crate 1610175 BLAKE2B 0e2810c18b39b2788839d59eabd602636413ff8a3501474e39ebac457067e811755c41a73e7dbb35ff90f5a402afcfb8fcfeb3a7f573a2d4901204b7272cd98c SHA512 0649a0a30e30afe08cccf356c08819ce0b0f57a6cea23e87d2e7deef88e4ef6513f07d04cbc5b76d125587ab3b7752d272c380d1a22b6a23cb965bf1f9698417
+DIST libgit2-sys-0.12.18+1.1.0.crate 1434936 BLAKE2B f283177caa941757388042ca4578394e160ea8e5776f6b4d842f778218286ccf65ce2febbfc780606d7624660224b11a470849b4d61302dbc11b3ba5e8d1b49f SHA512 3d9be57074e15bb0dbed151804d401d4688a77f1d46eee171e39b00815a983c103b614509ea0bcbe3c1355fc6c47738fe9da7ef6b8ee2d040fc30062db701233
 DIST libnghttp2-sys-0.1.3.crate 2307977 BLAKE2B 9f0ba44c0b9e51fed1b71b9b270c20633dfed6f066a150c8cf6e4be39f08e3f1bb3a606889b9286141a10cf02aeb0ae9610571e2a55ceb5eea718426dd824a35 SHA512 d8bf63f230ad394f39c3e66226bb9bf2ce9dd8931480d3bbbefc335ff9b54cc9517cfe29c69c0bdde9fdde2e81ab2e614c2650704ee34cca88998fcf52672d68
 DIST libnghttp2-sys-0.1.5+1.42.0.crate 4457076 BLAKE2B c36a7179602b00b88f98efe5b145209b7ec5f4c21b7012e781b9083b287bdf2983b9653532ba140b8afe179b3d4d730e7f156f4a2eac3c645c02a2245ab61462 SHA512 b6abb369f0f5ddbe31efbd21b22ecbbac5d5d8b9feb5c133949c9f532e80a4e57c13bc26cd4da406961190c47ca090e98e8f260c1cc86e01d955805740c13a51
 DIST libssh2-sys-0.2.16.crate 471055 BLAKE2B 4ac133a98f466a87a441f72fc030799d38bdad71496aabcf7734f4eb0d46df53ca1a5258d899e07909aeaac37269d0d6a05ca6153635a2dbb41c2432ebb1a3c4 SHA512 ada58da5ba71d577010ecae04504c9542ca5ce13b7d1f56b3408e018d28f7a3b39ab4821e82e1b212fd52a9e80bdc57d944651b33e923602b26153caf81b2400
 DIST libssh2-sys-0.2.20.crate 482687 BLAKE2B 1c35f69b06917df083f656ffae04791b5f748360087a7f4e07629b5795af7aa357541730345a1b209ab22b82810c55164dc47b9c6d8276f62ddd0bff6f750c85 SHA512 1528436d63d13dfc48dc55972fe1c7fdc7bdebccd4c2d046a9ed7f020eec6660f4bcee9cb562f6caaf721afc2f590ce4bd4cd00249a62ddf45211b436767e93a
 DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
-DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
@@ -111,13 +113,14 @@ DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d9
 DIST miow-0.3.6.crate 24533 BLAKE2B 232aac1d3449f2542c8fc21c9796932f478a4317a93e505de2113c6d980bba2c03a06f74d00a3abac79b689cbfbb06b5a4fa0b6778c9866bb67053111ee16d8c SHA512 13ef93e0965a2c5e561e7252407a0db03dd0811d076f20a6174a5c2ee28c49f1c340688d0ccb913736a1cab1c764cc719b61fa670f9b707f619b70797cb81ebe
 DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST once_cell-1.5.2.crate 27660 BLAKE2B a5413b7826abee1f700c55d05cbd942c6348b3d387217bec8f0de5188c3c8d14c76c216353e22e1dc7e2dfe1efa848a188af31254e3656e5484eb0cab2802f61 SHA512 63e7977e10a8b1eeab4c758bc03dfe7c78cfdd38f12667fc1d4842c657b8a4a2c0e46c21d7201a0fd5ed613055bedb8351e13bd2a4fe906d7fee0d51d67097ba
 DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
 DIST openssl-0.10.28.crate 189106 BLAKE2B f08547bf5636fb83aca04d859b5ca9fa790943ed866f52d2858da0b9304f07d80540e61a5eabc4da45b242789d2e8ca43af0ba253cbfcb072ceabb7d5a54a2a4 SHA512 1b8ee9409b6e3426bca45530250c89ede93ef420058f79f7c9674ee6f33e826815045d9ad9ef78719c449f6f8a02b6216b90b6b048562fd8efbad7d2b151d09d
-DIST openssl-0.10.31.crate 195472 BLAKE2B 9dececcfd2725471095f72108e70adda4d69877110f85b2ef186400e5b9fa19656f6c9fbe0ff3134d961812b3167e7ec3e77284011393c4d990591eb8474acd8 SHA512 b8844e982e012a084079b77de3de6729994b724d95b05731c3e134ce41669b3b7777d468e948bdcfa57324c4e2866b8d700e42b1da02e3e5d3d14a3c3b3b18aa
+DIST openssl-0.10.32.crate 199469 BLAKE2B d8dd269501a1991fb9ea27367a17674ec74265ea4281121aa114b18aebd821425d8cec43177f395542a1ee3227b1023d1bd4ca8c261ed194841e633d05735250 SHA512 dc37b5bdab49f6fab6c1b7610c89b5d9aca7a432f341bb10fb7c2a1132f42db63eda0c0bc4d82130e1bf3b521436fda1e0c1f9f1091c060621602384ea649962
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-src-111.13.0+1.1.1i.crate 5087843 BLAKE2B 89502daf1795de99e730a471acb58402c5cb1b6ff1b051870de7d220f585990291a80429c4a71b3ee8389b405b5ef12fbf8975dbf3fdea0d9810460cb50bfd12 SHA512 72d8bc3fc11197e6cbdf506e98bb512b89affa405795673e58e6005c0a4a177a8dfbafc2292ea788f8b2d3c1720a84a4223618f8958706d5738254ae5650e7f3
 DIST openssl-sys-0.9.54.crate 45751 BLAKE2B 7d21482f56568cdd7f8d02063f1c9b51ff355d67d20d44397f31332dccfbad36af9d6dae3294eb28feaf607b5ffcd13437ccc28df2ff0e43589b5e51c5faa012 SHA512 3c3271ac3b3825c6b8182e3d699835a4d73d774b43e9f694f4d9f1b9644de9ea1b8d8bfc2b98c9fe7af4c652d0eb7878001cd688f797d3b81bf5c8a72fd0334e
-DIST openssl-sys-0.9.59.crate 51178 BLAKE2B c29fa2d5d18f0a3fed73d231ce663dbfcfa8bd71b4841dc7dec9ae0057de16d0b353582330f5bc290edf55c8dca57d7b43787d52c86f12fe4d79c9c311920304 SHA512 dfc51d3cd90978a3173f4242f5f1c1848092680a042fd0735d4ea4d5793eca435a733173110081ca50ccae5fd8f75109bd5337146b7930872edea0e84f655241
+DIST openssl-sys-0.9.60.crate 51509 BLAKE2B ae3a9396115f1bcf9896ea49b0144b431b92491c4731ab6ca83ee7c99c5a38a727b008dfa837b09d80689c1a638fb57628066a4d8a85b3bb539f5e2ecd6b918e SHA512 6d9ae277c73a4efc567fd34f23e424cf6107b10f71b7e6902361dc33f514cbc8702718060fcda31c60ff65571fa29d7ea468f94cd9b8e3b37e85611f1d5adab2
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
@@ -133,16 +136,20 @@ DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf
 DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_core-0.6.1.crate 21634 BLAKE2B f059ef57238977208711b2b25f96682f58a5e935406b24a91cbbfca2cea918e764c512efa8ed8d77ee8df1fa3aae1d887148c5dd54cc0bd82ff14ee2dfade0f9 SHA512 546c1cc6064f22fa2b0cda1e42329aa7da1ea3be9b6aa277ef97de13067f28c473fe7f5bae4cf4151693aff31df3e57d6e99c6ff10d8fc79f94154dc26d19bf3
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
 DIST rand_xoshiro-0.4.0.crate 17029 BLAKE2B efee418e99b15aba76385a4320da667554effdde4f5d19dd55d16c1069d7915851f64526d4b4c9ed1cb6e5827572c0c96484f13669ff233baca124377ccbd48b SHA512 e889eb75ef40ad52eaf32692b3a405e01eacfeb20e0dc171de8f1b2ce05723ba448e293a2ee91eb3bec3cb5a2667bd05c11433b50470eea9219586afa73f519e
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
-DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
+DIST redox_syscall-0.2.4.crate 23234 BLAKE2B 2190c072fcc0d5be9823353427e5ebb3277a9452dd9c2320f7b46168a3d764f8a2e9215f333a72e272b6d021de7141c76d25e65210e70a6b0da6a7cc987a281c SHA512 622f38ed962f7647299bcd4a742dd137c63450d5eb85d74adfa4b72951144b9920eb04d4af87e9c679c4bd47a985c528a8e56bdc31b15f4c8cd85e6b1bbddfe3
 DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
-DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
+DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
 DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
-DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
+DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
@@ -157,20 +164,20 @@ DIST semver-0.10.0.crate 20503 BLAKE2B b27e780828e383a0baa0edf99d36952a847b10ffe
 DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.105.crate 73358 BLAKE2B ef75efaa654a5980648e8418553af18508f95b29fa1441f0804c78d9f8fe91764a3565ee1138c96c9245c28ed2ed8082d08c50f8ff36b9d40b12456a758ee289 SHA512 e8b471769b696b0c7f3b673879dfd056279fb49dad0228bc2ec459a2aa8bd26073d40ac1809a42c0b5ab3e9abfd32252f812c6493d17979c10796e7ab78a795f
-DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
+DIST serde-1.0.121.crate 74568 BLAKE2B 99535f0b8773e00baaf81023fd3e6c2a9f51c438a13487d3814e85dd40d5cf7652e902a07854906f146a01ecbabab3b35954457f343edd55fd0a35125f107d0b SHA512 08e93a23b13c665e6ab5daf8f658e025a50a7d93a7b4fd05cb2ec8273fab38acc8f22e10d184bfb080fd8ee925c69879379a3719ee330627b3ef28f9d1e06d6e
 DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
-DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
+DIST serde_derive-1.0.121.crate 50683 BLAKE2B a66be304196ad2077872a5bdfc0b47aff9149ff21347666f8207bae0d82d6de4a8df5bda47533f2dbe2b635b5aa79e4a0ce4371183e530c96dfe2707b6fac379 SHA512 6b58907d52eab18ff069d0f67c0005e384b92442c733f6acdd40e0b6106f9fbd4542474c9f41988a19bb69f34e156c987e108f0e4cdcf002dfe1d772adb4631a
 DIST serde_ignored-0.1.1.crate 11083 BLAKE2B 990f549b8b4fbd6b67f5bfe06fa6278f357ccd1014ee3a95561a09edab7f7f2e209d80c59ee749c6bc7524a07f0b357601e327d2f96bac0cfa514b3ea73afeed SHA512 1ef241d6a22f47c22305da613554e7c62cab00584e06c81381eab9c1e3e12e7ea9a516f845a5818b33bcbe72ee7dc9be686598bfc0121b400b0a8e165c8941e8
 DIST serde_ignored-0.1.2.crate 12179 BLAKE2B 45b8cab135fac2d7b23443462fe630212ae170207061f968540dd2b86a1f8c1203a185dfaa158f87dc36ceb8f769ea6c57e67c1497f2374444424237b7275af2 SHA512 c6f76051a5397615eea4aa953535ffa227cbdd6747f8f2ed0bf57d0a0b7bfa71536d8372a6cb8eb046b9a761e36f273e019754f607e6c84ae71bce25e25132cd
 DIST serde_json-1.0.48.crate 72113 BLAKE2B bc522d0924044b41548b5c0ca63ed3e1fe70b7632b9e04ca6b01a63245deeae0e7154b0d913b3edfeaecfc816c1edfebfb666734c2a5371b416aaab9c1880f3c SHA512 544dd844330a26fbdaeb5246825f143cf06110065089c8be3dc44f8437f797ac083d7dcc5181656ed3d78428fcddc44e6802544ae304466eebdcd625a5a5fef9
-DIST serde_json-1.0.60.crate 114828 BLAKE2B 8f8fcce30049b0f20ed4e11ce9323afb5edcb0f05a3a5e226b15770350147f27d6fc2cf242ced0f5b76c85c78694bf342ca084bcfeb18ea7d6c9e2bac5461f78 SHA512 c19262072cc2dee3f7e047e45ef3f02df121c9b1c9dc6f16a20f5fcbc0fb1bc25e87342358f9e9ac86bbd5f5d6091a9cb56256c04e22f3dac671ed23ff64d9f4
+DIST serde_json-1.0.61.crate 114887 BLAKE2B a06e2b3572b01b57d39a7df4d4c333408594cfe80b6b6a810f8c36479550f56f085cbd7e693d3c27f307bf0b49eefd34f55bef1872a4a0318797e4b9585cce9e SHA512 ff626602b547fa8e48c37251d2f6c91633fd45b49ed8211e66a3174f52f9aafe8778238466e7deb5d5477ed23eea0091596d78894e0967d6978f6737ae115891
 DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
 DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
 DIST sized-chunks-0.5.3.crate 40643 BLAKE2B f08b893f2e32eee10372c75fd6bb41b667f004e044bf271d8a4a0bb6bc9f393662ed685aae3046ec05823f0e9c70b3b7e15c40b94bd22a5aa2079873d4b4c842 SHA512 9ffe2b6d0510d8cad010f4e3015f605ea0d0f4e27ded1fdfd7d7080e338bf239bec30fe85ef4576160297ad287ed006097ffc12151a2cdc578d7031d1501440b
 DIST sized-chunks-0.6.2.crate 40265 BLAKE2B eb02254a9feaf421460130345969ac244f8b46a536f6eae27e9fe55133ab6149f545864bacee70d839a492b81b790a9eb74a0f31f44c6f2d6ce7f470a6a2eb48 SHA512 524eb5ca27cbadc6b3a2ee32e4968308ab7fd01c961511b2c783338fbc0435303a607d92c2066a9dc1fe1772ccfdc0a97875da9a929e7cfcbbb8d0647768d26d
 DIST smallvec-1.2.0.crate 23658 BLAKE2B 7e662c79fb35e6965b409a63128da6ae6d8183992ab12f09ca7b97f15b2c7c29b1844c35cf4ff72d02d934481bebe5b2353a9c70d17d9f44a11bdcd496f2c201 SHA512 ad89826c1e999c63feb6d481e7ca3110831a08491ff8fc66825e92ad003a06b40033b365ba628c4707df06a3ac2c0d3b71e327c1caa4dc86f48150515031e52f
 DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
-DIST socket2-0.3.18.crate 33513 BLAKE2B 83d42f6a96b9c4ae023079204a5f4a1506abc7f133c78dc4d659c8b46a6a04e5e6ac51cb4e28188d7ccb4f51cb268dad1a42adc88acfc9844deac3b00efbe48b SHA512 5820d1f2de59dad6545c356e111f6c40248763a8f432d696288c7996acbc73dbb0f3800f421a2c2ebf1e712e3db7fddc1280f8a889ecace2cb0ca2956a073514
+DIST socket2-0.3.19.crate 33782 BLAKE2B 1ab3c61a439c1594e19c4a14958d0a85b54666532d16eaa9a1e40e586b7707b1c7b5a751fb373f16bcc26510abc25e0321808e721c0b33b7b04416b9f6cbc5bb SHA512 113d902ca0b966bc0bcad71e3b7d715c79cd075d9dd7fc4140a042bac91b3ce692fb0f1fd0216fa3f6286920b4a92e1a4c342d7ae8d1d98ded36e7480ddafec9
 DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.3.12.crate 50273 BLAKE2B 9d7493700cfed14a8f20cae73c807fd103623ec6502a76ec677ff6bdd5385a88d5d20a395394fa28be580ac2fac34aeb19a8fb0ffb8dd23a50e9551ce973e7a5 SHA512 a71f4cb68ff3cfdacc4600350e35ab040e7fb5c929f3e9649fc0d93f9ca74c6a6efc46e1aecaadf3690106cd281118a1c7c03dd7b265d532e033d437f5ec2e7d
@@ -178,16 +185,18 @@ DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
 DIST structopt-derive-0.4.5.crate 19402 BLAKE2B 921dd4dcd8d19556351afa37d6ed4b1f6f3d1e847a6a33d80ff32e8fb0674d595f467cdb0d2949ffdcb95d36d6ac12db7fa37ff6a4088b9622519619ee75af1d SHA512 34205ba32a30bda80a06ca8c0cad3b17dcfdccfefec027b95769c08682736fb1462c161bbecf047ccb5f8d1ec02dcee6313dfad4fb61ef910deb1b65665b419a
 DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
-DIST syn-1.0.55.crate 229095 BLAKE2B e46833d7f6a252dd95bde77040787f937b19a8a96e9ca2041d667ef7b7d824976d0513b49f899bffbca32c87c51458701074507e55e9a4b47a83b328db915681 SHA512 9c3e5087db4819141994470c912e5f4d09d22a8e7ea9179b575f9601ce78ed501cf76f8303237e519c17e8628764d5f547141f97cea88ce7daf4c2982b7c1399
+DIST syn-1.0.60.crate 231087 BLAKE2B c37be0cac1d9a5bdb7622fcf716cf2d7f3bbc1594f978ed98c84dcefce618c87bc8709ee491c0b9d01feba37d6db641eadf60d814df22cf80adc33279ce1ec94 SHA512 8474c40ce4257e3ee7eacd6f993745237181f2463067a9227bb62851d4a542657cd3811fd925c4e06c25909a5f69d9d8865a34fa479cbf3d5efabb1818e64d24
 DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
 DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
-DIST tar-0.4.30.crate 45211 BLAKE2B 9c1e3b2b7526c48854a4c4955f1d0cd79599a55fedd4a351249761007ab2c57da98a492f457558242a25dfea306160ed1dc2fabe66e4bfca42d5793f21ce5b68 SHA512 7cc921057a8b1a38e3eb03966313ea39812ad36b5694f383c9ea69ded9813ce3ff1c7bb0f3fc596d63630279722365a7ea0cdd034bc2cfeaa3056ff83d6201b0
+DIST tar-0.4.32.crate 45469 BLAKE2B 2e0425c4e0fe28244dfd0099091f3b1e5ff3c58f9edfc43dc8776564ab9e2fa0484eecd2cee3e7ab9b180b009e589882e7a5deda84eaf62a5ef670a8bbe3510c SHA512 189ddc1d396d852694ce86e833a5bd10bcf47e742264639ebe382bf186088dac59098e3b526a8cac49371ab0b8fe1be298327ca05921d8e8b3a94dea7e94e1e7
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
-DIST tinyvec-1.1.0.crate 39037 BLAKE2B 8033a336c2c346df70d5c6161233043a7e196a2994b62c15aa022b7053f7aee686092fc7e2db551cd1a09ee5e4a038e777120c5c33c891bb47b71c78cac60e92 SHA512 29830cec393506651b20d045c584e3df5ce5f13fdf70e866d4d6b7e97fe4f6b07ccf2a2c64ced5b092d5d963af74f826930d96d817db90bc0e4ad112a399926e
+DIST thread_local-1.1.2.crate 12977 BLAKE2B dcad93f7e7fdd7dcfad61b2caf6c283398d28b3f1f9162f89b8a770bbc040f1dfcf6d13fb928a18ee93f89a613cf303cb6c073bc321563521c6a347a7f44afe4 SHA512 194d834eb0a1e66965c8d7ef5fe36dcc9b77f6102745bdc91f5706a29510a44ce8abce642700bea49e69e77beaa5dd770841c37199308e5a2793f2cdad5a5dec
+DIST tinyvec-1.1.1.crate 39896 BLAKE2B 7655703bb7c3eda6a4bfb78c46cd10d5bd195ccc9aae9b8eab78c1584c904a6ac1a75511952b7f63eb953590b0b3a3c436296c13b6dabba11d279931ca769442 SHA512 de8de26bdb39d4b2255099b85c116a95b7f563f27549816d360a7cf68f04d3940745236aea4c73eeb86ed5427ae5f65d8936f0d60dae9b16076827134d77281e
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
@@ -213,6 +222,7 @@ DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+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 winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@@ -221,5 +231,5 @@ DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cargo-c-0.6.2.ebuild 3051 BLAKE2B 049145dfd1f0ba27a92845082e12221cc9b04b5e6238ecff6490792ceb1861db0959224bba6e5c25bea273012724e420a23c95b4e6243d77c912e13b00936c35 SHA512 8b789d8bba907d3a46b17efc1471e8e8e25941b903727d5177994a0bee7904c5f5d73d332a9a940f37c1617c7d7879b5b4cc7c1f4ffa5d9c033d9b522f3e38d7
-EBUILD cargo-c-0.7.0.ebuild 3298 BLAKE2B 86eb973dcfb1024573c076ac5d63623ede11628976828bfaa81c3e68d66186feb952883af86c4d8ff3ff510d93c4d249bcf218be550b7d75178b61b9bde117f5 SHA512 975070dcc1a250382caa551be5165e6f26eac41ad54de419f71d42a4bd3d69174f60abc4f3a2c1686207f74e796b823eb430f519c33d623cf5e0a5396199b08e
+EBUILD cargo-c-0.7.2.ebuild 3259 BLAKE2B c3daacdeca4b7a787f0df6befa73bf036313e11eee532d6459129380e0db34e5963bc64f5f2ebade4f9ea8832d45f5d666f761ba99e6de584618cc9347ac0a28 SHA512 65c36e6e14c8a11bd9f04a4f62ce0dd2fe2d702bac0468fe2853c491d82ea2d43c543649c91408c103199f896f66a6898dc383d69d763b819903358dc804953c
 MISC metadata.xml 326 BLAKE2B ec5622ca2c87640dfe5c409704f1674bc53ef0ce4d0778227d3816cd4a151f5f09e3de1f09814ce98f5e208e04a5cc0a6c28dd1b9bd81fa3857b688d8e9eebb9 SHA512 f28238739f1c2d04cb617ac31c2965fb110b560e5b9bbc6fa2749f22cd4cb353ef6cda1df1d718f165e4ae56f5bdf66da9104f6440d7d0009ba352a877c1f3c8
diff --git a/dev-util/cargo-c/cargo-c-0.7.0.ebuild b/dev-util/cargo-c/cargo-c-0.7.2.ebuild
index e9fb83044277..7d804f9a64e2 100644
--- a/dev-util/cargo-c/cargo-c-0.7.0.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.7.2.ebuild
@@ -6,22 +6,21 @@
 EAPI=7
 
 CRATES="
-cargo-c-0.7.0+cargo-0.49
+cargo-c-0.7.2+cargo-0.50
 adler-0.2.3
 aho-corasick-0.7.15
 ansi_term-0.11.0
-anyhow-1.0.36
+anyhow-1.0.38
 atty-0.2.14
 autocfg-1.0.1
 bitflags-1.2.1
 bitmaps-2.1.0
 bstr-0.2.14
 bytesize-1.0.1
-cargo-0.49.0
+cargo-0.50.0
 cargo-platform-0.1.1
 cbindgen-0.16.0
 cc-1.0.66
-cfg-if-0.1.10
 cfg-if-1.0.0
 clap-2.33.3
 commoncrypto-0.2.0
@@ -30,72 +29,71 @@ core-foundation-0.9.1
 core-foundation-sys-0.8.2
 crates-io-0.31.1
 crc32fast-1.2.1
-crossbeam-utils-0.7.2
 crossbeam-utils-0.8.1
 crypto-hash-0.3.4
 curl-0.4.34
 curl-sys-0.4.39+curl-7.74.0
-env_logger-0.7.1
-filetime-0.2.13
+env_logger-0.8.2
+filetime-0.2.14
 flate2-1.0.19
 fnv-1.0.7
 foreign-types-0.3.2
 foreign-types-shared-0.1.1
 form_urlencoded-1.0.0
 fwdansi-1.1.0
-getrandom-0.1.15
-git2-0.13.13
+getrandom-0.2.2
+git2-0.13.17
 git2-curl-0.14.1
 glob-0.3.0
 globset-0.4.6
 hashbrown-0.9.1
-heck-0.3.1
-hermit-abi-0.1.17
+heck-0.3.2
+hermit-abi-0.1.18
 hex-0.3.2
 hex-0.4.2
 home-0.5.3
-humantime-1.3.0
-humantime-2.0.1
+humantime-2.1.0
 idna-0.2.0
 ignore-0.4.17
 im-rc-15.0.0
 indexmap-1.6.1
-itoa-0.4.6
+itoa-0.4.7
 jobserver-0.1.21
 lazy_static-1.4.0
 lazycell-1.3.0
-libc-0.2.81
-libgit2-sys-0.12.15+1.1.0
+libc-0.2.84
+libgit2-sys-0.12.18+1.1.0
 libnghttp2-sys-0.1.5+1.42.0
 libssh2-sys-0.2.20
 libz-sys-1.1.2
-log-0.4.11
+log-0.4.14
 matches-0.1.8
 memchr-2.3.4
 miniz_oxide-0.4.3
 miow-0.3.6
 num_cpus-1.13.0
+once_cell-1.5.2
 opener-0.4.1
-openssl-0.10.31
+openssl-0.10.32
 openssl-probe-0.1.2
-openssl-sys-0.9.59
 openssl-src-111.13.0+1.1.1i
+openssl-sys-0.9.60
 percent-encoding-2.1.0
 pkg-config-0.3.19
 ppv-lite86-0.2.10
 proc-macro-error-1.0.4
 proc-macro-error-attr-1.0.4
 proc-macro2-1.0.24
-quick-error-1.2.3
 quote-1.0.8
-rand-0.7.3
-rand_chacha-0.2.2
+rand-0.8.3
+rand_chacha-0.3.0
 rand_core-0.5.1
-rand_hc-0.2.0
+rand_core-0.6.1
+rand_hc-0.3.0
 rand_xoshiro-0.4.0
-redox_syscall-0.1.57
-regex-1.4.2
-regex-syntax-0.6.21
+redox_syscall-0.2.4
+regex-1.4.3
+regex-syntax-0.6.22
 remove_dir_all-0.5.3
 rustc-workspace-hack-1.0.0
 rustfix-0.5.1
@@ -104,24 +102,24 @@ same-file-1.0.6
 schannel-0.1.19
 semver-0.10.0
 semver-parser-0.7.0
-serde-1.0.118
-serde_derive-1.0.118
+serde-1.0.121
+serde_derive-1.0.121
 serde_ignored-0.1.2
-serde_json-1.0.60
+serde_json-1.0.61
 shell-escape-0.1.5
 sized-chunks-0.6.2
-socket2-0.3.18
+socket2-0.3.19
 strip-ansi-escapes-0.1.0
 strsim-0.8.0
 structopt-0.3.21
 structopt-derive-0.4.14
-syn-1.0.55
-tar-0.4.30
-tempfile-3.1.0
+syn-1.0.60
+tar-0.4.32
+tempfile-3.2.0
 termcolor-1.1.2
 textwrap-0.11.0
-thread_local-1.0.1
-tinyvec-1.1.0
+thread_local-1.1.2
+tinyvec-1.1.1
 tinyvec_macros-0.1.0
 toml-0.5.8
 typenum-1.12.0
@@ -137,7 +135,7 @@ vec_map-0.8.2
 version_check-0.9.2
 vte-0.3.3
 walkdir-2.3.1
-wasi-0.9.0+wasi-snapshot-preview1
+wasi-0.10.2+wasi-snapshot-preview1
 winapi-0.3.9
 winapi-i686-pc-windows-gnu-0.4.0
 winapi-util-0.1.5
@@ -150,7 +148,7 @@ DESCRIPTION="Helper program to build and install c-like libraries"
 # does not provide this value so instead repository is used
 HOMEPAGE="https://github.com/lu-zero/cargo-c"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
-MY_P="${PN}-0.7.0+cargo-0.49"
+MY_P="${PN}-0.7.2+cargo-0.50"
 S="${WORKDIR}/${MY_P}"
 
 RESTRICT="mirror"
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index dc0be1f553c8..80ceeac622e2 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -2,8 +2,8 @@ DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST cbindgen-0.15.0.crate 181832 BLAKE2B 01ba21eb1c5bcd4e562ee2d43c839941a69fcc45d17b31800c54016d815c2fcd998176b96108d73b0146a62924315eec373c3749823a5219942e68cb483f888a SHA512 cb0868ccdd5ae8f46b3c07f7f06bfad0583f2eda5381e4404a679814dcaad62ce95c9c16c22f00dedfaa2b78f25f1e5f3404a3e515ab50cffac05d1e6f936e60
 DIST cbindgen-0.16.0.crate 178160 BLAKE2B 45e6d3054582069abeeb6ac9cd54bfc25392eff48b84ae6d5f05f1a7d416caaa0194889c6ff0aa3090fe6eb844087f5ddc3a7be292d341f86c221d86d646e662 SHA512 aca6a783f4347bb977d115b5a1ae8c532b0cad1509a6ec0ddccb4d5f043c59de1242b4f1f4ab081b7ec04f67b5f137b614ab71374377efeb7b119043b47e089d
+DIST cbindgen-0.17.0.crate 180231 BLAKE2B e272dfa70c13535b01cc9d938f6240088edb91a643c017929586a402071b2dcc234c9019322d5dd1c294743da13d477b3c86a6af804132912670184671a481ce SHA512 ea8adaa6cc1d681ef28391e1a3b001c250d9a90a9961d02d6666582d7d98c79333ba02ef3ff8df6bf375f0c371e72aed1b8bc60aade26d36ab74ce1bbe70f545
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
@@ -49,6 +49,6 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD cbindgen-0.15.0.ebuild 1078 BLAKE2B 030a83c667ad7f0c5c31cbf4464ed3890b677d589b9b0467b45bcff7a65ba3cc1337b7052525ce971c1b4d075a298ac15c3d487e76bf542e4e72e197e6538a03 SHA512 6db7fe82e89d6349359f1bafb50f5e4dd8c80c891abbe3b0ed3380bee89918c072d796060f26a941f698f348a5fb2941e5f6189efa0ddbea2299c3af4b86395e
-EBUILD cbindgen-0.16.0.ebuild 1262 BLAKE2B edaf376e06bd6d4a8c737d44a0ff6f49a9eddc80a5600f6969769ede6a0c915c3a9970fb6877223476e4b801cb537463bd229a4d54c0f4e84da179a7254ea998 SHA512 1aa70da53fe32783011d7054044fce79dcb6ff4e564f681644487ffe45cebcd78c6d1211e39ddc82b9588764435d5e0a8f85ae96f51cd270f8d528cd740bf20e
+EBUILD cbindgen-0.16.0.ebuild 1259 BLAKE2B c1240ac649ca4c9bcf2c959c6b2a05bd5557e8acd93182a0decfadc44e3cc359e8753e02038bfd15e03dc9586e1a7ffd4a17b479213c4af629d69f0d25ddb900 SHA512 8b057dd1a1726033c7b2d9be0be536a662f5624be02c30aff7430206c3785466e08ce390bcd3a195d8a397302c70888660782f7a020b74424386f274e27136f8
+EBUILD cbindgen-0.17.0.ebuild 1262 BLAKE2B 3f4d12cb789d1b6a73ca60f5d62a9413b80dba2f95934fdd6b9dd137a09d0b626ffdcc3cc77e3ae882c317e55dd596e0949e2bc2fcf8075094c0d93e24e72559 SHA512 ef83b406cc0f41c91e8637ce2543359c210e25b0dda8b9e136058f0be640923b9a5e72d2f067012fc4647f59ae6f27b3c7265cd0e70dd0d4893628ad09e36d4c
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.16.0.ebuild b/dev-util/cbindgen/cbindgen-0.16.0.ebuild
index f89f82967825..070536dda748 100644
--- a/dev-util/cbindgen/cbindgen-0.16.0.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.16.0.ebuild
@@ -63,6 +63,6 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 RESTRICT="test"
 QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/cbindgen/cbindgen-0.15.0.ebuild b/dev-util/cbindgen/cbindgen-0.17.0.ebuild
index c2d3d1844a1a..570cf7278a46 100644
--- a/dev-util/cbindgen/cbindgen-0.15.0.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -8,17 +8,22 @@ ansi_term-0.11.0
 atty-0.2.14
 autocfg-1.0.1
 bitflags-1.2.1
-cbindgen-0.15.0
+cbindgen-0.17.0
 cfg-if-0.1.10
 clap-2.33.3
+cloudabi-0.0.3
 getrandom-0.1.15
 hashbrown-0.9.1
 heck-0.3.1
 hermit-abi-0.1.16
 indexmap-1.6.0
 itoa-0.4.6
+lazy_static-1.4.0
 libc-0.2.77
+lock_api-0.3.4
 log-0.4.11
+parking_lot-0.10.2
+parking_lot_core-0.7.2
 ppv-lite86-0.2.9
 proc-macro2-1.0.21
 quote-1.0.7
@@ -29,9 +34,13 @@ rand_hc-0.2.0
 redox_syscall-0.1.57
 remove_dir_all-0.5.3
 ryu-1.0.5
+scopeguard-1.1.0
 serde-1.0.116
 serde_derive-1.0.116
 serde_json-1.0.57
+serial_test-0.5.0
+serial_test_derive-0.5.0
+smallvec-1.4.2
 strsim-0.8.0
 syn-1.0.41
 tempfile-3.1.0
@@ -54,5 +63,6 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+RESTRICT="test"
 QA_FLAGS_IGNORED="usr/bin/cbindgen"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 0019b3583bdc..e11bfbd2b8ea 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,10 +1,9 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
-AUX ccache-3.7.12-objdump.patch 302 BLAKE2B dfd85c0448ee685109079d0b6d84342941d777aee0d0eaa968abc9f089173f7d9e63b97dcbc1618431815238de1c231d2454d4577b7177e63230e4806cce4d3b SHA512 18461643d1404b341f9259aea8163c5306c81155350487bef22614586c7ba355bb846d2bc2ebe2746ac781d7267a474933ed3baf2196f1d62bb3fdeff5c8d094
 AUX ccache-4.0-objdump.patch 271 BLAKE2B e641f1acef1e439660753c781d5760ab2a2530ce8dbcfacb1c3835523ec41ff35701536698827f11c39c1e06641fcf6b57d374944ecb44888a66c7860f97b813 SHA512 cc53f44b173c1ae66258aa573182ae936304dac9daf8489a20c45dbe3d554df207bd93b370da2c86b22fbc4edf5fd954f84fd18812d97d41a88ea4c7926f117c
 AUX ccache-4.1-avoid-run-user.patch 557 BLAKE2B 956ac163da6c8acdefb5b395549067272beea095e93686cf553d534c94d76c1c032ef3423f851907367006e1e7bc7b4afe1494bef1eb293e5aca2e3625c29c10 SHA512 bbdd370e478839980423777053baa42ce37cd18ebf8cd36d3f5b13d9252c38b17840ab6e71aefda20a9903bd4a85e4cdb4582728a9db9d1e847b0ee9569bba9e
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
-DIST ccache-3.7.12.tar.xz 354684 BLAKE2B b0b1028ede8206622c4b563cdc1351bdbe49ac11aa92d405c778af91db5bac029f7331371ef0a55bc3b1c7a0b60fbc5711277e048481bf0f4ad4b1be8acd3495 SHA512 0eb47869f86d36b3e5fad0d5073973f0444f3efe23fd14469a9e05154ea219228443098b1c5e4a8a0c5c78b4bfa7623735b50ebd6b8b4d0626766061850d6a62
 DIST ccache-4.1.tar.xz 389240 BLAKE2B 265ed6cd9602a04db0fadf63266d0fe1e78a74c69a27f05854a287e4048934d6afd63e71987bc525217782075c1a158601c400f3418caa0eb9730f34275bd08c SHA512 e80075eeea3fef8215de0a793e02381bfb59d7e74237fa34a49306047c60f0de0e678396ad3a9e5d86d3ad2aa21bbe29c7f0055f06b3ba2470f6895ce2eedd7b
-EBUILD ccache-3.7.12.ebuild 1531 BLAKE2B 135f010762040f4a6141d67016db66e4e10dcda9bf7e6a25733e1bda77988a50bccd52afc647e3227e71b05373f12d4d1317692672a89a4f1e6e5b8b9eea9fec SHA512 8b0a26a598f3cd704527e6657cdc393a1e13ab4ab83bae67744e8439a71761b98fc727b11b65676c79f972d90979a2b027cb2fdcb4a00fc5e71dbf5537b012a6
-EBUILD ccache-4.1.ebuild 1727 BLAKE2B f8284cb2dfd4a9533365f2b507bbcfbaa2814d645996f9463803d41bfdc1bf8e19167335842c05bba0a590e60a25e3e1d454808be8e95cfe6a34e50d1d0c16cd SHA512 0a25d48cc753ef90f272d670302b6f6472f8f427377071986aeb4f92df2fd946ae951e58736f9fe48444b456b9ed21e08386645acc615ac8b07c45b31cbf7fe3
+DIST ccache-4.2.tar.xz 422688 BLAKE2B 932db2e4f6ef9d98359fe44f931d083acb9fd32661d9baec5a2d0cfffc9301a999b04e4628d31513ec809bf43e3e94d71f9b92a1c83bcebbaf5e35e219596704 SHA512 b7e5823a0705b9a1100c959281170dcd682228b585c329821337ef57d5b5cf47d6f3d644a6d5a3675a32a02730559f8fe6d84d11f01847f47b77c0893d1d1fbe
+EBUILD ccache-4.1.ebuild 1726 BLAKE2B 26faa29d244714adedc0a6f7306ea92d39ab152be9ba623491c195207d6685a5e8b265fb264bfc75d8ee6679b0ea872b50a18656e517bb507c630b02c312340e SHA512 215de272d0ecb95fbb6acf0fd0cf5760c953d20fc922e39c1ef159034a4db82100911177f199c1a1b9ada1cb16723fbbaa24de4b15e3881b18e686ab8b6b09df
+EBUILD ccache-4.2.ebuild 1662 BLAKE2B 3747ef40e6edd8f35a9c2760200593bb93c222b5864f9edda872413f1f54393b01402c675a7e39280786d32f87f2a798286f6ab6c14993a366d76c6e7548eef3 SHA512 7538e49273de477d4bc77b8db6e093c5c222d59c5c25383677195399a89bce281d64014b8631ab107c5af05c04aef69f6872a55631fecaee3a81b36d957b5921
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-4.1.ebuild b/dev-util/ccache/ccache-4.1.ebuild
index 3bee41803c9c..710619c6fb9c 100644
--- a/dev-util/ccache/ccache-4.1.ebuild
+++ b/dev-util/ccache/ccache-4.1.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/ccache-3.7.12.ebuild b/dev-util/ccache/ccache-4.2.ebuild
index 5300a828d02a..3f58044c6822 100644
--- a/dev-util/ccache/ccache-3.7.12.ebuild
+++ b/dev-util/ccache/ccache-4.2.ebuild
@@ -1,62 +1,67 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+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"
+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="app-arch/xz-utils
-	sys-libs/zlib"
+DEPEND=""
 RDEPEND="${DEPEND}
+	app-arch/zstd:0=
 	dev-util/shadowman
-	sys-apps/gentoo-functions"
+	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 )"
+	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}-3.7.12-objdump.patch
+	"${FILESDIR}"/${PN}-4.0-objdump.patch
+	"${FILESDIR}"/${PN}-4.1-avoid-run-user.patch
 )
 
 src_prepare() {
-	default
+	cmake_src_prepare
 
 	sed \
 		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
 		"${FILESDIR}"/ccache-config-3 > ccache-config || die
 
 	# mainly used in tests
-	tc-export OBJDUMP
+	tc-export CC OBJDUMP
 }
 
 src_configure() {
-	econf --without-bundled-zlib
-}
-
-src_compile() {
-	emake V=1
-}
+	local mycmakeargs=(
+		-DUSE_CCACHE=OFF
+		-DUSE_FASTER_LINKER=OFF
+		-DZSTD_FROM_INTERNET=OFF
+	)
 
-src_test() {
-	emake check V=1
+	cmake_src_configure
 }
 
 src_install() {
-	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-	default
+	cmake_src_install
 
 	dobin ccache-config
 	insinto /usr/share/shadowman/tools
diff --git a/dev-util/ccache/files/ccache-3.7.12-objdump.patch b/dev-util/ccache/files/ccache-3.7.12-objdump.patch
deleted file mode 100644
index f5387104e453..000000000000
--- a/dev-util/ccache/files/ccache-3.7.12-objdump.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Allow ${CHOST}-objdump (or any other override)
---- a/test/suites/debug_prefix_map.bash
-+++ b/test/suites/debug_prefix_map.bash
-@@ -24,7 +24,7 @@ objdump_cmd() {
-     if $HOST_OS_APPLE; then
-         xcrun dwarfdump -r0 $1
-     else
--        objdump -W $1
-+        ${OBJDUMP-objdump} -W $1
-     fi
- }
- 
diff --git a/dev-util/cgvg/Manifest b/dev-util/cgvg/Manifest
index 99ee14d8ed07..df4fdb536dfc 100644
--- a/dev-util/cgvg/Manifest
+++ b/dev-util/cgvg/Manifest
@@ -1,3 +1,3 @@
 DIST cgvg-1.6.3.tar.gz 42130 BLAKE2B e272a42cbc2c5edf08459273eb9f71036ec1afde4d20bb39593028eaf40026b83707b327ef8892a39b1e6f0f399dff3b52f9ff023e9092e26439d1e935da99d5 SHA512 9aeebd0952fc6a99ebeca54bbc54f9ff8858baed3b6c16ae391c033ba6ec6c411e34da88e25ec1208c8f0c536a47424ef09af15bf650485d54921b33c652e0ab
-EBUILD cgvg-1.6.3.ebuild 415 BLAKE2B 7128e1306b6fe436c60293ba57ee7a0bcfdc6424712c6106bbb2a6c618c88725be8db47ae27141b36cffa0317d3c603bb1157889e9a93095c7000d5cd53873a9 SHA512 2b179dfb0ff21c004f8af119ad75bc2be9af38602396fdbdfa9f0edc2b7b4ae1f0898361a6700d69c2589384bcfa09f2ab3963ab3a43901ab2e0613f1b27341f
+EBUILD cgvg-1.6.3.ebuild 418 BLAKE2B 99a7e93e2a383a91163e387b3e70c798b7cb7bbb68479672c819b031a190ea23b7ca025a9897a809f85ebfa452bc38ddc2ff8e0f4fe2287c8409d6c11567d076 SHA512 ae33fcae458ac851310d8b5d8ddfd6ccdea105fcfd5d247b13f8698366680051e448ff641eb9a3659cd7a3b84e08d3bdf532a1e9aa10ac0db5a1f69b59c50ba6
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cgvg/cgvg-1.6.3.ebuild b/dev-util/cgvg/cgvg-1.6.3.ebuild
index a65b759b2995..81dae35db07e 100644
--- a/dev-util/cgvg/cgvg-1.6.3.ebuild
+++ b/dev-util/cgvg/cgvg-1.6.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Minimal command-line source browsing tool similar to cscope"
-HOMEPAGE="http://uzix.org/cgvg.html"
-SRC_URI="http://uzix.org/cgvg/${P}.tar.gz"
+HOMEPAGE="https://uzix.org/cgvg.html"
+SRC_URI="https://uzix.org/cgvg/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 7d7029483c7f..81b4fab50d34 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -23,7 +23,7 @@ DIST cmake-3.19.3.tar.gz 9265831 BLAKE2B 133ca8b12c0ccff0f9d833543c66cac597d7289
 DIST cmake-3.19.4.tar.gz 9266976 BLAKE2B b5ac44fa426a47031e37fca990130d9289909a5f21eed2ebb0987da9202db16f654a1f3eeaca2465693b2fca09de05b9bb452dd71df9a65ffd27c02da577a1c5 SHA512 e2781479d2185f8f927439b795120a0f4957e9da7730804ff8ec06d6bbe75a0069e49d95e642706179520a7229ae82e53bab891fa8cfd859913c0cb5fd4e843f
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
 EBUILD cmake-3.17.4-r1.ebuild 6124 BLAKE2B e5e3ae707d53e486d2fc594a3376138067b1e2e0041e04354e1ac3a1f7ae40f2d87b4eb404e457967a3cb62ba437b0b9dcd916cce50e8d6d30c0c0da3ecece28 SHA512 145b100bd219c50de18d94066c5d73cc77051b054ea5822e0fcb86f53c3d381a29e0026c25e115320df3c324a96519ffa670ecf73e8dc24527043dafb51fe443
-EBUILD cmake-3.18.5.ebuild 6078 BLAKE2B 01cb28e819e3494817ee7cb0f3faa663d7cb2a2a4d8d575e1211e41b4d35bdc1ea9a1ce21fa3ea650f8d69a290ffdad83fd462b305a3a3da19de62aa3180042d SHA512 39c8ea042d9358546100659b25fb7e223afbbf66d404a9b11dd399470f69c5d96ddeb36d160d1be14c1a4b9227c71ae6d79c09f5344abfa4519c2643ab24e1ec
+EBUILD cmake-3.18.5.ebuild 6077 BLAKE2B 09bb5432f455b53cf232dd57a11a5ea755af02860923ba4a4b9b9b2a86824b71b72fdd89b86ac2afc02b414aad1a0f4460b17185942db0f4591f23a394ebba8c SHA512 e4f51821a1b966ccc716115bbf8a5ee325272cf03f4011a2b04e2e5f882fa3804b6af0776bd2922cfe48946501de1de1dfbe00b7f17c6543902bdbe6223a42f7
 EBUILD cmake-3.19.3.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
 EBUILD cmake-3.19.4.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild
index 4cd2e415b0d0..a8a036ebaeec 100644
--- a/dev-util/cmake/cmake-3.18.5.ebuild
+++ b/dev-util/cmake/cmake-3.18.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index bc138055fbb5..936e4b39a24c 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -1,5 +1,5 @@
 DIST cproto-4.7q.tgz 175005 BLAKE2B 4138aeb87bff6cd59182939ca93c174cc23a67fd5830bbbb4f0e148edb7856acd7ec98390b46cc1c268c694347d6624a48d94e126751ddeec29fa8a305ed5d89 SHA512 014b51dfcc4b00cf0f71355901ce6ea5d5627846f4bce370559c4a7d9935abe8abc2f994a70793d4886ab93a24843152aa6c873515aa7d9a72d9c4a18fa1171e
 DIST cproto-4.7r.tgz 178234 BLAKE2B 83198fda34413253c7396e0171e3675642c664044b5a409d3a652b0b4ec6a83c9eb64bd35e86a9593ba02af60e9947e04f0251224d1766ef6d0d4639ea56b905 SHA512 934b9241f8e3ddabb6f0065117f500e716f552bc3593879e03890a22332da8baf6cf0b9c0b13c077e13c4bb692bef0efd3c39e96092154863d318219b7845e57
 EBUILD cproto-4.7q.ebuild 422 BLAKE2B f5495bf978f1a1a03d907edc7d70e4fe808fa2b278808fef8be397e44e5d42cbe1478d92268196aedaa9f57fffdcc4f59c4aa8445420ff63b8de8b475d5a43c8 SHA512 ca832bfcc8415386be6577cc2cf8864d844a8cae97bc449450315c27e432198693a0b15f553786eba3bdb865665f00dd71a56750c4a839073e4f445c96e1992d
-EBUILD cproto-4.7r.ebuild 425 BLAKE2B 2d3ad5e51f0bcf8092469d91e3ea19d212d172e602357e69423fc8db281ff332383300a86db1f3be23d5c12a0a132085996ea089622f3672fec69ae62a74d5c9 SHA512 ca74bf309b1af207e65561438cd82b706c970b1c2c7113e02143a79cc10dde3306f652b6545bb082aa9029128ee8a2470349e7d8d2fbc94ca20c9b9244fce5ef
+EBUILD cproto-4.7r.ebuild 423 BLAKE2B 78023dc73091355c36184f28e745c31e75ad43b309f705a1fe9e128851339fb3be96b784918ca0adf21d3c23c7ca63e03c64095bb6902c13360c5f1fefb23b84 SHA512 d05c79fa7989c46c07aeb1d0f59d2f7ac9ffce1f19561ba3594b7e4621f1635ab054a81dbcd1dc9aca31c436cd2317542d0f4bf87835e15c2a82d39f1d1e1723
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cproto/cproto-4.7r.ebuild b/dev-util/cproto/cproto-4.7r.ebuild
index 75a444986957..0ae328fd7df6 100644
--- a/dev-util/cproto/cproto-4.7r.ebuild
+++ b/dev-util/cproto/cproto-4.7r.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/cproto/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="sys-devel/flex
 	virtual/yacc"
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 1d4c1f942779..ef5e6a6b378c 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-test-runner-19.04.0.tar.gz 444289 BLAKE2B dc3b11c8d376103b320d98d211bf1ace035a2de5a1caceadd946bfdc46a6aab3fcf69fae15c7142500b9487a9832275a6157f887c8efcbbb56d13c8841609dd0 SHA512 5906225f0ce429ea218d7eb4c67281b7ef368d6a173965b214f4f4501e729002ca3293a94fd8afd3002f301cd1f2208cba01c733f678c2d51661220e8a7ce971
-EBUILD dbus-test-runner-19.04.0-r1.ebuild 1256 BLAKE2B 9a16aef85a25493cba494d9a048d8486c3672d6fc4c0df8ed9ba5c91eefd9ce9bfb7d56de158b43f7437d86776b2392731ea907edf95c3f406ee3bd6e68a886d SHA512 f18443cca62b55e2a7e67e08eb1cc816ff97e8728f1d436dbe2486320076f1072df1d8f6a5ad23d54b32c67df6aa3aa45c06780be78ce3312f35d94dbe2aa676
+EBUILD dbus-test-runner-19.04.0-r1.ebuild 1255 BLAKE2B 5cc19b799ea0a8a6277460bc089f4189bf96d55a4629e88b87f7468ad6f01ffa230e3bb8c1472ab5851b370f3c4b63e2f8172711cbaa6b51b66baff082a2abbc SHA512 f8d414d994dbeed12d42c950eb3a39eb2616566aa16a0f1b2219ff92a5070d4644092fc8eb95c26bb80b6ef91c400ff4323abb023c3866d2bb21e44138b0be0a
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
index f8e44b2bee9b..ea93a99df1ea 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-19.04.0-r1.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
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 1b50c0538fed..3cf9507bfa4f 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,3 @@
-DIST diffoscope-165.tar.gz 1568656 BLAKE2B 606b2f11bc03da085d51fd10ceefbfe1ba4bf5599e45cc317ec0f555633e1f58219098fc59418dfa380f5afdb143af89e71fd7b90aeb8a77959a4abdbe410722 SHA512 0adbb7032bfff196d7028c6c140268b27d00adbbc253f3914b89dbe0505cc128ecb2c11db6a1efcdcffb8188031aad2557000a7f4de04e0598c9ef6ac05f1f28
-EBUILD diffoscope-165.ebuild 2187 BLAKE2B a2e6f968f5dab8e641a85bdb892c07038e33adf59781fdea3eca1e32542ad77c33d70d530c974d68808bc98e315b351941337f207975358813a764c9714e9a31 SHA512 0a1af94edfabeca89f8b4624a6ec84b041f9de8ba40e3139c018e82bf9a78719824a9194a49b94e6cf3a9bef6eec9c2d24497c3d381cfa627cee74dd5816ab72
+DIST diffoscope-166.tar.gz 1568885 BLAKE2B 49afce2624c6e31acefad8b1ce948e49c474f1aac67cc0cddbf0e19d43204163aaf36f90a697469b5bbef17ece571ec3f0db802ce4ae53b9205f202966e65d2e SHA512 a08dbb9979d3a17daaee0f8b44b24fc1ed77e26a64502ae8b7f9789e321889b6139a9e4df52328bce70f6e3a16250ef65bbc35cd296f88568c1f4ad520816cc5
+EBUILD diffoscope-166.ebuild 2187 BLAKE2B a2e6f968f5dab8e641a85bdb892c07038e33adf59781fdea3eca1e32542ad77c33d70d530c974d68808bc98e315b351941337f207975358813a764c9714e9a31 SHA512 0a1af94edfabeca89f8b4624a6ec84b041f9de8ba40e3139c018e82bf9a78719824a9194a49b94e6cf3a9bef6eec9c2d24497c3d381cfa627cee74dd5816ab72
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
diff --git a/dev-util/diffoscope/diffoscope-165.ebuild b/dev-util/diffoscope/diffoscope-166.ebuild
index 3dc64bbf263f..3dc64bbf263f 100644
--- a/dev-util/diffoscope/diffoscope-165.ebuild
+++ b/dev-util/diffoscope/diffoscope-166.ebuild
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index 7166bdf2bb0b..1f3c3e5f8d84 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,5 +1,5 @@
 DIST diffstat-1.63.tgz 270855 BLAKE2B 01a54c49200396a102c42d982e952d38d23c78452ae467e799d29ae1199aa179927ff719955d700081c4b4f4296c0b73229fa35823e3e18f80b2edc51e3316e2 SHA512 e1319f95088e615d442b0b02af922605d0c76e15ba2f0e8cf8c4db56949ac63f4a6e3e42099254480b9aab388cbd6550f515ed4d4995c6723d24f392d1872b16
 DIST diffstat-1.64.tgz 278873 BLAKE2B 41500977adacf492498a7ea38d5f5a7bb5a31d5e39a202c72ee344ad1996f36c493ff18af74cf4dda18d47617832351fd55e386f008493c39f4b64e6d3f01910 SHA512 d647477beb49b0999c5de41d084da827528571c4848f40c69c2d64d060fc89848d15d03d59b1a31d79f02180f81d92cdf6e19d0172482bc569cf2a87476f12cf
 EBUILD diffstat-1.63.ebuild 449 BLAKE2B 8e41fa28b91fb83c97c8304ba302c33a25b7c2abf7d76e012c3f11f852a9932452ad36a4139a2b152d86c87ebbe0aa431e8b660525ef63e2c8e012bde74018a8 SHA512 f8c6d1d9c207d2957f4afee7abb589f89d81df0d33e2c3ea414f5dbccce2f2cb732e11f4753fffd3a298db99322e3caaa9e163b44d81591e0114e0303396e29c
-EBUILD diffstat-1.64.ebuild 449 BLAKE2B 8992746b8e1465aea49fa8a6a8650f889447261198e31b9c6608d5ced4fd154a2db0c9f14630e0e030c535473698648aa27b724de681b2a4f8a0c450dda9a9ef SHA512 61c26a80cbd5d8c87e86dc601e611f4fa8eb60179a569ac7d0fdeaf3f54814e714ef57c70564f7d3b71cbacc38cff65eb735ad0bf337bdd212b3053387c8d1bb
+EBUILD diffstat-1.64.ebuild 446 BLAKE2B 8cc4fb83b26f7d04d059705330ca4c56e2e7fe045e111c0cb70f888e7c50ae4729cec48bd39e92a919d45ea52e7ebe38fe7fa0c75d4235886485e00a4e241b6d SHA512 57b886e9c33568afcf87089b75e41ce0f8a8843ed4d9aa75447cffe747ad31e7a0e1b1caffd77e06bfb42beab62754cfab63b12d5b9411d0f636dc6a577577c5
 MISC metadata.xml 371 BLAKE2B 2c3b630946c1fa3f6e48d84b71b09902f6bd1d325abf2addc77cf89347771b9de8851c918eb90268989c41f725ce8f44ff5383fd51b4a483e40e67fe7ee066c2 SHA512 612277ac37956a5eb62db296c83919d9b49125145a9e9408dd4cd65c4e38439ac70b965de73e8f975e0410d9b0bcdf8bf1fce6a93c4883cd806fd39c6f9ab549
diff --git a/dev-util/diffstat/diffstat-1.64.ebuild b/dev-util/diffstat/diffstat-1.64.ebuild
index f72e1c0d0024..fa125520d04d 100644
--- a/dev-util/diffstat/diffstat-1.64.ebuild
+++ b/dev-util/diffstat/diffstat-1.64.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-util/dwarves/Manifest b/dev-util/dwarves/Manifest
index 03c017547aaf..05a2e46ed4fc 100644
--- a/dev-util/dwarves/Manifest
+++ b/dev-util/dwarves/Manifest
@@ -2,8 +2,11 @@ AUX dwarves-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb0632
 DIST dwarves-1.17.tar.xz 309028 BLAKE2B 600d095359fa1ef208cc83655761505a07512faf9957144cc5fdd9e69bef98be3afc8b29a4c13aa0246aa43fdc9b4906de95f37c86fc6790ece52a79e3b13695 SHA512 8916ea24316efe1eb322d045fb2d81c230905f2fe33942eac641e9e0311f33a3bcf55be454eac32781799c255303bafacd8f1bd1b3ec08f0dae4d5f38d8186ba
 DIST dwarves-1.18.tar.xz 324912 BLAKE2B bdce2903608a1229e2fc7e8a01bc41249a17a1a003fc3616910959fc43b430569cd737a220edfab2473485cd2dc0519b4add0e0e3a690e51ad35c4fa082752a5 SHA512 01647607ce0f4dfceb464367f2dd8a432f33eb5d0e003b6bbb07b38bd992a2992844309b04aee2a0388658c41d8b2059d03064c6e450fe7c347c5bca445d7938
 DIST dwarves-1.19.tar.xz 686136 BLAKE2B f7fe50be30fa9b247bf0f35d5dec6aa8f1bed44eaaf8a2cde8da6f65a870212c2d257740a6d4f94da24f365ad49259d53c4f5447921b22754c63184001029620 SHA512 b378a504da5b00c6280b9efda7348c2d61015ce6477f3e4e4466f58d9bf6837457cd0aa9263b7d921093cca5ee26c4fab9950f7f75ca05d27ae646b3bfe22f9a
+DIST dwarves-1.20.tar.xz 688728 BLAKE2B c57f390f7e1d20c861a4acb8cd7fe238a3f7c3f2d915d96fc051dba2587942e8fabfa4f524d18555c486863fa02bc4ab63d90e90d477f376dc5e547aa36cccac SHA512 306bb74c498527a5a9bdae4d304e90511336cab627d9acad5237d93cbb48efe11dbca4418c540fa03e3ecdd168ce224cabe9fd2f6fbb50520d0dd17741c80817
 EBUILD dwarves-1.17-r1.ebuild 918 BLAKE2B f9da513e397cf0b8f2dc68853e6ed8965c5b0f91c31ea6d272f47b4f559530c110ae14c2933f168721ec168fb1749278e9f74a1ea5b91c0e184e00b9422f922c SHA512 a8eac9a1a836459c7ae6a91ab34413127a93632afb3a4b84e4cda008d61e7eebc2d53a5e5f3d0cf42151097d7ce1f75f7d8103133a830a80b088a2a78184082a
 EBUILD dwarves-1.17.ebuild 933 BLAKE2B 8cd67a6045d31537c2165522db80a34986107df4ba9180d3d5f6f2733d31ec88fd81dab7d6ff3b6c90485a1710bbb39df90cb7badb885bf0057e6999b0a3af16 SHA512 0a2487163441ab6570c36f0ec812e26fad471ce8ae6e9db5fecbe657c8b9f437b4a85641d756a9c38db2dbab37e0a1b5e798eab3ab0da8ffab83a79df267a6e3
 EBUILD dwarves-1.18.ebuild 918 BLAKE2B f9da513e397cf0b8f2dc68853e6ed8965c5b0f91c31ea6d272f47b4f559530c110ae14c2933f168721ec168fb1749278e9f74a1ea5b91c0e184e00b9422f922c SHA512 a8eac9a1a836459c7ae6a91ab34413127a93632afb3a4b84e4cda008d61e7eebc2d53a5e5f3d0cf42151097d7ce1f75f7d8103133a830a80b088a2a78184082a
+EBUILD dwarves-1.19-r1.ebuild 1027 BLAKE2B 152b86a3775abb0e6d2505bc7a7f651bcbd2e7d0fa38ce7cd1abda1021345496751d493982f795a8171953f11b1f76374c1d9084091314aaaac9fd21aadc0611 SHA512 ffc02657d39e3672b7a63ae77e83062270eaf2e27f46c5c49d08ced5578c70bd9f1c3ad18431299efc44bdd44db54df5fa201e22597dba91d3869f759f6d733b
 EBUILD dwarves-1.19.ebuild 930 BLAKE2B 9a82ee9483d21c5b0d89dc02de73a656a3269604a76906b10b4e0e368812fdb4650195b67c6bc46ac1dee85c58cee119cd52bea6ab3a01319287ce7e8650e940 SHA512 5e6202ea6aefae993358b0439ecf1d75659a69533e63fe486dabc40d3faa63bf05693117662c951730c60f57bfc40c2692eeaaeaffb1076fa14d38ea8bddb558
+EBUILD dwarves-1.20.ebuild 1027 BLAKE2B 152b86a3775abb0e6d2505bc7a7f651bcbd2e7d0fa38ce7cd1abda1021345496751d493982f795a8171953f11b1f76374c1d9084091314aaaac9fd21aadc0611 SHA512 ffc02657d39e3672b7a63ae77e83062270eaf2e27f46c5c49d08ced5578c70bd9f1c3ad18431299efc44bdd44db54df5fa201e22597dba91d3869f759f6d733b
 MISC metadata.xml 671 BLAKE2B 78a2fa86c0acc136403b1477db4e2deb3bde1ceed636ced96705cdaccb7e42f76e8fbd202c3fa258c1f33b14827f95b5ce343f8f4df981be66e0ad3a8dd226b8 SHA512 0cdd2c3e4e76a9017120a409aec1f70327363ee146e5fb74684d0e08e2836f0079cb97be1c4874445b271b98c13daf04f75ee481ef21607aac8976a78437af11
diff --git a/dev-util/dwarves/dwarves-1.19-r1.ebuild b/dev-util/dwarves/dwarves-1.19-r1.ebuild
new file mode 100644
index 000000000000..10618245f8ef
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.19-r1.ebuild
@@ -0,0 +1,49 @@
+# 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}"
+
+if [[ ${PV//_p} == ${PV} ]]; then
+	SRC_URI="http://fedorapeople.org/~acme/dwarves/${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/dwarves/dwarves-1.20.ebuild b/dev-util/dwarves/dwarves-1.20.ebuild
new file mode 100644
index 000000000000..10618245f8ef
--- /dev/null
+++ b/dev-util/dwarves/dwarves-1.20.ebuild
@@ -0,0 +1,49 @@
+# 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}"
+
+if [[ ${PV//_p} == ${PV} ]]; then
+	SRC_URI="http://fedorapeople.org/~acme/dwarves/${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/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index 7832ce339062..393cd944912c 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,3 +1,5 @@
 DIST flawfinder-2.0.11.tar.gz 256777 BLAKE2B e2aa109a0cc435da7a8ba5f40b5dc6474e27ec340785c0070fce4a648fb5a186f6f0f5ab4e53c8e06c91fb1cb15179ecdb605a7f7477968e4d5595fc46cbd7c8 SHA512 4236da49914fa6317eb2fae1b3fd7ba08aa96a34bc5245bfd15b6532049193cbd0367bb3620e32252ce71cdd1128bec4b20c0e88b02c55d0ede1bb5bb091ddeb
+DIST flawfinder-2.0.15.tar.gz 253677 BLAKE2B 5c4a0e21e0a7f144382c6ca25f713aef9bdb413d4bb5a73f66632ef365f55c75e755ab59cf92fb54dc2d043c8b88be8c28d5f5fca36df6795dabc00313b839f2 SHA512 12b637bae789ee86710c7d6ee203b811e78414ad5d173730bfffe3ea783a76ce999878c57ddaa8019744cac6bf94967663fd9fd80769d7a24b0a79d23c0b0d9d
 EBUILD flawfinder-2.0.11.ebuild 782 BLAKE2B 73c59c1af865aa768a8b9c8202de9b17f67ba7a53a4ed5dac79db2b5165f45cf790d7d54d1499a995396447fa5c786a26211d5541040ee7de4e6d6a60509673c SHA512 7dea1626824336d141020c1b4ab286863a19ae6231ab49e56357ed9057c433c5723ac9853fa2ff69665cc506848600f4d0ca049a19fba90bb537e2f1bbfdf330
-MISC metadata.xml 608 BLAKE2B 7f1407feb1709c799430f428b77c8746c7f9128e1fc419da67d13ff6095f9977f90a655c048160e5c15546219f91d8e80c2c22f8b57ea405b23da5f408a03a98 SHA512 19db01e5347dc2ee7d9fadc3899ae7c361f59cc23277862120240c556ea74bff78ff2b6b2b4417c6c1cadad8a773646e4385e99aae7cfdacb2b7ff3d5d479f5b
+EBUILD flawfinder-2.0.15.ebuild 780 BLAKE2B 4815dd5da5cbfe39f4e479bcbdad2855dab70eaad93650a71871c763d3cfdeaab520286119f9d430c613be15ae4e8a4e426735cc19effcf2c28a9dc1df2a9111 SHA512 8bc086a66519fc7550859162f21d8f4bef32fac2802abab8adabc78144b59768ecc6db122a2c67d924119abafa02d8085228afdcfa9a2e5c0e53144d65e3d0cd
+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
new file mode 100644
index 000000000000..445563b0e667
--- /dev/null
+++ b/dev-util/flawfinder/flawfinder-2.0.15.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,8} )
+
+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/flawfinder/metadata.xml b/dev-util/flawfinder/metadata.xml
index 293ded822179..885fb2b15f87 100644
--- a/dev-util/flawfinder/metadata.xml
+++ b/dev-util/flawfinder/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ramage.lucas@protonmail.com</email>
-		<name>Lucas Ramage</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
 	</maintainer>
 	<upstream>
 		<changelog>https://sourceforge.net/p/flawfinder/code/ci/master/tree/ChangeLog</changelog>
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index 9de4b569283e..f7740aadab33 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -1,205 +1,112 @@
 DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
-DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
-DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
-DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
-DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
-DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
-DIST base64-0.12.1.crate 56378 BLAKE2B 90a948eebbae820ced325055b2d49feebdc3b178a271fa7508356d7e44d9f81f586822b6512169f3c1e9901da491b1728783182796c14e6b2c8c647e57202ed1 SHA512 06c73723c4364ac8bcf4204a943893080d1752dd925a13da800889f486b1ebf97bccae79b7b04cbe758afc95bb1d61464276365d4721689896fa641a8e55b660
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
-DIST bincode-1.2.1.crate 15489 BLAKE2B 98d8a7b3653dc75aed07a637707a8a0d7b574c9a7e9ab8aa39d6f235d003ee15dc4abdd76e3ba171b10aafc98dc16f9ef8413f4154c30848ca0c12d4972f527e SHA512 b86915db2079128d6abe52c8f3fa0ec21815faa988bf678a162c2caaeb0d2ecf2f5df496d5dab08f399578b4f0258f252e890d9ab9e8347c50e5d7a2ab374db7
 DIST bincode-1.3.1.crate 26121 BLAKE2B 7bccc02071a11944e787fdb4c86b082827834df31f3fb751ed32720d4c44e4a26977838e311580ed330d9f6bc5ad76632e0af5530a3f8781ee739d9dc1ff218b SHA512 75e62caef54a58ea5d24acbdef70b55893b11706400ad423919084a4723f5ea60e337447221171c4cd86d764db1f9f767c303b4cf5cd8f27318519db77fb82b4
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST blake2b_simd-0.5.9.crate 33575 BLAKE2B f5bd6efad39b7727bdf033bea9796eb0eb24ffdcccf9d9682c22942a5acfac6c566377f635e3030d2ec9cea05129632627c1906031a1c395744c787354e4948c SHA512 cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e
 DIST box_drawing-0.1.2.crate 2819 BLAKE2B 968243dc8cc4c999d87b1ecf45314e9ed5fd81c8403b181f6452889df92edcc407e98774592a4072c1b3a0f551ae99913cbc01bf97bec69dccc7e2b7fba14200 SHA512 fba2720279dbfd56a14371951b854aa0a30fb4caeb5b95703ec6721d681dfe97a37b21b069e6264565510fa3f3d0716dba99d8b3021bec76410c823ef262e746
 DIST bytelines-2.2.2.crate 4218 BLAKE2B 48523123ac1b5b643666ccd466a9fb48c4aff77bd13b198b24d0e1092dd971bf5ba804d97a83a38a8b99ecab94b51e837cb4850d5b0789f4d2f0115159c4176d SHA512 0d768b579993c0d72914affe36d61632e0c39310094b4d3dde29e69039249c9bb88af18e8f8033c377b05938c50e43ebd29114d2c664b2c904be27c61b1b8dad
-DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
-DIST cc-1.0.54.crate 51972 BLAKE2B f3760987ea93e71254939a42bc795cfd68b994494c2d5820fbd6bda29e31b3a28d55ed9aaddb35f720b26b1bfc01f3369af81990b68da06a7c46c17eb014636c SHA512 4562c89b52786cd16a66c1970a4005485299ff0c21c61fd22a08fada933e5ecf3fcc1686f6e4f5a8ec4827ac00ed24c1c4ab4931ec5e9a12d2e5c283f6096b77
 DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
-DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST console-0.12.0.crate 21278 BLAKE2B ee79ab5478a6f49d4c42389f2e9d17a5fe97749728fa548330a49b0869e8d839576eb4fc3874c60b873a3de8be9bdb7f928da6303c2ab0e68e9381052abd9e82 SHA512 f35d40ef5f91d99eddaa498b8e043f884fd624afd39215a7f207ca79b99d9eb563b47595974af345ce68542d76d58da17c358ce60231bcb0a1dcb9da31f7c6c7
 DIST console-0.14.0.crate 22587 BLAKE2B 3e91af20994c45b503fa4187ca537fad18efb0b552e09a3cc8e97f84ae0b51309dc1bff91bb54d06412f4779bb218652d649936216bb24fba473b988f1191ad2 SHA512 d453e82559629f0a7516760c18ce28ad347b4016e02d0c4f1aa725b93000cabc41749ce0bbb43cc98d6f9b0b92bf6726a8a265369d86f54a41a0a3f4ff8dd4b1
-DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
-DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
-DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
-DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
 DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
-DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
 DIST dirs-sys-next-0.1.1.crate 10490 BLAKE2B a691f9603b649f648d410c7588a84c69adaff41179aa8eac899ed47082f171d765876864f08e3d0dbf3fa3798c1342b30e3bdf530ef06ed017c235a63b15d5a9 SHA512 e89af71b6bb4e23efb8ff189b42615672c2aa305fb8798393de2f9151c78cbfd5f3e45b066f5de64dfad69a84b15e72a1cdb4377f31ee9288018143017ed5730
-DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
-DIST encode_unicode-0.3.5.crate 42677 BLAKE2B d8044f314f03f93965bc4de11c065f08112d33c4e1b42d9054476dd7ea925e22fb7b32fa855250be2053a00d877bbdb83a293c0aede3aa6e48d978b61f0f57df SHA512 e9849cffcffbf66e28b609e86b0d26b1267f6e2858c6564f93b071b1257aa505732dc3b7ae5bcb347874514fb8c21a606282bdcf69de842f8b96e79547f434a2
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
-DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
-DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
-DIST flate2-1.0.12.crate 73844 BLAKE2B 46d0e592e68dae030c4e05aa073ac8940c8778e707b315b33f54eefabcbb2074f9843b784a98b4c7955a34d965482505ea0700e5ac04774b40473889fb335e3e SHA512 3247d6cca560ed4e7518a3b035e1745472f5ad98f049c764a16a4559b6dcf2a006acb613b57557556f917b529376ab0eea2d3c5ce0ea9e044b0fbae804dd3ecb
 DIST flate2-1.0.19.crate 73768 BLAKE2B 1cdce9db71ace32d45b90774cc0804f4f663d1193687e9487ffcb8b8962006c680449dcdabd296e1b1046bb3dc2d910a11106f24debea5c63f757b471fc33fa1 SHA512 6e802f351085ce8804afad32d9502980269e2c03e2315349b9dcdbbb6895f61c89fbde822e31504eb00d94e665e1a8186ea3d128b5b612c61323494a8dd4332e
-DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST form_urlencoded-1.0.0.crate 8412 BLAKE2B d65250a1d56cee26befb8733733ab67ffba9b9826755194158f336a22e792d38320292548ec73cedf18a56a806707334eb75833e54bb811c56a2ccfee05aa731 SHA512 193b8630b2790931c1ade898187637b2efdfed60b2c98a2dec6658380433fb7711fc2d8196834c19eecddd219ca7383e4a4946bef25c664bf4dc010388b60605
-DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
-DIST git-delta-0.4.4.tar.gz 1024790 BLAKE2B c0a74299196c4dde617db74832d4db906b8b3eab2a1b302ee81ce5a9fe2df4daf8306768d00d9914153159aa8fc0d5aaaebd9ddbeec3c79ce41bed8c92702308 SHA512 1d42f87efef0ba065860fd2c3d2db3cfc1e97580b4bd031e91393a21479ab61d5c7afc99eb232eb16bf8db6853072b714027c720fd2d452be74e0ef0a5d1dc34
-DIST git-delta-0.5.0.tar.gz 1053905 BLAKE2B f42269cb12367ac07761975f775c640dc5bfe30cac0cdd60c2e91f863e2de869364b0e1937a8f70012b0afaed3690f0013b0364847eee3ebb5b23264f403dfb2 SHA512 1431939ec5afb09b8586d974ea795c5a804307195010bf461f8651f8ad2eaa953bcdd8d6bad8186d982592857304f476cf3c14c0816bbcd82c84358b8db98ae1
 DIST git-delta-0.5.1.tar.gz 1054097 BLAKE2B f08cac42102b3c1b84c967d7380056cfe3937ffba849ece57cf5639cc2c6330f33bc53d9f77847f2a3de856164d86df55cbc7ae03fc5171fff937318c94c640e SHA512 437c30c45d8d8076375efd99f0b65e202cf1741605d6d94b097ec335c94725a13326f90efaac4c07679fa9d418dac212246dda51bfa2fe90e902b49223efb4e5
-DIST git2-0.13.11.crate 173742 BLAKE2B c14fa5ff6c6d7dcb78a2c7abc3ac8254e50fdfc21926484596f6e259a8fee825b4b11b4a592e923a079cda019059c2feb787c82e4bc23e0de1c18a2b68f8d71e SHA512 2cacde47dfbf9df7a46d8d25fcd182f3ef239c4dd987e7f21b3e49e29671bcbae84f387014610559b2bacdad0708a9ec2804b67befb1ec139848a625508e93a9
+DIST git-delta-0.6.0.tar.gz 1055845 BLAKE2B 1d686808c745ec224592b6156ba2263d5b16341058cb01505399dfd45f362e4c7107925949d36dde7a5df16e41de2aa023dfe673d4270b2a62f17010cce9ccab SHA512 b5085d90e1fd0bf05113b289e9fa79eb2419206de0432622f58b3041d536a263e4a6fb484a11dfed24763a5990dbf46989b7b881d0beac0bad00000b89ffec0d
 DIST git2-0.13.15.crate 180011 BLAKE2B c395900bbe65628ad8b0a51c99ddbc5b5d0b76240c0c030a1df08f18f0220515ac9e613a8d6eb7e71a64d303be843242c9dfe96c62ee8cf6a43b2369cccc15bc SHA512 c08ada81843f512cb855f5951c0fc97d4bb64af98f834bba30255b1ea70e4a7848ff018944a6c4a7d36fc480e631be4c40a5259e493258a6bdc1c233775cecb9
+DIST git2-0.13.17.crate 181726 BLAKE2B be159d2f3602a65b133d6bdb3d949a48b34029b7a491961469d7a5a6dd8d471b0460ea53e802f69a216ed6111d0329e8a8ee29024af3753a185258f1268b5ead SHA512 5d95ff8d5c62df55b9995f2319dc350dfc9c44b90bb594f6b90df4985f8ebed50211e380885826251aa4e86eef1cfac99f648fba5f91cd4b725b0d05b3800fc9
 DIST hashbrown-0.8.2.crate 75830 BLAKE2B 9b08d98fd06e0cdf1dda7a86b8e2c6b1463d28eaf108c38c7c8fce1364ff1d752b044a46d0081b2348c6eecf0bf3e935e85a2d88c67b144e86734bf85a8e13ef SHA512 a6c5e5ae29d3068d54799efbf79b40ae95c2ab64807fe61ad44a49cd90c72b44f1e72340f5d6e2af1f9bb2684675dd86fb74eda03cfbf3a49d3dcf5080867a02
-DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
-DIST hermit-abi-0.1.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
-DIST indexmap-1.3.2.crate 47144 BLAKE2B 70330e3a7bca371051f871b029938c1c3d6507739cdfaf348347a811a69ee923ea9f5884b6375b0b95d7f06472e18be3652ce110ae91cf723d609a01cd4f9dde SHA512 f3a618bbc0274cc9c8e25183448b1f65db11107bc72debbeb178040ab3f5609e4771df00bcd0a9b8cd5f395b982f7d031dae7c3bb8ee71d7abba19fa21534dfb
 DIST indexmap-1.5.2.crate 47558 BLAKE2B 67d5cbd16bf464bf2a003e13285f559a2f02cf427cbb9d84ce80bea6a57a983c2b7db834a0a7172bb747d003b1d81530bea0c7cc8017cba4b963cedb14f8a1a2 SHA512 6297d720181a41624ad255c2f870abd2de12a7752f7ae4c724a64822c36b37275103cd75e35f6e690e150688171dd34de45b01cebac74a3711be7a3f5728ed6a
 DIST itertools-0.10.0.crate 109656 BLAKE2B 73b65db4a9f02cd6940a81966ff433c5d9d82bda15b2250907728b2305451e2914e0211ed16e9755585d6a4ea67c3f2b1a5b1ca589afb60f20f23d1c1d31da7a SHA512 ecc194ded512a0979c4429c0395125e1d3968c61f673546b755c0a8bf2fa5a604690baf77e95dbb91dc26a3004b50a856a8aee0dae0e4c1bd83073e5e7cacefd
-DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
-DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.60.crate 409744 BLAKE2B 1d2dfb912a0a01d93ef10d57ee7d2259c0b82ec29b34a0f1c4065c6be080685f556407cee896bd74b01136a59d9c583258818118c81e9ecec5a6387569affe77 SHA512 649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c
 DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
-DIST libgit2-sys-0.12.13+1.0.1.crate 1555713 BLAKE2B 2b8455575182d4e56be1dfe392b4a55cb04b2d61c18982623dfec182ff348ac7ebe42cfce97bcf8e4f17cf55efb6a85b7e31553d4ccd1911c91748cbe8d0df6c SHA512 fc8a1e85ab4d23a408ff5f0af9cea16db6a9a30a68885340431ce7e26bc4e13ae50c96cd09485c9f3bc3f74ab57cc16e3b50f0a73ed8c67571afed289bbbd913
 DIST libgit2-sys-0.12.17+1.1.0.crate 1434697 BLAKE2B 864f59851b8d3aab35f520a5a5f726fbe3f97d36046e47fde7b237d01b9e40a03da0d0e08f241b08b4f53eba417795acfb80440e2870a5f473ba3e5f50409300 SHA512 a7232df268f091309c3405ff17833661ec5952404d7fe63a68c8ae98bf134ac49acfd4ec5bc3402382b07bcce529fb7140938fb150828a7d670bf164a73693eb
-DIST libz-sys-1.1.0.crate 1324239 BLAKE2B cab82119fdeed84c3c4d37080b2065002dfe9de7b9bfa63256a61ff98cf06fc08e9f1edf02288589085d0f7a400335338b50f9c5f7bca5d2c71fdad433e802a8 SHA512 2d7ca1dc376d77c8b4b764d02bb6371c72ab6f07def5f50b22d77d19631e5a1f67d2e1a51c4cf7766fb365cda2286692181c6a05f55126404033347f307b9283
+DIST libgit2-sys-0.12.18+1.1.0.crate 1434936 BLAKE2B f283177caa941757388042ca4578394e160ea8e5776f6b4d842f778218286ccf65ce2febbfc780606d7624660224b11a470849b4d61302dbc11b3ba5e8d1b49f SHA512 3d9be57074e15bb0dbed151804d401d4688a77f1d46eee171e39b00815a983c103b614509ea0bcbe3c1355fc6c47738fe9da7ef6b8ee2d040fc30062db701233
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
-DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
-DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
-DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
-DIST miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93
 DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
-DIST num-integer-0.1.42.crate 19463 BLAKE2B 91ea6900dba5a38bc7ac4de0db8706f5335baab636937e9efdb1b82ff0e8ece4451503de3ac9e473a4dd7c70d599066f14840789fa88aeedafa585f0f98ed61a SHA512 8c7e0529888e18b872a634e8983034b0357143aa72914b45c02ee87447204296970e9b1ed078d9436ecc779f25360b1a1cfaae5a9bf7c8ffc68793d7c25593b2
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
-DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST onig-6.0.0.crate 30200 BLAKE2B 9e9ea6ff6345db408a09ee78e57acf12ba698bdd90c8a41c7c9a9e17df048570f6241de2ec3be8fcea661be66665a3ad70526e24113b09ee97d87700b1eed782 SHA512 f5ab1586c23a96b813300d0478c6f4d401f3a6e44c562f72cc251225374811d3d89ec77b2660a10b5b52d71e4c1656f1f9fb9ab640d227af308401162663be69
 DIST onig-6.1.1.crate 30790 BLAKE2B ee5b49def2318cdc1fa7123484eef48551faba5be52659403e7c037e84a9d2c786afdadd44812b1a478762ae582fe24f46425f9d70f1adecc870020bdcb58b29 SHA512 4d754f05a3612486f6730f850956a041f1fb8ff723fd512acd0a8a0a4a2c8be2b98cd6f7b6a882947d3b368bdb5822241e55a87eef331de80c375433d326a864
-DIST onig_sys-69.5.0.crate 614674 BLAKE2B 3f98097a709b1e95e84404b81ea104a4800e0b9f0713e988c6417c36e578b8148a8b5bb8c6dacd2d59d760ed79d8cf1f93f2ae2cec7ee8abfcb607e5dbb92538 SHA512 644019ca67a89790bab5cb173f5499bf3b0af5a4c39e027e79a63e5752f471c6bff86f679e1c86502b6c3cf795c23cd461a87c36b2eb687dfe21e9d232bcb7ac
 DIST onig_sys-69.6.0.crate 620817 BLAKE2B 294bc78ba0aa31743ec12c1cd2c29c3566fc960f64788681cfc3b333e942efc367c1721efdad06bba218a48b3eb1893b28daac163f76cb28a3f872e940ccdf02 SHA512 79903461da8cdacf3f50c7f4d7a1babb200a883a3fa6515119a6d2a82c15eb64b7f758932a2a8c46f89acd052d8f2ab84cf87bf16a3ec9c570667232f54418f5
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
-DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
-DIST plist-1.0.0.crate 39489 BLAKE2B b7a968fdf07cab728f64f60a002b1cbf14946431e42f39af4e851469834c58b20b6555d80b51325552368cdacbba27d62c34f7c02da599eb1d06153e52b22de9 SHA512 e8d5e70fe882ce0c471f6a13ea0db897e10594ca28c8113814d7c38a3ed92c90f734ea45646ea12bd6f59c17e060d2269229d191ba9fc3d514e0fa7ce2bfb855
 DIST plist-1.0.1.crate 39980 BLAKE2B 59c5e604e3e381e7d9a76fe7b694ff1779842bc8908fa187b176f361735c8fc8bfbb208ba3ae6ae5871ae2b8fa63e7266379b344eaccda17fc84b2c2ac545e4a SHA512 67c9b478ff89b3461a44c72e0718047fe8378909c3c371de36d875b54e867b7c41f56ccf6215688d7a511fa291620eddea1e1fcd7bfe357276d3d08ec9a84376
-DIST proc-macro-error-1.0.2.crate 23699 BLAKE2B 2d8310300002d1dc3fa68391190c5536e1faf6be05f1dd2ed1429d530dc527f431bdb93a994f2e68ff6120523b0d10a4a2ab35a0703f3013b404d0b82ab68372 SHA512 a9ec65c02f853f05f6adbfd398a82e84dac5bc376f041ede65a47b510914f5def1ae480c1a7e68aa6fab836efb6bda0d712d45243472b73c12d1ce7cdf8c3583
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
-DIST proc-macro-error-attr-1.0.2.crate 6974 BLAKE2B 4b8fb0c70873eb487dbfbcd37d5a5dae6d877a910f3523d9985a511ea97795082548f03bef926ca91028340dada954217926e7b9d8cc70765343f6d86c1e7c01 SHA512 1fe7ea1e005ab4d6b777b2caa4a5c2ad7655b5375fa987b0b2cfbec6a0673d844aee2dc273dd327687dcdf21a165261e78175eed69e881dfbe1f2992eb505c78
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
-DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
-DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
-DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
-DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
-DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
-DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
-DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
-DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
-DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
 DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
-DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
+DIST regex-1.4.3.crate 237273 BLAKE2B e13e1b5106123a728b6b02a81c3223d17620fc0c1e9e72f3472a0c7844aedf0f178be3d3f70bb15c054554c925e270bdf112e41f855f1bdf9183f42913ae21b2 SHA512 bc0dbde01a79e7863997194b894c0e76e01ed209d56225bd611dcbccbbe997abd48bdc4640cbf349c5f16d96ec613f5b31740e81fc7da82082a4ed48fa06deac
 DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
-DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
-DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
-DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST regex-syntax-0.6.22.crate 293187 BLAKE2B 6dfa3502133e4f654ea3533c6e9eda7674b0628f8b0bc44f8b3cccd740a5cfa8016acb5f4f3be4a54d18a46bb1f950ab75a39ace69b5606667a371f714206b8b SHA512 f83a72e46da02800ee545d6ea3c5eaab48706a9c63a03bb73363f597173ed205b3e7c86bd80d909478787e68f49fe07aa52c29a83c381e3c4863e5d856bbfb6e
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
-DIST safemem-0.3.1.crate 6931 BLAKE2B 4f8a0301ea9d8bc6c74d9e379a2b9526a7d39fa03252b53f69e1baecdaf4ad23fc8c6e21bd36f2754b0dd9dcf608365c2ba450ca023188476ec92b4a7d6612cf SHA512 e2555f4c78d8ebf0457d38fbe881b708c5f2c8625c00a1d00054915ec4c4e65e3e84de7281928176ccb0c9a63a8a6468d791744ed4650e9d628b51d8b62bee66
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
-DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
-DIST serde-1.0.98.crate 72417 BLAKE2B f0a49162951fe9e69b02dcd1f24ddf37aee08e23128de15e4a4490f07bda9f1c56d9abe3b90422152989d4485e78ce9e0da2ac8800d401922fe4732640755845 SHA512 a949d803c7c66312f280483c532c705f8b3a2b4d058b717195ffc539ce9e92bff707a585cb9e2f52c16152107edab40ff8bc4cf825c06f6b73f1fa189cb9dba7
 DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
-DIST serde_derive-1.0.98.crate 49046 BLAKE2B beff0012254085fcbe0a73dad9b8f9bb650270c1dc0900cea98e816650ac3f0e12931560a2a36de9a589cbff767ebb65c11a8746646899b3ac3328292b8530b5 SHA512 16313a0fade030fce860f02daffd47febfe3c470b5ecf3a8a53d88eae42b251fba56dab7caceb3560f562860957be4fc66ece06d176757c61b8497f5508a1ece
-DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
 DIST serde_json-1.0.61.crate 114887 BLAKE2B a06e2b3572b01b57d39a7df4d4c333408594cfe80b6b6a810f8c36479550f56f085cbd7e693d3c27f307bf0b49eefd34f55bef1872a4a0318797e4b9585cce9e SHA512 ff626602b547fa8e48c37251d2f6c91633fd45b49ed8211e66a3174f52f9aafe8778238466e7deb5d5477ed23eea0091596d78894e0967d6978f6737ae115891
 DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
-DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST structopt-0.3.19.crate 50644 BLAKE2B caeb54d559de0830b10b8d20603f09c03da46a856041b470522a59a574e5f73177d4d180a1dda7525251a7b4f73f8b3fe0a96b90d7da3a97391f542d7bfa2fad SHA512 e97e81b936c7077bc2f58c3d65eda8fe3f235929a1f30e9ddcd4666e2ff0a4b24a9175e5beb0ff1414a55d2b6aadba54f762c4ad83ee5a6dbb4b272bd7d59c29
 DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
-DIST structopt-derive-0.4.12.crate 19742 BLAKE2B e1da17d19b5244ebc32522827e7acfe4133bb919374639f775864f7bd4b52fa16374640d4022f839ac682954cfd07c692d70329a347281d9dec4035bf89c7afa SHA512 ef65a34b9a9f23be853340413cd5847434b2c3279a401f938a0a82d5499f9c17968b85f13c60a058a69fbe78c7c24380fca31f0e7ef86d986fe15a082353d98b
 DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
-DIST syn-0.15.43.crate 184065 BLAKE2B f0f1f97fecc71c91da6ef9d8c5be43f0a320fbf5d7ea6d1d6ec6743735790adea03b0058b8c544b1b06ad7618b7c7b56c64ceff5ccbfd2cc2240772cbd46e720 SHA512 b2b022706c802a601b92e21601113205b147c8129b9c0e6fa86d0c4f823fc3ac3c1bcb48f678fb2396c76759580254b16f10267d8d22a98a733dded34ebbadae
-DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
 DIST syn-1.0.57.crate 229228 BLAKE2B c1f4e6a38ce706f86d8f075409fb341ed9a46aeb8d0f4534fceb2aa2fd717063667bc89361b2d95916c0dcb036d5450d94c23139d110afdacabe91c0a5f988cb SHA512 2e7f318f15c57d518df8e2875545f92faa8171c37f1ac15be189bd58e9a178978e3734417ba99030c62fb84e55e4300fc477d0422fac60a7ee8b759cdd1e56a6
-DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
-DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
-DIST syntect-4.4.0.crate 751314 BLAKE2B 4d70ea137ba28e733e2bf505f547e1caa8a38dec33497e092d5efa77e321bc468ef955a0957ec949a0c68df31684e33234838f177f201e77d5e70aec8337829b SHA512 018fc26a99cad799446dfda0e406af87fb63e35cc5684fe2928f42f1b0a1199606a25b9ee4f1bd138abebc40f365c26407716856376f1ed6d3352c879a1689f4
 DIST syntect-4.5.0.crate 752883 BLAKE2B 9c9ff2cc63ea421c0b8928a0578b278883d0a86be7f7c256820120a858f8c02b1d292e2474e5f2b63486e45cf5387e1a8ba4db2a5c9e7a2b0cf4eb687b42ffad SHA512 17653ae9baa4da049c899820f6033b3e7d71b96ab70b9c12e57a1ab305d155b12acec470167be2a0a37ea9c89ec4d19850f72d456e6857a7cf4dee65fc288273
-DIST terminal_size-0.1.13.crate 8094 BLAKE2B b46de1f0dfdd6f4dd44c21a5cd7936cd9fef67d96be44775c29f3850e39b94f200c719bd0c0c31727725f1741ee9640a83c1f3083a45ed665db7f03e50793826 SHA512 75efac1092c6919efc7d427e3cf7d4c36a4d12b3d5c38ee35f94ddf2fb0efcc16fb92e608382905475d5de3078e9c64a29ec77816572797fdfb53a6708eaf266
 DIST terminal_size-0.1.15.crate 8795 BLAKE2B 2e7590a524bd8e439d385f925c3d5a3aadea20bb24b7fb5c52dedc4dccdd67f986b304208dc6d9cecf0e4b2c449dd980613b4e381603cad74fd9038420b289e2 SHA512 cf1612f46c8502e079b87a240ddecdc02be8481cb7b78115ba1550a9a732103bc19de11f46160dbc5af06f8576d3dc780ed0b199b7f24c92fc0734e0d07e484e
-DIST termios-0.3.1.crate 9541 BLAKE2B fb2862550920607bf7ab65157b25392ad67c486227a0298ad2b0b58ef2f2f240ed1b0a6b02bcb905078cd4721b2e56b76a9c1ace1fecdf15643f76d3c39da2c0 SHA512 5f4f423f7aa0ca7e25f1fb0727029e47fbae9024aae6e168b911ee036bd217084332707ae809b2713d0ae35fe6a7fd1d866fbd1f06bebead32c0c2534671b311
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST tinyvec-1.1.0.crate 39037 BLAKE2B 8033a336c2c346df70d5c6161233043a7e196a2994b62c15aa022b7053f7aee686092fc7e2db551cd1a09ee5e4a038e777120c5c33c891bb47b71c78cac60e92 SHA512 29830cec393506651b20d045c584e3df5ce5f13fdf70e866d4d6b7e97fe4f6b07ccf2a2c64ced5b092d5d963af74f826930d96d817db90bc0e4ad112a399926e
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
-DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
 DIST unicode-normalization-0.1.16.crate 92805 BLAKE2B 556b0b95b6d21f95ad99181e999d2f2a1291951db14e95cdaa4596b159323e999a135380ca0f795c996f97ffaa0c25465bfe5884bebc8903130bfd7437d4b86a SHA512 c1f83a79b0fffd2f0e1b8a579ae4e5021c4cffd74c259d065919b937bdd78b9ef83650cfd777010e7008ceb51e072777b195dd2483e1a85798a98b72f8648ead
-DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
-DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
-DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
 DIST url-2.2.0.crate 42787 BLAKE2B 115380294b06c833fe183423b26f32b7a0cb3eb7bbb53380c41b32c031d6d34ed55f11153d5ed8f3e82effc13b9571f3b27d9889fe61cf63a68ea3767ef63cc8 SHA512 5474daa20242552fc76f8e21a28f8880c011627773fed74061fdf15afd5a33cc1b09baf6583112126a1b8287ad71a22055d2bbf78a73a0d82a115db1334d05ee
 DIST utf8parse-0.2.0.crate 13392 BLAKE2B 05296f48fe429a871f42e729e3540ec3a974a69892c6bc9da95e23c0aee2163c9b115a9614eb1943363076793e17ac4c89e28066a9816cab30c451524a5832c0 SHA512 1f6a2eca32e42c8e4b53d28c4fea54c426ed66fc01447b3cf8fc0fd75694453eadbe3ba000ac8ee0347d16dbfec47681254117949109081798eab5370886827c
 DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
-DIST vcpkg-0.2.9.crate 11279 BLAKE2B fc36eff275a69d9dc959cefa730b8ad53f4f277391d4858658ca1fe0bc5ebc4f3f311e46d5e5a8fe4a404fa135362f3115830798b7746d6b562e26f966659df0 SHA512 fc0cf61329f1ca0c16357749edf10a468b5e07cc8353cbbdb1af275b1ef450b07291280e128c7768cc57e23e5f20ef6bcff78a9af7d3ca44d486a709f081f83b
-DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
-DIST vte-0.8.0.crate 23854 BLAKE2B 27fdd36358b5d10f2b30e2dd8d0f0f3201263ca86bb5e734966cc67099a125df91512c39ed8dc06206dd3db90f02cabf7ba85c6471c402999c7529c2d607031b SHA512 c4545c8e12bdb78674434eb8414dac9d2885c2547f302d19533eeb77dc2dc8d97f077ace4905f8f105269e68b808bd01a1a825ddb86fe5947c8a4acf18ea4ee7
+DIST vte-0.10.0.crate 24923 BLAKE2B f5a19e93ccf3eb29cd3cec5964309247cc7de951f92d6ef255e429fa05cd82ffc312c094cf9c6d17c9cbdf125f195bb6706d2b0fccf145b970abce2c2154a8c4 SHA512 39cc8addb09a1f3e50c7548a1be00f020e972f6f9aea3f7a091f3ab645948b7b1c96aec5332cb4f0c9bdb20fec0ae2ca2e82c63bba7680aaeed468a48097254f
 DIST vte-0.9.0.crate 24930 BLAKE2B 91b3c85493037d35563337e43ab64e14503e997b029bd2cc68e56a4e95cd25f1e65b9bbd24cde567e170f5744d55fa965f1b7abba407486cb44f84a21d0bedbf SHA512 ac7c947a01ec404132133740efbaba0bb7fe441fb97373c144dfe4f19a6e5d300657768c2a93fbc7be78247efffcf90257ac2373d5f1a283abd98a968f88b5c7
 DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
-DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.4.crate 10089 BLAKE2B 5dfae5588233a6fa10ec000b3c5de17679e7636bcfb70cbbc1b2b1340543334125b413d53583459823be253a32b90279eba5a3a8debb404390d0328ed6377352 SHA512 2a90921a30ca021b6178b175b780e4803f40ac87f35bcb63bb09fbc9c79f8f991dd94fa3a0fa525c2e38354d9f6dee780a6cc5ea0a24bff49356d052f6bb8231
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST xml-rs-0.8.0.crate 50974 BLAKE2B 47f5c663e0982b0ca6caa7aceb7029f2bdff948395ffe07da50fe021d7014ecee7c1d45ea9bf370da8ddbbac637bdbf39b9b829769041406958f069ce884e5e2 SHA512 94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
-DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-EBUILD git-delta-0.4.4.ebuild 3125 BLAKE2B 6985c2c8eba067312e835d5fd3276bb1b09a77219c7c6f6c8ed24dc0b4d867064173fb085b7ef2ba65330e68f06f7ada9fa2afc9e48434e13fe903a006602226 SHA512 17b04a1a37cf446de82238028d080faff836e33ee77ab32d18c7aab2e9bc3c2f3817e9a821fdd8740af73ed746dbdaee40d6baacfbd9b5b4f1f5964a3ba78f39
-EBUILD git-delta-0.5.0.ebuild 3136 BLAKE2B 83aa3e41b8d4a25bbf290336cd613e5cb427778f140dbee7c64ccd2375d392236f43c04becc4759888b2c664c87c200e2716ef0f3355b4b21168436e6cdfeebb SHA512 2c117322dda5baf6c9f3707def169d5f38861fde49f7757fbd8756fa2442dc7df8e85a3c9f79af89fc2f75d5871a26668b82994cb5763295924a3525133cc5d8
-EBUILD git-delta-0.5.1.ebuild 2854 BLAKE2B afbe62ef15e45078e752343e134e919b371bfb8f60b94d6e80d074dcc090812b3ed8ec4796a7fbfd42f028b272fb6db9e339b3782fba6e36b1224d69c2894ab1 SHA512 753d40296077c2b27e6c7c07e171b9758d03d86ff059af1594c6af9782aef57d6b9bca91efa86e51ebb795f12ef92c2b128a7c61a90aee198e231357ac8ebdd9
+EBUILD git-delta-0.5.1.ebuild 2853 BLAKE2B add56017caabf0915ee87626c23386c0fac561c828ccd26791dfdc6a494bd11c1ba7bb1668ba1465837b03e2772cdc5f470c79e2f0cbafc50a0b1863e4d9a90b SHA512 c0a1f1c5e0e39391346ce6d881dbdfd3fc38febf6ee28a347f312e7acabe22b491ace2d9e6cc985225fd3ad4d0089663aeb7eae0403a9d1f0882e7fce93736f1
+EBUILD git-delta-0.6.0.ebuild 2855 BLAKE2B dfaee8c2e4c8dd73f48123c5297dbfb6ebd8cb551a229ebc75b6fec94731c4af50c1f737e9f52ef0f68d370c5b989bb3b1f595c4c16f3e2974f3405a92263633 SHA512 ddb9576019da8c0562d21604e8cc8113b5761b2a8fc9b943a9cd1bafc3ddce286ea3bae18fb4de8dd879d4678a0c4c2a13205f60fd68e8a3934954569fcfeb35
 MISC metadata.xml 330 BLAKE2B f09602a10d43f553a7dc36968f26f5f4a79d12aab213ea51b1b2e76eb2f5ba8b698147a9ab3db7b088ca42008045f1dd1a5447fe5d7d2ce46a61d1438c202185 SHA512 ca570caf0648315637beede9dfd9c124b7b313448f2929a86262b7fec90280bdf105b22ca112f7ddb2fe16ee4c6f242e7524041c14a692aa9155ad4ae432207b
diff --git a/dev-util/git-delta/git-delta-0.4.4.ebuild b/dev-util/git-delta/git-delta-0.4.4.ebuild
deleted file mode 100644
index 018bc8592754..000000000000
--- a/dev-util/git-delta/git-delta-0.4.4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-adler32-1.0.4
-aho-corasick-0.7.6
-ansi_colours-1.0.1
-ansi_term-0.11.0
-ansi_term-0.12.1
-arrayref-0.3.5
-arrayvec-0.5.1
-atty-0.2.14
-autocfg-1.0.0
-backtrace-0.3.40
-backtrace-sys-0.1.32
-base64-0.10.1
-base64-0.12.1
-bincode-1.2.1
-bitflags-1.2.1
-blake2b_simd-0.5.9
-box_drawing-0.1.2
-bytelines-2.2.2
-byteorder-1.3.2
-cc-1.0.54
-cfg-if-0.1.9
-chrono-0.4.11
-clap-2.33.0
-cloudabi-0.0.3
-console-0.12.0
-constant_time_eq-0.1.4
-crc32fast-1.2.0
-crossbeam-utils-0.6.6
-dirs-3.0.1
-dirs-sys-0.3.5
-either-1.5.3
-encode_unicode-0.3.5
-error-chain-0.12.4
-failure-0.1.6
-failure_derive-0.1.6
-flate2-1.0.12
-fnv-1.0.6
-fuchsia-cprng-0.1.1
-git2-0.13.11
-heck-0.3.1
-hermit-abi-0.1.12
-idna-0.2.0
-indexmap-1.3.2
-itertools-0.9.0
-itoa-0.4.4
-jobserver-0.1.21
-lazy_static-1.4.0
-lazycell-1.2.1
-libc-0.2.60
-libgit2-sys-0.12.13+1.0.1
-libz-sys-1.1.0
-line-wrap-0.1.1
-linked-hash-map-0.5.2
-log-0.4.8
-matches-0.1.8
-memchr-2.2.1
-miniz_oxide-0.3.6
-num-integer-0.1.42
-num-traits-0.2.11
-onig-6.0.0
-onig_sys-69.5.0
-percent-encoding-2.1.0
-pkg-config-0.3.17
-plist-1.0.0
-proc-macro-error-1.0.2
-proc-macro-error-attr-1.0.2
-proc-macro2-0.4.30
-proc-macro2-1.0.6
-quote-0.6.13
-quote-1.0.2
-rand_core-0.3.1
-rand_core-0.4.2
-rand_os-0.1.3
-rdrand-0.4.0
-redox_syscall-0.1.56
-redox_users-0.3.1
-regex-1.3.9
-regex-syntax-0.6.18
-rust-argon2-0.5.1
-rustc-demangle-0.1.16
-ryu-1.0.0
-safemem-0.3.1
-same-file-1.0.5
-serde-1.0.98
-serde_derive-1.0.98
-serde_json-1.0.40
-shell-words-1.0.0
-smallvec-1.4.0
-strsim-0.8.0
-structopt-0.3.19
-structopt-derive-0.4.12
-syn-0.15.43
-syn-1.0.11
-syn-mid-0.5.0
-synstructure-0.12.3
-syntect-4.4.0
-terminal_size-0.1.13
-termios-0.3.1
-textwrap-0.11.0
-thread_local-1.0.1
-unicode-bidi-0.3.4
-unicode-normalization-0.1.12
-unicode-segmentation-1.6.0
-unicode-width-0.1.8
-unicode-xid-0.1.0
-unicode-xid-0.2.0
-url-2.1.1
-utf8parse-0.2.0
-vcpkg-0.2.9
-vec_map-0.8.1
-version_check-0.9.1
-vte-0.8.0
-vte_generate_state_changes-0.1.1
-walkdir-2.2.9
-winapi-0.3.7
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.4
-winapi-x86_64-pc-windows-gnu-0.4.0
-xml-rs-0.8.0
-yaml-rust-0.4.3
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A syntax-highlighting pager for git"
-HOMEPAGE="https://github.com/dandavison/delta"
-SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" $(cargo_crate_uris ${CRATES})"
-S="${WORKDIR}/${P/git-/}"
-
-LICENSE="Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	dev-libs/libgit2:=
-	dev-libs/oniguruma:=
-"
-RDEPEND="${DEPEND}
-	!app-text/delta
-"
-
-QA_FLAGS_IGNORED="/usr/bin/delta"
-
-src_configure() {
-	# Some crates will auto-build and statically link C libraries(!)
-	# Tracker bug #709568
-	export RUSTONIG_SYSTEM_LIBONIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
-	export PKG_CONFIG_ALLOW_CROSS=1
-}
-
-src_install() {
-	cargo_src_install
-
-	# No man page (yet?)
-
-	# Completions
-	newbashcomp "${S}/etc/completion/completion.bash" delta
-
-	insinto /usr/share/zsh/site-functions
-	newins "${S}/etc/completion/completion.zsh" _delta
-}
diff --git a/dev-util/git-delta/git-delta-0.5.1.ebuild b/dev-util/git-delta/git-delta-0.5.1.ebuild
index da3282a3822e..0da47ff62800 100644
--- a/dev-util/git-delta/git-delta-0.5.1.ebuild
+++ b/dev-util/git-delta/git-delta-0.5.1.ebuild
@@ -118,7 +118,7 @@ S="${WORKDIR}/${P/git-/}"
 
 LICENSE="Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
diff --git a/dev-util/git-delta/git-delta-0.5.0.ebuild b/dev-util/git-delta/git-delta-0.6.0.ebuild
index fbc091d59d13..881c6ea5955f 100644
--- a/dev-util/git-delta/git-delta-0.5.0.ebuild
+++ b/dev-util/git-delta/git-delta-0.6.0.ebuild
@@ -1,129 +1,111 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CRATES="
-adler32-1.0.4
-aho-corasick-0.7.6
+adler-0.2.3
+aho-corasick-0.7.15
 ansi_colours-1.0.1
 ansi_term-0.11.0
 ansi_term-0.12.1
-arrayref-0.3.5
-arrayvec-0.5.1
+arrayvec-0.5.2
 atty-0.2.14
-autocfg-1.0.0
-backtrace-0.3.40
-backtrace-sys-0.1.32
-base64-0.10.1
-base64-0.12.1
-bincode-1.2.1
+autocfg-1.0.1
+base64-0.13.0
+bincode-1.3.1
 bitflags-1.2.1
-blake2b_simd-0.5.9
 box_drawing-0.1.2
 bytelines-2.2.2
-byteorder-1.3.2
-cc-1.0.54
-cfg-if-0.1.9
+byteorder-1.3.4
+cc-1.0.66
+cfg-if-0.1.10
 cfg-if-1.0.0
-chrono-0.4.11
-clap-2.33.0
-cloudabi-0.0.3
+chrono-0.4.19
+clap-2.33.3
 console-0.14.0
-constant_time_eq-0.1.4
-crc32fast-1.2.0
-crossbeam-utils-0.6.6
+crc32fast-1.2.1
 dirs-next-2.0.0
 dirs-sys-next-0.1.1
-either-1.5.3
-encode_unicode-0.3.5
+either-1.6.1
+encode_unicode-0.3.6
 error-chain-0.12.4
-failure-0.1.6
-failure_derive-0.1.6
-flate2-1.0.12
-fnv-1.0.6
-fuchsia-cprng-0.1.1
-git2-0.13.15
-heck-0.3.1
-hermit-abi-0.1.12
+flate2-1.0.19
+fnv-1.0.7
+form_urlencoded-1.0.0
+getrandom-0.1.16
+git2-0.13.17
+hashbrown-0.8.2
+heck-0.3.2
+hermit-abi-0.1.17
 idna-0.2.0
-indexmap-1.3.2
+indexmap-1.5.2
 itertools-0.10.0
-itoa-0.4.4
+itoa-0.4.7
 jobserver-0.1.21
-lazycell-1.2.1
+lazycell-1.3.0
 lazy_static-1.4.0
-libc-0.2.60
-libgit2-sys-0.12.17+1.1.0
-libz-sys-1.1.0
+libc-0.2.81
+libgit2-sys-0.12.18+1.1.0
+libz-sys-1.1.2
 line-wrap-0.1.1
-linked-hash-map-0.5.2
-log-0.4.8
+linked-hash-map-0.5.3
+log-0.4.11
 matches-0.1.8
-memchr-2.2.1
-miniz_oxide-0.3.6
-num-integer-0.1.42
-num-traits-0.2.11
-onig-6.0.0
-onig_sys-69.5.0
+memchr-2.3.4
+miniz_oxide-0.4.3
+num-integer-0.1.44
+num-traits-0.2.14
+onig-6.1.1
+onig_sys-69.6.0
 percent-encoding-2.1.0
-pkg-config-0.3.17
-plist-1.0.0
-proc-macro2-0.4.30
-proc-macro2-1.0.6
-proc-macro-error-1.0.2
-proc-macro-error-attr-1.0.2
-quote-0.6.13
-quote-1.0.2
-rand_core-0.3.1
-rand_core-0.4.2
-rand_os-0.1.3
-rdrand-0.4.0
-redox_syscall-0.1.56
-redox_users-0.3.1
-regex-1.4.2
-regex-syntax-0.6.21
-rust-argon2-0.5.1
-rustc-demangle-0.1.16
-ryu-1.0.0
-safemem-0.3.1
-same-file-1.0.5
-serde-1.0.98
-serde_derive-1.0.98
-serde_json-1.0.40
+pkg-config-0.3.19
+plist-1.0.1
+proc-macro2-1.0.24
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+quote-1.0.8
+redox_syscall-0.1.57
+redox_users-0.3.5
+regex-1.4.3
+regex-syntax-0.6.22
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+serde-1.0.118
+serde_derive-1.0.118
+serde_json-1.0.61
 shell-words-1.0.0
-smallvec-1.4.0
 strsim-0.8.0
 structopt-0.3.21
 structopt-derive-0.4.14
-syn-0.15.43
-syn-1.0.11
-syn-mid-0.5.0
-synstructure-0.12.3
+syn-1.0.57
 syntect-4.5.0
 terminal_size-0.1.15
 textwrap-0.11.0
 thread_local-1.0.1
+tinyvec-1.1.0
+tinyvec_macros-0.1.0
 unicode-bidi-0.3.4
-unicode-normalization-0.1.12
+unicode-normalization-0.1.16
 unicode-segmentation-1.7.1
 unicode-width-0.1.8
-unicode-xid-0.1.0
-unicode-xid-0.2.0
-url-2.1.1
+unicode-xid-0.2.1
+url-2.2.0
 utf8parse-0.2.0
-vcpkg-0.2.9
-vec_map-0.8.1
-version_check-0.9.1
-vte-0.9.0
+vcpkg-0.2.11
+vec_map-0.8.2
+version_check-0.9.2
+vte-0.10.0
 vte_generate_state_changes-0.1.1
-walkdir-2.2.9
-winapi-0.3.7
+walkdir-2.3.1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.9
 winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.4
+winapi-util-0.1.5
 winapi-x86_64-pc-windows-gnu-0.4.0
-xml-rs-0.8.0
-yaml-rust-0.4.3
+xml-rs-0.8.3
+yaml-rust-0.4.5
 "
 
 inherit bash-completion-r1 cargo
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index f10ddc468b22..b37d8a4b92c5 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2
 DIST gnome-builder-3.38.1.tar.xz 12077860 BLAKE2B 68dfbf9aeda93c695035a51c020735a914a11a09d7106228c2b7fe603b3b1b7b292f6a110c77df2057d40ae7f0c7559cb48c6ecc888de2767984a03d34467a2f SHA512 50872a7285292f4e29acec153a7ba4616ab8e69529fbc7682fb74fa9d8b5c49ed52b939c7652bcf410444e2c2de969280b82ab4da44008f4b95863bfd52ac59a
+DIST gnome-builder-3.38.2.tar.xz 12078024 BLAKE2B 9cf8a74be5a48b73c21ce247a07fcb1441482edab8fd118a2d773429f68efcd50f4a8a1ef826cf90a9f76e482f25d9a092ca1700504178051fcf903abe9eb1ae SHA512 6f9d284a9c915562fe55a863ddcc385ca9278b4ee201f4b97272f425937066d630c35c0b337bdf94ce4b12226080a9020eb5dc253ccfb25bc6cdbf8e50779569
 EBUILD gnome-builder-3.36.1.ebuild 6734 BLAKE2B 6b0896c41507bd34ee64068475aee10f52dd716692fe0ec2a142b247ebbcdae8e7065c8e6cc19018075f4bd2d26e4a77ce5d2898008fb2c6e641bf387fb429be SHA512 56a968adba26e26b6844bd07a4d93b2798c2e3a63a2d3049a04e7c43d96600377e4e1c516fa5b527c09a3db09b6eb070faf08542ca4cffd42f8532052cde350d
 EBUILD gnome-builder-3.38.1.ebuild 6821 BLAKE2B 95493c6664fc6a0d3d164bcaf353808a91b2e1e92cbe1be139224227d0568f94205b8e0534b70d0e9f4939f6e163b3d505809a6b96aa5ac39d6b0d0fe40afeb4 SHA512 210aead19214bf34e2aa880c3c47c3bf391960fbe70c9d2f1949a117de099cc2b2291e2134164124ed3a0fed0fca03e1486943dbd9d333c78b10b239499a43d5
+EBUILD gnome-builder-3.38.2.ebuild 6821 BLAKE2B 7700ae42ae35b8b5557688bad9c9a9c61aad7076b68fb1ec6f81dd51a39ef54e4b0a32852693f9e2cd16c942322d02f41bbfab9ab97a2284bd07980b871a88e9 SHA512 aa10009d86d5dc3685968e707a26f82fbe6c3ec987dfd69ca3ab0bebf466a58fcab567413c58f59bb9331870ad7e26ccf5eee2187bed4f01228686e92bdfcc47
 MISC metadata.xml 976 BLAKE2B 088592bf7fc4c650b17862e771d3283aced4d7a5003f66938dd5830c4a8b88884fb46362e50745b09f9903347dad3233b1ba8339bdaa66c7ea9f70024071a3b8 SHA512 136ec6b271c0084e86f8b7e309f46cd89d382e96d815269f50f0dae33795084d17790daf360fb760a17a2d4885a4a5aae5f8563449160ebec49bf4c9f69438a8
diff --git a/dev-util/gnome-builder/gnome-builder-3.38.2.ebuild b/dev-util/gnome-builder/gnome-builder-3.38.2.ebuild
new file mode 100644
index 000000000000..e7f5655f8321
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.38.2.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+# TODO: automagic libportal dep
+# TODO: automagic sysprof dep for tracing paths from toplevel meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.37.0[introspection]
+	>=dev-libs/glib-2.65.0:2
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.19.91
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection]
+	>=x11-libs/vte-0.40.2:2.91[introspection]
+	>=net-libs/webkit-gtk-2.26:4=[introspection]
+	>=dev-libs/libxml2-2.9.0
+	git? ( dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
+	)
+	dev-libs/libpcre:3
+	dev-libs/libpcre2
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	glade? ( >=dev-util/glade-3.22.0:3.10= )
+	spell? ( >=app-text/gspell-1.8:0=
+		app-text/enchant:2 )
+	sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] )
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? ( $(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	') )
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer (rls plugin now disabled by default); Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dchannel=other
+
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang plugin_clang)
+		$(meson_use devhelp plugin_devhelp)
+		-Dplugin_deviced=false
+		-Dplugin_editorconfig=true # needs libpcre
+		-Dplugin_flatpak=false
+		$(meson_use git plugin_git)
+		$(meson_use glade plugin_glade)
+		-Dplugin_podman=false
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_update_manager=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index c00dc525ce0d..a4f41b35b9a6 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1,3 @@
-DIST goland-2020.3.tar.gz 484825433 BLAKE2B d3991ca6fdbbe0556ac99f65f5714a9e7b4904782a66904161d6a408ab816b2a44ea2282e51a41e71c827011da099f09e1087c259c42c8cca4e766da4cae0164 SHA512 47d5e91e17a4b3515fb72e9331bf63d69aec36d207822f20e99079d12de0351d8a9d3eca2f201a8a29bfcdc14c2f88015542f94c30be29921d4e12f0db4901f5
-EBUILD goland-2020.3.ebuild 2504 BLAKE2B e50db652814195f564e98c9398c2b5a6694044a5e66799fc77e5d097f6a77e199e9a4d92f6d0b7747069a652d88c20647a87204142ff30ea7c56c9235d84232b SHA512 9d0f3229470a40d4539afa7993e3c6bece0b65c8920dbeee10d45167219ab3bb2e37d81028b93c692b4a0b11887dda0a43deb8c4998b24d24b9514a31eb81c97
+DIST goland-2020.3.2.tar.gz 484904300 BLAKE2B a60825d0b994cb16b9a41fe228787e0dba541f34e613cc88b040b2b80d044a9b45a69fb1346ba2a919241cc5497b5cc398b571344a790d173dbb60333d536b19 SHA512 2ea02dbc8ba0338ec73cd35c6eb0a70f5f6b6487d7d58629ee1e454ca5b22b233dd5fb28be64e5131be291a4153910b6ed2ddadeb1f8f4ac1ce2f63b22c6b233
+EBUILD goland-2020.3.2.ebuild 2503 BLAKE2B 65b09fe6619840071b7c1db9f239f7d3bcb392279467b7796bab1a2e4921ad62b42223a84449754ea19bc115feb1ccc95af8b8dec4b7d7b0e8d43fc4376a7890 SHA512 0101e3fe3e5d6987ac89094e30e023c562ec916dcc087f2df77c385f16438bedb844885ebdc3d7064e2a57522f59a4273a4611b64c3eb2775434a8afd567d9be
 MISC metadata.xml 244 BLAKE2B 2ac557d4fb04230c7b4f706b52203ab6dc62d90aebc8e916561e6e3f6e41bf61bac231a0e7afe07fb18752177c6163b79fee124a171c3e8933041f4648db3a22 SHA512 da08729fbf0eceb858cadc8413dd857600ab595860ca483054e4d1422e3cacc52ce94f89d633a25c25d6b30df4a48ac7de011731418072238adb43bc8e7b3f3f
diff --git a/dev-util/goland/goland-2020.3.ebuild b/dev-util/goland/goland-2020.3.2.ebuild
index d487b813e0a4..86cbae508305 100644
--- a/dev-util/goland/goland-2020.3.ebuild
+++ b/dev-util/goland/goland-2020.3.2.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
@@ -55,7 +55,7 @@ src_install() {
 
 	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
 	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
+	make_desktop_entry "${PN}" "goland" "${PN}" "Development;IDE;"
 }
 
 pkg_postinst() {
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 0f840bce6025..37dffe876c3f 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -3,5 +3,5 @@ DIST gtk-update-icon-cache-3.24.21.tar.bz2 91918 BLAKE2B b9cf0f944f13c3280ad615a
 DIST gtk-update-icon-cache-3.24.24.tar.bz2 91902 BLAKE2B ed0ad6b501c31745eb40d56523ac78609d793d1389e4222a3e26c585d467aa57c17b188de8fd0c5847a7e773bcd174b25752a3b4c613c8f2a30e0d3237e9f484 SHA512 6dd7237d5f2e3bdbccafef2114c88aa4cfe6ba027f451791c981e8cb2cdd134ddc7bd20d2252d4605dab260567dbb78ba639f985baa2ae8ca8cf4c7d41deef26
 EBUILD gtk-update-icon-cache-3.24.20.ebuild 884 BLAKE2B 63830fae35e08408a5f65874cdbce4c6a5c8235508e1dec4b994a1a2ff15afdae4a31700b4172b9c1b3a42d6488c25ea84f878eb4efbc6743aab88108181c353 SHA512 847e0b3e70971ca53b6e5b1c0202135f79199e8f919f115dcb658f786735e6fc2add758fa554e93d3c24ef56f1d30145da75dd673f192678d4d711f15f28d68b
 EBUILD gtk-update-icon-cache-3.24.21.ebuild 891 BLAKE2B 3f0624e0b7e5f9c6de546d656deb5493ce4f4e549810e3cf76bd935cd57ecc987da693bcc298e308196726976093d04ef2b86fe9c40c68bb116b2d28929763e2 SHA512 18b0292291330e263af174acd179c36ab2e283eb36a29163e78774ae7461ae3057b49dfc183d57e04f12517dfad8e5f4b5acc06f709b44575f5ce1dbb0171f34
-EBUILD gtk-update-icon-cache-3.24.24.ebuild 895 BLAKE2B 99aaff2457b86bb9053ccf56b814e7041353025b7358c97eda335c64f930ab461f309a18399277cb3f3eac1ec788b2d68bd18a6ef825a9071b3884028e135cde SHA512 78b2ef9531a5da1360970489dfe4687e0a15799ab9f7941a59bef06ad4ed3bc9c30acb3f489578b046e9965daa1e5da6c2b68c1c0848bc1007d3227aa9d5032b
+EBUILD gtk-update-icon-cache-3.24.24.ebuild 892 BLAKE2B 53b4ce1015ceb2c8f561f89861254111ba547ac364757e8940564894442342504b542efdc6bf0b79d574f12dcbae67406bf68c610fa8c111793474f88e359b98 SHA512 0b7df96eca435a6653d5b26ba95d95ba91f8e4164b7f16e325c89eef7f65d886c3f7adeed393b56412ecf6113010b28eb55e8383b3a444410276681d79404a7b
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
index eb99ed63ac2c..5d650a3c1b1b 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/hfstospell/Manifest b/dev-util/hfstospell/Manifest
index 80c7097dfac0..46cb078d1bce 100644
--- a/dev-util/hfstospell/Manifest
+++ b/dev-util/hfstospell/Manifest
@@ -1,4 +1,3 @@
 DIST hfstospell-0.5.2.tar.gz 152115 BLAKE2B 667c01672fd6fd6ee743a6542677ffe74e3900c27ab2754f8fa7dcc57081074bd98e8d82827fe176b2a6c9abc4565efcb3204df43110906f5a333405ec8a6bf2 SHA512 307aff3aec91ac6ffed3ebabdc2baa1a6e913431f57a80a0d0254be57fbd72e28d7592c35e0d72e5979f7e0b4c585f11b8eb91183b0877f9670a9cd5206c0140
-EBUILD hfstospell-0.5.2-r1.ebuild 884 BLAKE2B ff6f1d9b69aad5651a921d705b3d865e493e5c34e08e175dc1c0d586d202ec91fd0a1cdb71e3c8d34b1456dd0b9aedca62fce09c5b76f7601ac2f37ac5d86ada SHA512 07b0468408360c1fdfd481566eae56601931342b5bdd219f22de5bd419137ef815599b52ab5367e20ced10e53827783b5b82a84c06caffb2646b170a1a7e77b4
-EBUILD hfstospell-0.5.2.ebuild 679 BLAKE2B 02dd2bda990c8e01596828dd21891332242fac8df412c48276082bc4813f9e20abdd7220a779a0aa0a2ec0e5a69263316ea3e80bff116703fe2ad51172df59d5 SHA512 ba79bce0a5b5820397db178d670825e88c4905792df3cc83adcd89d0178262b636370433b4a7f87c738e02379c5977c29f2807f7c449e60ce82815c91f5f07bb
+EBUILD hfstospell-0.5.2-r1.ebuild 882 BLAKE2B 3a26db6923c7d9ee7f0fa423e9a3b37fbd5a130f3656bbcb6d46a9c9d3743a6054ea7516682651c456a7f7d3af1cc7f7f9a6e705ec8bc10ed57a480cbc23ede3 SHA512 8c1fb1cc418b341ce9acfed8e20c77347e8a1968c8dd57aba230ced8283cd75e6c0f83860809b4d4c124fb073c5f781c5201e9e0cf979ba439c55e017da4965f
 MISC metadata.xml 350 BLAKE2B 7ee5a7e4724c7a13a1f607e8134f95fcbcf40989b972002d0ae488a8d378d9dee83939948c7c1f8c6c124ca2e7927620ea906a804a5ebe16690ddd20415392d4 SHA512 77662d70afc9c6c6fcd7a1e12aeb3c26c49f5263088cccc0c587cb30d41592c65e63009dde1c36ffeca978b2f96628a6fba08ec909f4dad99fc7d9457aba9473
diff --git a/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild b/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild
index 3b6cb8750ad9..59c8bd7eae66 100644
--- a/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild
+++ b/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="clang"
 
 DEPEND="app-arch/libarchive
diff --git a/dev-util/hfstospell/hfstospell-0.5.2.ebuild b/dev-util/hfstospell/hfstospell-0.5.2.ebuild
deleted file mode 100644
index f269ab5ace37..000000000000
--- a/dev-util/hfstospell/hfstospell-0.5.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="HFST spell checker library and command line tool"
-HOMEPAGE="https://github.com/hfst/hfst-ospell"
-SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/libarchive
-	dev-cpp/libxmlpp:2.6
-	dev-libs/icu:=
-	dev-libs/tinyxml2"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/hfst-ospell-${PV}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
-}
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index a42b4f730f25..b6dd21807e22 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,5 +1,7 @@
+DIST howdoi-2.0.10.tar.gz 25921 BLAKE2B 6af903f11ca240eeaf773957a34f8eb585067c589d3a51b449f044bcc5b4e885637d3f4e7f266fbe39ccebbfbe6da7f12feba75f196e99d4215c270a58afb506 SHA512 534d292bfbd3b2c44dd4101faa5642ae71d6c0161d45fe082dfb4129e6a594d13148970029e9c91e3672911fe55ab570fddad352c1efa405e6312b3c3c16eca4
 DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275
 DIST howdoi-2.0.8.tar.gz 25366 BLAKE2B f444b600f80c60cea658781b2b1e12dbb241b6707f51f419e55099334cd45c8bfda402ada052473b2ef35ffbc77c88d33000b210fada5eb4f09b529589fe8d60 SHA512 c2a62f5e6669fcca41a706cdeec8827e39816d31d37464d061b881ed3731995163cab56322d73362863acf5064d35dc82c383db1fad78434152bd36678ec0794
+EBUILD howdoi-2.0.10.ebuild 695 BLAKE2B 70c88f0b23fd73d22fe788c5a02e0d48e3686b2192ac5701053af5c42d5177847fa6b7626a0db9233d332c3573b4500a68748682baf6384b688aeb2b7e3b269a SHA512 e1876358f75aa6acbf7446933a792ff6df59c5745ed25a10e6fde5d0529b19cb3c8cf1f48caa58347ca1628fde463c766972404d8687387ea4e3c6862b190adb
 EBUILD howdoi-2.0.7.ebuild 693 BLAKE2B f3349a11696b95e0cfdee1a19b9589d487bbd762c2bdf034d0c41865413908b52bf0db1357ba8fe612db3ea5e14a6c63e14b090f763eab8a2ae52b07d2fed09b SHA512 99fef66aa24ea1ddc962d9637a79691b215bc86633ef16359bc2bed9b1b39f4298bf8974fa643e88fb9d42220a4fa4ee6214e0ba1e98ef55e8043b6e527db01c
 EBUILD howdoi-2.0.8.ebuild 695 BLAKE2B 2ae9852f20f40a24cae7afcd591022d1c824ec2d34bb1939ad3321ea92e6507071245fba5064fe229128eebb31d6a99c4067d7fe53bf1b3558f304332fc71c52 SHA512 526ac025b6ef755e21b26db1d3fc0fcdd672ade3b24c642a151a95c4546dba4e391728352ad6056ccacfad7e3211255eb8a2b3075a7cd9483700622a983db134
 MISC metadata.xml 367 BLAKE2B cad999effcfe4ba7eb7fcce4efa22b7cc1bc501c01f28c647c8d94fd560645b96d25bc89703bd43c8f5a969606f9842e14f955bc7ace46fcff0333469843e62b SHA512 eacaf9118ec14ec50c3f22d0abf5deafb42ebbcb3bfbdb87f01c6908983b36c6c837b13f903c0cdd7be3137d9c999f66d7983157a7ec33685d08d608096f0e27
diff --git a/dev-util/howdoi/howdoi-2.0.10.ebuild b/dev-util/howdoi/howdoi-2.0.10.ebuild
new file mode 100644
index 000000000000..8fba32c5aa56
--- /dev/null
+++ b/dev-util/howdoi/howdoi-2.0.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 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 c40121999d1c..a6f69c6480d3 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -3,4 +3,4 @@ DIST ideaIC-3.1.203.6682.168.tar.gz 577542631 BLAKE2B d47d017b76fa9106a55805b558
 DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
 EBUILD idea-community-2020.3.1.203.6682.168.ebuild 4043 BLAKE2B 4bf62f4d6d79ab1d6d839f18e94c4f13965e3d7c5d3473aad0f00a0f80bc1123fb5ce9a2cc86212b21c53d0691514c5cf4e9b24bc8decbb89042f1e80dc6cb15 SHA512 75c0b45cd2cf78d9f4a19bb1f2fff91ec0ed6b4ccc7e44b9a33baa72bea6600965fc728ef3f6eb36a4f57fb722bbe6d20ac29a39a767c14ede0f09e9bf7116fd
 EBUILD idea-community-2021.3.1.203.6682.168.ebuild 4043 BLAKE2B 4bf62f4d6d79ab1d6d839f18e94c4f13965e3d7c5d3473aad0f00a0f80bc1123fb5ce9a2cc86212b21c53d0691514c5cf4e9b24bc8decbb89042f1e80dc6cb15 SHA512 75c0b45cd2cf78d9f4a19bb1f2fff91ec0ed6b4ccc7e44b9a33baa72bea6600965fc728ef3f6eb36a4f57fb722bbe6d20ac29a39a767c14ede0f09e9bf7116fd
-MISC metadata.xml 561 BLAKE2B 511df10fb880b655143aba1063715ffdaaadd232c97f3f957105c1526a7a25ab1019fb13d0d36212799050dda94c1040a82c5219f81e41c4202ba9ae417723d3 SHA512 f1c87b067dc5252c5a9a92070428971472c3bd8102ebaea048aff7eb2783ec4fe485a5a91be4463c808025ea5df150c0c28c34cf5b3094c1aa52f0dd3b9f1db6
+MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03
diff --git a/dev-util/idea-community/metadata.xml b/dev-util/idea-community/metadata.xml
index 3642c1e6927b..137750823861 100644
--- a/dev-util/idea-community/metadata.xml
+++ b/dev-util/idea-community/metadata.xml
@@ -5,10 +5,6 @@
 		<email>mpagano@gentoo.org</email>
 		<name>Mike Pagano</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>alicef@gentoo.org</email>
-		<name>Ferrazzi Alice</name>
-	</maintainer>
 	<longdescription lang="en">
 	Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
 	</longdescription>
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index 90d0e0c0df34..a289dc2be68e 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -1,3 +1,3 @@
 DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b73e45a4c28ee20ab2932c523b528d577c45c32db88f2ee4aed58d1dceeda2fe68b8975d211dc0dad4a3a20f7c7 SHA512 dbe73bd3729074825f9f5b4241a4c539ad32069df56511963417caf0351ff9ec5edd77e9580338301c8abf89ab9c0592bc7e82c14eec7450c496259d7e9045dd
-EBUILD indent-2.2.12.ebuild 1105 BLAKE2B 4dbe7b734361d83a83cc923788ebef158a5364723330d5951fd7826341014b6e211d92d8c2dccea0e39d3a111181ca7028eb1ab679918b4e7d6ef62a9808ef68 SHA512 c35a3b472b35931645c78f51a7bd4ffbc9f2803212256dae3f7c7ec78afade30f0f8c4851db515e2d62892ea1770bfe81fac570567936cbbed99477e9b18198d
+EBUILD indent-2.2.12.ebuild 1079 BLAKE2B ad621207386629fb1f103dfbf64305ada8c0b825a87a08786d7605c39e8ec23554472b24bf467d0cdb7b859e7722fdf22f915171c3deb146ee8601c89cd572d6 SHA512 42c53030ce258be055535fbc791493d9d0d5dbcf96dff6634c5df9376abaea6f7d890b3351e4d11e55bafcd4418ff63cf2e7855838250473abb7e9cf69c5dd88
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index ab0455d550ad..a3c8834d1a88 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit l10n
 
 DESCRIPTION="Indent program source files"
 HOMEPAGE="https://www.gnu.org/software/indent/"
@@ -13,9 +14,9 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
-DEPEND="
-	nls? ( sys-devel/gettext )
+BDEPEND="
 	app-text/texi2html
+	nls? ( sys-devel/gettext )
 "
 RDEPEND="
 	nls? ( virtual/libintl )
@@ -23,7 +24,6 @@ RDEPEND="
 
 src_prepare() {
 	default
-
 	sed -i -e '/AM_CFLAGS/s:-Werror::g' src/Makefile.{am,in} || die
 }
 
@@ -47,5 +47,5 @@ src_test() {
 src_install() {
 	# htmldir as set in configure is ignored in doc/Makefile*
 	emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dodoc AUTHORS NEWS README.md ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
+	dodoc AUTHORS NEWS README.md ChangeLog{,-1990,-1998,-2001}
 }
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 3ee576e800ad..fbc1494338c8 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -2,6 +2,8 @@ AUX intel-graphics-compiler-1.0.4111-opencl-clang_version.patch 1567 BLAKE2B cef
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
 DIST intel-graphics-compiler-1.0.4944.tar.gz 6632351 BLAKE2B a3d72730b8c10fd3810fdb8206d9d92da325a094627b678bb9f8d0941e29c1697994a2d98a1b49780fae62dc421e623dea4c3a7e3061347de5f5b644cfb5e105 SHA512 34fafd5387f3b86bef17511015ff1e8daef75ebdff5d1d14ff2000b58968bb502a9ec1aee988858a2992414f6cdb222e7de19c2d877f7fc8cd84a79417e9a85e
+DIST intel-graphics-compiler-1.0.5353.tar.gz 6642256 BLAKE2B 34b80b30f33dbd57bcea15852c80cdf8bdbf4630a7904946c7ce84481789e7db42f5216ba14140d445e9b0adbfcfe224468e462ea27768f0e8d31525ce56cde1 SHA512 e9f20e2261c5cb79d365d5d8257e8f4830b2364962c48413cc80154469db34c1c844ae5d576cbce2e3c5e5cbe22c7c3710ebd0a7fe7208e5412e81ce20077c80
 EBUILD intel-graphics-compiler-1.0.4111.ebuild 1948 BLAKE2B b94c41a2657cb985065ef195ae06d62d53db8a02d30f48fdd37014b8209382d459cec5da6bfc4f1a2ded793a60adf736ea4d43f6511aecde9614c2b6aac42c49 SHA512 0abfecf61f289b258909da53e3edae8eea31577a3b57108043b7e8d6902d53153d55d8f635bc3146e71e986e9f12bfebf280ead5f58196e3f36abaeeda7411a0
 EBUILD intel-graphics-compiler-1.0.4944.ebuild 2492 BLAKE2B 2a41f64fb5ab688815cbfb29c4454eabd645cfa4ae0e852ff6fe41511726dd380843a561ebe4b594971093c51f5ceab8b132d9ac766d980bd6b4a254979f996c SHA512 feaaad5029246bff1faff06c3ba9d7c4afb15be0c31656ebfcb1a9dee7127271599144d5fb118625b034f8bb86970aed83f2acc0822eff01f2791ea74c671785
+EBUILD intel-graphics-compiler-1.0.5353.ebuild 2471 BLAKE2B c8874af4a5ba31cc8d977b52a8d2c2a41f0c9ba8957b900bbaafe3e4474a4cac42d1713f2797edaa0ccfaf02b6a35f1f075e80138171339ed9deb784e54a820f SHA512 1ae9e4cbee369646bfa05626e5358a1540b9fbbfc09c55c464f2822abfa7477e688b299bcea224c7796bee175a3d2f71d354e2d4e2f5f7ad91b03b1206a7c966
 MISC metadata.xml 262 BLAKE2B 6c3ab6eb29647b8d630b1421eca7289613438d56dfa180f85efefbb922d8d2772a26ac2360715dbce23f5b5acff73ccc5cf8d85c90a666c0475f232ed1a6a2ad SHA512 58cf8c27cd031f7653e54b8187dd99b885b5ff336c8db4692a9ee64ecbc6f503d2c41921410114d30c1ec49da925bfc67f5f7da61dd6f89a0257eb1f35c9b6ec
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild
new file mode 100644
index 000000000000..3945893333cb
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.5353.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic llvm
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+LLVM_MAX_SLOT=11
+
+# Yes, the last dependency does effectively force the use of llvm-10
+# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
+# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
+# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
+DEPEND="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
+	>=dev-libs/opencl-clang-11.0.0:=[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+	"${FILESDIR}"/${PN}-1.0.4111-opencl-clang_version.patch
+)
+#	"${FILESDIR}"/${PN}-1.0.4427-noVC_TranslateBuild_retval.patch
+
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+find_best_llvm_slot() {
+	local candidate_slot
+
+	# Select the same slot as the best opencl-clang
+	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
+	einfo "Selecting ${ocl_clang_ver}"
+	candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
+
+	# Sanity check - opencl-clang brings the right LLVM slot as its
+	# dependency so if this is missing, something is very wrong.
+	has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
+
+	echo ${candidate_slot}
+}
+
+multilib_src_configure() {
+	local llvm_slot=$(find_best_llvm_slot)
+	einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
+	local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
+
+	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
+	# IGC uses this definition causes problems for some users (see Bug #718824).
+	use debug || append-cppflags -DNDEBUG
+
+	# VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
+	local mycmakeargs=(
+		-DCCLANG_SONAME_VERSION=${llvm_slot}
+		-DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
+		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+		-DIGC_PREFERRED_LLVM_VERSION=${llvm_slot}
+		-DIGC_BUILD__VC_ENABLED=no
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 050ac1f2dd6a..88ba9d298766 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -4,7 +4,9 @@ AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
 DIST jenkins-bin-2.263.3.war 67287051 BLAKE2B 376612f444d6827ad270f1121c2df3f134893eb9a501b919e2c1b506f0536b506a1158152541c46a211f55ecc62b39930024bf3457e2e550900e5aa98f368f39 SHA512 c8badbb4704ad60ede50d32b9df36ca8f78da7e4238e9277a26eaa90a16bd27106bf7e04497cf2bf2ef086befc8cfdb64db9af7f4ceccb1dc22d4e21e5898e68
-DIST jenkins-bin-2.277.war 70882207 BLAKE2B 241606f7fcd3b37393636f9075fe8ab6173ca379664914c5e32b81dcb16a311e2877080a5c804545b2e30ae8be67def51c19bdd906605297120cee8047750e94 SHA512 7a5e5083e525005968727d3b4bb2a80e7cc87f79e6b8ed7f803a9c7bd045ec48498e6336e88830bfb72b4c4dd66ada530020c5db345834657983781c7ab3e9d0
-EBUILD jenkins-bin-2.263.3.ebuild 1105 BLAKE2B 96354716d929d2e229fdada62b1998ec7450849d9a519e974d22f9ad33c209150f1c43aa78c1016c61bbf68126f52d67c4055f683b6f50af99773309dc197b20 SHA512 7d056a9a3f7c321fc22bb4980de0d25bca8f72dbb828b1ddda06d65a4edcbc02353e6fc9bc227ee9e960b3d054e6d21c20ad0cc883327e0fc9eccb76550f5ffd
-EBUILD jenkins-bin-2.277.ebuild 1105 BLAKE2B 15c84a6e246eb72decbf8eac284db1cf74e4502424a3caec2564007004205995f06b2dc2690974a28ff5823a565ee16e082f544c7d2a308d026ba877622f8922 SHA512 4898f7440514a649891c69e47d421282494be9d642bbb00e5c5b1bdacdc3e410be7ef95a9525ec9142d8085e172ba6b08af50d60a78629a4569a993f450c0507
+DIST jenkins-bin-2.263.4.war 67287029 BLAKE2B 0e5a510fab07fccebbfae7cf5b9accb88543e5ba7a7512d120db518afb4f80e9feeb6895c3227ff52da5286440a7cd226c172a77b10a4573df2917643a1df3a3 SHA512 4f648b372a51c01b04d2057b61d2a50b2abd5d3b282b3d790eb579ebba3381cdc3fda28bcb7bad0df4ff837f66b9074e8ade66309c38b52d1f3c22f1b8d0f63e
+DIST jenkins-bin-2.279.war 73234774 BLAKE2B eeb1b70b111f86e6f295d69d5681e5683c890f2b482c7a4566738e6250e7124f3d8838c8b1411a054e61f8e75758ed23c7d0cdbf41b930418f2b27bb145df2a9 SHA512 c833efe6fe711e5d3a2ab0c13e598c3533e132cd7127c17842746e05b5172f2d9f58b1b9be09be238a7ab62c0dc9c23f2f646c72d0f4103624b2adf546348a5f
+EBUILD jenkins-bin-2.263.3-r1.ebuild 1102 BLAKE2B 560378478544d116efe5385cc2a5171f081d882a50c6b62a1ecbe48f18f271477d7ecabd478362cf30ad07561fb7ef9d623eedb2b55f249591029f2bc7da37df SHA512 a82442648b9a04c1faa77900388f81d138b4af4b21623ee67e75d6dc3d08d62b1800a9aa311b41b391c68af00e3662bd2f40bfc5236fb6830cb9f3cb2641d45d
+EBUILD jenkins-bin-2.263.4.ebuild 1102 BLAKE2B 560378478544d116efe5385cc2a5171f081d882a50c6b62a1ecbe48f18f271477d7ecabd478362cf30ad07561fb7ef9d623eedb2b55f249591029f2bc7da37df SHA512 a82442648b9a04c1faa77900388f81d138b4af4b21623ee67e75d6dc3d08d62b1800a9aa311b41b391c68af00e3662bd2f40bfc5236fb6830cb9f3cb2641d45d
+EBUILD jenkins-bin-2.279.ebuild 1095 BLAKE2B 1d093b0278f84e6859f84086f1535e639be595bab27450ec4149ee38f549f8e9c47197b541a6dc68d043339cd0e633bd7a689fa1a4e84a56aec0bcfb1b2c5bda SHA512 7cd242540c553714c013e65f6254a2cd67f36675b620f1d9155637ed67085714a15d0ce96de05da30950245fe85996528b3756d36b205d97a347323550a9a143
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.263.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.263.3-r1.ebuild
index e24da02245e6..d60a4fb1e670 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.263.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.263.3-r1.ebuild
@@ -3,32 +3,31 @@
 
 EAPI=7
 
-inherit user systemd
+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"
-RESTRICT="mirror"
 SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
 IUSE=""
 
-RDEPEND="media-fonts/dejavu
+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}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
+S="${WORKDIR}"
 
 src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
 	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
 
 	insinto /opt/jenkins
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.263.4.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.263.4.ebuild
new file mode 100644
index 000000000000..d60a4fb1e670
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.263.4.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}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.277.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.279.ebuild
index 2eea44d52656..960720966a1b 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.277.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.279.ebuild
@@ -3,32 +3,31 @@
 
 EAPI=7
 
-inherit user systemd
+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"
-RESTRICT="mirror"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
 IUSE=""
 
-RDEPEND="media-fonts/dejavu
+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}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
+S="${WORKDIR}"
 
 src_install() {
+	local JENKINS_DIR=/var/lib/jenkins
+
 	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
 
 	insinto /opt/jenkins
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index b72fa3522381..8e072dbc4978 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,3 +1,5 @@
 DIST kdev-php-5.6.1.tar.xz 1063372 BLAKE2B 4c7d3897c67629b6aafb8a2e04d080a3ab5fd3bbbd836fe09d41cbdc29a14367fc2b1dc790375e761917b81bce08b88737a1b4a03163743fad71eea1410a5d29 SHA512 45e84c7ecf293dfa48805c3a80804f468a5fb8019ea3ced6b8cc1cb9042d84774635bc58e2d61945c3e5a2e77d1bc139ecdf9ebc408157c640ccbcaa2c26f189
+DIST kdev-php-5.6.2.tar.xz 1063520 BLAKE2B b301f2da6c0936dd08f6a8ee72599e0c247c5efe18190e3c8fc7690a291d86f40f7fdffef7d036b8e5f258f749464c8aedd549feb0249d2d4fbbdefa41254307 SHA512 781ef76536b263c80be1de138b44cb3f979a1c941a868119069fa7265560d3078b9ea45be6cec30b481392a5ac69be100fe8ec3d106fffdbacf4c777045193fc
 EBUILD kdevelop-php-5.6.1.ebuild 1265 BLAKE2B d1b1b8e071a28cd998f56561c3e5a608551a2733a8351d400fef0a434685666158c91ed7f7841b0a827faf2450d1cfa8d461cc35864dcc8a5cca3f8abdcc19a2 SHA512 ff34b6d2b6ceaa3d15ff296bd88181160ec948a16b0f1f1a87a28222f245341458e5c0c325aef00b8ffe699ee0fde70c630900cabea1339cb2c9730dec43cd7e
+EBUILD kdevelop-php-5.6.2.ebuild 1263 BLAKE2B fc009b6c811c2900b1a8ef49043bce73ab4d33bfde21f5f9e62e37432fa11cfa5f15858702d8640911f83b3ab684452d2f05a316444ecb9c5c65d288b1340d75 SHA512 c35b1dd9aa80a5571a11c828581ce7e7c299857fef12ff0ee5df31c96c96f64f20589ff57e9543aa75787c8e985b3e537bb010cf707c3a268e12acd1fedd4668
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.6.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.6.2.ebuild
new file mode 100644
index 000000000000..02ca653bf56c
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.6.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK_DIR="docs"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-php"
+KFMIN=5.77.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+IUSE=""
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+BDEPEND="
+	test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop-pg-qt:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	ecm_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index e9939e2bfd77..69948e853478 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,3 +1,5 @@
 DIST kdev-python-5.6.1.tar.xz 1071080 BLAKE2B f9972f6460723bc4822b00e49ab35f74eecc86cfb642fe76d98f551519f8ab690d6c5b6bbd7db778a3a62a1d11e81f8a0ea39fda91120b951b0fb80667d52b64 SHA512 bdf05ed098cfbca395c8c82650c278f33bd5878a08527f43d555e905142b3b486267d37789cbe9bf4924162fb9c3024c13e445a2f1d408626861b96c96103e12
+DIST kdev-python-5.6.2.tar.xz 1072212 BLAKE2B 06f75d55a6c4171f6f2cfd219cfb5c54308db82dead25e9b79538ff04c7a0edd05ca5135121a923e7e169317a124d64f53da52e2226d59793d9a6c3c1ddfa6d3 SHA512 c0ecf9c075fe8c18e31152b774e76596367bb5eca8bb5ec976e9ce90ce78512d9e42bc95daea0f1de18474ef4deee430674e186263736df0de67d7d26c81f6a0
 EBUILD kdevelop-python-5.6.1.ebuild 1276 BLAKE2B d83cc1ec21061a6d542d068937dbed25afb4905b431aa12b9bb58f78effada07aaf35ca0d7a30a4255291b22c28cb6c00a7310fdae279778c30b37e653af8d7a SHA512 56bd86795497d846f713346714e22eb3be3befcfa16acd949a6021fe6fd2ed54036ed396ec83ae62e4ca23e52039d1e2befc536ed5c3b00400c9d1ea29e48f2d
+EBUILD kdevelop-python-5.6.2.ebuild 1273 BLAKE2B 8e01ee9428387cae7648fc6a4ac0aa29c546d5030e885ce5b37fec5b83d97f351cf7c3930b9d49bb35f79a746481d8ea0ab89aeff84c099ade51ba2616b8abfa SHA512 cf77e6407c981ce81bf14cc553e95abf8e60234b30d8ba7735b30f2c3958e1857d3f8cc2d22b4ad5bc9b5a6cac29a7cade3587a9988d3bfb2346a070f800f566
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild
new file mode 100644
index 000000000000..c0457e34f51b
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.6.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.77.0
+QTMIN=5.15.2
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT+=" test"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-util/kdevelop:5=
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
+	')
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 0198c32fd843..ab00a187c917 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,5 @@
 DIST kdevelop-5.6.1.tar.xz 7130284 BLAKE2B 989218ec07d437d641033b7895b533a4f92b8c557e73bac0e3671a34335aac02936eeb3b73b95d1a7bbab6ad8b32a21f15db1d5af0485999fa2f7eb24b9e8bb6 SHA512 a03e22d57b5d556489e3e140e4cad6939170087a36afa8c755318ff6b5101806b8df82bd402e32daa715f4a72352dada1c2ce3ff4455dcac0debe6456c0bc7cd
+DIST kdevelop-5.6.2.tar.xz 7128828 BLAKE2B 605b16f1666201f49e119499007a2031c4a2b28e7eb5c3b7bbf8bcd8aa2dc069708740831dc9fe327a8c9baebeffeeda5dd6d16c24c21a2be66c7475bf194423 SHA512 d5ec09b3eda439436bee4dee88612deedf02caf949e74cb7d8405fbb40ae6f16ae1b5278da0574f41c43d186edbeec6b8c40918ef7f5fafa437e07a8c4ae92ce
 EBUILD kdevelop-5.6.1.ebuild 4068 BLAKE2B 53311b167862220919bbc0ef75d6b681a66401195366a762548920f96909e7cd0f41ef6c3363cea020d27de1e3d2d93239f7160a6d4e3ff42854897c381d62e8 SHA512 4b4f6349f4692ef37fb1c4f658129186fd75ae49291238620294c46893a1bb2537fa70cbb096943d268a3532248abc1d383ad346b8ea2f739f87db02cf4a9942
+EBUILD kdevelop-5.6.2.ebuild 4205 BLAKE2B e6afd6d47514b78a64baf3b8cdf432d5934c08d0db6c25e2e417d77c4bb4942ec1fa8cd5cea4bd91a7062abd0741db8c151f3c82c0133595f38f46d6b8039475 SHA512 f5643545956ef7716f65d0833f84ff5e7d1bb6eba722c3b2f613c43c7ca7a97c459171852936891789461dda052832d701a1729270699e27fdfcfcd2c8210890
 MISC metadata.xml 554 BLAKE2B 4e34566d1ec19cb7589766d89dafabfb0b50698afdcffd9c217108cb0f5940d27c367f44cf1f6be491814f3874c67e96ebf9cbf517670091e6fa36f3a8471bd9 SHA512 33f889291d1c2b4ddf7ad8fdd33d74758090e401b093d3f7691bfe6569ab068720811747380275db58b2160fd1b301126576721d0c2c61f04e917560af2c33ac
diff --git a/dev-util/kdevelop/kdevelop-5.6.2.ebuild b/dev-util/kdevelop/kdevelop-5.6.2.ebuild
new file mode 100644
index 000000000000..9ca60dd1d33a
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.6.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KDE_ORG_CATEGORY="kdevelop"
+KFMIN=5.77.0
+QTMIN=5.15.2
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://kdevelop.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5/56" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
+
+# see bug 366471
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	dev-libs/grantlee:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qthelp-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qttest-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-util/astyle-3.1:=
+	kde-apps/libkomparediff2:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/threadweaver-${KFMIN}:5
+	>=sys-devel/clang-6.0:=
+	gdbui? ( kde-plasma/libksysguard:5= )
+	hex? ( app-editors/okteta:5 )
+	plasma? (
+		>=kde-frameworks/krunner-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+	)
+	qmake? ( dev-util/kdevelop-pg-qt:5 )
+	reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	subversion? (
+		dev-libs/apr:1
+		dev-libs/apr-util:1
+		dev-vcs/subversion
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	dev-util/ninja
+	kde-apps/kapptemplate:5
+	kde-apps/kio-extras:5
+	>=sys-devel/gdb-7.0[python]
+	reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
+"
+
+src_configure() {
+	local clang_version=$(best_version sys-devel/clang)
+	local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+
+	local mycmakeargs=(
+		-DLLVM_ROOT=${llvm_root}
+		$(cmake_use_find_package gdbui KSysGuard)
+		-DBUILD_executeplasmoid=$(usex plasma)
+		$(cmake_use_find_package plasma KF5Plasma)
+		$(cmake_use_find_package hex OktetaKastenControllers)
+		$(cmake_use_find_package qmake KDevelop-PG-Qt)
+		$(cmake_use_find_package reviewboard KF5Purpose)
+		$(cmake_use_find_package subversion SubversionLibrary)
+	)
+
+	use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
+	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "konsole view" kde-apps/konsole
+		optfeature "static C++ Qt code analysis" dev-util/clazy
+		optfeature "static C/C++ code analysis" dev-util/cppcheck
+		optfeature "heap memory profiling" dev-util/heaptrack[qt5]
+		optfeature "meson project manager plugin" dev-util/meson
+		optfeature "formatting configurations via customscript plugin" dev-util/indent
+		optfeature "formatting configurations via customscript plugin" dev-util/uncrustify
+	fi
+	ecm_pkg_postinst
+}
diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
index e8aa23a2ab43..3a9c3adc2c27 100644
--- a/dev-util/kernelshark/Manifest
+++ b/dev-util/kernelshark/Manifest
@@ -1,6 +1,8 @@
 AUX kernelshark-1.0-build.patch 1288 BLAKE2B 4d79cb34c04186edf9a4787463eede7971177ccfa64988e931345ce66b86003482f1cdb6bb2609f3a7696a18f644204d61b85ad10988347c0db6ee23335ef873 SHA512 f257b73da9494297a44363a5126528dd03e018050464d12b414c4eb0a157da550318a430f40df17db0cf4e0b49feb904c071be42685c3cf64bf455ff9c2d0779
 AUX kernelshark-1.0-desktop-version.patch 313 BLAKE2B 64663bb60499910061328169e726f75e10f843c2dcf036f31954307ffeae863bedaca259ef8d6f1bb653f14c45ffd4a83d2687ed053263526001d8aa175ecaec SHA512 33f6c02a5c8328af71f12a452fa3e5efba1300977397a1382b1e4c04cc5e49fc6c50f95555a294b57ede4616e04bc10c7b8849010ca2a63cc8c1eb266fdb13af
-DIST kernelshark-1.0.tar.gz 4238163 BLAKE2B edae4bcaf646a8c430e64205cd5d137d8df7eb839075b4bb5da459852e1bb887eaa98de51afd1884cfd27833d3513fc26995fba6964220eb8b95a317d3e4e057 SHA512 ff9f0846ba7105813742bb56887870eff8af4f525864ab75d37dcb2dd6c2222fbd500fd08140d605c3f0021d88991c114e0ffeb7da9ada979bdd78defaa1c266
-EBUILD kernelshark-1.0.ebuild 1316 BLAKE2B 1de0e7b262e6dbcfb4378be8ce0764f30d285f1e4bd7447c0e7d12627d150a19d303f0a3d3b01d1437b668a1fc4bb151fdd264ee0d70a10c7cc4c3f28035659a SHA512 2bc6432d5bbbf12928946600a192ff981cc085662c3291b61a4bdfe6f97c1e74819e3756ac1ddb486489203440b863a12774be328dcefb7bf18df5124a049bd4
+AUX kernelshark-1.2-build.patch 1619 BLAKE2B 14d7d2d949c4d738470c1f0102a72617400a3bd01718d3cd580cbac88588b268ce57b06cbe7052648e27241aa5904681a01817067785d9313eecfd4747af2027 SHA512 6f7ba465cf3c449c590b684c67302d35ef8332e4fcbe77763003c40502d26ca3078613e68232314f407f5e0185c42faad6f559efead0b337a6b065cc4503cd36
+AUX kernelshark-1.2-desktop-version.patch 196 BLAKE2B 6800b889e03902caf27a73c6358180499bf7a1051fe19af38c90aa5ea38e4230eb3a4670fcb2a8fc6b54afea371c3b3f689b06ee51f1596e14450615256c7708 SHA512 58331560d558b4fb4bbd50a24fb0cfce6b50b73cfe8481449e5d4a87836d3d2be8bd1a7f5453e8b28d87f1657b426d0453ebcefa78f97b8da44e1ed7ee8fd629
+DIST kernelshark-1.2.tar.gz 4298175 BLAKE2B 2ebe70c2b7c0691b65b0251027f1c558fc2fc5ef9bf61512d3ddd554fbb6ec349e36fca4dd0060c6b7db49eca0ec81a2f1296d635459b91883e54e77146ea3ae SHA512 059ac0ced71fa00de34c30ece433430f1e2fc36acb1b3a3f15cb84ce74d7a4f115e4ee8fbf9a256d5a731050aee02823a90a024dca4b4f6a17061652b871b935
+EBUILD kernelshark-1.2.ebuild 1256 BLAKE2B b7f5ce31272a8034fea5ecd17e259112d0b0b310e221c861529b5cef6e4a87532c6eb574938534e656171bc703eb546d1a4c60c40b0269f225acd9f7d5aa1b48 SHA512 4a85706ac373a672ed577ef0960583ba9010e2ebe801616a3829344322e1c4efd8882f15efab28aab138191196b4e0564a5d0c01dcec32232c73e04cc53e67e0
 EBUILD kernelshark-9999.ebuild 1316 BLAKE2B 1de0e7b262e6dbcfb4378be8ce0764f30d285f1e4bd7447c0e7d12627d150a19d303f0a3d3b01d1437b668a1fc4bb151fdd264ee0d70a10c7cc4c3f28035659a SHA512 2bc6432d5bbbf12928946600a192ff981cc085662c3291b61a4bdfe6f97c1e74819e3756ac1ddb486489203440b863a12774be328dcefb7bf18df5124a049bd4
 MISC metadata.xml 409 BLAKE2B a224422be52a292645aeafbd692638a1f07b1cce88debff7f3a25b9cccd02674ac1e448cb9ac329be6b8f3ff869c0aeb2d205d0930d9d5828eef88dbd295204e SHA512 2e9b3fb0033679637107c2c317fd98c0bd06ec7f8afc3fd2b7b3feef4a7188e818f3f82c6dfa704770b5c71b823e611b3d1445f22bb27ee42c2fd41c368f1708
diff --git a/dev-util/kernelshark/files/kernelshark-1.2-build.patch b/dev-util/kernelshark/files/kernelshark-1.2-build.patch
new file mode 100644
index 000000000000..c7fcd0d8d33f
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.2-build.patch
@@ -0,0 +1,39 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,11 +67,11 @@ set(KS_LOGO_LABEL  KS_logo_horizontal.svg)
+ 
+ set(CMAKE_INSTALL_RPATH "${_LIBDIR}/${KS_APP_NAME}/")
+ 
+-if (CMAKE_BUILD_TYPE MATCHES Package)
++if (NOT CMAKE_BUILD_TYPE MATCHES Package)
+ 
+     set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ 
+-else (CMAKE_BUILD_TYPE MATCHES Package)
++else (CMAKE_BUILD_TYPE MATCHES Gentoo)
+ 
+     set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ 
+--- a/build/FindTraceCmd.cmake
++++ b/build/FindTraceCmd.cmake
+@@ -38,17 +38,17 @@ find_path(TRACEFS_INCLUDE_DIR   NAMES  tracefs/tracefs.h
+                                        ${CMAKE_SOURCE_DIR}/../include/
+                                 NO_DEFAULT_PATH)
+ 
+-find_library(TRACECMD_LIBRARY   NAMES  trace-cmd/libtracecmd.a
++find_library(TRACECMD_LIBRARY   NAMES  trace-cmd/libtracecmd.so
+                                 PATHS  $ENV{TRACE_CMD}/lib/
+                                        ${CMAKE_SOURCE_DIR}/../lib/
+                                 NO_DEFAULT_PATH)
+ 
+-find_library(TRACEFS_LIBRARY    NAMES  tracefs/libtracefs.a
++find_library(TRACEFS_LIBRARY    NAMES  tracefs/libtracefs.so
+                                 PATHS  $ENV{TRACE_CMD}/lib/
+                                        ${CMAKE_SOURCE_DIR}/../lib/
+                                 NO_DEFAULT_PATH)
+ 
+-find_library(TRACEEVENT_LIBRARY NAMES  traceevent/libtraceevent.a
++find_library(TRACEEVENT_LIBRARY NAMES  traceevent/libtraceevent.so
+                                 PATHS  $ENV{TRACE_CMD}/lib/
+                                        ${CMAKE_SOURCE_DIR}/../lib/
+                                 NO_DEFAULT_PATH)
diff --git a/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch
new file mode 100644
index 000000000000..5f469b199547
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.2-desktop-version.patch
@@ -0,0 +1,9 @@
+--- a/build/ks.desktop.cmake
++++ b/build/ks.desktop.cmake
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=@KS_VERSION_STRING@
++Version=1.2
+ Type=Application
+ Name=Kernel Shark
+ GenericName=Kernel Shark
diff --git a/dev-util/kernelshark/kernelshark-1.0.ebuild b/dev-util/kernelshark/kernelshark-1.2.ebuild
index 969302e6c70a..f3406107a78a 100644
--- a/dev-util/kernelshark/kernelshark-1.0.ebuild
+++ b/dev-util/kernelshark/kernelshark-1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic cmake-utils
+inherit flag-o-matic cmake
 
 DESCRIPTION="Graphical reader for trace-cmd output"
 HOMEPAGE="https://kernelshark.org/"
@@ -18,41 +18,39 @@ else
 	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-${MY_P}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/trace-cmd-${MY_P}/kernel-shark"
-
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="custom-optimization doc"
 
-DEPEND=">=dev-util/trace-cmd-2.8.3:=
+DEPEND="
+	>=dev-util/trace-cmd-2.8.3:=
 	dev-libs/json-c:=
-	>=media-libs/freeglut-3.0.0:=
-	x11-libs/libXmu:=
-	x11-libs/libXi:=
 	dev-qt/qtcore:5=
-	dev-qt/qtwidgets:5=
 	dev-qt/qtnetwork:5=
-"
+	dev-qt/qtwidgets:5=
+	>=media-libs/freeglut-3.0.0:=
+	x11-libs/libXmu:=
+	x11-libs/libXi:="
 RDEPEND="${DEPEND}"
-BDEPEND=">=dev-util/cmake-2.8.11
+BDEPEND="
 	doc? (
 		media-gfx/graphviz
 		app-doc/doxygen
-	)
-"
+	)"
 
 PATCHES=(
-	"${FILESDIR}/kernelshark-1.0-build.patch"
-	"${FILESDIR}/kernelshark-1.0-desktop-version.patch"
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-desktop-version.patch
 )
 
 src_configure() {
 	local mycmakeargs=(
 		-D_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DTRACECMD_INCLUDE_DIR="${EPREFIX}/usr/include/trace-cmd"
-		-D_DOXYGEN_DOC="$(usex doc)"
+		-D_DOXYGEN_DOC=$(usex doc)
 	)
 	use custom-optimization || replace-flags -O? -O3
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 46bc6a87a394..b594f9ccb6da 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -3,6 +3,7 @@ DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
 DIST llvmorg-11.1.0-rc2.tar.gz 122794772 BLAKE2B ab533f078d9d6c37e27c578866a07896344a0b4cf4ebf6402f4fa490213e017310d1c882bf63e552e99a5b4f6d1d8c01413420713b200bfa6732eff64f3c47a9 SHA512 88d8f1d938f0ba7ec39478d03a35c09a30bea51735276205494265b1061621b3ebcda8ee4211e896783b1b99a377c9fa68046118b0d6cb7fcb7bea1e960f95b7
+DIST llvmorg-11.1.0-rc3.tar.gz 122785838 BLAKE2B d0998219471476be1a1249b3a2444750585a352047d4dc14de6fec87eb3407d0f4b848757340200d3423cb4090554ae033fb4ec3797446e46556fbb566bb77a3 SHA512 b67874cb127f3f929a3796558cdfbf509b384c4247f4936ba08cecf88ca880a167cf67c23d78104b5bab4a98efd9435d1b923deb7ae7367875414e6c896957d1
 DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.1.ebuild 2335 BLAKE2B 662414b8dfc8cd767c39c86276645af44f50bb3fa6ce4b1922400bb5a6e27acd18410aeb63f026a06e7bf025ff2648ae1d5d5c60c61a4f66fe1465018acb8011 SHA512 25d70f6228848646b46080c89ed53d47a4cd4d32412f1e7d5e056ca9799001e1055093c1f81437d7d509f01be3f8ca66604094535da8d22d52353889db589555
@@ -10,6 +11,7 @@ EBUILD lldb-11.0.0.ebuild 2383 BLAKE2B 8f9b788255186f72bc366551ef6d80b9c5d145672
 EBUILD lldb-11.0.1.ebuild 2346 BLAKE2B c5d93a7cd2e140351b9307684df9dd66f987d66c55f6650d07a888e358905e354ba7ce19d2c142c47896e93b6dcaf7c9640cf336359715de62bec902966cf013 SHA512 2550bc7de00480ed4a186975e2a1f32e29644f21c63f51619e00d6b4dacbbf1cfd7957ba41a8a8555788c8070295aefdca1ae237d9990544bc87a566b3b581a7
 EBUILD lldb-11.1.0_rc1.ebuild 2323 BLAKE2B 62366b1e23b8060489f22b536805bd3a3eb714c4f47059b4cdcfca3c04ae923777b895093e97b069aa77a2168e582c8ec32d9f45dd3ca39c282f51b8126eb1a5 SHA512 7ece8a940cc012670ea878e22640facd8d28214242b873330590de4316ee62f83fe7467ff3312554258a0b5860e13732eb52573756373c89a35f9bb458d7c32b
 EBUILD lldb-11.1.0_rc2.ebuild 2323 BLAKE2B 62366b1e23b8060489f22b536805bd3a3eb714c4f47059b4cdcfca3c04ae923777b895093e97b069aa77a2168e582c8ec32d9f45dd3ca39c282f51b8126eb1a5 SHA512 7ece8a940cc012670ea878e22640facd8d28214242b873330590de4316ee62f83fe7467ff3312554258a0b5860e13732eb52573756373c89a35f9bb458d7c32b
+EBUILD lldb-11.1.0_rc3.ebuild 2323 BLAKE2B 62366b1e23b8060489f22b536805bd3a3eb714c4f47059b4cdcfca3c04ae923777b895093e97b069aa77a2168e582c8ec32d9f45dd3ca39c282f51b8126eb1a5 SHA512 7ece8a940cc012670ea878e22640facd8d28214242b873330590de4316ee62f83fe7467ff3312554258a0b5860e13732eb52573756373c89a35f9bb458d7c32b
 EBUILD lldb-12.0.0.9999.ebuild 2395 BLAKE2B 30abaf03d119e20086ce988473c097d6495c4a04d4b17cf78ed8cb4c017a5d4721cdac7baace5c4fa666683b2f6e24f7d462cfb570bb92cb50491098211be0a5 SHA512 27e26543ede484152ba194e288ba8dee4897cba401cd4adb6039a214685c496c9c7fb2dd1b3376b0621c29749bdbc5228985862beccb08eb156a31c89f3861bc
 EBUILD lldb-12.0.0_rc1.ebuild 2395 BLAKE2B 30abaf03d119e20086ce988473c097d6495c4a04d4b17cf78ed8cb4c017a5d4721cdac7baace5c4fa666683b2f6e24f7d462cfb570bb92cb50491098211be0a5 SHA512 27e26543ede484152ba194e288ba8dee4897cba401cd4adb6039a214685c496c9c7fb2dd1b3376b0621c29749bdbc5228985862beccb08eb156a31c89f3861bc
 EBUILD lldb-13.0.0.9999.ebuild 2395 BLAKE2B 30abaf03d119e20086ce988473c097d6495c4a04d4b17cf78ed8cb4c017a5d4721cdac7baace5c4fa666683b2f6e24f7d462cfb570bb92cb50491098211be0a5 SHA512 27e26543ede484152ba194e288ba8dee4897cba401cd4adb6039a214685c496c9c7fb2dd1b3376b0621c29749bdbc5228985862beccb08eb156a31c89f3861bc
diff --git a/dev-util/lldb/lldb-11.1.0_rc3.ebuild b/dev-util/lldb/lldb-11.1.0_rc3.ebuild
new file mode 100644
index 000000000000..e2aae7d39efa
--- /dev/null
+++ b/dev-util/lldb/lldb-11.1.0_rc3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+	${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-lit
+	# failures + hangs
+	#use python && cmake_build check-lldb
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 238553d6b42c..ea8ec6c37f93 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -8,9 +8,10 @@ AUX ltrace-0.7.3-no-error.h-2.patch 1676 BLAKE2B 55451613cb1a5e37503dcfe38ac5535
 AUX ltrace-0.7.3-no-error.h.patch 885 BLAKE2B a893550c62e4a479405f8dd3e4c41c01d0a027bee2ed6a25e104c407e7c4372cbb2b0774c6feb3e7691f3b8f1b194d0e2377d0e9244564c2edb6d143574952c1 SHA512 193fc57ef6df54c39a099db7991237dbd2bcb1454fd5b889074c54e005fc50175f5702e118b25a3c4d09bb2d1e03ce38734798ce0143cd3b7293383b93775e2d
 AUX ltrace-0.7.3-pid_t.patch 179 BLAKE2B 7782ab18e9ec8233ed4d60aed339175e1a30f6f3f589d8a7e9eeaa228918cfba6b00528790cf2908adc785c28231e208b96a7c76fd0daa914f9ce6bdb91b01ba SHA512 87e5f49c89dcdd3218547bcd57f0ae05253d4756abb4d4981d78501a6b1de2d5389987fd90d59fe41348a0ad2b56b62a8e087e9092533e12f2cdcd800abfa8db
 AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588ee7cd074cff4b90f57fe821f6124d4aee9e2cb8f60b46b7007659d5a29d929cf579c38d858c31b8667ba50f64d579909c81 SHA512 9f407805719f21838fa3d2c48aaa96025fb4785a28b5b4e50b2593093067ed6cb406dbb662e0178e84e9db101b4cfa12867127cd212abf6417130e7cb4c21002
+AUX ltrace-0.7.3-test-glibc-2.33.patch 555 BLAKE2B 2f79f132871ea5ac1b2a6efe45959e2a1a5d2a6cfba591ee9ca9cfd9fc94af7b39d605977c843eeb4bf860fa75024b4f12d647271a38c9b061ae37a9b9d4215c SHA512 31d8390807c69446724c8c2bf5dbf56a6fdc59771883fddaa3589b7473ab0d0eeaed2e8fd4790e5b961167ad739324a36348bc2eef3e484173b5d6f253e3bd85
 AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
 AUX ltrace-0.7.3-tuple-tests.patch 460 BLAKE2B f8beacb8468f7842603e6abd1aeace86ad52cd9347fab1fb7ee243bfc1b536b42d91405380354476bc68c033687216561f6512e82bedca6e525407e79dcab2dd SHA512 07a1808ea6a9564c891ce0caec9cbb0e55975a171c46a6bb3358a9e16f217cd4bbd4b3c39a0e278b34e9c542199e13afdbe817bc2ba26390e879edbda71bf993
 DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d9869e51bf11288185da46f7a77a0aaffb41af75f84baa7d094f9f752071c9e8f53c565982a955e3250a7fc721c529b20 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.3_p4-r1.ebuild 1817 BLAKE2B 9dc0e9cdcf0b311522e3eb466a0d3bd1a1c60c8625ed61bcd645a67de3b3745de8579bc5bd58fffa90c0210217c1a460175d7c08bd675dd8095e78c215033a3e SHA512 68a303ef5f31fee2ee4c1585dd8e2ec12c047566eaa2389660fb2dd54b7017991a8dc2dc5c763a9ad6bed8016a7253d3c4079d96bfd637568fdc17752312cc2b
+EBUILD ltrace-0.7.3_p4-r1.ebuild 1866 BLAKE2B a674f6b490f9c54a4a601747b30d56e6e9964dca417d35813ba06f1efa10dee76f663ff60d974a15410977be5071eb64a3c315f11a61fada86b21f21a8784eaa SHA512 840b9017372cc8faec0c26ab0034e818fee37480b05f0da722c7f8815b2abb998e5af01df436af7a7147d83d30047efcb36784775263622b60cdfcbb8ee38575
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-test-glibc-2.33.patch b/dev-util/ltrace/files/ltrace-0.7.3-test-glibc-2.33.patch
new file mode 100644
index 000000000000..137d6271c065
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-test-glibc-2.33.patch
@@ -0,0 +1,11 @@
+--- a/testsuite/ltrace.main/system_calls.exp
++++ b/testsuite/ltrace.main/system_calls.exp
+@@ -55,7 +55,7 @@ set pattern "SYS_symlink"
+ ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1
+ set pattern "SYS_unlink"
+ ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1
+-set pattern "SYS_(new)?stat"
++set pattern "SYS_(new)?stat|SYS_newfstatat"
+ ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1 egrep
+ set pattern "SYS_access"
+ ltrace_verify_output ${objdir}/${subdir}/${testfile}.ltrace $pattern 1
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
index bf48fa668be1..8f9f97e7fb45 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.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
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.7.3-pid_t.patch #713428
 	"${FILESDIR}"/${PN}-0.7.3-tuple-tests.patch
 	"${FILESDIR}"/${PN}-0.7.3-CXX-for-tests.patch
+	"${FILESDIR}"/${PN}-0.7.3-test-glibc-2.33.patch
 )
 
 src_prepare() {
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index ae0417fece6a..c77622a57798 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -3,6 +3,6 @@ DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e
 DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
 EBUILD lttng-ust-2.11.0.ebuild 773 BLAKE2B 8ab82f84b6e9a444e8e24f02d3c3ff51f9dc187f8e327f709f86126e4b770987ac45f29f0bf2a24e8c56affb1f7834769bf78800424d715b1ebbb8a661911541 SHA512 cf354f8e33cb778b58b8afdbd64720eea0a13afe4362641fa59057531f31f9279b927b4359b1f8da6f466eba0d7f31ccd5eec043eab6300e369e5686ee056233
-EBUILD lttng-ust-2.12.0.ebuild 789 BLAKE2B 2e4320195999f877fe60e005057ecdbbbb053378588967204c34ee290ae3ed4f30de3d6354027b8f29827f1632320663df3613fe86d2e6d4f9ff084c13e7c700 SHA512 abe862b52817d3e921731296ec1377292ac66ba883b17c990c90692facd8e525d7804e861f96e9e6a7ef738af342ee92dde89dcf4db5ca824928df148855405d
+EBUILD lttng-ust-2.12.0.ebuild 788 BLAKE2B 9b2eb907974ae73450f271e25ba5c133ba11cc0e5a517e5b106bc75a37ac4f334594301d1ecfe3327268bb4654403e75352f80d8bd1020bc70d911bac3cd2669 SHA512 d954112dc17d7a7424dad4cc1de705dfe9ba365b8d4786ddb5705d168b3f5b895e42204a7141ffde948e15e2dd3c521b3be5375c6ce04b21080d370b71ce338b
 EBUILD lttng-ust-2.8.1.ebuild 661 BLAKE2B e08924d8e984f5fcaf64e18254c3cb84e1595299c6657081250bcc7671568d61be48289f80200697a8e9a8bc592edacb71f45c5d490edeeb962d0a1deab64ab3 SHA512 ca86ec9950371c87faa5f84d16a3ad9778c80cbd2b896657f6f4481e6e2623d5ddc53bd15b3c5837f7a5320bcf41d3a96a5dbdf231d1dcd8e07bfdc5f7e080d8
 MISC metadata.xml 700 BLAKE2B 868502f60e5fe09cbd2a2abd0794920341ccb496eaf2b1bbeaf377c0d894b35e950f79636e334ec910dd3ea0e3f2a205eb849b3bb2eaf17c1b7851e630a186fe SHA512 dda0af06ba5f4c5cf8b01aa61989c910acb58ff96b0e50f23f43f8d1932194a954bd3e1ae38ef052e4ad4d32dd025a082fea1de739ca1d9e4a2f60bf8ecbcae4
diff --git a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
index 1fa1ef7f3a36..ba8711568dae 100644
--- a/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 IUSE="examples numa"
 
 DEPEND="
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 6fbb51145334..e2470d472c8f 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -11,5 +11,5 @@ DIST patch-5.9.9.xz 502816 BLAKE2B 104fa2ecaac3c543662b891de22cb881a917320317d58
 EBUILD perf-5.4.20.ebuild 6647 BLAKE2B bd49393856869a9211a533d736210e2cb69d53fa47cc4a766c091384ce1d71a0812ca8225733edb3fd395304087eaf85f3663b82357b66f360d7a06d8d8d7582 SHA512 887881de705a28c0b8cdd1ea46586b0d0c8a7323acd460eec7dc8a93fc6d10da7280412d117feb4debd2d4a05843c975ae576e3d6252d30b7abdf793a9cb5cfe
 EBUILD perf-5.7-r1.ebuild 6479 BLAKE2B aacf8002ddaa40ebb9aabca97bf241dd07673d219629e3e3f088e392a1b4e1b378393fad2c889c0b137a3624a56317645492d8f9dce9a62832cb8f9a10aadf05 SHA512 1d4c98b296bfc1c2b64487f5094afacfc941e13709955342501a11af5f3938cf335f9aa82e971835d6bdafa5679e64636692f3350cc17c9ba08de00827b90aff
 EBUILD perf-5.8.ebuild 6645 BLAKE2B be18e759056f79629689d00cfe599c4102a6e041ac5d9657f854773681437040a1ed19c634db594be4779da799b163c514f11f2bea479705f9489f4f81fbb736 SHA512 b77d0aafd23dec90cf050d6a810f2a7807b0b8301d3619a80d790c2d7c2472c94e386174224d7aecfaf210ca8fcfe61147e8bed3ea2282c595433f9ebd549399
-EBUILD perf-5.9.9.ebuild 6863 BLAKE2B ac8d1548d71e82ec5efb802cdac03c3d30d2ba8755e8bfce9ae61b8617a94bb06348e20725429856139772afc02453cca4f9db96b40852c38df68dda3cc474fd SHA512 6019e9d342546ac799380be021e152c3e78bd8fa71d410734a8a8d2624d11d8273b1b0fa7456e9b19f6045fd76c782ddacc9ff8db46738628bd94925ed409f96
+EBUILD perf-5.9.9.ebuild 6863 BLAKE2B a72ab5d45815e2311d1a88a1bf8971171cd13ab476d3a3a8fa45b769f64bbf4b537860318b6ae601ec9104f729af5b057ec90b90e981df2672551336a7b2d171 SHA512 766cd1f2e0e10c46c05ac3dacd585a1acc027edaccd89b38cbc5db8ac535c66c5aac65ccc4ed666dfdd5b2faff6adf54b5ff4d61b9c8b9948a3fde71b5cc7a28
 MISC metadata.xml 1506 BLAKE2B 3f82b3824ed6e126239ccedc332b79b450a695df6149b094b05674e6bf99c1300919fd7046bc47b62a39f879cfaa72d1f496f46c2f6b76aded8ef154b3ae5a2d SHA512 ba7560b91456c4930c44427865859512166e747002fb4e5331530a2fd2b40f0828870ec59f21abb2836b6c51c70ddf77a820d475f7f8f97a03737c7178b5d8d6
diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild
index 4b9cf2265543..6fc372d7c680 100644
--- a/dev-util/perf/perf-5.9.9.ebuild
+++ b/dev-util/perf/perf-5.9.9.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
@@ -37,6 +37,7 @@ IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl pyth
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
+	${LINUX_PATCH+dev-util/patchutils}
 	sys-devel/bison
 	sys-devel/flex
 	doc? (
@@ -68,7 +69,6 @@ RDEPEND="audit? ( sys-process/audit )
 
 DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-4.19
-	${LINUX_PATCH+dev-util/patchutils}
 	java? ( virtual/jdk )
 "
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 85756e2923bb..1662c9ed9d44 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,9 +1,11 @@
 DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
 DIST pkgcheck-0.7.9.tar.gz 275854 BLAKE2B 4a98d801fc4e628f6b116fa6d05a5e31bf259f7774fc724c5ca497ea29c5e475a4679fdc4d5c2256de307af740c7bdb95a1d10e30adba94e8336a1e8a3657838 SHA512 1af7d90dcc1c13882f946f470746f7d03638762ed12d97094977c05eb11208f00a19d3a8789ce074efcc91e15258ac784027018016487213ae17e91ed6916630
 DIST pkgcheck-0.8.1.tar.gz 455289 BLAKE2B 5e0999c4348e4707e917b511718d378bd7cbb337aaae1fdb437b5bca5f4f795a65bebdf58f11e72b2b737e019a02a9b970636130b0712751ce9bf9ae9d023018 SHA512 16af41bede87b065cae59e5232707d272ad7c66ad1bac4bf4c3e4b727671be4a30d1e7d5408c29c5b288bfae8fac98829ae96b040c706deda95e670df095d022
+DIST pkgcheck-0.8.2.tar.gz 455039 BLAKE2B 282c75578cd4aa7aca3f54e9625360cde4d7146cc08a6b2bcf2f594b21b6224a18e0623055e8aa866e89583b9fd6ec12749aa4bba791f06a851b1b43fe60d440 SHA512 3377060dae6e2c49d5ae6f2dbb883da4ddeab35ecd04133635f3a91f5bfb63177497b8843445914132539efc461ce0ea89bd5d07d3cba49e0854b91d7e2f74ce
 EBUILD pkgcheck-0.7.7-r1.ebuild 1439 BLAKE2B c9f277bf416adb2b9e8371b539cfce4d04cd42080c71f292e218769c81030ca59e792f8eb198370aabd95fadd9c8470d399fb00eedb37453c87ad5e7c47bdd22 SHA512 eb03cd5371488c808186f057c20127935ae2570aaee927ea4d012fc4c0634970f5fd0d33757f611f14958de7e4a9e192a65d5ba997ff6389c8e9f2145de8ecb8
 EBUILD pkgcheck-0.7.9-r1.ebuild 1446 BLAKE2B 3a4b8bc7d6d0d515e220343eef74345ba39853f65ed39e898a68b8bf900c49610c7f5f78c1f49de08eff9254f0cdd54f57672a8177469e23bf0cc82e0effbef4 SHA512 a077e0f9e8879d89691c608e6cf0b619fc56ccb3ba92052280a55c5a5b1005d397ae72aa7638df040dbb2c15498e0df4f33f0d7e1dc3540b4e87fbdc583523e7
 EBUILD pkgcheck-0.7.9-r2.ebuild 1447 BLAKE2B ddbd3beddb0ecfd71c9120eab6d338d398b82f7dc3813698a115c74a126fb0464f6c077a7ea1b4aa35787517538c23531d58233da0d61ded74db7e2bb4b57e5e SHA512 eb46f428631af94a1095bb3f9df59ff7ec9cc6b57621f38b745e1755ae50f5b830f4c4ddc45f86b0a76afd6ef36cfef159a1f92723be3432195b08d3b1c507c1
-EBUILD pkgcheck-0.8.1.ebuild 1376 BLAKE2B e2cd0778b9aafc67fa5ed33ebbfc68fb6f6fb3ce34162864d7dc303f9bf55acccfb15bac0e9e88d3e91fdb8349e00c0a3648a0326eeb87f96625612570eac136 SHA512 72d2401d706c3833f378a485a8e8c0a95859c111695d05dd421ed61411063a4aec095e10974f60e5f03b8cff1a1e56303b922d7ebc87258c5ac2ecdcfada6654
+EBUILD pkgcheck-0.8.1.ebuild 1333 BLAKE2B ad76771e021b1a03d04d894595e3f5b25c56ff581232be0456b4aca31addf30c8e92c05716e60bcab898c5c7a536b1a9c495682d64960399da120ddb9a3459fe SHA512 24744918a0f103ac3b0d3df720c2046df5066b302eb9016bc0e6ff0834a85415e561a6f1fdc7d98f9982c66ada2e3814484072f00280b115892240d16dc04fac
+EBUILD pkgcheck-0.8.2.ebuild 1351 BLAKE2B 3b305830d1aaadb874a31a1889c8c9931b2c9a82088119985687f2624f216c9130815fd505c5c58555ca18660bea7bf24c835a0adc7a6e13216082e06fc9da7f SHA512 679bc3298c43b0285a99aef69d5da494fcbd84c3af82930f9148f96b3454641b91d25495968bc002fe8ca82f0cb5d9627620f65982ea7542b8c9c7e261b405c0
 EBUILD pkgcheck-9999.ebuild 1376 BLAKE2B e2cd0778b9aafc67fa5ed33ebbfc68fb6f6fb3ce34162864d7dc303f9bf55acccfb15bac0e9e88d3e91fdb8349e00c0a3648a0326eeb87f96625612570eac136 SHA512 72d2401d706c3833f378a485a8e8c0a95859c111695d05dd421ed61411063a4aec095e10974f60e5f03b8cff1a1e56303b922d7ebc87258c5ac2ecdcfada6654
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
index 8f19d2338355..a768d08fe5a5 100644
--- a/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.8.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.2.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.2.ebuild
new file mode 100644
index 000000000000..17e855847cfb
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.8.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	dev-python/tree-sitter[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index a80e389de493..3f7b939cc208 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,6 @@
 DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
-DIST radare2-5.1.0.tar.gz 7908690 BLAKE2B 4757eb0f729d6fa0de9bdf41b697c2ba722f8a2815e4ddb267ee1e68d50530596eaf549a7b062fd798aede214f982e309693f27df4f26257968559d35afe3076 SHA512 f973aeeb4d3a1e9eaf889a14bba4d54568dc2527d1160c7d999a7b2c870270cec7dc11a0eed12ae8f1d0aeacf63f14a92c7ca99f44e38573a6ce2276a08180f1
+DIST radare2-5.1.1.tar.gz 7920840 BLAKE2B c6109453d3da6a08f8169bfdc610614f2aee2d6ef13a975ed89e5337c79ad1a8340a08df1ba9d08cbb0db7b61db8c0357a4878e7b948a988c08b895c24ec366b SHA512 b6728bb59788804f5442d5eec8141f62c3b51f589955589b310733b3aeb28beedb969af540649f454dad96710231df384e389d8b4a1d55627d8370e4d3da454f
 EBUILD radare2-4.5.1-r1.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
-EBUILD radare2-5.1.0.ebuild 1700 BLAKE2B d66644f48b043f437e1161b57bd40f97d5be9bdc29a6df60fc631ec781461f1e7ba67aefe2c4100e6641beb947d06c79dcdf586c4613d88fb6c4d987b7b35353 SHA512 9084fb753207d024beaca63143781b7f9dc73043845118a2eb86e6230bd5394964c8638bb657fb463ea3fc01ed28270cb325d1bccda49c29a3164a73c908ba7d
+EBUILD radare2-5.1.1.ebuild 1700 BLAKE2B d66644f48b043f437e1161b57bd40f97d5be9bdc29a6df60fc631ec781461f1e7ba67aefe2c4100e6641beb947d06c79dcdf586c4613d88fb6c4d987b7b35353 SHA512 9084fb753207d024beaca63143781b7f9dc73043845118a2eb86e6230bd5394964c8638bb657fb463ea3fc01ed28270cb325d1bccda49c29a3164a73c908ba7d
 EBUILD radare2-9999.ebuild 1700 BLAKE2B 71ba7c3ec35e8555ae9125e89c9b2b2b97bc6206d591b54ccb79151c195854cfc97b36725ee521cdd431d80214537dbd9c5b04cd418c7da7f222d1f11c744cda SHA512 2658993539d9e2631b83a6e6a52a1d363598f50656e254e21434c76b14e31b79da7c43388e72f77cd7010462982789251da93c02120f969c314dc4bb880b1705
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/radare2-5.1.0.ebuild b/dev-util/radare2/radare2-5.1.1.ebuild
index fb93a9ece984..fb93a9ece984 100644
--- a/dev-util/radare2/radare2-5.1.0.ebuild
+++ b/dev-util/radare2/radare2-5.1.1.ebuild
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 3605dc6abf9d..872ecd6874f9 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -1,3 +1,3 @@
 DIST mozilla-rr-5.4.0.tar.gz 1434820 BLAKE2B 8454304fa2ddf85fcd385d3d4e72b8963dc0f6804bf572db31654cdf5bfc8a3afd050380fe34d280264114467e9b973866384d75d6f8b7078affd51064e9f597 SHA512 69b029a29cf3c147f033ff4c1c67c6190f5163b4f7329306e5f0ccfe78cae4b6ae262602253772e83d5a55408c5a4d121e5a9b3530779de74adc34b81e2592c8
 EBUILD rr-5.4.0.ebuild 1348 BLAKE2B f67c328eb6070da7f39a582be3b5e9aebab505ca8c59a2085649ecdfd1fb1cc7b9ec3d8cd9d4bc5d1345519aabbedf4dcf2b102165d77a98d96d07d585323b5c SHA512 04da5ee7ceb085c9aed2beac5a770eadb2b807f30e8ccec31bfec262185681f98982fa04845afdf2176433a5b549c511072beeabca210e8b6a69b2ed7574824d
-MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a
+MISC metadata.xml 443 BLAKE2B d70c790352f2bb15eba6c51faf34dafd53ee72d263608e3a449e0af2ba552bfebb98688de88c48bd087cbe884be5d330152a760e0922be35623a16216ffa3076 SHA512 2470f85fee8847c9346e37eefb7c3dc384e38e9fdfee47a70a88b5737669a1321910cfe7fa1b381818515165ec9aa94ada2ec331cca312a9b9be73531979eb2a
diff --git a/dev-util/rr/metadata.xml b/dev-util/rr/metadata.xml
index 4c3360d06373..642ca0c4ef15 100644
--- a/dev-util/rr/metadata.xml
+++ b/dev-util/rr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -9,10 +9,6 @@
 		<email>lu_zero@gentoo.org</email>
 		<name>Luca Barbato</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">mozilla/rr</remote-id>
 	</upstream>
diff --git a/dev-util/sasm/Manifest b/dev-util/sasm/Manifest
index a135e02526d3..7e7f68e458b2 100644
--- a/dev-util/sasm/Manifest
+++ b/dev-util/sasm/Manifest
@@ -1,6 +1,4 @@
 AUX sasm-3.10.1-unbundle-qtsingleapplication.patch 441 BLAKE2B 433221ce1d28357dc3897916e11f0e42ae4bb95402c1da6b6abcfcdecf33ddfd1a727b87ab2bf933f96fbeda95137f70e31d02c8e731a7ab3da7a784f148dad3 SHA512 c04977ee0f651c8cd5f56c93c32668aeeeeac5ae3c1bcc909933a660afae149dd797bf23df159f15fe8374001a9dbdf78ca5c5f6b59034922a82e19ad16c037f
-DIST sasm-2.2.tar.gz 9117410 BLAKE2B f85d120469f11fd8cdb7ae9dcdc87464d8bc64db4f99cb2787c4f2adb6294288a7fd1dc071b53badb8153e8c8220a77964b102a234ad9ebc3b6a64d505c828dd SHA512 42d4af775d37d47bcf63fb70b9142e387e33cef5589002ff3e3cee926b5fca7e1508d640d1d5a175d48fc9fd041eb1f03304cad5ddc3c22a09ff29198650b513
 DIST sasm-3.10.1.tar.gz 22349749 BLAKE2B e1337d9ab1f62b0ccab31f202f5964ab2b355ab597cf08e65dd69f7a35f72187a36767d1bbbf339e3bf8330dffcd924682e464d0e8cdc13255723b2c5ed75747 SHA512 2a1410c996e3dac1179a2c8a0140b2180ccc9e461e4695a588c6a5db787a13de5ca9124d467561905e1d445d08bd044bd99831203faa6a740614bc6680ae10d1
-EBUILD sasm-2.2-r1.ebuild 709 BLAKE2B 843eb1da7c0081aab0306936d2234381970a0ae6b7eda4543bc5f5b7ced04e9d800b66fa393cc0e1ba414ebd3ed3af5bfae182a49836b3ebd600a9958dfbf1f5 SHA512 82386d4f7c34b704625a7d2cb34ddd0f0e8c08ae9dda9fa193a93cab456c54fb7f26cb5247a85475cfa839d3e9b38025c45ec03abe2373fda6f5a75eb75c8f2a
 EBUILD sasm-3.10.1.ebuild 1135 BLAKE2B 4073da7d0a2b0675c6ce998940986d1490960a2007efad9449459218cd7287799e610a2ceb8a1c9906125d506fcee4e73e95ab15ec568c1b86a165b22fe44dc6 SHA512 cf0cbfa63b493d4fee91bce2a0d90e18e3eccc6ae6a193f35a0bb167dbbeb37211935426e0f08e05a99a8655db743deb903b3e33573c7b16234419fe07f62640
 MISC metadata.xml 243 BLAKE2B 52ba8a69b807c81b1271fdd34d750c1c4612230ff085b2e95205eb73f9cc9c90d3570b418bdc025e1969925ba17113c42cf4474fffa9bb601a07ce80bc5fbccb SHA512 bb1fe31b23fa8bf8b3826eeb813e6c615f1bcfb8cb5b7d326f2ca15deb2deaaccbc69f98cb78dee6034e08bab2dc644aa1ae8074df412e1c2a59f62b410c0e75
diff --git a/dev-util/sasm/sasm-2.2-r1.ebuild b/dev-util/sasm/sasm-2.2-r1.ebuild
deleted file mode 100644
index eb371161fa27..000000000000
--- a/dev-util/sasm/sasm-2.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/Dman95/SASM.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/Dman95/SASM/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${P^^}"
-fi
-
-DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
-HOMEPAGE="http://dman95.github.io/SASM/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	dev-lang/nasm
-	sys-devel/gdb
-"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index d2f2a28896aa..34efea5081cd 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,14 +1,6 @@
-AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d264915a10c4c5908de98719c9a73c37f5f7de32824dce6df32a0884c4aeb53658d05cda5dbb9c6102ecd6307c085719d4e568c2 SHA512 07fa387b9ad50cd1e92495a414973acddac8c062827858b44867ff1da0560c1493d29992fe4ac2c6de8eb37ab218967df9a6d9ffa2cb26be772324a637fadbcb
-AUX scons-3.0.3-respect-cc-etc-r1.patch 3381 BLAKE2B f7003c4fc7b054dbbfe4f185876470cf04461fd1a408f44bbac2967c9e709e7f16293dcdaf2042bda811610ca65e3007dceb0f8764b7ac2ea7675e901159d097 SHA512 054037a917a8cdc57fbca940a23699bb6ba55554b4753774df7d0b5102e0468ebb770910727f96ade949e69a6db94f2ed60e84061bd3967ff2366724980eb129
 AUX scons-4.0.0-env-passthrough.patch 1472 BLAKE2B 8f44a054fdf28ca1f049cb2f85f4e344fe294abbf1112b65c4037fd57850b4f0dc3852cdbb6e86d538d1d0543ed4409b789d1e4bb0f4ea2632ff3746e7455fdc SHA512 10fee12e0e120c81d7829d65b0f69ee295c768bec7ad6d5745963b956037d6ff4ad1bc1ec2e47871e3e9352a4855932e07a3e2a9e4b69f06bec5574bfec2e50d
 AUX scons-4.0.0-respect-cc-etc-r1.patch 3241 BLAKE2B 8e9cabb597db0c1cf278169bd6010168e46fc38895d00a0b013894b2783c65c5262156ded125e080b61927e34f40ef5ed4f2852dfd341d1d42bbcc1efad7b4ab SHA512 1878dc8f28d17aecd5c61b624c135ab3d1b311ec1b92687e1f205c4913dd5f99eeea0f7758d5623e6e60470c34fc2e7ce70571593f2197c8e59fed8df1586b53
 AUX scons-4.1.0-env-passthrough.patch 1498 BLAKE2B 9aaae51779053518d983c9f028fff58a68a8c3e1213c8a746aad2e6dc6cebf139939dd3fb41a643c5db7e6079e09ad9850e552192e35bc4c8bf75818334b9e0d SHA512 4c5c3364575d95f4922b7c5b3c8f536a34b58136e7a604bc06760d94a8b20c7e8cdfd3100ab8c56e08b885e2e9521f036f4009512b1f1b10aec2785a74119683
-DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34fa16bec47a58972b97ba28f9a88254b419b4d2edeb2d920e70cf3e0c739df5357956c8586e5377afcd4125ba0a8 SHA512 bd00bcdcd01b192a42110ec65cdb906963af08f5bbc9d5e61624b5b5b1a667b115b099ce2ef71444a8998171a5544f4caecf3acec9715876d4e9e5baa581e60d
-DIST scons-3.1.1-user.pdf 2564248 BLAKE2B 702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4 SHA512 0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594
-DIST scons-3.1.1.tar.gz 663878 BLAKE2B 095d5f45885ac12937066be247194e70d33e8f5dc0955e7d693c4b0d3a4b61e776bc1d64cd00ebc89d1e85a7992747b8f448255a76c1b6c2d9df8fa173967711 SHA512 2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54
-DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be3f21c1c90cfa6602b344c52c704f021ed8e611abaf2e24ca06c5116e79fb78ca724c9920186cce35feccbac899d SHA512 a13ed1157f6aad25acbad6e1e3d2c0a16a14dd1d5fa369ba27777ca30eeb31ce37c735c1870c80f7343f0f98a4305fe1ef7c2b679cf2cb9c0d6670f34a3aeba8
-DIST scons-3.1.2-user.pdf 2557502 BLAKE2B 1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321 SHA512 9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169
-DIST scons-3.1.2.tar.gz 668298 BLAKE2B 14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203 SHA512 bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33
 DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cfd1848be797a9519bf94834cd4174d3da3274ef77f64106c1cc182c3f8cef363e3982f5c227d3a6dcbeadbc847c2 SHA512 f1165836ad80c90caa4d936ffc86c0ed20ea4c5e7854c36fee3a2c575b1c05c731d4ece9554e43292e6da30176ad9f31f31cf12f84264307c1494f79b06f43c7
 DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d
 DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6
@@ -17,8 +9,6 @@ DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88
 DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7
 DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44
 DIST scons-4.1.0.tar.gz 3007701 BLAKE2B 70ab64ecfd89fa2af1d78a33fcef82a5f7db9875ffe9d2c16ea75cf40e661b2874359e3a5f75d761b3d9e863f7a434560992cfb020cce3e21e389381331d90de SHA512 24fd493643545a2998b053ed0d68caf6241f05bc2437e7cbeae33d2e1c63517a61449a1a18062f8e4e5a639295a2486925296ba3e54ccfa2ecdd56fa07132de8
-EBUILD scons-3.1.1.ebuild 1555 BLAKE2B 412bbaefb14c319ff0dd8c7e796dd9c22aff8906da7097d9977798c0ae0832a51f2978e8b1c7ad2b3fd0ec399f19df0e77630c188b5c1fa9aa69e6cc235c517e SHA512 f3a607f4aa344d860c0f5ed001e97325dba4c313c6941575da01dc81d2bde6add0354aa81e6a2be1704d18dfbe0c2b7e52afd54bf16dcb5975905951dde6444c
-EBUILD scons-3.1.2.ebuild 1681 BLAKE2B 577ce71970d632a71afcd1644b48b62d0a6f1303476ac8f34fb5771ee832bbf137eee7d9e05df5321eb41fe0988acf14c66cad7ac3d1e9859ae7ef43d293fa6c SHA512 17e714fb9f8b986ddd4bfc61dbd2034c7644d89e54fdce0c908844d62ce45a408cc5b6b4b98a5b35290d61c2d73dcccd291dc857c4aa801ccaf8f57104840433
-EBUILD scons-4.0.1.ebuild 2864 BLAKE2B 140ca0b78eb805fb31aee70a5dff9b9278b22aba3d88e52bf26bcfc5d158485a57a7f4086e359d07eb0baa8a7f954a68bddb7b184aff9d2f03bc6ebbe05d2603 SHA512 5fc7b36281215b8f37a368bbceca8e512b7042355808fced52e8404102fc155258ea2db6efb5913a02220e7afa289f384652413dce5e528d4e1521e0254f6748
+EBUILD scons-4.0.1.ebuild 2862 BLAKE2B 165cf3e5bea9f7b135b6f73fb14471622444411726359bb038a5283b02f37c911ebb8b503a46065898e31c6c135f32a80efb98601b5e1bf9cdcdea381138a661 SHA512 da479aa49b8060b7493c2f66618b23f3ce5db3a61b8b19585d637e8a15d2b54d9923f0c026bba4bf2f5719d470b79df7eaba2be082824c42040670112c4b4455
 EBUILD scons-4.1.0-r1.ebuild 2764 BLAKE2B dcbb27b7566e58af4d77be30920b4225126ea0f032488afa92f7fde5f945390bdae6f9b1afa09750c06b6da582a8d8505085fe63d0871435c7c6678d93924be0 SHA512 9195ae0ea29c580f4a8e7762733517f2fbf24070b417055b6424477dbd3df49691283914d10fc968ccd296de8e98954acec1815c8fc358c70afdd3bb02ef4a6a
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/files/scons-3.0.1-env-passthrough.patch b/dev-util/scons/files/scons-3.0.1-env-passthrough.patch
deleted file mode 100644
index 16de316766b1..000000000000
--- a/dev-util/scons/files/scons-3.0.1-env-passthrough.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f2f8536be12f1d095382e7598060c1eb51eb5337 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 9 May 2018 17:04:49 +0200
-Subject: [PATCH] posix: Support GENTOO_SCONS_ENV_PASSTHROUGH=1
-
-Support GENTOO_SCONS_ENV_PASSTHROUGH=1 variable to override the default
-of wiping the environment and resetting PATH to default, and instead
-pass all variables through.
----
- src/engine/SCons/Platform/posix.py | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
-index 8db08db1..af34650c 100644
---- a/src/engine/SCons/Platform/posix.py
-+++ b/src/engine/SCons/Platform/posix.py
-@@ -87,9 +87,17 @@ def generate(env):
-     pspawn = piped_env_spawn
-     # Note that this means that 'escape' is no longer used
- 
--    if 'ENV' not in env:
--        env['ENV']        = {}
--    env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
-+    # Force pass-through of environment variables in Gentoo builds
-+    if os.environ.get('GENTOO_SCONS_ENV_PASSTHROUGH', False):
-+        new_env = os.environ.copy()
-+        if 'ENV' in env:
-+            new_env.update(env['ENV'])
-+        env['ENV'] = new_env
-+    else:
-+        if 'ENV' not in env:
-+            env['ENV']        = {}
-+        env['ENV']['PATH']    = '/usr/local/bin:/opt/bin:/bin:/usr/bin'
-+
-     env['OBJPREFIX']      = ''
-     env['OBJSUFFIX']      = '.o'
-     env['SHOBJPREFIX']    = '$OBJPREFIX'
--- 
-2.17.0
-
diff --git a/dev-util/scons/files/scons-3.0.3-respect-cc-etc-r1.patch b/dev-util/scons/files/scons-3.0.3-respect-cc-etc-r1.patch
deleted file mode 100644
index b888993b436e..000000000000
--- a/dev-util/scons/files/scons-3.0.3-respect-cc-etc-r1.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 929986e568446f54c2a99c309fbb4d05bd4af00a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 10 May 2018 08:01:08 +0200
-Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
-
----
- src/engine/SCons/Platform/posix.py | 20 ++++++++++++++++++++
- src/engine/SCons/Tool/cc.py        |  3 ++-
- src/engine/SCons/Tool/cxx.py       |  3 ++-
- src/engine/SCons/Tool/link.py      |  3 ++-
- 4 files changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
-index 739310a1..ef7528e0 100644
---- a/src/engine/SCons/Platform/posix.py
-+++ b/src/engine/SCons/Platform/posix.py
-@@ -95,6 +95,26 @@ def generate(env):
-         if 'ENV' in env:
-             new_env.update(env['ENV'])
-         env['ENV'] = new_env
-+
-+        # Furthermore, force common compiler/linker variables as well
-+        envvar_mapping = {
-+            'AR': 'AR',
-+            'AS': 'AS',
-+            'ASFLAGS': 'ASFLAGS',
-+            'CC': 'CC',
-+            'CXX': 'CXX',
-+            'CFLAGS': 'CFLAGS',
-+            'CXXFLAGS': 'CXXFLAGS',
-+            'CPPFLAGS': 'CPPFLAGS',
-+            'LDFLAGS': 'LINKFLAGS',
-+        }
-+
-+        for envvar, toolvar in envvar_mapping.items():
-+            if toolvar not in env and envvar in env['ENV']:
-+                val = env['ENV'][envvar]
-+                if toolvar.endswith('FLAGS'):
-+                    val = SCons.Util.CLVar(val)
-+                env[toolvar] = val
-     else:
-         if 'ENV' not in env:
-             env['ENV']        = {}
-diff --git a/src/engine/SCons/Tool/cc.py b/src/engine/SCons/Tool/cc.py
-index 590ec5fd..5f9229a0 100644
---- a/src/engine/SCons/Tool/cc.py
-+++ b/src/engine/SCons/Tool/cc.py
-@@ -80,7 +80,8 @@ def generate(env):
- 
-     if 'CC' not in env:
-         env['CC']    = env.Detect(compilers) or compilers[0]
--    env['CFLAGS']    = SCons.Util.CLVar('')
-+    if 'CFLAGS' not in env:
-+        env['CFLAGS'] = SCons.Util.CLVar('')
-     env['CCCOM']     = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-     env['SHCC']      = '$CC'
-     env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
-diff --git a/src/engine/SCons/Tool/cxx.py b/src/engine/SCons/Tool/cxx.py
-index 430851c8..ca5ab563 100644
---- a/src/engine/SCons/Tool/cxx.py
-+++ b/src/engine/SCons/Tool/cxx.py
-@@ -74,7 +74,8 @@ def generate(env):
- 
-     if 'CXX' not in env:
-         env['CXX']    = env.Detect(compilers) or compilers[0]
--    env['CXXFLAGS']   = SCons.Util.CLVar('')
-+    if 'CXXFLAGS' not in env:
-+        env['CXXFLAGS'] = SCons.Util.CLVar('')
-     env['CXXCOM']     = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-     env['SHCXX']      = '$CXX'
-     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
-diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py
-index 5adc6ca2..a12ea8ed 100644
---- a/src/engine/SCons/Tool/link.py
-+++ b/src/engine/SCons/Tool/link.py
-@@ -318,7 +318,8 @@ def generate(env):
- 
-     env['SMARTLINK'] = smart_link
-     env['LINK'] = "$SMARTLINK"
--    env['LINKFLAGS'] = SCons.Util.CLVar('')
-+    if 'LINKFLAGS' not in env:
-+        env['LINKFLAGS'] = SCons.Util.CLVar('')
- 
-     # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
-     env['LINKCOM'] = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
--- 
-2.20.1
-
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
deleted file mode 100644
index 8983c62b15e3..000000000000
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-RESTRICT="test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
-	mkdir -p "${P}"/src || die
-	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/},$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.1.2.ebuild b/dev-util/scons/scons-3.1.2.ebuild
deleted file mode 100644
index 8ca8614d68c6..000000000000
--- a/dev-util/scons/scons-3.1.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# False positive due to commented code in setup.py
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="https://www.scons.org/"
-SRC_URI="
-	https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
-	doc? (
-		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-RESTRICT="test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
-	mkdir -p "${P}"/src || die
-	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/},$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
index 351967ed4c28..ccba5ef0e0e6 100644
--- a/dev-util/scons/scons-4.0.1.ebuild
+++ b/dev-util/scons/scons-4.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index d8d38eaab524..aaf63bd7de8e 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,6 +1,8 @@
 AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c605681b2dbfc4c52730c9f20f8290f11a2be9c37db78e533a996c22140faafc2691c732b49b9de28a59644bd5e39a2b7d4209eb44486cdeee1338de8 SHA512 db4786a10e4380f4575d52cf861a82d0aa9f69cec7d47d574f453d159396e993527ba4e469fab75fabc36b977ee4b61abb9e3787ee2af45af8f5865b3b06e10c
 DIST spirv-llvm-translator-10.0.0.tar.gz 535828 BLAKE2B 0bce2f663b2f70a2db2b1ef0665d627716d63baa6cb47ced532ac2e30e8b0424934d273135581655445ea87f5c84c9df876da0490d7a302a6d00c86b78e05c22 SHA512 d6400bb3e4df780358b5d6d0af889e7654b7dfd472c8d41b77ff98e7ff1bd017c289ecacb59a3dd7bfddb1a5108e21028aa770bf645e06178610bb322de905be
 DIST spirv-llvm-translator-10.0.0_p20200909.tar.gz 599696 BLAKE2B 9407d0b3ea9f812a06d08b8fec6cecd73fcab5ebd8aaf10c38c7693207f161b4f1eb822e60b42521e3879cd34b95da7d37cec71fb891f8df13dc60783e655c49 SHA512 fe3e4a00d1ae3fd2324379bb92244399b18a4a31b1a2ec6b9bc60eec471a8ce2da7fbe2ea5a0d247590dd7ffb6e620072197a36631f384357e808fc9b96192f5
+DIST spirv-llvm-translator-11.0.0.tar.gz 665804 BLAKE2B 826d13107efc28fc72e90761e3f4d5b718d4dda9376ce45a7db7a71494adfd293387ebd1fe473d177fb249ef7aca5b10394e200bf60b5de700ba6699e4199ce6 SHA512 e0f4c2f41d686cb574e1fc56fdebbbf4b40602219a9f941fab4c44cc86347e6f651d2fde2ea0fba81c871826f1e8ee92f07bdac5a7532f66fca25b9ed8354b05
 EBUILD spirv-llvm-translator-10.0.0.ebuild 1266 BLAKE2B be273ccb5a212aae3dbed3bff6b31001e106aefe6cf829b82c2705f462b3d758d6170174c6644ce6bcb1240772a49fd59ed92701366fe98684dc68b51ca4a086 SHA512 dadf2527303877c0fe74e8535b49699a6531c496df7220d887dd6a033faf641eedfff5ce31555f5a56523497e9493e8721d2c2aec1f069b4a1f01d2c1632fa79
 EBUILD spirv-llvm-translator-10.0.0_p20200909.ebuild 1555 BLAKE2B 12befee30e2c709c9e709195bb37d9149542ea0abcea4b2fe94a6174c5262a991ca80bc74cd32437b410b0afb43adb7a7e69cd5bb623c2599863c282c03821d0 SHA512 f5a0144d7ecdbd13e263e972774ddf0b08de7ebe4e8cbd450a6c58d1f535b725556f323018433838d4df15620fbc458461f2edab76c605344be5380605e91f2b
+EBUILD spirv-llvm-translator-11.0.0.ebuild 1555 BLAKE2B e2140c932905dfe3f53507cdfca04572fcf9c68a7c16e3f09de02426e9b1af71ff1056e5a9aca39d248653a4561ed686eecd76f7f9d2e5b3082ef7c9f3d6ea57 SHA512 0650a432c75a86437bb94ce30ba569bf5c39117e3eff5efca26e3bef9bc1047f20c3209f4b0347bd734e49c32fbec5531fa27e0b141f6e752b593a130169cb6b
 MISC metadata.xml 364 BLAKE2B 203073aa7deafccc7b4521504756fdf2f062d089e132b3175394c3bcc19b72d372260b911bf451a0b362194599b09a9d59dd018fdea8d2bb36d70c631ac1d167 SHA512 770937412a353d713452613168a44fa6697a19352c4b04f51b68fb93aa194f079120d095660b55477ce4d4bbf9eb9c587b2cc7d39d6dbf87cf0ee8181cc1442c
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0.ebuild
new file mode 100644
index 000000000000..473d07748b25
--- /dev/null
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-11.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic llvm
+
+EGIT_COMMIT="d6dc999eee381158a26f048a333467c9ce7e77f2"
+MY_PN="SPIRV-LLVM-Translator"
+MY_P="${MY_PN}-${EGIT_COMMIT}"
+
+DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="11"
+KEYWORDS="~amd64"
+IUSE="test tools"
+
+# I have yet to see a non-release spirv-llvm-translator ebuild pass ANY tests.
+# This is probably something silly like the test suite expecting different
+# directory names but I really can't be bothered to debug VCS snapshots.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON="sys-devel/clang:11=[${MULTILIB_USEDEP}]"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+BDEPEND="test? ( dev-python/lit )"
+
+REQUIRED_USE="test? ( tools )"
+
+LLVM_MAX_SLOT=11
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
+)
+
+src_prepare() {
+	append-flags -fPIC
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
+		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# Some tests fail on amd64 when ABI==x86
+	if multilib_is_native_abi; then
+		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
+	fi
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 0912de852c02..ba45a82714a6 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -9,4 +9,4 @@ EBUILD strace-5.4.ebuild 2524 BLAKE2B 3a21233c29527856cbe1723407ddac3525b57efe6f
 EBUILD strace-5.8.ebuild 2346 BLAKE2B 92f60380f83865c45f25a76347a47baee0fa23e240dd7d7879ac31a47a8a6e8614b37d9c8ef4068463527c1c0f31e5f05091febd9082515191faa30ffa1cff45 SHA512 9793e5ef0ad81c97b7bf7e29d3233a1504adce9dd1ace85cbb5b7b04e6b1e9f38b88d8b28c9d36dbeee6dd644615a6068ef45021355b9b587b0b00503b60b929
 EBUILD strace-5.9.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
 EBUILD strace-9999.ebuild 2354 BLAKE2B 65b3aaf00c35f709158d0f3de01f7bcc0b1a8daaab9e614bb9d381d0b4ae26794cd6fe8e502e1d8f953a9271e8fe0bd460b84f8ca84266192635a37d54c3b653 SHA512 879a423a1786a2147484d817a89060960e1e4796f481902f2001b872a0942a84e7d78ad87869d35637bc9cd2b3ad61821067a32def5a8dbb196b3a638676f3c2
-MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
+MISC metadata.xml 760 BLAKE2B 05d51ee681a1103d9619582b1f7788c1c0f2ff180b55fd26cbed2f5aea52cae0e9333ae31fc93a90f8c33798f5caeaf6bc1039cac9a023f114c79c71abfb8480 SHA512 3a7445fe5210eaf6c98ed5193f3e79567e6e815e295671669c2894f3f53a2decd5f2b4db5c87e85cf8b71cc4743fc94cc4a800fb33493c5f99f40ec83b6e57b3
diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml
index ed202ff2ec68..7aa6b81780e3 100644
--- a/dev-util/strace/metadata.xml
+++ b/dev-util/strace/metadata.xml
@@ -17,6 +17,7 @@
     </flag>
   </use>
   <upstream>
+    <remote-id type="github">strace/strace</remote-id>
     <remote-id type="sourceforge">strace</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index e00d1521e066..e607f1afca87 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,5 +1,7 @@
+DIST stripe-mock-0.102.0.tar.gz 555895 BLAKE2B 60062d92b58b0e65727675a2744ca15daa5029f5a1d0f5a25f41de32ad6268adea75e9562d2ed7f9b45995bf48773296cfbcd83f3b0091b5bdb7b3860c856bd6 SHA512 8c3e3b9cf1dd5eeac790458b7ce7fdbf79b956e478ea022d12ccd3840f099912c2e43db0ea44e6dd9e2bdc10fe6212f55e192ee0337fa94e48a4b40334215fe8
 DIST stripe-mock-0.79.0.tar.gz 462829 BLAKE2B 7cb1365f3fabe4ad286b7f80bc4e1ef25764c86b090aacd543239ab35626271638fe5bde7131431cf233115451ba1c9e9df53a69ff9948c5e04965a67ed5038a SHA512 46f6900eb2d8ee37b1f8dc9a0603ee6182cc70889f92c2d9a8a976670211b2f37feb33d53d51364a05a91c130c4358cff3e0b15dfe61a7619132ef568266c27e
 DIST stripe-mock-0.88.0.tar.gz 504374 BLAKE2B 2414de64ebfd1ed4842fc85e77e940da4b08cc647abebc25259d402db23bf010ab69c9660ad80ad3428f27df4036e706051fa44dcee0d2c0f6e1f089994d31d5 SHA512 eb33249ff0c135d1e74bdfaf5d7ad04b1d7ff05d1472e30d55eb819f06795ec7a05ffe73e90b0dfdd3ebcb54f0fdfa6c0ecd1158ca22abc044e1c2e212984517
+EBUILD stripe-mock-0.102.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 EBUILD stripe-mock-0.79.0.ebuild 584 BLAKE2B 9052a35ea96059edaed6c0893930a2708f76cc8fd14526372468912a20fc38e1a3b93ae7ace2811783ff5c20fed4ed852e7ae01b0d5c5809f7554dc6a13673af SHA512 6d905c6ac495e5b644761cb5a19714360a4dba45f9c673481f5f5afd262cf96ef7c43dc505cecd4146fe14f99d34ff7cbbcbb8d31cdb81e38521fce04b353198
 EBUILD stripe-mock-0.88.0.ebuild 582 BLAKE2B dd8676dfab0891cc40b5922fe235ba58960c644a09734cbe60a1943d14b54395e7079a87b817b375bcf45536ad3314eb9751917d7a0aef68adafb6072a40b4a2 SHA512 a640eefff3cace87e30b6fc09ad3686139f8ce9048afa3115df14845a64602ccc76681bb34e345c1d4703820209d0c57961dddfd4aa1c6b435e06151934e4ccd
-MISC metadata.xml 591 BLAKE2B 0ecadf3b61979e117b020d78ffa50f7fc9ca8e7d36ef9b403b76063849032187dd7b86c1f44f877504874a100989079b238d0d046f5dcc2c9a74608859c2e1e5 SHA512 6e5bb363e28b92303a6793b4605a970253bb6263c2045527d04b21566aed05f6a51002a0af575e37cc644b9c3e0c2b384dab6cd04fe2ae531881054a901b48c4
+MISC metadata.xml 725 BLAKE2B 5581ffca5d7ed165d7f01d0d158e4ef45454d7a917d1996e62b9e1fab9593d6ee63c6042149f3581944747f896292dd9f65d462b019768658f5adf24146093a7 SHA512 808daf9ba987547a9d639c70bf6d78d4d1769481a9023a54005a79106a5cc7bbf90c9edec7551f3284fa055a2ffd368335405d558fd1bc5578da3bd667956ba3
diff --git a/dev-util/stripe-mock/metadata.xml b/dev-util/stripe-mock/metadata.xml
index f552f2aeb9a6..2f64d0144cbb 100644
--- a/dev-util/stripe-mock/metadata.xml
+++ b/dev-util/stripe-mock/metadata.xml
@@ -13,6 +13,10 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="project">
+    <!-- tight dependency of dev-python/stripe -->
+    <email>python@gentoo.org</email>
+  </maintainer>
   <upstream>
     <remote-id type="github">stripe/stripe-mock</remote-id>
   </upstream>
diff --git a/dev-util/stripe-mock/stripe-mock-0.102.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.102.0.ebuild
new file mode 100644
index 000000000000..05a7220e34b0
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.102.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/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 7e129afb9f0b..de7b81128124 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-dev-tools-4.15.1.tar.bz2 340738 BLAKE2B 73c08f27011ce0d2144eaa1672209
 DIST xfce4-dev-tools-4.16.0.tar.bz2 340107 BLAKE2B 93919e1b705858770f5c98cab080ba86785d524dc7371f09fba065f2bdf549d9a3ada66cdef3e1bbd344fb62cecb70661a1b6ce8c8bb51ada0be9459604d4d4f SHA512 54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7
 EBUILD xfce4-dev-tools-4.14.0.ebuild 578 BLAKE2B ee9471d511f0f61bebc4458fafd29ec7c246ede52b393404d055058f8453149fb13a0c5e83504aa15465ac4549ec67a8bc693d59f44cb268e61ab313de3b0aac SHA512 de4981b2dd476a6582654f5bc09b3e6008d0f96b310737e0797c66bf3e469783a7dbef58445ff20d5e9d8ea02539d334e6c5047f78ecbb82290deab39a9aa83a
 EBUILD xfce4-dev-tools-4.15.1.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
-EBUILD xfce4-dev-tools-4.16.0.ebuild 597 BLAKE2B d24451c67a946a275cb193ccf8610aeac5dce272c8b5335e22b395836d25f7190f39aed222216153088dd1385d3452547924d16697e334f1cd52f6734056e754 SHA512 3a04d78a2571fb904352701895d640a8cbfc4efd118e3df7c56c8256ac3bafb50a1b2990b5f611ebcd8eb88309f8f4a8c250b7624836ea2e82ccfec2a701a91c
+EBUILD xfce4-dev-tools-4.16.0.ebuild 594 BLAKE2B 58ebfcb1e8ac14763ebc87d471913e54f6053491ae6085289833f0a47a234184d7f1e772da1b69bebda31289e3ef6a6ce9993e7c25bad1fac5d84e422cdcacad SHA512 04950ffd8223e353cdfd6bcbbba291cbd9f15eb6b40000cf9433e9eea52cd701e1ae4c78db0ad133b4b31dccfd80e104ee376f81449d5a8decd5f514679fe4ae
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
index 4a16245a3622..61c8cb857a19 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND="